Download as
Browse Code »

Commit 1739379787f5c1ddaf0a28d175b059f9cc7d92a2

Authored by Victor Costa
2 parents e8e9e5b0 173fc071
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge branch 'master' of gitlab.com:noosfero/noosfero

Showing 23 changed files with 177 additions and 199 deletions   Show diff stats
AUTHORS.md
  Diff comments   View file @1739379
... ... @@ -127,12 +127,14 @@ Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
127 127 Evandro Jr <evandrojr@gmail.com>
128 128 Evandro Junior <evandrojr@gmail.com>
129 129 Fabio Teixeira <fabio1079@gmail.com>
  130 +FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
130 131 Fernanda Lopes <nanda.listas+psl@gmail.com>
131 132 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
132 133 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
133 134 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
134 135 Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
135 136 Gabriela Navarro <navarro1703@gmail.com>
  137 +Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
136 138 Grazieno Pellegrino <grazieno@gmail.com>
137 139 Gust <darksshades@hotmail.com>
138 140 Hebert Douglas <hebertdougl@gmail.com>
... ... @@ -200,10 +202,12 @@ Marcos &lt;marcos.rpj2@gmail.com&gt;
200 202 Marcos Ramos <ms.ramos@outlook.com>
201 203 Martín Olivera <molivera@solar.org.ar>
202 204 Maurilio Atila <cabelotaina@gmail.com>
  205 +M for Momo <mo@rtnp.org>
203 206 Michal Čihař <michal@cihar.com>
204 207 Moises Machado <moises@colivre.coop.br>
205 208 Naíla Alves <naila@colivre.coop.br>
206 209 Nanda Lopes <nanda.listas+psl@gmail.com>
  210 +Niemand Jedermann <predatorix@web.de>
207 211 Parley Martins <parleypachecomartins@gmail.com>
208 212 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
209 213 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
... ... @@ -244,6 +248,7 @@ Tallys Martins &lt;tallysmartins@yahoo.com.br&gt;
244 248 tallys <tallys@tallys>
245 249 tallys <tallys@tallys.(none)>
246 250 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
  251 +Tuux <tuxa@galaxie.eu.org>
247 252 Valessio Brito <contato@valessiobrito.com.br>
248 253 Valessio Brito <contato@valessiobrito.info>
249 254 Valessio Brito <valessio@gmail.com>
... ...
Gemfile
  Diff comments   View file @1739379
... ... @@ -15,7 +15,7 @@ gem &#39;nokogiri&#39;, &#39;~&gt; 1.5.5&#39;
15 15 gem 'rake', :require => false
16 16 gem 'rest-client', '~> 1.6.7'
17 17 gem 'exception_notification', '~> 4.0.1'
18   -gem 'gettext', '~> 2.2.1', :require => false, :group => :development
  18 +gem 'gettext', '~> 2.2.1', :require => false
19 19 gem 'locale', '~> 2.0.5'
20 20 gem 'whenever', :require => false
21 21 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
... ...
Rakefile.release 0 → 100644
  Diff comments   View file @1739379
... ... @@ -0,0 +1,18 @@
  1 +# This Rakefile is intentionally independent from Rails to it can be used to
  2 +# handle release-related tasks without having to load the entire Rails
  3 +# environment (which is slow, requires a database connection and several other
  4 +# inconveniences).
  5 +
  6 +$: << 'lib'
  7 +require 'noosfero'
  8 +require 'noosfero/version'
  9 +
  10 +load 'lib/tasks/gettext.rake'
  11 +load 'lib/tasks/doc.rake'
  12 +load 'lib/tasks/error_messages.rake'
  13 +load 'lib/tasks/translation.rake'
  14 +
  15 +load 'lib/tasks/package.rake'
  16 +load 'lib/tasks/release.rake'
  17 +
  18 +task :default => 'noosfero:translations:compile'
... ...
debian/changelog
  Diff comments   View file @1739379
  1 +noosfero (1.1~rc2) wheezy; urgency=low
  2 +
  3 + * Second release candidate for Noosfero 1.1
  4 +
  5 + -- Antonio Terceiro <terceiro@colivre.coop.br> Mon, 09 Mar 2015 12:47:39 -0300
  6 +
1 7 noosfero (1.1~rc1) wheezy; urgency=low
2 8  
3 9 * First release candidate for Noosfero 1.1
... ...
debian/rules
  Diff comments   View file @1739379
... ... @@ -33,4 +33,4 @@ override_dh_clean:
33 33  
34 34 override_dh_auto_build:
35 35 dh_auto_build
36   - rake noosfero:translations:compile > /dev/null
  36 + rake -f Rakefile.release > /dev/null
... ...
lib/noosfero/version.rb
  Diff comments   View file @1739379
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '1.1~rc1'
  3 + VERSION = '1.1~rc2'
4 4 end
5 5  
6   -if File.exist?(File.join(Rails.root, '.git'))
7   - Noosfero::VERSION.clear << Dir.chdir(Rails.root) { `git describe --tags`.strip }
  6 +root = File.expand_path(File.dirname(__FILE__) + '/../..')
  7 +if File.exist?(File.join(root, '.git'))
  8 + Noosfero::VERSION.clear << Dir.chdir(root) { `git describe --tags`.strip.sub('-rc', '~rc') }
