Merge branch '1.0.x' into schema-x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

9 files changed, 36 insertions, 40 deletions

diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index 2d8efbf5c..6975dbaea 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+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"
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index efea4febe..52c847155 100644
--- a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:59+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index 3c88ec4db..ff53e5bd0 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:59+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-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-openid\n"
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index d25c86fc9..d20835cbf 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:59+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-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-openid\n"
@@ -351,7 +351,6 @@ msgstr ""
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
 #: OpenIDPlugin.php:641
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continuer"
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 9a416ec88..68e4e32e2 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:47:00+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-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-openid\n"
@@ -341,7 +341,6 @@ msgstr ""
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
 #: OpenIDPlugin.php:641
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continuar"
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index a28736e4e..851239175 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:47:00+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-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-openid\n"
@@ -337,7 +337,6 @@ msgstr "Користете <a href=\"http://openid.net/\">OpenID</a> за нај
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
 #: OpenIDPlugin.php:641
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Продолжи"
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index b64129047..d2bf563cd 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -10,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:47:00+0000\n"
 "Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-openid\n"
@@ -191,7 +191,7 @@ msgstr ""
 
 #: openidadminpanel.php:251
 msgid "Options"
-msgstr "Instellingen"
+msgstr "Opties"
 
 #: openidadminpanel.php:258
 msgid "Enable OpenID-only mode"
@@ -345,10 +345,9 @@ msgstr ""
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
 #: OpenIDPlugin.php:641
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Continue"
-msgstr "Doorgaan"
+msgstr "Continue"
 
 #. TRANS: OpenID plugin logon form legend.
 #: OpenIDPlugin.php:658 openidlogin.php:140
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index 5f41aff84..e820e9514 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:47:00+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-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-openid\n"
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index bd381baf3..2f13743a3 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -2,6 +2,7 @@
 # Expored from translatewiki.net
 #
 # Author: Boogie
+# Author: Тест
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 18:02+0000\n"
-"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:47:00+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-20 17:54:48+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); 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-openid\n"
@@ -343,7 +344,6 @@ msgstr ""
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
 #: OpenIDPlugin.php:641
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Продовжити"