fix conflit with master

Leandro Santos
2 parents a8d259b7 59520e8c
Showing 7 changed files with 64 additions and 78 deletions Show diff stats
AUTHORS.md
debian/changelog
lib/noosfero/version.rb
po/fr/noosfero.po
public/500.html
util/debian-install/README.md
util/debian-install/Vagrantfile
@@ -83,6 +83,9 @@ Carlos Morais + Eduardo Morais &lt;carlos88morais@gmail.com&gt;
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
 Carlos Morais <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>
 Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
@@ -128,6 +131,7 @@ Eduardo Vital &lt;vitaldu@gmail.com&gt;
 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>
 Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@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
  
-  [ root ]
-  * Api test
+  [ Antonio Terceiro ]
+  * Noosfero 1.2 RC1
  
- -- root <root@17edebf1ae91>  Mon, 06 Jul 2015 14:39:06 +0000
+ -- 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~1'
+  VERSION = '1.2~rc1'
 end
  
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -7,7 +7,7 @@ msgstr &quot;&quot;
 "Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-01 17:26-0300\n"
-"PO-Revision-Date: 2015-07-03 00:41+0200\n"
+"PO-Revision-Date: 2015-07-13 10:39+0200\n"
 "Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/fr/>\n"
@@ -6788,32 +6788,28 @@ msgid &quot;There are members currently using this role.&quot;
 msgstr ""
  
 #: app/views/profile_roles/destroy.html.erb:13
-#, fuzzy
 msgid "To which role do you want to change them?"
-msgstr "Indiquez quels contacts vous souhaitez inviter."
+msgstr "Pour quel rôle voulez-vous les changer ?"
  
 #: app/views/profile_roles/destroy.html.erb:20
-#, fuzzy
 msgid "Delete role"
-msgstr "Détruire le profil"
+msgstr "Supprimer le rôle"
  
 #: app/views/profile_roles/index.html.erb:1 app/views/role/index.html.erb:1
 msgid "Manage user roles"
 msgstr "Gérer les rôles des utilisateurs"
  
 #: app/views/profile_roles/index.html.erb:5 app/views/role/index.html.erb:5
-#, fuzzy
 msgid "Role"
-msgstr "Rôles :"
+msgstr "Rôle"
  
 #: app/views/profile_roles/index.html.erb:17
 msgid "Assign"
 msgstr ""
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:1
-#, fuzzy
 msgid "Hi!"
-msgstr "Visites"
+msgstr "Bonjour !"
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:3
 msgid ""
@@ -6823,9 +6819,8 @@ msgstr &quot;&quot;
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:5
 #: app/views/comment_notifier/notification.text.erb:5
-#, fuzzy
 msgid "Title: %s"
-msgstr "Ticket : %s"
+msgstr "Titre : %s"
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:7
 #: app/views/comment_notifier/notification.text.erb:7
@@ -6922,9 +6917,8 @@ msgid &quot;Set %s template as default&quot;
 msgstr "Définir %s comme modèle par défaut"
  
 #: app/views/templates/index.html.erb:31
-#, fuzzy
 msgid "Edit settings"
-msgstr "Paramètres de messagerie"
+msgstr "Modifier les paramètres"
  
 #: app/views/templates/index.html.erb:33
 #, fuzzy
@@ -6932,9 +6926,8 @@ msgid &quot;Edit sideblocks&quot;
 msgstr "Éditer les boîtes de menus"
  
 #: app/views/templates/index.html.erb:35
-#, fuzzy
 msgid "Edit header/footer"
-msgstr "Édition des en-tête et pied de page"
+msgstr "Modifier en-tête/pied de page"
  
 #: app/views/doc/_path.html.erb:2
 msgid "You are here:"
@@ -6946,9 +6939,8 @@ msgid &quot;Manual sections&quot;
 msgstr "Paramètres de messagerie"
  
 #: app/views/home/terms.html.erb:1
