Merge remote-tracking branch 'origin/master'

Weblate
2 parents 40928528 41c081de
Showing 6 changed files with 39 additions and 9 deletions Show diff stats
AUTHORS.md
debian/changelog
lib/noosfero/version.rb
public/500.html
util/debian-install/README.md
util/debian-install/Vagrantfile
@@ -43,11 +43,15 @@ Alessandro Palmeira + Rafael Manzo &lt;alessandro.palmeira@gmail.com&gt;
 analosnak <analosnak@gmail.com>
 Ana Losnak <analosnak@gmail.com>
 Andre Bernardes <andrebsguedes@gmail.com>
+André Bernardes <andrebsguedes@gmail.com>
+André Guedes <andrebsguedes@fedora.local>
+André Guedes <andrebsguedes@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
 Arthur Del Esposte <arthurmde@gmail.com>
 Arthur Del Esposte <arthurmde@yahoo.com.br>
+Athos Ribeiro <athoscribeiro@gmail.com>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
@@ -82,6 +86,7 @@ Carlos Morais + Diego Araújo &lt;diegoamc90@gmail.com&gt;
 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
+Christophe DANIEL <papaeng@gmail.com>
 Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
 Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
@@ -126,11 +131,14 @@ DylanGuedes &lt;djmgguedes@gmail.com&gt;
 Eduardo Passos <eduardo@risa.localdomain.localhost>
 Eduardo Passos <eduardosteps@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
+Eduardo Vital <vitaldu@gmail.com>
 Evandro Jr <evandrojr@gmail.com>
 Evandro Junior <evandrojr@gmail.com>
+Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
 Fabio Teixeira <fabio1079@gmail.com>
 FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
+Filipe Ribeiro <firibeiro77@live.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
@@ -198,6 +206,7 @@ Lucas Kanashiro &lt;kanashiro.duarte@gmail.com&gt;
 Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
 Luciano <lucianopcbr@gmail.com>
+Luciano Prestes Cavacanti <lucianopcbr@gmail.com>
 Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
@@ -207,6 +216,7 @@ Martín Olivera &lt;molivera@solar.org.ar&gt;
 Maurilio Atila <cabelotaina@gmail.com>
 M for Momo <mo@rtnp.org>
 Michal Čihař <michal@cihar.com>
+Michel Felipe <mfelipeof@gmail.com>
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
@@ -251,6 +261,7 @@ Tallys Martins &lt;tallysmartins@yahoo.com.br&gt;
 tallys <tallys@tallys>
 tallys <tallys@tallys.(none)>
 Thiago Casotti <thiago.casotti@uol.com.br>
+Thiago Ribeiro <thiagitosouza@hotmail.com>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Tuux <tuxa@galaxie.eu.org>
 TWS <tablettws@gmail.com>
-noosfero (1.2~1) UNRELEASED; urgency=medium
-
-  [ Antonio Terceiro ]
-  * Temporary version in heavy development
+noosfero (1.2~rc1) wheezy; urgency=medium
  
   [ Joenio Costa ]
   * Build noosfero-chat package
  
- -- Joenio Costa <joenio@colivre.coop.br>  Mon, 18 May 2015 14:32:21 -0300
+  [ Antonio Terceiro ]
+  * Noosfero 1.2 RC1
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 13 Jul 2015 15:44:17 -0300
  
 noosfero (1.1) wheezy; urgency=low
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.2~0'
+  VERSION = '1.2~rc1'
 end
  
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -67,7 +67,7 @@
  
  
       <div id='fr' style='display: none' class='message'>
-        <h1>Problème temporaire du système.</h1>
+        <h1>Problème temporaire du système</h1>
         <p>
         Notre équipe technique est en train d'y travailler. Merci de réessayer plus tard. Nous sommes désolés de la gêne occasionnée.
         </p>
 This directory contains the basic structure to test the installation of
 Noosfero debian packages, using a fresh Vagrant VM and packages built in
 ${NOOSFEROROOT}/pkg/.
