Download as
Browse Code »

Commit 1fa89209634a020f4ac1fe45030b648e591a14fa

Authored by JoenioCosta
1 parent 5e5626db

ActionItem611: update Password and Password confirmation strings 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/branches/0.10.x@2366 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 7 changed files with 28 additions and 26 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @1fa8920
@@ -4,8 +4,8 @@ require 'digest/sha1' @@ -4,8 +4,8 @@ require 'digest/sha1'
4 # Rails generator. 4 # Rails generator.
5 class User < ActiveRecord::Base 5 class User < ActiveRecord::Base
6 6
7 - N_('User|Password')  
8 - N_('User|Password confirmation') 7 + N_('Password')
  8 + N_('Password confirmation')
9 9
10 # FIXME ugly workaround 10 # FIXME ugly workaround
11 def self.human_attribute_name(attrib) 11 def self.human_attribute_name(attrib)
po/de/noosfero.po
  Diff comments   View file @1fa8920
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.10.3\n" 9 "Project-Id-Version: noosfero 0.10.3\n"
10 -"POT-Creation-Date: 2008-07-31 19:51-0300\n" 10 +"POT-Creation-Date: 2008-07-31 20:29-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot; @@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot;
1099 msgstr "" 1099 msgstr ""
1100 1100
1101 #: app/models/user.rb:7 1101 #: app/models/user.rb:7
1102 -msgid "User|Password" 1102 +msgid "Password"
1103 msgstr "" 1103 msgstr ""
1104 1104
1105 #: app/models/user.rb:8 1105 #: app/models/user.rb:8
1106 -msgid "User|Password confirmation" 1106 +msgid "Password confirmation"
1107 msgstr "" 1107 msgstr ""
1108 1108
1109 #: app/models/user.rb:47 1109 #: app/models/user.rb:47
po/fr/noosfero.po
  Diff comments   View file @1fa8920
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 msgid "" 6 msgid ""
7 msgstr "" 7 msgstr ""
8 "Project-Id-Version: noosfero 0.10.3\n" 8 "Project-Id-Version: noosfero 0.10.3\n"
9 -"POT-Creation-Date: 2008-07-31 19:51-0300\n" 9 +"POT-Creation-Date: 2008-07-31 20:29-0300\n"
10 "PO-Revision-Date: 2008-06-13 16:15-0300\n" 10 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
11 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n" 11 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n" 12 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1202,11 +1202,12 @@ msgid &quot;Enable email&quot; @@ -1202,11 +1202,12 @@ msgid &quot;Enable email&quot;
1202 msgstr "Adresse e-mail" 1202 msgstr "Adresse e-mail"
1203 1203
1204 #: app/models/user.rb:7 1204 #: app/models/user.rb:7
1205 -msgid "User|Password" 1205 +msgid "Password"
1206 msgstr "Mot de passe" 1206 msgstr "Mot de passe"
1207 1207
1208 #: app/models/user.rb:8 1208 #: app/models/user.rb:8
1209 -msgid "User|Password confirmation" 1209 +#, fuzzy
  1210 +msgid "Password confirmation"
1210 msgstr "Mot de passe (confirmation)" 1211 msgstr "Mot de passe (confirmation)"
1211 1212
1212 #: app/models/user.rb:47 1213 #: app/models/user.rb:47
@@ -4236,6 +4237,9 @@ msgstr &quot;Un projet du FBES&quot; @@ -4236,6 +4237,9 @@ msgstr &quot;Un projet du FBES&quot;
4236 msgid "Developed by Colivre" 4237 msgid "Developed by Colivre"
4237 msgstr "Développé par Colivre" 4238 msgstr "Développé par Colivre"
4238 4239
  4240 +#~ msgid "User|Password"
  4241 +#~ msgstr "Mot de passe"
  4242 +
