summaryrefslogtreecommitdiff
path: root/locale/ru_RU
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-08-27 11:16:45 -0700
committerEvan Prodromou <evan@status.net>2009-08-27 11:16:45 -0700
commit5d09b6b3f0595540c66b703ae085f0af904fe30f (patch)
tree59269a4dacf90bbab9f0ff63afff4bf1781a1240 /locale/ru_RU
parentf1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff)
parent82b0927f5838f3c12816e03712df9460a9f77b72 (diff)
Merge branch '0.8.x' into 0.9.x
Conflicts: EVENTS.txt actions/finishremotesubscribe.php actions/postnotice.php actions/public.php actions/remotesubscribe.php actions/showstream.php actions/updateprofile.php actions/userauthorization.php classes/laconica.ini lib/common.php lib/oauthstore.php lib/omb.php
Diffstat (limited to 'locale/ru_RU')
-rw-r--r--locale/ru_RU/LC_MESSAGES/statusnet.mo (renamed from locale/ru_RU/LC_MESSAGES/laconica.mo)bin109415 -> 109421 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/statusnet.po (renamed from locale/ru_RU/LC_MESSAGES/laconica.po)16
2 files changed, 8 insertions, 8 deletions
diff --git a/locale/ru_RU/LC_MESSAGES/laconica.mo b/locale/ru_RU/LC_MESSAGES/statusnet.mo
index 6ebd0713a..c4066c65e 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.mo
+++ b/locale/ru_RU/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ru_RU/LC_MESSAGES/laconica.po b/locale/ru_RU/LC_MESSAGES/statusnet.po
index 8735bacd3..8a553a37f 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.po
+++ b/locale/ru_RU/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-#
+# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
@@ -244,8 +244,8 @@ msgstr ""
#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82
-#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79
+#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
+#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
@@ -270,7 +270,7 @@ msgstr "Метод API не найден!"
#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172
+#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
#: actions/twitapistatuses.php:562
msgid "API method under construction."
@@ -1116,11 +1116,11 @@ msgstr "Пригласить новых пользователей"
#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
#, php-format
msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Этот сервис работает при помощи [Laconica](http://laconi.ca/) - программного "
+"Этот сервис работает при помощи [StatusNet](http://status.net/) - программного "
"обеспечения для микроблогинга, версии %s, доступного под лицензией [GNU "
"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-"
"3.0.html)."
@@ -4559,8 +4559,8 @@ msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
#: lib/action.php:602 lib/action.php:623
-msgid "Laconica software license"
-msgstr "Laconica лицензия"
+msgid "StatusNet software license"
+msgstr "StatusNet лицензия"
#: lib/action.php:630
msgid "All "