8 9 end
... ...
lib/tasks/doc.rake
  Diff comments   View file @1739379
  1 +require 'noosfero'
  2 +require 'pathname'
  3 +
1 4 namespace :noosfero do
2 5 namespace :doc do
3 6 def plugins_textiles
... ... @@ -9,8 +12,9 @@ namespace :noosfero do
9 12 end
10 13 end
11 14 task :unlink_plugins_textiles do
12   - rm_f Dir.glob(Rails.root.join('doc/noosfero/plugins/*.textile')) -
13   - [Rails.root.join('doc/noosfero/plugins/index.textile')]
  15 + root = Pathname.new(File.dirname(__FILE__) + '/../..').expand_path
  16 + rm_f Dir.glob(root.join('doc/noosfero/plugins/*.textile')) -
  17 + [root.join('doc/noosfero/plugins/index.textile')]
14 18 end
15 19 input = Dir.glob('doc/noosfero/**/*.textile') + plugins_textiles.map{|i| "doc/noosfero/plugins/#{File.basename(i)}"}
16 20 topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }.uniq
... ...
lib/tasks/error_messages.rake
  Diff comments   View file @1739379
1   -templates = Dir.glob(Rails.root.join('public', '*.html.erb'))
  1 +root = Pathname(File.dirname(__FILE__)).join('../../').expand_path
  2 +templates = Dir.glob(root.join('public', '*.html.erb'))
2 3 targets = []
3 4 templates.each do |template|
4 5 target = template.gsub(/.erb$/, '')
... ... @@ -16,6 +17,6 @@ end
16 17 namespace :noosfero do
17 18 namespace 'error-pages' do
18 19 desc 'Translates Noosfero error pages'
19   - task :translate => [:environment] + targets
  20 + task :translate => targets
20 21 end
21 22 end
... ...
lib/tasks/gettext.rake
  Diff comments   View file @1739379
... ... @@ -2,6 +2,8 @@
2 2 # Added for Ruby-GetText-Package
3 3 #
4 4  
  5 +require 'pathname'
  6 +
5 7 makemo_stamp = 'tmp/makemo.stamp'
6 8 desc "Create mo-files for L10n"
7 9 task :makemo => makemo_stamp
... ... @@ -37,14 +39,15 @@ task :symlinkmo do
37 39 langmap = {
38 40 'pt' => 'pt_BR',
39 41 }
40   - mkdir_p(Rails.root.join('locale'))
41   - Dir.glob(Rails.root.join('po/*/')).each do |dir|
  42 + root = Pathname.new(File.dirname(__FILE__) + '/../..').expand_path
  43 + mkdir_p(root.join('locale'))
  44 + Dir.glob(root.join('po/*/')).each do |dir|
42 45 lang = File.basename(dir)
43 46 orig_lang = langmap[lang] || lang
44   - mkdir_p(Rails.root.join('locale', "#{lang}", 'LC_MESSAGES'))
  47 + mkdir_p(root.join('locale', "#{lang}", 'LC_MESSAGES'))
45 48 ['iso_3166'].each do |domain|
46 49 origin = "/usr/share/locale/#{orig_lang}/LC_MESSAGES/#{domain}.mo"
47   - target = Rails.root.join('locale', "#{lang}", 'LC_MESSAGES', "#{domain}.mo")
  50 + target = root.join('locale', "#{lang}", 'LC_MESSAGES', "#{domain}.mo")
48 51 if !File.symlink?(target)
49 52 ln_s origin, target
50 53 end
... ...
lib/tasks/package.rake
  Diff comments   View file @1739379
1   -
2 1 desc "Generate source tarball"
3 2 task :package => 'package:clobber' do
4 3 require_dependency 'noosfero'
... ...
lib/tasks/release.rake
  Diff comments   View file @1739379
1 1 # encoding: UTF-8
2 2  
3   -require 'noosfero/version'
4 3 $version = Noosfero::VERSION
5 4  
6 5 namespace :noosfero do
... ... @@ -132,13 +131,13 @@ EOF
132 131  
133 132 if target =~ /-test$/
134 133 if new_version =~ /~rc\d+/
135   - new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" }
  134 + new_version.sub!(/\~rc([0-9]+).*/) { "~rc#{$1.to_i + 1}" }
136 135 else
137 136 new_version += '~rc1'
138 137 end
139 138 else
140   - if new_version =~ /~rc\d+/
141   - new_version.sub!(/~rc[0-9]+/, '')
  139 + if new_version =~ /~rc\d+.*/
  140 + new_version.sub!(/~rc[0-9]+.*/, '')
142 141 else
143 142 components = new_version.split('.').map(&:to_i)
144 143 if components.size < 3
... ... @@ -158,9 +157,10 @@ EOF
158 157 sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{new_version}'/\" lib/noosfero/version.rb"
159 158 ENV['DEBFULLNAME'] ||= `git config user.name`.strip
160 159 ENV['DEBEMAIL'] ||= `git config user.email`.strip
161   - sh "dch --newversion #{new_version} --distribution #{target} --force-distribution '#{release_message}'"
  160 + distribution = `dpkg-parsechangelog | sed '/Distribution:/!d; s/^.*:\s*//'`.strip
  161 + sh "dch --newversion #{new_version} --distribution #{distribution} --force-distribution '#{release_message}'"
162 162  
163   - sh 'git diff debian/changelog lib/noosfero/version.rb'
  163 + sh 'git diff --color debian/changelog lib/noosfero/version.rb'