-#, fuzzy
 msgid "Terms of use - %s"
-msgstr "Conditions d'utilisation"
+msgstr "Conditions d'utilisation - %s"
  
 #: app/views/home/welcome.html.erb:4
 msgid "Welcome to %s!"
@@ -6966,9 +6958,8 @@ msgid &quot;Firstly, some tips for getting started:&quot;
 msgstr ""
  
 #: app/views/home/welcome.html.erb:11
-#, fuzzy
 msgid "Confirm your account!"
-msgstr "Confirmer votre nouveau mot de passe"
+msgstr "Confirmer votre compte !"
  
 #: app/views/home/welcome.html.erb:12
 msgid ""
@@ -7022,9 +7013,8 @@ msgid &quot;%s your Gmail, Yahoo and Hotmail contacts!&quot;
 msgstr "%s vos contacts de Gmail, Yahoo et Hotmail !"
  
 #: app/views/home/welcome.html.erb:25
-#, fuzzy
 msgid "Invite and find"
-msgstr "Inviter mes contacts !"
+msgstr "Inviter et trouver"
  
 #: app/views/home/welcome.html.erb:26
 msgid ""
@@ -7047,16 +7037,14 @@ msgid &quot;What can I do as a %s?&quot;
 msgstr ""
  
 #: app/views/home/index.html.erb:2
-#, fuzzy
 msgid "News"
-msgstr "Nouveau %s"
+msgstr "Nouveautés"
  
 #: app/views/home/index.html.erb:45
 #: app/views/profile/_profile_activities_list.html.erb:14
 #: app/views/profile/_profile_network_activities.html.erb:6
-#, fuzzy
 msgid "View more"
-msgstr "Voir le profil"
+msgstr "Voir plus"
  
 #: app/views/features/_manage_enterprise_fields.html.erb:5
 #: app/views/features/_manage_community_fields.html.erb:5
@@ -7071,16 +7059,14 @@ msgid &quot;Required&quot;
 msgstr "Obligatoire"
  
 #: app/views/features/_manage_enterprise_fields.html.erb:8
-#, fuzzy
 msgid "Display on registration?"
 msgstr "Afficher à l'inscription ?"
  
 #: app/views/features/_manage_enterprise_fields.html.erb:13
 #: app/views/features/_manage_community_fields.html.erb:13
 #: app/views/features/_manage_person_fields.html.erb:13
-#, fuzzy
 msgid "Check/Uncheck All"
-msgstr "Tout décocher"
+msgstr "Tout cocher/décocher"
  
 #: app/views/features/manage_fields.html.erb:1
 msgid "Manage fields displayed for profiles"
@@ -7134,19 +7120,16 @@ msgstr &quot;&quot;
 "modifications."
  
 #: app/views/features/index.html.erb:15
-#, fuzzy
 msgid "Feature"
-msgstr "Quelques fonctionnalités"
+msgstr "Fonctionnalité"
  
 #: app/views/features/index.html.erb:16
-#, fuzzy
 msgid "Enabled?"
-msgstr "Activé"
+msgstr "Activé ?"
  
 #: app/views/features/index.html.erb:27
-#, fuzzy
 msgid "Configure features"
-msgstr "Quelques fonctionnalités"
+msgstr "Editer les fonctionnalités"
  
 #: app/views/features/index.html.erb:29
 msgid "Page to redirect after signup"
@@ -7174,9 +7157,8 @@ msgid &quot;Embed unavailable.&quot;
 msgstr "Indisponible"
  
 #: app/views/chat/start_session_error.html.erb:3
-#, fuzzy
 msgid "Could not connect to chat"
-msgstr "Impossible de créer le produit"
+msgstr "Impossible de se connecter au chat"
  
 #: app/views/chat/start_session_error.html.erb:3
 msgid "try again"
