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

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