164 164 if confirm("Commit version bump to #{new_version} on #{target} distribution")
165 165 sh 'git add debian/changelog lib/noosfero/version.rb'
166 166 sh "git commit -m 'Bumping version #{new_version}'"
... ...
lib/tasks/translation.rake
  Diff comments   View file @1739379
... ... @@ -5,7 +5,7 @@ namespace :noosfero do
5 5 task :update => ['updatepo', 'noosfero:doc:rebuild']
6 6  
7 7 desc 'Compiles all translations'
8   - task :compile => ['makemo', 'environment', 'noosfero:doc:translate']
  8 + task :compile => ['makemo', 'noosfero:doc:translate']
9 9  
10 10 end
11 11 end
... ...
plugins/comment_classification/po/fr/comment_classification.po
  Diff comments   View file @1739379
... ... @@ -7,8 +7,8 @@ msgstr &quot;&quot;
7 7 "Project-Id-Version: 1.0-690-gcb6e853\n"
8 8 "Report-Msgid-Bugs-To: \n"
9 9 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
10   -"PO-Revision-Date: 2015-02-23 11:38+0200\n"
11   -"Last-Translator: Michal Čihař <michal@cihar.com>\n"
  10 +"PO-Revision-Date: 2015-03-07 12:26+0200\n"
  11 +"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
12 12 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
13 13 "comment-classification/fr/>\n"
14 14 "Language: fr\n"
... ... @@ -19,110 +19,95 @@ msgstr &quot;&quot;
19 19 "X-Generator: Weblate 2.3-dev\n"
20 20  
21 21 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
22   -#, fuzzy
23 22 msgid "A plugin that allow classification of comments."
24   -msgstr "Un bloc qui affiche vos groupes"
  23 +msgstr "Un greffon qui permet de ranger du contenue."
25 24  
26 25 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:16
27   -#, fuzzy
28 26 msgid "Label created"
29   -msgstr "Adresse électronique de contact"
  27 +msgstr "Label crée"
30 28  
31 29 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:19
32   -#, fuzzy
33 30 msgid "Label could not be created"
34   -msgstr "Ce fichier n'a pas pu être sauvegardé"
  31 +msgstr "Le label n'a pas pu êtres créer"
35 32  
36 33 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:31
37   -#, fuzzy
38 34 msgid "Label updated"
39   -msgstr "Dernière mise à jour"
  35 +msgstr "Label mis à jour"
40 36  
41 37 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:34
42   -#, fuzzy
43 38 msgid "Failed to edit label"
44   -msgstr "Échec dans l'édition du rôle"
  39 +msgstr "Erreur lors de l'édition du label"
45 40  
46 41 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:45
47   -#, fuzzy
48 42 msgid "Label removed"
49   -msgstr "Corps de l'article"
  43 +msgstr "Label supprimé"
50 44  
51 45 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:47
52 46 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:50
53   -#, fuzzy
54 47 msgid "Label could not be removed"
55   -msgstr "Ce fichier n'a pas pu être sauvegardé"
  48 +msgstr "Le label n'a pas pu êtres supprimé"
56 49  
57 50 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:15
58   -#, fuzzy
59 51 msgid "Status created"
60   -msgstr "Adresse électronique de contact"
  52 +msgstr "Statut créé"
61 53  
62 54 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:18
63   -#, fuzzy
64 55 msgid "Status could not be created"
65   -msgstr "Ce fichier n'a pas pu être sauvegardé"
  56 +msgstr "Les statuts n'ont pas pu êtres créés"
66 57  
67 58 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:29
68   -#, fuzzy
69 59 msgid "Status updated"
70   -msgstr "Date de début"
  60 +msgstr "Les statuts sont à jour"
71 61  
72 62 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:32
73   -#, fuzzy
74 63 msgid "Failed to edit status"
75   -msgstr "Échec dans l'édition du rôle"
  64 +msgstr "Échec dans l'édition des statuts"
76 65  
77 66 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:43
78   -#, fuzzy
79 67 msgid "Status removed"
80   -msgstr "Corps de l'article"
  68 +msgstr "Les statuts ont été supprimés"
81 69  
82 70 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:45
83 71 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:48
84   -#, fuzzy
85 72 msgid "Status could not be removed"
86   -msgstr "Ce fichier n'a pas pu être sauvegardé"
  73 +msgstr "Les statuts ne peuvent pas êtres supprimés"
87 74  
88 75 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb:6
89 76 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:9
90 77 #: plugins/comment_classification/views/comment/comment_extra.html.erb:12
91 78 msgid "Status"
92   -msgstr "Statut"
  79 +msgstr "Statuts"
93 80  
94 81 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb:7
95   -#, fuzzy
96 82 msgid "Reason:"
97   -msgstr "Région"
  83 +msgstr "Raison:"
98 84  
99 85 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:1
100   -#, fuzzy
101 86 msgid "Status for comment"
102   -msgstr "Un commentaire"
  87 +msgstr "Statuts pour le commentaire"
103 88  
104 89 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:16
105 90 msgid ""
106 91 "<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</"
107 92 "i>."
108 93 msgstr ""
  94 +"<i>%{utilisateur}</i> ajout des statuts <i>%{nom_ du_statut}</i> à "
  95 +"<i>%{creer_a}</i>."