+
+To perform a test, do
+
+```
+$ cd /path/to/noosfero
+$ rake noosfero:deb
+$ cd util/debian-install/
+$ vagrant up
+```
+
+To reset the environment in preparation for a new test, destroy the VM and
+remove any local `*.deb` files :
+
+```
+$ cd util/debian-install/
+$ vagrant halt
+$ vagrant destroy
+$ rm -f *.deb
+```
@@ -5,7 +5,7 @@
 VAGRANTFILE_API_VERSION = "2"
  
 require 'fileutils'
-debs = `find ../../pkg/ -name '*.deb' | sort -t _ -V | tail -2`.split
+debs = `find ../../pkg/ -name '*.deb' | sort -t _ -V`.split
 if debs.empty?
   puts "W: no debs built in ../../pkg/; will either install existing local"
   puts "   ones, or the ones from the remote repository"
@@ -16,7 +16,7 @@ else
  
     local_debs.delete(fn)
  
-    if File.stat(f) != File.stat(fn)
+    if !File.exist?(fn) || File.stat(f) != File.stat(fn)
       FileUtils::Verbose.rm_f(fn)
       FileUtils::Verbose.ln f, '.'
     end
...	...	@@ -43,11 +43,15 @@ Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
43	43	analosnak <analosnak@gmail.com>
44	44	Ana Losnak <analosnak@gmail.com>
45	45	Andre Bernardes <andrebsguedes@gmail.com>
	46	+André Bernardes <andrebsguedes@gmail.com>
	47	+André Guedes <andrebsguedes@fedora.local>
	48	+André Guedes <andrebsguedes@gmail.com>
46	49	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
47	50	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
48	51	Antonio Terceiro <terceiro@colivre.coop.br>
49	52	Arthur Del Esposte <arthurmde@gmail.com>
50	53	Arthur Del Esposte <arthurmde@yahoo.com.br>
	54	+Athos Ribeiro <athoscribeiro@gmail.com>
51	55	Aurelio A. Heckert <aurelio@colivre.coop.br>
52	56	Braulio Bhavamitra <brauliobo@gmail.com>
53	57	Bráulio Bhavamitra <brauliobo@gmail.com>
...	...	@@ -82,6 +86,7 @@ Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
82	86	Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
83	87	Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
84	88	Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
	89	+Christophe DANIEL <papaeng@gmail.com>
85	90	Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
86	91	Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
87	92	Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
...	...	@@ -126,11 +131,14 @@ DylanGuedes <djmgguedes@gmail.com>
126	131	Eduardo Passos <eduardo@risa.localdomain.localhost>
127	132	Eduardo Passos <eduardosteps@gmail.com>
128	133	Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
	134	+Eduardo Vital <vitaldu@gmail.com>
129	135	Evandro Jr <evandrojr@gmail.com>
130	136	Evandro Junior <evandrojr@gmail.com>
	137	+Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
131	138	Fabio Teixeira <fabio1079@gmail.com>
132	139	FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
133	140	Fernanda Lopes <nanda.listas+psl@gmail.com>
	141	+Filipe Ribeiro <firibeiro77@live.com>
134	142	Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
135	143	Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
136	144	Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
...	...	@@ -198,6 +206,7 @@ Lucas Kanashiro <kanashiro.duarte@gmail.com>
198	206	Lucas Melo <lucas@colivre.coop.br>
199	207	Lucas Melo <lucaspradomelo@gmail.com>
200	208	Luciano <lucianopcbr@gmail.com>
	209	+Luciano Prestes Cavacanti <lucianopcbr@gmail.com>
201	210	Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
202	211	Luis David Aguilar Carlos <ludwig9003@gmail.com>
203	212	Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
...	...	@@ -207,6 +216,7 @@ Martín Olivera <molivera@solar.org.ar>
207	216	Maurilio Atila <cabelotaina@gmail.com>
208	217	M for Momo <mo@rtnp.org>
209	218	Michal Čihař <michal@cihar.com>
	219	+Michel Felipe <mfelipeof@gmail.com>
