diff options
author | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
commit | 5d09b6b3f0595540c66b703ae085f0af904fe30f (patch) | |
tree | 59269a4dacf90bbab9f0ff63afff4bf1781a1240 /locale/ko_KR | |
parent | f1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff) | |
parent | 82b0927f5838f3c12816e03712df9460a9f77b72 (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/ko_KR')
-rw-r--r-- | locale/ko_KR/LC_MESSAGES/statusnet.mo (renamed from locale/ko_KR/LC_MESSAGES/laconica.mo) | bin | 88923 -> 88929 bytes | |||
-rw-r--r-- | locale/ko_KR/LC_MESSAGES/statusnet.po (renamed from locale/ko_KR/LC_MESSAGES/laconica.po) | 12 |
2 files changed, 6 insertions, 6 deletions
diff --git a/locale/ko_KR/LC_MESSAGES/laconica.mo b/locale/ko_KR/LC_MESSAGES/statusnet.mo Binary files differindex 7d50135ab..2b177ff86 100644 --- a/locale/ko_KR/LC_MESSAGES/laconica.mo +++ b/locale/ko_KR/LC_MESSAGES/statusnet.mo diff --git a/locale/ko_KR/LC_MESSAGES/laconica.po b/locale/ko_KR/LC_MESSAGES/statusnet.po index 6dcb6f5c5..7bbdcdcf2 100644 --- a/locale/ko_KR/LC_MESSAGES/laconica.po +++ b/locale/ko_KR/LC_MESSAGES/statusnet.po @@ -254,8 +254,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 @@ -280,7 +280,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." @@ -1100,11 +1100,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 버전을 사용합니다. Laconica는 " +"이 사이트는 [StatusNet](http://status.net/) 마이크로블로깅 소프트웨어 %s 버전을 사용합니다. StatusNet는 " "[GNU Affero General Public " "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 " "있습니다." @@ -4405,7 +4405,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 |