109 96  
110 97 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:18
111 98 msgid "<i>Reason:</i> %s"
112   -msgstr ""
  99 +msgstr "<i>Raison:</i> %s"
113 100  
114 101 # (second try of this knid of contents)
115 102 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:24
116 103 #: plugins/comment_classification/views/comment_classification_plugin_status/create.html.erb:1
117 104 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:29
118   -#, fuzzy
119 105 msgid "Add a new status"
120   -msgstr "Une entreprise"
  106 +msgstr "Ajouter un nouveau statut"
121 107  
122 108 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/index.html.erb:1
123   -#, fuzzy
124 109 msgid "Manage comment classification"
125   -msgstr "Information sur les dirigeants"
  110 +msgstr "Manager le rangement de commentaire"
126 111  
127 112 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:6
128 113 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:6
... ... @@ -132,39 +117,34 @@ msgstr &quot;Nom&quot;
132 117 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:7
133 118 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:10
134 119 msgid "Color"
135   -msgstr ""
  120 +msgstr "Couleur"
136 121  
137 122 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:8
138   -#, fuzzy
139 123 msgid "Enable this label?"
140   -msgstr "Activer l'entreprise"
  124 +msgstr "Activer ce label?"
141 125  
142 126 #: plugins/comment_classification/views/comment_classification_plugin_labels/edit.html.erb:1
143   -#, fuzzy
144 127 msgid "Editing label %s"
145   -msgstr "Édition de %s"
  128 +msgstr "Édition du label %s"
146 129  
147 130 # (second try of this knid of contents)
148 131 #: plugins/comment_classification/views/comment_classification_plugin_labels/create.html.erb:1
149 132 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:29
150   -#, fuzzy
151 133 msgid "Add a new label"
152   -msgstr "Une entreprise"
  134 +msgstr "Ajouter un nouveau label"
153 135  
154 136 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:1
155   -#, fuzzy
156 137 msgid "Manage comments labels"
157   -msgstr "Gérer les champs des groupes"
  138 +msgstr "Gérer les commentaires des labels"
158 139  
159 140 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:5
160   -#, fuzzy
161 141 msgid "(no label registered yet)"
162   -msgstr "(pas encore de matière brute enregistrée)"
  142 +msgstr "(pour le moment aucun label n'est enregistré)"
163 143  
164 144 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:9
165 145 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
166 146 msgid "Label"
167   -msgstr ""
  147 +msgstr "Label"
168 148  
169 149 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:11
170 150 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:10
... ... @@ -177,29 +157,24 @@ msgid &quot;Actions&quot;
177 157 msgstr "Actions"
178 158  
179 159 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:21
180   -#, fuzzy
181 160 msgid "Are you sure you want to remove this label?"
182   -msgstr "Êtes-vous sûr(e) que vous voulez retirer ce commentaire ?"
  161 +msgstr "Êtes-vous sûr(e) que vous voulez retirer ce label ?"
183 162  
184 163 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:7
185   -#, fuzzy
186 164 msgid "Enable this status?"
187   -msgstr "Gérer les contacts."
  165 +msgstr "Activer ce statut?"
188 166  
189 167 #: plugins/comment_classification/views/comment_classification_plugin_status/edit.html.erb:1
190   -#, fuzzy
191 168 msgid "Editing status %s"
192   -msgstr "Édition de %s"
  169 +msgstr "Édition du statut %s"
193 170  
194 171 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:1
195   -#, fuzzy
196 172 msgid "Manage comments status"
197   -msgstr "Gérer les contacts."
  173 +msgstr "Gérer les commentaires des statuts"
198 174  
199 175 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:5
200   -#, fuzzy
201 176 msgid "(no status registered yet)"
202   -msgstr "genre non enregistré"
  177 +msgstr "(il n'y a pas de statut enregistré pour le moment)"
203 178  
204 179 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:11
205 180 #, fuzzy
... ... @@ -207,25 +182,21 @@ msgid &quot;Reason enabled?&quot;
207 182 msgstr "%s n'était pas activé(e)"
208 183  
209 184 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:21
210   -#, fuzzy
211 185 msgid "Are you sure you want to remove this status?"
212   -msgstr "Êtes-vous sûr(e) de vouloir ôter cet élément ?"
  186 +msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut?"
213 187  
214 188 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
215 189 msgid "[Select ...]"
216 190 msgstr "[Choisir...]"
217 191  
218 192 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:1
219   -#, fuzzy
220 193 msgid "Comments classification options"
221   -msgstr "Options de modération"
  194 +msgstr "Options de rangement des commentaires"
222 195  
223 196 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:4
224   -#, fuzzy
225 197 msgid "Manage Labels"
226   -msgstr "Gérer les champs"
  198 +msgstr "Gérer les labels"
227 199  
228 200 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:5
229   -#, fuzzy
230 201 msgid "Manage Status"
231   -msgstr "Gérer les contacts."
  202 +msgstr "Gérer les statuts"
... ...
plugins/custom_forms/po/de/custom_forms.po
  Diff comments   View file @1739379
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: 1.0-690-gcb6e853\n"
10 10 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
11   -"PO-Revision-Date: 2015-02-23 11:38+0200\n"
  11 +"PO-Revision-Date: 2015-03-09 09:51+0200\n"
