Merge remote branch 'gitorious/1.0.x' into 1.0.x

16 files changed, 665 insertions, 25 deletions

diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index e7240a644..c4ba6464e 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  *
  * @seeAlso  Location
  */
-
 class MapstractionPlugin extends Plugin
 {
     const VERSION = STATUSNET_VERSION;
@@ -64,7 +63,6 @@ class MapstractionPlugin extends Plugin
      *
      * @return boolean event handler return
      */
-
     function onRouterInitialized($m)
     {
         $m->connect(':nickname/all/map',
@@ -85,7 +83,6 @@ class MapstractionPlugin extends Plugin
      *
      * @return boolean event handler return
      */
-
     function onAutoload($cls)
     {
         switch ($cls)
@@ -109,7 +106,6 @@ class MapstractionPlugin extends Plugin
      *
      * @return boolean event handler return
      */
-
     function onEndShowScripts($action)
     {
         $actionName = $action->trimmed('action');
@@ -190,6 +186,7 @@ class MapstractionPlugin extends Plugin
                                     array('nickname' => $action->trimmed('nickname')));
 
         $action->element('a', array('href' => $mapUrl),
+                         // TRANS: Clickable item to allow opening the map in full size.
                          _m("Full size"));
 
         $action->elementEnd('div');
@@ -203,8 +200,7 @@ class MapstractionPlugin extends Plugin
                             'homepage' => 'http://status.net/wiki/Plugin:Mapstraction',
                             'rawdescription' =>
                             _m('Show maps of users\' and friends\' notices '.
-                               'with <a href="http://www.mapstraction.com/">Mapstraction</a> '.
-                               'JavaScript library.'));
+                               'with <a href="http://www.mapstraction.com/">Mapstraction</a>.'));
         return true;
     }
 }
diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php
index 5dab670e2..fa05ccc7a 100644
--- a/plugins/Mapstraction/allmap.php
+++ b/plugins/Mapstraction/allmap.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class AllmapAction extends MapAction
 {
     function prepare($args)
@@ -63,16 +62,22 @@ class AllmapAction extends MapAction
     function title()
     {
         if (!empty($this->profile->fullname)) {
+            // @todo FIXME: Bad i18n. Should be "%1$s (%2$s)".
             $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
         } else {
             $base = $this->user->nickname;
         }
 
         if ($this->page == 1) {
+            // TRANS: Page title.
+            // TRANS: %s is a user nickname.
             return sprintf(_m("%s friends map"),
                            $base);
         } else {
-            return sprintf(_m("%s friends map, page %d"),
+            // @todo CHECKME: does this even happen? May not be needed.
+            // TRANS: Page title.
+            // TRANS: %1$s is a user nickname, %2$d is a page number.
+            return sprintf(_m("%1$s friends map, page %2$d"),
                            $base,
                            $this->page);
         }
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index 764bf7b29..3c5339100 100644
--- a/plugins/Mapstraction/locale/Mapstraction.pot
+++ b/plugins/Mapstraction/locale/Mapstraction.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,19 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: MapstractionPlugin.php:182
+#: MapstractionPlugin.php:178
 msgid "Map"
 msgstr ""
 
-#: MapstractionPlugin.php:193
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
 msgid "Full size"
 msgstr ""
 
-#: MapstractionPlugin.php:205
+#: MapstractionPlugin.php:202
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
-"mapstraction.com/\">Mapstraction</a> JavaScript library."
+"mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
 #: map.php:72
@@ -38,17 +39,14 @@ msgstr ""
 msgid "User has no profile."
 msgstr ""
 
-#: allmap.php:71
-#, php-format
-msgid "%s friends map"
-msgstr ""
-
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
 #: allmap.php:74
 #, php-format
-msgid "%s friends map, page %d"
+msgid "%s friends map"
 msgstr ""
 
-#: usermap.php:71
+#: usermap.php:73
 #, php-format
 msgid "%s map, page %d"
 msgstr ""
diff --git a/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..7a926598b
--- /dev/null
+++ b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - Mapstraction to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Kartenn"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr ""
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+
+#: map.php:72
+msgid "No such user."
+msgstr "N'eus ket eus an implijer-se."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Kartenn mignoned %s"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr "%s gartenn, pajenn %d"
diff --git a/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..8e3b8d54d
--- /dev/null
+++ b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - Mapstraction to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: Apmon
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Karte"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr ""
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+
+#: map.php:72
+msgid "No such user."
+msgstr "Unbekannter Benutzer."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Benutzer hat kein Profil."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr ""
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr ""
diff --git a/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..a6f8b0d93
--- /dev/null
+++ b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - Mapstraction to Finnish (Suomi)
+# Expored from translatewiki.net
+#
+# Author: Nike
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Kartta"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Täysi koko"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+
+#: map.php:72
+msgid "No such user."
+msgstr "Käyttäjää ei ole."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Käyttäjällä ei ole profiilia."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Kartta käyttäjän %s ystävistä"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr ""
diff --git a/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..5de819b1b
--- /dev/null
+++ b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - Mapstraction to French (Français)
+# Expored from translatewiki.net
+#
+# Author: Verdy p
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Cartographie"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Pleine taille"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Affiche des cartes localisant les avis des utilisateurs et amis avec <a href="
+"\"http://www.mapstraction.com/\">Mapstraction</a>."
+
+#: map.php:72
+msgid "No such user."
+msgstr "Utilisateur inexistant."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Aucun profil ne correspond à cet utilisateur."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Carte des amis de %s"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr "Carte %s, page %d"
diff --git a/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..340a21114
--- /dev/null
+++ b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - Mapstraction to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Mapa"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Tamaño completo"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+
+#: map.php:72
+msgid "No such user."
+msgstr "Non existe tal usuario."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "O usuario non ten perfil."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr ""
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr ""
diff --git a/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..c2fcc51b6
--- /dev/null
+++ b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - Mapstraction to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Mappa"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Dimension complete"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Monstra mappas de notas de usatores e amicos con <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+
+#: map.php:72
+msgid "No such user."
+msgstr "Iste usator non existe."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Le usator non ha un profilo."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Mappa del amicos de %s"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr "Mappa de %s, pagina %d"
diff --git a/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..840e337f5
--- /dev/null
+++ b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - Mapstraction to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Карта"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Полна големина"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Прикажувај карти со забелешките на корисниците и пријателите со <a href="
+"\"http://www.mapstraction.com/\">Mapstraction</a>"
+
+#: map.php:72
+msgid "No such user."
+msgstr "Нема таков корисник."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Корисникот нема профил."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Карта на пријатели на %s"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr "Карта на %s, стр. %d"
diff --git a/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..f4fade52b
--- /dev/null
+++ b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - Mapstraction to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Kaart"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Groter"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Geeft een kaart met de mededelingen van de gebruiker en vrienden weer met "
+"behulp van <a href=\"http://www.mapstraction.com/\">Mapstraction</a>."
+
+#: map.php:72
+msgid "No such user."
+msgstr "Deze gebruiker bestaat niet"
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Deze gebruiker heeft geen profiel."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Kaart van %s en vrienden"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr "Kaart van %s, pagina %d"
diff --git a/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..da8cb7aaa
--- /dev/null
+++ b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Mapstraction to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Eleferen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Карта"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Полный размер"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+
+#: map.php:72
+msgid "No such user."
+msgstr "Нет такого пользователя."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "У пользователя нет профиля."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Карта друзей: %s"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr ""
diff --git a/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..1253cd82b
--- /dev/null
+++ b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - Mapstraction to Tagalog (Tagalog)
+# Expored from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: tl\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Mapa"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Buong sukat"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Nagpapakita ng mga mapa ng mga pabatid ng mga tagagamit at ng mga kaibigan "
+"sa pamamagitan ng <a href=\"http://www.mapstraction.com/\">Mapstraction</a>."
+
+#: map.php:72
+msgid "No such user."
+msgstr "Walang ganyang tagagamit."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Walang balangkas ang tagagamit."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "%s na mapa ng mga kaibigan"
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr "%s na mapa, pahina %d"
diff --git a/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..b10928213
--- /dev/null
+++ b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - Mapstraction to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:54+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: MapstractionPlugin.php:178
+msgid "Map"
+msgstr "Мапа"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:190
+msgid "Full size"
+msgstr "Повний розмір"
+
+#: MapstractionPlugin.php:202
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Показ мапи дописів користувачів і друзів за допомогою <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+
+#: map.php:72
+msgid "No such user."
+msgstr "Такого користувача немає."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Користувач не має профілю."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:74
+#, php-format
+msgid "%s friends map"
+msgstr "Мапа друзів %s."
+
+#: usermap.php:73
+#, php-format
+msgid "%s map, page %d"
+msgstr "Мапа друзів %s, сторінка %d"
diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index 7dab8e10a..50ff82b67 100644
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class MapAction extends OwnerDesignAction
 {
     var $profile = null;
@@ -116,7 +115,6 @@ class MapAction extends OwnerDesignAction
      *
      * @return boolean event handler return
      */
-
     function showScripts()
     {
         parent::showScripts();
diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php
index 094334f60..0ee956159 100644
--- a/plugins/Mapstraction/usermap.php
+++ b/plugins/Mapstraction/usermap.php
@@ -42,10 +42,8 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class UsermapAction extends MapAction
 {
-
     function prepare($args)
     {
         if(parent::prepare($args)) {
@@ -61,14 +59,17 @@ class UsermapAction extends MapAction
     function title()
     {
         if (!empty($this->profile->fullname)) {
-            $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
+            // @todo FIXME: Bad i18n. Should be '%1$s (%2$s)'
+            $base = $this->profile->fullname . ' (' . $this->user->nickname . ')';
         } else {
             $base = $this->user->nickname;
         }
 
         if ($this->page == 1) {
+            // @todo CHECKME: inconsisten with paged variant below. " map" missing.
             return $base;
         } else {
+            // @todo CHECKME: Is the part ", page %2$d" relevant here?
             return sprintf(_m("%s map, page %d"),
                            $base,
                            $this->page);