@@ -7199,26 +7181,22 @@ msgid &quot;Select theme&quot;
 msgstr "Choisissez le thème"
  
 #: app/views/themes/_select_theme.html.erb:5
-#, fuzzy
 msgid "Use the default theme"
-msgstr "Utiliser ce thème"
+msgstr "Utiliser le thème par défaut"
  
 #: app/views/themes/_select_theme.html.erb:5
-#, fuzzy
 msgid "Are you sure you want to use the environment default theme?"
-msgstr "Êtes-vous sûr(e) de vouloir sortir ?"
+msgstr "Etes-vous sûr que vous voulez utiliser le thème par défaut ?"
  
 #: app/views/file_presenter/_image.html.erb:7
 #: app/views/file_presenter/_image.html.erb:9
-#, fuzzy
 msgid "&laquo; Previous"
-msgstr "Précédent"
+msgstr "&laquo; Précédent"
  
 #: app/views/file_presenter/_image.html.erb:13
 #: app/views/file_presenter/_image.html.erb:15
-#, fuzzy
 msgid "Next &raquo;"
-msgstr "Plus récents &raquo;"
+msgstr "Suivant &raquo;"
  
 #: app/views/file_presenter/_image.html.erb:22
 msgid "image %d of %d"
@@ -7229,18 +7207,16 @@ msgstr &quot;&quot;
 #: app/views/profile_members/_members_list.html.erb:2
 #: app/views/profile_members/add_member.html.erb:2
 #: app/views/profile_members/add_admin.html.erb:2
-#, fuzzy
 msgid "Current members"
-msgstr "Un membre"
+msgstr "Les membres actuels"
  
 #: app/views/profile_members/_manage_roles.html.erb:21
 msgid "Type in a search term for users"
 msgstr ""
  
 #: app/views/profile_members/_add_admins.html.erb:1
-#, fuzzy
 msgid "Add admins to %s"
-msgstr "Tous les membres"
+msgstr "Ajouter un admin à %s"
  
 #: app/views/profile_members/affiliate.html.erb:7
 #: app/views/environment_role_manager/affiliate.html.erb:7
@@ -7248,9 +7224,8 @@ msgid &quot;Affiliate&quot;
 msgstr "Affilié"
  
 #: app/views/profile_members/_index_buttons.html.erb:3
-#, fuzzy
 msgid "Add members"
-msgstr "Tous les membres"
+msgstr "Ajouter des membres"
  
 #: app/views/profile_members/_index_buttons.html.erb:5
 #: app/views/invite/select_friends.html.erb:6
@@ -7279,9 +7254,8 @@ msgstr &quot;&quot;
 "membre pour administrer cette communauté."
  
 #: app/views/profile_members/add_members.html.erb:1
-#, fuzzy
 msgid "Add members to %s"
-msgstr "Tous les membres"
+msgstr "Ajouter des membres à %s"
  
 #: app/views/profile_members/change_role.html.erb:1
 #: app/views/environment_role_manager/change_role.html.erb:1
@@ -7289,14 +7263,12 @@ msgid &quot;Changing role of %s&quot;
 msgstr "Changement du rôle de %s"
  
 #: app/views/profile_members/change_role.html.erb:15
-#, fuzzy
 msgid "Custom Roles:"
-msgstr "Rôles :"
+msgstr "Rôles personnalisés :"
  
 #: app/views/maps/edit_location.html.erb:15
-#, fuzzy
 msgid "Locate in the map"
-msgstr "Créer un nouveau thème"
+msgstr "Localiser sur la carte"
  
 #: app/views/maps/edit_location.html.erb:15
 msgid ""
@@ -7317,9 +7289,8 @@ msgid &quot;Invalid address&quot;
 msgstr "Adresse invalide"
  
 #: app/views/maps/_google_map.js.erb:137
-#, fuzzy
 msgid "Request denied"
-msgstr "Accès interdit"
+msgstr "Demande refusée"
  
 #: app/views/maps/_google_map.js.erb:139
 msgid "Over query limit"