12 12 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
13 13 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
14 14 "custom-forms/de/>\n"
... ... @@ -200,7 +200,7 @@ msgstr &quot;Neue Option hinzufügen&quot;
200 200  
201 201 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
202 202 msgid "Ok"
203   -msgstr ""
  203 +msgstr "OK"
204 204  
205 205 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
206 206 #, fuzzy
... ...
plugins/custom_forms/po/es/custom_forms.po
  Diff comments   View file @1739379
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: 1.0-690-gcb6e853\n"
9 9 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
10   -"PO-Revision-Date: 2015-02-23 11:36+0200\n"
  10 +"PO-Revision-Date: 2015-03-09 09:51+0200\n"
11 11 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
12 12 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
13 13 "custom-forms/es/>\n"
... ... @@ -214,7 +214,7 @@ msgstr &quot;Añadir nuevo producto&quot;
214 214  
215 215 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
216 216 msgid "Ok"
217   -msgstr ""
  217 +msgstr "Ok"
218 218  
219 219 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
220 220 #, fuzzy
... ...
plugins/custom_forms/po/pt/custom_forms.po
  Diff comments   View file @1739379
... ... @@ -13,7 +13,7 @@ msgid &quot;&quot;
13 13 msgstr ""
14 14 "Project-Id-Version: 1.0-690-gcb6e853\n"
15 15 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
16   -"PO-Revision-Date: 2015-02-23 11:38+0200\n"
  16 +"PO-Revision-Date: 2015-03-09 09:51+0200\n"
17 17 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
18 18 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
19 19 "/plugin-custom-forms/pt/>\n"
... ... @@ -197,7 +197,7 @@ msgstr &quot;Adicionar uma nova opção&quot;
197 197  
198 198 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
199 199 msgid "Ok"
200   -msgstr ""
  200 +msgstr "Ok"
201 201  
202 202 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
203 203 msgid "Remove alternative"
... ...
plugins/custom_forms/po/ru/custom_forms.po
  Diff comments   View file @1739379
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: 1.0-690-gcb6e853\n"
9 9 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
10   -"PO-Revision-Date: 2015-02-23 11:37+0200\n"
  10 +"PO-Revision-Date: 2015-03-09 09:51+0200\n"
11 11 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
12 12 "Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/plugin-"
13 13 "custom-forms/ru/>\n"
... ... @@ -213,7 +213,7 @@ msgstr &quot;Одна компания&quot;
213 213  
214 214 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
215 215 msgid "Ok"
216   -msgstr ""
  216 +msgstr "OK"
217 217  
218 218 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
219 219 #, fuzzy
... ...
plugins/display_content/po/es/display_content.po
  Diff comments   View file @1739379
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: 1.0-690-gcb6e853\n"
9 9 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
10   -"PO-Revision-Date: 2015-02-23 11:35+0200\n"
  10 +"PO-Revision-Date: 2015-03-09 09:51+0200\n"
11 11 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
12 12 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
13 13 "display-content/es/>\n"
... ... @@ -48,9 +48,8 @@ msgid &quot;Abstract&quot;
48 48 msgstr "Resumen"
49 49  
50 50 #: plugins/display_content/lib/display_content_block.rb:151
51   -#, fuzzy
52 51 msgid "Read more"
53   -msgstr "Ver más"
  52 +msgstr "Leer más"
54 53  
55 54 #: plugins/display_content/lib/display_content_block.rb:194
56 55 msgid "%{month}/%{day}/%{year}"
... ...
plugins/display_content/po/fr/display_content.po
  Diff comments   View file @1739379
... ... @@ -7,110 +7,107 @@ msgstr &quot;&quot;
7 7 "Project-Id-Version: 1.0-690-gcb6e853\n"
8 8 "Report-Msgid-Bugs-To: \n"
9 9 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
10   -"PO-Revision-Date: 2014-12-12 14:22+0200\n"
11   -"Last-Translator: Michal Čihař <michal@cihar.com>\n"
12   -"Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
13   -"fr/>\n"
  10 +"PO-Revision-Date: 2015-03-07 02:11+0200\n"
  11 +"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
  12 +"Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
  13 +"display-content/fr/>\n"
14 14 "Language: fr\n"
15 15 "MIME-Version: 1.0\n"
16 16 "Content-Type: text/plain; charset=UTF-8\n"
17 17 "Content-Transfer-Encoding: 8bit\n"
18 18 "Plural-Forms: nplurals=2; plural=n > 1;\n"
19   -"X-Generator: Weblate 2.2-dev\n"
  19 +"X-Generator: Weblate 2.3-dev\n"
20 20  
21 21 #: plugins/display_content/lib/display_content_plugin.rb:10
22 22 msgid ""
23 23 "A plugin that adds a block where you could choose any of your content and "
24 24 "display it."
25 25 msgstr ""
  26 +"Un greffon qui permet d'ajouter une zone ou vous pourrez y afficher le "
  27 +"contenue de votre choix."
26 28  
27 29 #: plugins/display_content/lib/display_content_block.rb:34
28   -#, fuzzy
29 30 msgid "Display your contents"
30   -msgstr "Afficher un de vos contenus."
  31 +msgstr "Afficher vos contenus"
31 32  
32 33 #: plugins/display_content/lib/display_content_block.rb:38
33   -#, fuzzy
34 34 msgid ""
35 35 "This block displays articles chosen by you. You can edit the block to select "
36 36 "which of your articles is going to be displayed in the block."
37 37 msgstr ""
38   -"Ce bloc affiche un de vos articles. Vous pouvez éditer le bloc pour "
  38 +"Ce bloc affiche l'article de votre choix. Vous pouvez éditer le bloc pour "
