Merge pidgin.pot into all translations.

Specifically I ran this:
XGETTEXT_ARGS=--no-location intltool-update --report

1 files changed, 54 insertions, 50 deletions

diff --git a/po/et.po b/po/et.po
index 383117a500..3c6b543912 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-21 22:24-0800\n"
+"POT-Creation-Date: 2014-02-02 10:38-0800\n"
 "PO-Revision-Date: 2014-01-21 08:25+0000\n"
 "Last-Translator: Richard Laager <rlaager@wiktel.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/pidgin/language/"
@@ -11405,6 +11405,9 @@ msgstr "Araabia"
 msgid "Assamese"
 msgstr ""
 
+msgid "Asturian"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr "Valgevene ladina"
 
@@ -14302,6 +14305,56 @@ msgstr ""
 "Selle plugina abil saab kasutaja kohandada vestluse käigus edastatud "
 "sõnumite ajatemplite vorminguid."
 
+#. Alerts
+msgid "Chatroom alerts"
+msgstr ""
+
+msgid "Chatroom message alerts _only where someone says your username"
+msgstr ""
+
+#. Launcher integration
+msgid "Launcher Icon"
+msgstr ""
+
+msgid "_Disable launcher integration"
+msgstr ""
+
+msgid "Show number of unread _messages on launcher icon"
+msgstr ""
+
+#, fuzzy
+msgid "Show number of unread co_nversations on launcher icon"
+msgstr "Vestluste arv akna kohta"
+
+#. Messaging menu integration
+msgid "Messaging Menu"
+msgstr ""
+
+msgid "Show number of _unread messages for conversations in messaging menu"
+msgstr ""
+
+msgid "Show _elapsed time for unread conversations in messaging menu"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Unity Integration"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Provides integration with Unity."
+msgstr ""
+
+#. *  description
+msgid "Provides integration with Unity's messaging menu and launcher."
+msgstr ""
+
 msgid "Audio"
 msgstr "Audio"
 
@@ -14450,55 +14503,6 @@ msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
-#. Alerts
-msgid "Chatroom alerts"
-msgstr ""
-
-msgid "Chatroom message alerts _only where someone says your username"
-msgstr ""
-
-#. Launcher integration
-msgid "Launcher Icon"
-msgstr ""
-
-msgid "_Disable launcher integration"
-msgstr ""
-
-msgid "Show number of unread _messages on launcher icon"
-msgstr ""
-
-msgid "Show number of unread _conversations on launcher icon"
-msgstr ""
-
-#. Messaging menu integration
-msgid "Messaging Menu"
-msgstr ""
-
-msgid "Show number of _unread messages for conversations in messaging menu"
-msgstr ""
-
-msgid "Show _elapsed time for unread conversations in messaging menu"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-msgid "Unity Integration"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-msgid "Provides integration with Unity."
-msgstr ""
-
-#. *  description
-msgid "Provides integration with Unity's messaging menu and launcher."
-msgstr ""
-
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Välja logitud.</font>"