@@ -7340,9 +7311,8 @@ msgid &quot;New category&quot;
 msgstr "Nouvelle catégorie"
  
 #: app/views/categories/_category.html.erb:10
-#, fuzzy
 msgid "Show"
-msgstr "Voir le diaporama"
+msgstr "Voir"
  
 #: app/views/categories/_category.html.erb:12
 msgid "Hide"
@@ -7361,14 +7331,12 @@ msgid &quot;Are you sure you want to remove \&quot;%s\&quot; and all its subcategories?&quot;
 msgstr "Êtes-vous sûr(e) d'ôter/effacer «%s» et toutes ses sous-catégories ?"
  
 #: app/views/categories/_form.html.erb:22
-#, fuzzy
 msgid "Display in the menu"
 msgstr "Afficher dans le menu"
  
 #: app/views/categories/_form.html.erb:24
-#, fuzzy
 msgid "Pick a color"
-msgstr "Afficher la couleur"
+msgstr "Choisir la couleur"
  
 #: app/views/categories/edit.html.erb:1
 msgid "Editing %s"
@@ -7383,14 +7351,12 @@ msgid &quot;Regions&quot;
 msgstr "Régions"
  
 #: app/views/memberships/welcome.html.erb:1
-#, fuzzy
 msgid "Community created"
-msgstr "Groupe"
+msgstr "Communauté créée"
  
 #: app/views/memberships/welcome.html.erb:2
-#, fuzzy
 msgid "Your community (%s) was successfully created."
-msgstr "%s, votre nouveau mot de passe a bien été installé."
+msgstr "Votre communauté (%s) a été créée avec succès."
  
 #: app/views/memberships/welcome.html.erb:3
 #, fuzzy
@@ -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
...	...	@@ -83,6 +83,9 @@ Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
83	83	Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
84	84	Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
85	85	Carlos Morais <carlos88morais@gmail.com>
	86	+Christophe DANIEL <papaeng@gmail.com>
	87	+Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
	88	+Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
86	89	Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
87	90	Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
88	91	Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
...	...	@@ -128,6 +131,7 @@ Eduardo Vital <vitaldu@gmail.com>
128	131	Evandro Jr <evandrojr@gmail.com>
129	132	Evandro Junior <evandrojr@gmail.com>
130	133	Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
	134	+Fabio Teixeira <fabio1079@gmail.com>
131	135	FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
132	136	Fabio Teixeira <fabio1079@gmail.com>
133	137	Fernanda Lopes <nanda.listas+psl@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		- [ root ]
10		- * Api test
	6	+ [ Antonio Terceiro ]
	7	+ * Noosfero 1.2 RC1
11	8
12		- -- root <root@17edebf1ae91> Mon, 06 Jul 2015 14:39:06 +0000
	9	+ -- Antonio Terceiro <terceiro@colivre.coop.br> Mon, 13 Jul 2015 15:44:17 -0300
13	10
14	11	noosfero (1.1) wheezy; urgency=low
15	12
...	...
1	1	module Noosfero
2	2	PROJECT = 'noosfero'
3		- VERSION = '1.2~1'
	3	+ VERSION = '1.2~rc1'
4	4	end
5	5
6	6	root = File.expand_path(File.dirname(__FILE__) + '/../..')
...	...
...	...	@@ -7,7 +7,7 @@ msgstr ""
7	7	"Project-Id-Version: 1.1-166-gaf47713\n"
8	8	"Report-Msgid-Bugs-To: \n"
9	9	"POT-Creation-Date: 2015-06-01 17:26-0300\n"
10		-"PO-Revision-Date: 2015-07-03 00:41+0200\n"
	10	+"PO-Revision-Date: 2015-07-13 10:39+0200\n"
