Commit 0702669bc8e4d0b418f4f815abdff534197766a2

Authored by Leandro Santos
2 parents a8d259b7 59520e8c

fix conflit with master

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