summaryrefslogtreecommitdiff
path: root/locale/el_GR
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
committerZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
commit9d87313eaebe8240393ac300a435f3b1332c8849 (patch)
tree6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /locale/el_GR
parent5efe588174c71979fc1970353c9a556ea441f138 (diff)
parentbeae3db41375879e725af053edf8041bbd76ac8c (diff)
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts: plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'locale/el_GR')
-rw-r--r--locale/el_GR/LC_MESSAGES/statusnet.mo (renamed from locale/el_GR/LC_MESSAGES/laconica.mo)bin7230 -> 7230 bytes
-rw-r--r--locale/el_GR/LC_MESSAGES/statusnet.po (renamed from locale/el_GR/LC_MESSAGES/laconica.po)10
2 files changed, 5 insertions, 5 deletions
diff --git a/locale/el_GR/LC_MESSAGES/laconica.mo b/locale/el_GR/LC_MESSAGES/statusnet.mo
index 071ea3bc5..071ea3bc5 100644
--- a/locale/el_GR/LC_MESSAGES/laconica.mo
+++ b/locale/el_GR/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/el_GR/LC_MESSAGES/laconica.po b/locale/el_GR/LC_MESSAGES/statusnet.po
index ccbeb34b9..314dd358c 100644
--- a/locale/el_GR/LC_MESSAGES/laconica.po
+++ b/locale/el_GR/LC_MESSAGES/statusnet.po
@@ -228,8 +228,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
@@ -254,7 +254,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."
@@ -1069,7 +1069,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 ""
@@ -4369,7 +4369,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