11	11	"Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
12	12	"Language-Team: French "
13	13	"<https://hosted.weblate.org/projects/noosfero/noosfero/fr/>\n"
...	...	@@ -6788,32 +6788,28 @@ msgid "There are members currently using this role."
6788	6788	msgstr ""
6789	6789
6790	6790	#: app/views/profile_roles/destroy.html.erb:13
6791		-#, fuzzy
6792	6791	msgid "To which role do you want to change them?"
6793		-msgstr "Indiquez quels contacts vous souhaitez inviter."
	6792	+msgstr "Pour quel rôle voulez-vous les changer ?"
6794	6793
6795	6794	#: app/views/profile_roles/destroy.html.erb:20
6796		-#, fuzzy
6797	6795	msgid "Delete role"
6798		-msgstr "Détruire le profil"
	6796	+msgstr "Supprimer le rôle"
6799	6797
6800	6798	#: app/views/profile_roles/index.html.erb:1 app/views/role/index.html.erb:1
6801	6799	msgid "Manage user roles"
6802	6800	msgstr "Gérer les rôles des utilisateurs"
6803	6801
6804	6802	#: app/views/profile_roles/index.html.erb:5 app/views/role/index.html.erb:5
6805		-#, fuzzy
6806	6803	msgid "Role"
6807		-msgstr "Rôles :"
	6804	+msgstr "Rôle"
6808	6805
6809	6806	#: app/views/profile_roles/index.html.erb:17
6810	6807	msgid "Assign"
6811	6808	msgstr ""
6812	6809
6813	6810	#: app/views/comment_notifier/mail_to_followers.html.erb:1
6814		-#, fuzzy
6815	6811	msgid "Hi!"
6816		-msgstr "Visites"
	6812	+msgstr "Bonjour !"
6817	6813
6818	6814	#: app/views/comment_notifier/mail_to_followers.html.erb:3
6819	6815	msgid ""
...	...	@@ -6823,9 +6819,8 @@ msgstr ""
6823	6819
6824	6820	#: app/views/comment_notifier/mail_to_followers.html.erb:5
6825	6821	#: app/views/comment_notifier/notification.text.erb:5
6826		-#, fuzzy
6827	6822	msgid "Title: %s"
6828		-msgstr "Ticket : %s"
	6823	+msgstr "Titre : %s"
6829	6824
6830	6825	#: app/views/comment_notifier/mail_to_followers.html.erb:7
6831	6826	#: app/views/comment_notifier/notification.text.erb:7
...	...	@@ -6922,9 +6917,8 @@ msgid "Set %s template as default"
6922	6917	msgstr "Définir %s comme modèle par défaut"
6923	6918
6924	6919	#: app/views/templates/index.html.erb:31
6925		-#, fuzzy
6926	6920	msgid "Edit settings"
6927		-msgstr "Paramètres de messagerie"
	6921	+msgstr "Modifier les paramètres"
6928	6922
6929	6923	#: app/views/templates/index.html.erb:33
6930	6924	#, fuzzy
...	...	@@ -6932,9 +6926,8 @@ msgid "Edit sideblocks"
6932	6926	msgstr "Éditer les boîtes de menus"
6933	6927
6934	6928	#: app/views/templates/index.html.erb:35
6935		-#, fuzzy
6936	6929	msgid "Edit header/footer"
6937		-msgstr "Édition des en-tête et pied de page"
	6930	+msgstr "Modifier en-tête/pied de page"
6938	6931
6939	6932	#: app/views/doc/_path.html.erb:2
6940	6933	msgid "You are here:"
...	...	@@ -6946,9 +6939,8 @@ msgid "Manual sections"
6946	6939	msgstr "Paramètres de messagerie"
6947	6940
6948	6941	#: app/views/home/terms.html.erb:1
6949		-#, fuzzy
6950	6942	msgid "Terms of use - %s"
6951		-msgstr "Conditions d'utilisation"
	6943	+msgstr "Conditions d'utilisation - %s"
