summaryrefslogtreecommitdiff
path: root/locale/zh_TW
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_TW
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_TW')
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.mo (renamed from locale/zh_TW/LC_MESSAGES/laconica.mo)bin11939 -> 11931 bytes
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po (renamed from locale/zh_TW/LC_MESSAGES/laconica.po)12
2 files changed, 6 insertions, 6 deletions
diff --git a/locale/zh_TW/LC_MESSAGES/laconica.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index 5b23372fb..e13548831 100644
--- a/locale/zh_TW/LC_MESSAGES/laconica.mo
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_TW/LC_MESSAGES/laconica.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index c6f880623..a94187518 100644
--- a/locale/zh_TW/LC_MESSAGES/laconica.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -9,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-25 16:24+0000\n"
"PO-Revision-Date: 2009-03-12 16:21+0000\n"
-"Last-Translator: Evan Prodromou <evan@controlyourself.ca>\n"
+"Last-Translator: Evan Prodromou <evan@status.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -237,8 +237,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
@@ -263,7 +263,7 @@ msgstr ""
#: 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."
@@ -1077,7 +1077,7 @@ 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 ""
@@ -4398,7 +4398,7 @@ msgid "Secondary site navigation"
msgstr ""
#: lib/action.php:602 lib/action.php:623
-msgid "Laconica software license"
+msgid "StatusNet software license"
msgstr ""
#: lib/action.php:630