Merge in phablet branch.

Approved by PS Jenkins bot, Pete Woods.

2 files changed, 13 insertions, 47 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index edb0388..70c7f6b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,15 @@
 [encoding: UTF-8]
-src/indicator-messages.c
+common/indicator-messages-service.c
+common/indicator-messages-application.c
+test/indicator-messages-service-activate.c
+src/im-phone-menu.c
+src/app-section.c
 src/messages-service.c
+src/im-desktop-menu.c
+src/im-menu.c
+src/im-application-list.c
+src/gsettingsstrv.c
+src/gmenuutils.c
+src/gactionmuxer.c
+libmessaging-menu/messaging-menu-message.c
+libmessaging-menu/messaging-menu-app.c
diff --git a/po/indicator-messages.pot b/po/indicator-messages.pot
deleted file mode 100644
index 3788bb5..0000000
--- a/po/indicator-messages.pot
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-16 14:53+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"
-
-#: ../src/messages-service.c:329
-msgid "Messages"
-msgstr ""
-
-#: ../src/messages-service.c:552
-msgid "Available"
-msgstr ""
-
-#: ../src/messages-service.c:553
-msgid "Away"
-msgstr ""
-
-#: ../src/messages-service.c:554
-msgid "Busy"
-msgstr ""
-
-#: ../src/messages-service.c:555
-msgid "Invisible"
-msgstr ""
-
-#: ../src/messages-service.c:556
-msgid "Offline"
-msgstr ""
-
-#: ../src/messages-service.c:659
-msgid "Clear"
-msgstr ""