6952	6944
6953	6945	#: app/views/home/welcome.html.erb:4
6954	6946	msgid "Welcome to %s!"
...	...	@@ -6966,9 +6958,8 @@ msgid "Firstly, some tips for getting started:"
6966	6958	msgstr ""
6967	6959
6968	6960	#: app/views/home/welcome.html.erb:11
6969		-#, fuzzy
6970	6961	msgid "Confirm your account!"
6971		-msgstr "Confirmer votre nouveau mot de passe"
	6962	+msgstr "Confirmer votre compte !"
6972	6963
6973	6964	#: app/views/home/welcome.html.erb:12
6974	6965	msgid ""
...	...	@@ -7022,9 +7013,8 @@ msgid "%s your Gmail, Yahoo and Hotmail contacts!"
7022	7013	msgstr "%s vos contacts de Gmail, Yahoo et Hotmail !"
7023	7014
7024	7015	#: app/views/home/welcome.html.erb:25
7025		-#, fuzzy
7026	7016	msgid "Invite and find"
7027		-msgstr "Inviter mes contacts !"
	7017	+msgstr "Inviter et trouver"
7028	7018
7029	7019	#: app/views/home/welcome.html.erb:26
7030	7020	msgid ""
...	...	@@ -7047,16 +7037,14 @@ msgid "What can I do as a %s?"
7047	7037	msgstr ""
7048	7038
7049	7039	#: app/views/home/index.html.erb:2
7050		-#, fuzzy
7051	7040	msgid "News"
7052		-msgstr "Nouveau %s"
	7041	+msgstr "Nouveautés"
7053	7042
7054	7043	#: app/views/home/index.html.erb:45
7055	7044	#: app/views/profile/_profile_activities_list.html.erb:14
7056	7045	#: app/views/profile/_profile_network_activities.html.erb:6
7057		-#, fuzzy
7058	7046	msgid "View more"
7059		-msgstr "Voir le profil"
	7047	+msgstr "Voir plus"
7060	7048
7061	7049	#: app/views/features/_manage_enterprise_fields.html.erb:5
7062	7050	#: app/views/features/_manage_community_fields.html.erb:5
...	...	@@ -7071,16 +7059,14 @@ msgid "Required"
7071	7059	msgstr "Obligatoire"
7072	7060
7073	7061	#: app/views/features/_manage_enterprise_fields.html.erb:8
7074		-#, fuzzy
7075	7062	msgid "Display on registration?"
7076	7063	msgstr "Afficher à l'inscription ?"
7077	7064
7078	7065	#: app/views/features/_manage_enterprise_fields.html.erb:13
7079	7066	#: app/views/features/_manage_community_fields.html.erb:13
7080	7067	#: app/views/features/_manage_person_fields.html.erb:13
7081		-#, fuzzy
7082	7068	msgid "Check/Uncheck All"
7083		-msgstr "Tout décocher"
	7069	+msgstr "Tout cocher/décocher"
7084	7070
7085	7071	#: app/views/features/manage_fields.html.erb:1
7086	7072	msgid "Manage fields displayed for profiles"
...	...	@@ -7134,19 +7120,16 @@ msgstr ""
7134	7120	"modifications."
7135	7121
7136	7122	#: app/views/features/index.html.erb:15
7137		-#, fuzzy
7138	7123	msgid "Feature"
7139		-msgstr "Quelques fonctionnalités"
	7124	+msgstr "Fonctionnalité"
7140	7125
7141	7126	#: app/views/features/index.html.erb:16
7142		-#, fuzzy
7143	7127	msgid "Enabled?"
7144		-msgstr "Activé"
	7128	+msgstr "Activé ?"
7145	7129
7146	7130	#: app/views/features/index.html.erb:27
7147		-#, fuzzy
7148	7131	msgid "Configure features"
7149		-msgstr "Quelques fonctionnalités"
	7132	+msgstr "Editer les fonctionnalités"