4239 #, fuzzy 4243 #, fuzzy
4240 #~ msgid "Register and activate enterprise" 4244 #~ msgid "Register and activate enterprise"
4241 #~ msgstr "Enregistrer une nouvelle entreprise" 4245 #~ msgstr "Enregistrer une nouvelle entreprise"
@@ -4785,9 +4789,6 @@ msgstr &quot;Développé par Colivre&quot; @@ -4785,9 +4789,6 @@ msgstr &quot;Développé par Colivre&quot;
4785 #~ msgid "Tags" 4789 #~ msgid "Tags"
4786 #~ msgstr "Tags" 4790 #~ msgstr "Tags"
4787 4791
4788 -#~ msgid "Password"  
4789 -#~ msgstr "Mot de passe"  
4790 -  
4791 #~ msgid "" 4792 #~ msgid ""
4792 #~ "To change your password, please fill the form on this screen using yout " 4793 #~ "To change your password, please fill the form on this screen using yout "
4793 #~ "username and your e-mail. You will receive a message at that e-mail " 4794 #~ "username and your e-mail. You will receive a message at that e-mail "
po/hy/noosfero.po
  Diff comments   View file @1fa8920
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.10.3\n" 9 "Project-Id-Version: noosfero 0.10.3\n"
10 -"POT-Creation-Date: 2008-07-31 19:51-0300\n" 10 +"POT-Creation-Date: 2008-07-31 20:29-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot; @@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot;
1099 msgstr "" 1099 msgstr ""
1100 1100
1101 #: app/models/user.rb:7 1101 #: app/models/user.rb:7
1102 -msgid "User|Password" 1102 +msgid "Password"
1103 msgstr "" 1103 msgstr ""
1104 1104
1105 #: app/models/user.rb:8 1105 #: app/models/user.rb:8
1106 -msgid "User|Password confirmation" 1106 +msgid "Password confirmation"
1107 msgstr "" 1107 msgstr ""
1108 1108
1109 #: app/models/user.rb:47 1109 #: app/models/user.rb:47
po/nl/noosfero.po
  Diff comments   View file @1fa8920
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.10.3\n" 9 "Project-Id-Version: noosfero 0.10.3\n"
10 -"POT-Creation-Date: 2008-07-31 19:51-0300\n" 10 +"POT-Creation-Date: 2008-07-31 20:29-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot; @@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot;
1099 msgstr "" 1099 msgstr ""
1100 1100
1101 #: app/models/user.rb:7 1101 #: app/models/user.rb:7
1102 -msgid "User|Password" 1102 +msgid "Password"
1103 msgstr "" 1103 msgstr ""
1104 1104
1105 #: app/models/user.rb:8 1105 #: app/models/user.rb:8
1106 -msgid "User|Password confirmation" 1106 +msgid "Password confirmation"
1107 msgstr "" 1107 msgstr ""
1108 1108
1109 #: app/models/user.rb:47 1109 #: app/models/user.rb:47
po/noosfero.pot
  Diff comments   View file @1fa8920
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.10.3\n" 9 "Project-Id-Version: noosfero 0.10.3\n"
10 -"POT-Creation-Date: 2008-07-31 19:51-0300\n" 10 +"POT-Creation-Date: 2008-07-31 20:29-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot; @@ -1099,11 +1099,11 @@ msgid &quot;Enable email&quot;
1099 msgstr "" 1099 msgstr ""
1100 1100
1101 #: app/models/user.rb:7 1101 #: app/models/user.rb:7
1102 -msgid "User|Password" 1102 +msgid "Password"
1103 msgstr "" 1103 msgstr ""
1104 1104
1105 #: app/models/user.rb:8 1105 #: app/models/user.rb:8
1106 -msgid "User|Password confirmation" 1106 +msgid "Password confirmation"
1107 msgstr "" 1107 msgstr ""
1108 1108
1109 #: app/models/user.rb:47 1109 #: app/models/user.rb:47
po/pt_BR/noosfero.po
  Diff comments   View file @1fa8920
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 msgid "" 12 msgid ""
13 msgstr "" 13 msgstr ""
14 "Project-Id-Version: noosfero 0.10.3\n" 14 "Project-Id-Version: noosfero 0.10.3\n"
15 -"POT-Creation-Date: 2008-07-31 19:51-0300\n" 15 +"POT-Creation-Date: 2008-07-31 20:29-0300\n"
16 "PO-Revision-Date: 2008-07-21 21:46-0300\n" 16 "PO-Revision-Date: 2008-07-21 21:46-0300\n"
17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n" 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 "Language-Team: LANGUAGE <LL@li.org>\n" 18 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1118,11 +1118,12 @@ msgid &quot;Enable email&quot; @@ -1118,11 +1118,12 @@ msgid &quot;Enable email&quot;
1118 msgstr "Habilitar e-mail" 1118 msgstr "Habilitar e-mail"
1119 1119
1120 #: app/models/user.rb:7 1120 #: app/models/user.rb:7
1121 -msgid "User|Password" 1121 +msgid "Password"
1122 msgstr "Senha" 1122 msgstr "Senha"
1123 1123
1124 #: app/models/user.rb:8 1124 #: app/models/user.rb:8
1125 -msgid "User|Password confirmation" 1125 +#, fuzzy
  1126 +msgid "Password confirmation"
1126 msgstr "Confirmação de senha" 1127 msgstr "Confirmação de senha"
1127 1128
1128 #: app/models/user.rb:47 1129 #: app/models/user.rb:47
@@ -3977,6 +3978,9 @@ msgstr &quot;Um projeto FBES&quot; @@ -3977,6 +3978,9 @@ msgstr &quot;Um projeto FBES&quot;
3977 msgid "Developed by Colivre" 3978 msgid "Developed by Colivre"
3978 msgstr "Desenvolvimento Colivre" 3979 msgstr "Desenvolvimento Colivre"
3979 3980
  3981 +#~ msgid "User|Password"
  3982 +#~ msgstr "Senha"
  3983 +
3980 #~ msgid "Register and activate enterprise" 3984 #~ msgid "Register and activate enterprise"
3981 #~ msgstr "Registrar e ativar empreendimento" 3985 #~ msgstr "Registrar e ativar empreendimento"
3982 3986
@@ -4645,9 +4649,6 @@ msgstr &quot;Desenvolvimento Colivre&quot; @@ -4645,9 +4649,6 @@ msgstr &quot;Desenvolvimento Colivre&quot;
4645 #~ msgid "Person|Data" 4649 #~ msgid "Person|Data"
4646 #~ msgstr "Dados" 4650 #~ msgstr "Dados"
4647 4651
4648 -#~ msgid "Password"  
4649 -#~ msgstr "Senha"  
4650 -  
4651 #~ msgid "Do you want to activate the automatic help mode?" 4652 #~ msgid "Do you want to activate the automatic help mode?"
4652 #~ msgstr "Você gostaria de ativar o modo de ajuda automática?" 4653 #~ msgstr "Você gostaria de ativar o modo de ajuda automática?"
4653 4654