diff options
| author | Zach Copley <zach@status.net> | 2009-11-30 13:11:51 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-11-30 13:11:51 -0800 |
| commit | 790fa5975c8fac5d46510ab5057ce7e8573bb25c (patch) | |
| tree | ab6726ff25a4d617ff1c677d4f1cc8d258e1c02c | |
| parent | 2451192415ae93a329b412761cfbb26df8185474 (diff) | |
| parent | 4f71c7a9c78b2ad82498d0c72d46bfd5573ead50 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline:
Ticket 1677: apply a couple more welcomebot fixes from TranslateWiki before the next full update
| -rw-r--r-- | locale/fr/LC_MESSAGES/statusnet.po | 2 | ||||
| -rw-r--r-- | locale/ru/LC_MESSAGES/statusnet.po | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 216ad5c7c..7d9301836 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -4079,7 +4079,7 @@ msgstr "Impossible d'établir l’inscription au groupe." #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Bienvenu à %1$s, %2$s !" +msgstr "Bienvenu à %1$s, @%2$s !" #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 745f3e7e7..b95b572cb 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -4029,7 +4029,7 @@ msgstr "Не удаётся назначить членство в группе. #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Добро пожаловать на %1$s, %2$s!" +msgstr "Добро пожаловать на %1$s, @%2$s!" #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" |