39 39 "sélectionner lequel de vos articles va être affiche dans ce bloc."
40 40  
41 41 #: plugins/display_content/lib/display_content_block.rb:43
42   -#, fuzzy
43 42 msgid "Publish date"
44   -msgstr "Publié"
  43 +msgstr "Date de publication"
45 44  
46 45 #: plugins/display_content/lib/display_content_block.rb:45
47 46 msgid "Abstract"
48 47 msgstr "Résumé"
49 48  
50 49 #: plugins/display_content/lib/display_content_block.rb:151
51   -#, fuzzy
52 50 msgid "Read more"
53   -msgstr "plus..."
  51 +msgstr "En lire plus"
54 52  
55 53 #: plugins/display_content/lib/display_content_block.rb:194
56 54 msgid "%{month}/%{day}/%{year}"
57   -msgstr ""
  55 +msgstr "%{mois}/%{jour}/%{année}"
58 56  
59 57 #: plugins/display_content/lib/display_content_block.rb:194
60 58 msgid "%{month}/%{day}"
61   -msgstr ""
  59 +msgstr "%{mois}/%{jour}"
62 60  
63 61 #: plugins/display_content/lib/display_content_block.rb:197
64 62 msgid "%{month_name} %{day}, %{year}"
65   -msgstr ""
  63 +msgstr "%{nom_du_mois} %{jour}, %{année}"
66 64  
67 65 #: plugins/display_content/lib/display_content_block.rb:197
68 66 msgid "%{month_name} %{day}"
69   -msgstr ""
  67 +msgstr "%{nom_du_mois} %{jour}"
70 68  
71 69 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:5
72 70 msgid "Choose which attributes should be displayed and drag to reorder them:"
73 71 msgstr ""
  72 +"Choisissez quels attribues doivent êtres afficher et glisser/déposer pour "
  73 +"les réorganiser:"
74 74  
75 75 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:21
76 76 msgid "Choose which content should be displayed:"
77   -msgstr ""
  77 +msgstr "Choisissez le contenu à afficher:"
78 78  
79 79 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:23
80 80 msgid "Choose directly"
81   -msgstr ""
  81 +msgstr "Choisir directement"
82 82  
83 83 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:24
84   -#, fuzzy
85 84 msgid "Choose by Content Type"
86   -msgstr "Type de contenu"
  85 +msgstr "Choisir par type de contenu"
87 86  
88 87 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:28
89 88 msgid "Order by:"
90   -msgstr ""
  89 +msgstr "Trier par:"
91 90  
92 91 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:29
93 92 msgid "Most recent"
94   -msgstr ""
  93 +msgstr "Le plus récent"
95 94  
96 95 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:30
97 96 msgid "Most oldest"
98   -msgstr ""
  97 +msgstr "Le plus ancien"
99 98  
100 99 #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:1
101   -#, fuzzy
102 100 msgid "Display content types:"
103   -msgstr "Afficher un de vos contenus."
  101 +msgstr "Afficher le types de contenue:"
104 102  
105 103 #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:7
106   -#, fuzzy
107 104 msgid "more"
108   -msgstr "plus..."
  105 +msgstr "plus"
109 106  
110 107 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:5
111 108 msgid "Dinamically load children of selected folders"
112   -msgstr ""
  109 +msgstr "Dynamiquement charger les sous répertoires des répertoires sélectionnés"
113 110  
114 111 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:9
115 112 msgid "Limit:"
116   -msgstr ""
  113 +msgstr "Limite:"
... ...
plugins/shopping_cart/po/fr/shopping_cart.po
  Diff comments   View file @1739379
... ... @@ -7,8 +7,8 @@ msgstr &quot;&quot;
7 7 "Project-Id-Version: 1.0-690-gcb6e853\n"
8 8 "Report-Msgid-Bugs-To: \n"
9 9 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
10   -"PO-Revision-Date: 2015-02-23 11:37+0200\n"
11   -"Last-Translator: Michal Čihař <michal@cihar.com>\n"
  10 +"PO-Revision-Date: 2015-03-07 10:49+0200\n"
  11 +"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
12 12 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
13 13 "shopping-cart/fr/>\n"
14 14 "Language: fr\n"
... ... @@ -190,7 +190,7 @@ msgstr &quot;&quot;
190 190 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:9
191 191 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb:13
192 192 msgid "Status"
193   -msgstr "Statut"
  193 +msgstr "Statuts"
194 194  
195 195 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35
196 196 msgid "E-mail"
... ...
plugins/statistics/po/fr/statistics.po
  Diff comments   View file @1739379
... ... @@ -7,23 +7,22 @@ msgstr &quot;&quot;
7 7 "Project-Id-Version: 1.0-690-gcb6e853\n"
8 8 "Report-Msgid-Bugs-To: \n"
9 9 "POT-Creation-Date: 2015-03-05 12:09-0300\n"
10   -"PO-Revision-Date: 2014-12-12 14:22+0200\n"
11   -"Last-Translator: Michal Čihař <michal@cihar.com>\n"
12   -"Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
13   -"fr/>\n"
  10 +"PO-Revision-Date: 2015-03-07 02:46+0200\n"
  11 +"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
  12 +"Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
  13 +"statistics/fr/>\n"
