Merge branch '0.9.x' into 1.0.x

This commit is contained in:
Brion Vibber 2010-12-22 10:43:19 -08:00
commit 1513b8eeb9
2 changed files with 2 additions and 4 deletions

View File

@ -7927,7 +7927,7 @@ msgstr ""
"Si no, simplement ignoreu el missatge.\n" "Si no, simplement ignoreu el missatge.\n"
"\n" "\n"
"Gràcies pel vostre temps, \n" "Gràcies pel vostre temps, \n"
"%2$s" "%2$s\n"
#. TRANS: Subject of new-subscriber notification e-mail. #. TRANS: Subject of new-subscriber notification e-mail.
#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename. #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.

View File

@ -3219,9 +3219,7 @@ msgstr "Particular"
#: actions/licenseadminpanel.php:246 #: actions/licenseadminpanel.php:246
msgid "All Rights Reserved" msgid "All Rights Reserved"
msgstr "" msgstr "Todos os Direitos Reservados"
"\n"
"Todos os Direitos Reservados"
#: actions/licenseadminpanel.php:247 #: actions/licenseadminpanel.php:247
msgid "Creative Commons" msgid "Creative Commons"