7150	7133
7151	7134	#: app/views/features/index.html.erb:29
7152	7135	msgid "Page to redirect after signup"
...	...	@@ -7174,9 +7157,8 @@ msgid "Embed unavailable."
7174	7157	msgstr "Indisponible"
7175	7158
7176	7159	#: app/views/chat/start_session_error.html.erb:3
7177		-#, fuzzy
7178	7160	msgid "Could not connect to chat"
7179		-msgstr "Impossible de créer le produit"
	7161	+msgstr "Impossible de se connecter au chat"
7180	7162
7181	7163	#: app/views/chat/start_session_error.html.erb:3
7182	7164	msgid "try again"
...	...	@@ -7199,26 +7181,22 @@ msgid "Select theme"
7199	7181	msgstr "Choisissez le thème"
7200	7182
7201	7183	#: app/views/themes/_select_theme.html.erb:5
7202		-#, fuzzy
7203	7184	msgid "Use the default theme"
7204		-msgstr "Utiliser ce thème"
	7185	+msgstr "Utiliser le thème par défaut"
7205	7186
7206	7187	#: app/views/themes/_select_theme.html.erb:5
7207		-#, fuzzy
7208	7188	msgid "Are you sure you want to use the environment default theme?"
7209		-msgstr "Êtes-vous sûr(e) de vouloir sortir ?"
	7189	+msgstr "Etes-vous sûr que vous voulez utiliser le thème par défaut ?"
7210	7190
7211	7191	#: app/views/file_presenter/_image.html.erb:7
7212	7192	#: app/views/file_presenter/_image.html.erb:9
7213		-#, fuzzy
7214	7193	msgid "« Previous"
7215		-msgstr "Précédent"
	7194	+msgstr "« Précédent"
7216	7195
7217	7196	#: app/views/file_presenter/_image.html.erb:13
7218	7197	#: app/views/file_presenter/_image.html.erb:15
7219		-#, fuzzy
7220	7198	msgid "Next »"
7221		-msgstr "Plus récents »"
	7199	+msgstr "Suivant »"
7222	7200
7223	7201	#: app/views/file_presenter/_image.html.erb:22
7224	7202	msgid "image %d of %d"
...	...	@@ -7229,18 +7207,16 @@ msgstr ""
7229	7207	#: app/views/profile_members/_members_list.html.erb:2
7230	7208	#: app/views/profile_members/add_member.html.erb:2
7231	7209	#: app/views/profile_members/add_admin.html.erb:2
7232		-#, fuzzy
7233	7210	msgid "Current members"
7234		-msgstr "Un membre"
	7211	+msgstr "Les membres actuels"
7235	7212
7236	7213	#: app/views/profile_members/_manage_roles.html.erb:21
7237	7214	msgid "Type in a search term for users"
7238	7215	msgstr ""
7239	7216
7240	7217	#: app/views/profile_members/_add_admins.html.erb:1
7241		-#, fuzzy
7242	7218	msgid "Add admins to %s"
7243		-msgstr "Tous les membres"
	7219	+msgstr "Ajouter un admin à %s"
7244	7220
7245	7221	#: app/views/profile_members/affiliate.html.erb:7
7246	7222	#: app/views/environment_role_manager/affiliate.html.erb:7
...	...	@@ -7248,9 +7224,8 @@ msgid "Affiliate"
7248	7224	msgstr "Affilié"
7249	7225
7250	7226	#: app/views/profile_members/_index_buttons.html.erb:3
7251		-#, fuzzy
7252	7227	msgid "Add members"
7253		-msgstr "Tous les membres"
	7228	+msgstr "Ajouter des membres"
7254	7229
7255	7230	#: app/views/profile_members/_index_buttons.html.erb:5
7256	7231	#: app/views/invite/select_friends.html.erb:6
...	...	@@ -7279,9 +7254,8 @@ msgstr ""
7279	7254	"membre pour administrer cette communauté."
7280	7255
7281	7256	#: app/views/profile_members/add_members.html.erb:1
7282		-#, fuzzy
7283	7257	msgid "Add members to %s"
7284		-msgstr "Tous les membres"
	7258	+msgstr "Ajouter des membres à %s"
