Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / plugins / Xmpp / locale / Xmpp.pot

diff --git a/plugins/Xmpp/locale/Xmpp.pot b/plugins/Xmpp/locale/Xmpp.pot
index dd693b68c8e3cafaaf40a5a2f01813e00922f234..77bdfa737692e1d883855a13bfa58e301763ef76 100644 (file)
--- a/plugins/Xmpp/locale/Xmpp.pot
+++ b/plugins/Xmpp/locale/Xmpp.pot
@@ -8,23 +8,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"POT-Creation-Date: 2015-02-27 16:31+0100\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANS: Presence announcement for XMPP.
-#. TRANS: Message for XMPP reconnect.
-#: xmppmanager.php:167 xmppmanager.php:207
-msgid "Send me a message to post a notice"
-msgstr ""
-
 #. TRANS: Plugin display name.
 #: XmppPlugin.php:62
-msgid "XMPP/Jabber/GTalk"
+msgid "XMPP/Jabber"
 msgstr ""
 
 #. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
@@ -70,34 +65,40 @@ msgstr ""
 
 #. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
-#: XmppPlugin.php:368
+#: XmppPlugin.php:372
 #, php-format
-msgid "[%s]"
+msgid "[%u]"
 msgstr ""
 
 #. TRANS: Exception thrown when the plugin configuration is incorrect.
-#: XmppPlugin.php:406
+#: XmppPlugin.php:410
 msgid "You must specify a server in the configuration."
 msgstr ""
 
 #. TRANS: Exception thrown when the plugin configuration is incorrect.
-#: XmppPlugin.php:410
+#: XmppPlugin.php:414
 msgid "You must specify a port in the configuration."
 msgstr ""
 
 #. TRANS: Exception thrown when the plugin configuration is incorrect.
-#: XmppPlugin.php:414
+#: XmppPlugin.php:418
 msgid "You must specify a user in the configuration."
 msgstr ""
 
 #. TRANS: Exception thrown when the plugin configuration is incorrect.
-#: XmppPlugin.php:418
+#: XmppPlugin.php:422
 msgid "You must specify a password in the configuration."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: XmppPlugin.php:444
+#: XmppPlugin.php:473
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
 msgstr ""
+
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
+#: lib/xmppmanager.php:167 lib/xmppmanager.php:207
+msgid "Send me a message to post a notice"
+msgstr ""