14 14 "Language: fr\n"
15 15 "MIME-Version: 1.0\n"
16 16 "Content-Type: text/plain; charset=UTF-8\n"
17 17 "Content-Transfer-Encoding: 8bit\n"
18 18 "Plural-Forms: nplurals=2; plural=n > 1;\n"
19   -"X-Generator: Weblate 2.2-dev\n"
  19 +"X-Generator: Weblate 2.3-dev\n"
20 20  
21 21 #: plugins/statistics/lib/statistics_block.rb:24
22 22 msgid "Statistics for %s"
23 23 msgstr "Statistiques pour %s"
24 24  
25 25 #: plugins/statistics/lib/statistics_block.rb:46
26   -#, fuzzy
27 26 msgid "This block presents some statistics about your context."
28 27 msgstr "Ce bloc présente quelques statistiques sur votre environnement."
29 28  
... ... @@ -31,74 +30,65 @@ msgstr &quot;Ce bloc présente quelques statistiques sur votre environnement.&quot;
31 30 msgid ""
32 31 "A plugin that adds a block where you can see statistics of it's context."
33 32 msgstr ""
  33 +"Un greffon qui ajoute un bloc ou vous pouvez voir les statistiques de son "
  34 +"contexte."
34 35  
35 36 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:1
36   -#, fuzzy
37 37 msgid "Show user counter"
38   -msgstr "Localisation : "
  38 +msgstr "Montrer le nombre d'utilisateurs"
39 39  
40 40 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:4
41   -#, fuzzy
42 41 msgid "Show community counter"
43   -msgstr "Un groupe"
  42 +msgstr "Montrer le nombre de communautés"
44 43  
45 44 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:8
46   -#, fuzzy
47 45 msgid "Show enterprise counter"
48   -msgstr "Les entreprises de <b>%s</b>"
  46 +msgstr "Montrer le nombre d'entreprises"
49 47  
50 48 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:12
51   -#, fuzzy
52 49 msgid "Show product counter"
53   -msgstr "Tout le contenu"
  50 +msgstr "Montrer le nombre de produits"
54 51  
55 52 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:16
56   -#, fuzzy
57 53 msgid "Show category counter"
58   -msgstr "Nouvelle catégorie"
  54 +msgstr "Montrer le nombre de catégories"
59 55  
60 56 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:20
61   -#, fuzzy
62 57 msgid "Show tag counter"
63   -msgstr "Tout le contenu"
  58 +msgstr "Montrer le nombre d'étiquettes"
64 59  
65 60 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:24
66   -#, fuzzy
67 61 msgid "Show comment counter"
68   -msgstr "Nombre de commentaires"
  62 +msgstr "Montrer le nombre de commentaires"
69 63  
70 64 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:28
71   -#, fuzzy
72 65 msgid "Show hit counter"
73   -msgstr "Tout le contenu"
  66 +msgstr "Montrer le nombre de rencontres"
74 67  
75 68 #: plugins/statistics/views/box_organizer/_statistics_block.html.erb:34
76 69 msgid "Show counter for communities with template %s"
77   -msgstr ""
  70 +msgstr "Montrer le nombre de communautés avec un modèle %s"
78 71  
79 72 #: plugins/statistics/views/statistics_block.html.erb:7
80   -#, fuzzy
81 73 msgid "users"
82   -msgstr "utilisateur"
  74 +msgstr "utilisateurs"
83 75  
84 76 #: plugins/statistics/views/statistics_block.html.erb:10
85   -#, fuzzy
86 77 msgid "enterprises"
87 78 msgstr "entreprises"
88 79  
89 80 #: plugins/statistics/views/statistics_block.html.erb:13
90 81 msgid "products"
91   -msgstr ""
  82 +msgstr "produits"
92 83  
93 84 #: plugins/statistics/views/statistics_block.html.erb:16
94 85 msgid "communities"
95 86 msgstr "groupes"
96 87  
97 88 #: plugins/statistics/views/statistics_block.html.erb:19
98   -#, fuzzy
99 89 msgid "categories"
100   -msgstr "Catégories"
  90 +msgstr "catégories"
101 91  
102 92 #: plugins/statistics/views/statistics_block.html.erb:28
103 93 msgid "hits"
104   -msgstr ""
  94 +msgstr "rencontres"
... ...
po/fr/noosfero.po
  Diff comments   View file @1739379
... ... @@ -7,61 +7,50 @@ msgstr &quot;&quot;
7 7 "Project-Id-Version: 1.0-690-gcb6e853\n"
8 8 "Report-Msgid-Bugs-To: \n"
9 9 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
10   -"PO-Revision-Date: 2014-12-12 14:22+0200\n"
11   -"Last-Translator: Michal Čihař <michal@cihar.com>\n"
12   -"Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
13   -"fr/>\n"
  10 +"PO-Revision-Date: 2015-03-08 20:40+0200\n"
  11 +"Last-Translator: M for Momo <mo@rtnp.org>\n"
  12 +"Language-Team: French "
  13 +"<https://hosted.weblate.org/projects/noosfero/noosfero/fr/>\n"
