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/te_IN | |
| 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/te_IN')
| -rw-r--r-- | locale/te_IN/LC_MESSAGES/laconica.mo | bin | 43726 -> 0 bytes | |||
| -rw-r--r-- | locale/te_IN/LC_MESSAGES/statusnet.mo | bin | 0 -> 29270 bytes | |||
| -rw-r--r-- | locale/te_IN/LC_MESSAGES/statusnet.po (renamed from locale/te_IN/LC_MESSAGES/laconica.po) | 18 |
3 files changed, 9 insertions, 9 deletions
diff --git a/locale/te_IN/LC_MESSAGES/laconica.mo b/locale/te_IN/LC_MESSAGES/laconica.mo Binary files differdeleted file mode 100644 index 5cfa0c3fb..000000000 --- a/locale/te_IN/LC_MESSAGES/laconica.mo +++ /dev/null diff --git a/locale/te_IN/LC_MESSAGES/statusnet.mo b/locale/te_IN/LC_MESSAGES/statusnet.mo Binary files differnew file mode 100644 index 000000000..bb837b977 --- /dev/null +++ b/locale/te_IN/LC_MESSAGES/statusnet.mo diff --git a/locale/te_IN/LC_MESSAGES/laconica.po b/locale/te_IN/LC_MESSAGES/statusnet.po index e8522f971..4576f3613 100644 --- a/locale/te_IN/LC_MESSAGES/laconica.po +++ b/locale/te_IN/LC_MESSAGES/statusnet.po @@ -1,10 +1,10 @@ -# #-#-#-#-# laconica.pot (PACKAGE VERSION) #-#-#-#-# -# Laconica Telugu Translation +# #-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-# +# StatusNet Telugu Translation # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the Laconica package. +# This file is distributed under the same license as the StatusNet package. # Veeven <veeven@gmail.com>, 2008. # -# #-#-#-#-# 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. @@ -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." @@ -1082,7 +1082,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 "" @@ -4437,7 +4437,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 |