210	220	Moises Machado <moises@colivre.coop.br>
211	221	Naíla Alves <naila@colivre.coop.br>
212	222	Nanda Lopes <nanda.listas+psl@gmail.com>
...	...	@@ -251,6 +261,7 @@ Tallys Martins <tallysmartins@yahoo.com.br>
251	261	tallys <tallys@tallys>
252	262	tallys <tallys@tallys.(none)>
253	263	Thiago Casotti <thiago.casotti@uol.com.br>
	264	+Thiago Ribeiro <thiagitosouza@hotmail.com>
254	265	Thiago Zoroastro <thiago.zoroastro@bol.com.br>
255	266	Tuux <tuxa@galaxie.eu.org>
256	267	TWS <tablettws@gmail.com>
...	...
1		-noosfero (1.2~1) UNRELEASED; urgency=medium
2		-
3		- [ Antonio Terceiro ]
4		- * Temporary version in heavy development
	1	+noosfero (1.2~rc1) wheezy; urgency=medium
5	2
6	3	[ Joenio Costa ]
7	4	* Build noosfero-chat package
8	5
9		- -- Joenio Costa <joenio@colivre.coop.br> Mon, 18 May 2015 14:32:21 -0300
	6	+ [ Antonio Terceiro ]
	7	+ * Noosfero 1.2 RC1
	8	+
	9	+ -- Antonio Terceiro <terceiro@colivre.coop.br> Mon, 13 Jul 2015 15:44:17 -0300
10	10
11	11	noosfero (1.1) wheezy; urgency=low
12	12
...	...
1	1	module Noosfero
2	2	PROJECT = 'noosfero'
3		- VERSION = '1.2~0'
	3	+ VERSION = '1.2~rc1'
4	4	end
5	5
6	6	root = File.expand_path(File.dirname(__FILE__) + '/../..')
...	...
...	...	@@ -67,7 +67,7 @@
67	67
68	68
69	69	<div id='fr' style='display: none' class='message'>
70		- <h1>Problème temporaire du système.</h1>
	70	+ <h1>Problème temporaire du système</h1>
71	71	<p>
72	72	Notre équipe technique est en train d'y travailler. Merci de réessayer plus tard. Nous sommes désolés de la gêne occasionnée.
73	73	</p>
...	...
1	1	This directory contains the basic structure to test the installation of
2	2	Noosfero debian packages, using a fresh Vagrant VM and packages built in
3	3	${NOOSFEROROOT}/pkg/.
	4	+
	5	+To perform a test, do
	6	+
	7	+```
	8	+$ cd /path/to/noosfero
	9	+$ rake noosfero:deb
	10	+$ cd util/debian-install/
	11	+$ vagrant up
	12	+```
	13	+
	14	+To reset the environment in preparation for a new test, destroy the VM and
	15	+remove any local `*.deb` files :
	16	+
	17	+```
	18	+$ cd util/debian-install/
	19	+$ vagrant halt
	20	+$ vagrant destroy
	21	+$ rm -f *.deb
	22	+```
...	...
...	...	@@ -5,7 +5,7 @@
5	5	VAGRANTFILE_API_VERSION = "2"
6	6
7	7	require 'fileutils'
8		-debs = `find ../../pkg/ -name '*.deb' \| sort -t _ -V \| tail -2`.split
	8	+debs = `find ../../pkg/ -name '*.deb' \| sort -t _ -V`.split
9	9	if debs.empty?
10	10	puts "W: no debs built in ../../pkg/; will either install existing local"
11	11	puts " ones, or the ones from the remote repository"
...	...	@@ -16,7 +16,7 @@ else
16	16
17	17	local_debs.delete(fn)
18	18
19		- if File.stat(f) != File.stat(fn)
	19	+ if !File.exist?(fn) \|\| File.stat(f) != File.stat(fn)
20	20	FileUtils::Verbose.rm_f(fn)
21	21	FileUtils::Verbose.ln f, '.'
22	22	end
...	...