14 14 "Language: fr\n"
15 15 "MIME-Version: 1.0\n"
16 16 "Content-Type: text/plain; charset=UTF-8\n"
17 17 "Content-Transfer-Encoding: 8bit\n"
18 18 "Plural-Forms: nplurals=2; plural=n > 1;\n"
19   -"X-Generator: Weblate 2.2-dev\n"
  19 +"X-Generator: Weblate 2.3-dev\n"
20 20  
21 21 #: app/models/approve_comment.rb:17
22   -#, fuzzy
23 22 msgid "Anonymous"
24   -msgstr "Sigle"
  23 +msgstr "Anonyme"
25 24  
26 25 #: app/models/approve_comment.rb:25 app/models/approve_article.rb:17
27   -#, fuzzy
28 26 msgid "Article removed."
29   -msgstr "Corps de l'article"
  27 +msgstr "L'article a été supprimé."
30 28  
31 29 #: app/models/approve_comment.rb:33
32   -#, fuzzy
33 30 msgid "New comment to article"
34   -msgstr "Articles les plus commentés"
  31 +msgstr "Nouveau commentaire dans l'article"
35 32  
36 33 #: app/models/approve_comment.rb:49 app/models/approve_comment.rb:51
37   -#, fuzzy
38 34 msgid "%{requestor} commented on the article: %{linked_subject}."
39   -msgstr ""
40   -"%{author} veut publier l'article «%{article}» sur le groupe %{community}"
  35 +msgstr "%{requestor} a commenté l'article: %{linked_subject}."
41 36  
42 37 #: app/models/approve_comment.rb:55 app/models/approve_article.rb:77
43   -#, fuzzy
44 38 msgid "The article was removed."
45   -msgstr "Le texte original a été retiré."
  39 +msgstr "L'article a été supprimé."
46 40  
47 41 #: app/models/approve_comment.rb:81
48   -#, fuzzy
49 42 msgid "%{requestor} wants to comment the article: %{article}."
50   -msgstr ""
51   -"%{author} veut publier l'article «%{article}» sur le groupe %{community}"
  43 +msgstr "%{requestor} veut commenter l'article: %{article}."
52 44  
53 45 #: app/models/approve_comment.rb:83
54   -#, fuzzy
55 46 msgid "%{requestor} wanted to comment the article but it was removed."
56   -msgstr ""
57   -"%{author} veut publier l'article «%{article}» sur le groupe %{community}"
  47 +msgstr "%{requestor} veut commenter l'article mais il est déjà supprimé."
58 48  
59 49 #: app/models/approve_comment.rb:89
60   -#, fuzzy
61 50 msgid ""
62 51 "You need to login on %{system} in order to approve or reject this comment."
63 52 msgstr ""
64   -"Vous devez être connecté(e) sur %{system} pour pouvoir modérer cet article."
  53 +"Vous devez vous connecter sur %{system} pour pouvoir modérer cet article."
65 54  
66 55 #: app/models/approve_comment.rb:94
67 56 msgid ""
... ... @@ -2704,9 +2693,8 @@ msgid &quot;Online Manual&quot;
2704 2693 msgstr ""
2705 2694  
2706 2695 #: app/helpers/application_helper.rb:971 app/views/home/index.html.erb:12
2707   -#, fuzzy
2708 2696 msgid "Read more"
2709   -msgstr "Ôter/effacer"
  2697 +msgstr "En lire plus"
2710 2698  
2711 2699 #: app/helpers/application_helper.rb:1052
2712 2700 #, fuzzy
... ... @@ -3386,24 +3374,20 @@ msgid &quot;Type in a search term&quot;
3386 3374 msgstr "Désactiver la recherche d'entreprises"
3387 3375  
3388 3376 #: app/helpers/dates_helper.rb:18
3389   -#, fuzzy
3390 3377 msgid "%{month}/%{day}/%{year}"
3391   -msgstr "%{day} %{month} %{year}"
  3378 +msgstr "%{mois}/%{jour}/%{année}"
3392 3379  
3393 3380 #: app/helpers/dates_helper.rb:18 app/helpers/dates_helper.rb:30
3394   -#, fuzzy
3395 3381 msgid "%{month}/%{day}"
3396   -msgstr "%{day} %{month} %{year}"
  3382 +msgstr "%{mois}/%{jour}"
3397 3383  
3398 3384 #: app/helpers/dates_helper.rb:21
3399   -#, fuzzy
3400 3385 msgid "%{month_name} %{day}, %{year}"
3401   -msgstr "%{day} %{month} %{year}"
  3386 +msgstr "%{nom_du_mois} %{jour}, %{année}"
3402 3387  
3403 3388 #: app/helpers/dates_helper.rb:21
3404   -#, fuzzy
3405 3389 msgid "%{month_name} %{day}"
3406   -msgstr "%{month} %{year}"
  3390 +msgstr "%{nom_du_mois} %{jour}"
3407 3391  
3408 3392 #: app/helpers/dates_helper.rb:30
3409 3393 #, fuzzy
... ...
vendor/plugins/ruby_bosh/lib/ruby_bosh.rb
  Diff comments   View file @1739379
... ... @@ -125,8 +125,8 @@ class RubyBOSH
125 125 end
126 126  
127 127 def parse(_response)
128   - doc = Nokogiri::HTML.fragment(_response.to_s)
129   - doc.search("body").each do |body|
  128 + doc = Nokogiri::XML _response.to_s
  129 + doc.css("body").each do |body|
130 130 @sid = body.attributes["sid"].to_s
131 131 end
132 132 _response
... ...