diff options
author | Brion Vibber <brion@pobox.com> | 2010-12-22 10:43:19 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-12-22 10:43:19 -0800 |
commit | 1513b8eeb921538e4e342c2c6d64b2c0d1aed2dd (patch) | |
tree | f9ca0e2aab066113739c38afa8d331395f611a7e | |
parent | f82dd4e14f8e4797f2a14cf10527bb71bc224b72 (diff) | |
parent | a16131526b5ae77c558fe6b11d1726af39d7c82d (diff) |
Merge branch '0.9.x' into 1.0.x
-rw-r--r-- | locale/ca/LC_MESSAGES/statusnet.po | 2 | ||||
-rw-r--r-- | locale/pt_BR/LC_MESSAGES/statusnet.po | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 93e150107..cb4381819 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -7927,7 +7927,7 @@ msgstr "" "Si no, simplement ignoreu el missatge.\n" "\n" "GrĂ cies pel vostre temps, \n" -"%2$s" +"%2$s\n" #. TRANS: Subject of new-subscriber notification e-mail. #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename. diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 37412a935..20a0666b3 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -3219,9 +3219,7 @@ msgstr "Particular" #: actions/licenseadminpanel.php:246 msgid "All Rights Reserved" -msgstr "" -"\n" -"Todos os Direitos Reservados" +msgstr "Todos os Direitos Reservados" #: actions/licenseadminpanel.php:247 msgid "Creative Commons" |