7285	7259
7286	7260	#: app/views/profile_members/change_role.html.erb:1
7287	7261	#: app/views/environment_role_manager/change_role.html.erb:1
...	...	@@ -7289,14 +7263,12 @@ msgid "Changing role of %s"
7289	7263	msgstr "Changement du rôle de %s"
7290	7264
7291	7265	#: app/views/profile_members/change_role.html.erb:15
7292		-#, fuzzy
7293	7266	msgid "Custom Roles:"
7294		-msgstr "Rôles :"
	7267	+msgstr "Rôles personnalisés :"
7295	7268
7296	7269	#: app/views/maps/edit_location.html.erb:15
7297		-#, fuzzy
7298	7270	msgid "Locate in the map"
7299		-msgstr "Créer un nouveau thème"
	7271	+msgstr "Localiser sur la carte"
7300	7272
7301	7273	#: app/views/maps/edit_location.html.erb:15
7302	7274	msgid ""
...	...	@@ -7317,9 +7289,8 @@ msgid "Invalid address"
7317	7289	msgstr "Adresse invalide"
7318	7290
7319	7291	#: app/views/maps/_google_map.js.erb:137
7320		-#, fuzzy
7321	7292	msgid "Request denied"
7322		-msgstr "Accès interdit"
	7293	+msgstr "Demande refusée"
7323	7294
7324	7295	#: app/views/maps/_google_map.js.erb:139
7325	7296	msgid "Over query limit"
...	...	@@ -7340,9 +7311,8 @@ msgid "New category"
7340	7311	msgstr "Nouvelle catégorie"
7341	7312
7342	7313	#: app/views/categories/_category.html.erb:10
7343		-#, fuzzy
7344	7314	msgid "Show"
7345		-msgstr "Voir le diaporama"
	7315	+msgstr "Voir"
7346	7316
7347	7317	#: app/views/categories/_category.html.erb:12
7348	7318	msgid "Hide"
...	...	@@ -7361,14 +7331,12 @@ msgid "Are you sure you want to remove \"%s\" and all its subcategories?"
7361	7331	msgstr "Êtes-vous sûr(e) d'ôter/effacer «%s» et toutes ses sous-catégories ?"
7362	7332
7363	7333	#: app/views/categories/_form.html.erb:22
7364		-#, fuzzy
7365	7334	msgid "Display in the menu"
7366	7335	msgstr "Afficher dans le menu"
7367	7336
7368	7337	#: app/views/categories/_form.html.erb:24
7369		-#, fuzzy
7370	7338	msgid "Pick a color"
7371		-msgstr "Afficher la couleur"
	7339	+msgstr "Choisir la couleur"
7372	7340
7373	7341	#: app/views/categories/edit.html.erb:1
7374	7342	msgid "Editing %s"
...	...	@@ -7383,14 +7351,12 @@ msgid "Regions"
7383	7351	msgstr "Régions"
7384	7352
7385	7353	#: app/views/memberships/welcome.html.erb:1
7386		-#, fuzzy
7387	7354	msgid "Community created"
7388		-msgstr "Groupe"
	7355	+msgstr "Communauté créée"
7389	7356
7390	7357	#: app/views/memberships/welcome.html.erb:2
7391		-#, fuzzy
7392	7358	msgid "Your community (%s) was successfully created."
7393		-msgstr "%s, votre nouveau mot de passe a bien été installé."
	7359	+msgstr "Votre communauté (%s) a été créée avec succès."
7394	7360
7395	7361	#: app/views/memberships/welcome.html.erb:3
7396	7362	#, fuzzy
...	...
...	...	@@ -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
...	...