summaryrefslogtreecommitdiff
path: root/locale/zh_CN
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/zh_CN
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/zh_CN')
-rw-r--r--locale/zh_CN/LC_MESSAGES/laconica.mobin76518 -> 0 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin0 -> 63488 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po (renamed from locale/zh_CN/LC_MESSAGES/laconica.po)14
3 files changed, 7 insertions, 7 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.mo b/locale/zh_CN/LC_MESSAGES/laconica.mo
deleted file mode 100644
index 2d380582a..000000000
--- a/locale/zh_CN/LC_MESSAGES/laconica.mo
+++ /dev/null
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
new file mode 100644
index 000000000..a7a79f40c
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 5d285122d..529d2f4f8 100644
--- a/locale/zh_CN/LC_MESSAGES/laconica.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -258,8 +258,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
@@ -284,7 +284,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."
@@ -1107,11 +1107,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/)微博客服务,版本 %s,采用[GNU Affero "
+"它运行[StatusNet](http://status.net/)微博客服务,版本 %s,采用[GNU Affero "
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授权。"
@@ -4528,8 +4528,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 "