Merge lp:~dobey/indicator-sound/fix-i18n into lp:indicator-sound

[dobey]

Use intltool support from cmake-extras.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:548
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/12/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1634/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1641
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1419/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1419/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1419/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1419/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1419/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1419/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-02-10 15:51:57 +0000
+++ .bzrignore	2017-02-07 22:07:16 +0000
@@ -1,25 +1,3 @@
-/po/POTFILES
-/po/stamp-it
-
-/data/indicator-sound.conf
-
-/src/indicator-sound-service
-/src/indicator_sound_service_vala.stamp
-/src/main.c
-/src/media-player-list.c
-/src/media-player.c
-/src/mpris2-interfaces.c
-/src/mpris2-watcher.c
-/src/service.c
-/src/volume-control.c
-/src/freedesktop-interfaces.c
-
-# CMake Generated Files
-CMakeFiles/
-Makefile
-cmake_install.cmake
-CMakeCache.txt
-CTestTestfile.cmake
-config.h
-
-
+build/
+po/Makefile.in.in
+po/POTFILES.in

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-02-07 22:07:16 +0000
+++ CMakeLists.txt	2017-02-07 22:07:16 +0000
@@ -75,6 +75,7 @@
 
 add_subdirectory(data)
 add_subdirectory(src)
+add_subdirectory(po)
 
 enable_testing()
 add_subdirectory(tests)

=== modified file 'debian/control'
--- debian/control	2017-02-07 22:07:16 +0000
+++ debian/control	2017-02-07 22:07:16 +0000
@@ -14,6 +14,7 @@
                gnome-common,
                googletest | google-mock (>= 1.6.0+svn437),
                gsettings-ubuntu-schemas,
+               intltool,
                autotools-dev,
                valac (>= 0.20),
                lcov,

=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2017-02-07 22:07:16 +0000
@@ -0,0 +1,12 @@
+find_package(Intltool REQUIRED)
+
+intltool_update_potfile(
+    KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+    COPYRIGHT_HOLDER "Canonical Ltd."
+)
+
+intltool_install_translations(
+    ALL
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)

=== removed file 'po/POTFILES.in'
--- po/POTFILES.in	2015-12-31 17:24:33 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[encoding: UTF-8]
-src/info-notification.vala
-src/options-gsettings.vala
-src/service.vala
-src/sound-menu.vala
-src/warn-notification.vala
-

=== added file 'po/indicator-sound.pot'
--- po/indicator-sound.pot	1970-01-01 00:00:00 +0000
+++ po/indicator-sound.pot	2017-02-07 22:07:16 +0000
@@ -0,0 +1,131 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# 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: 2017-02-07 17:03-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/info-notification.vala:25 ../src/info-notification.vala:42
+#: ../src/sound-menu.vala:57 ../src/sound-menu.vala:251
+#: ../src/warn-notification.vala:31 ../src/service.vala:296
+#: ../src/service.vala:299
+#, c-format
+msgid "Volume"
+msgstr ""
+
+#: ../src/info-notification.vala:55
+msgid "Speakers"
+msgstr ""
+
+#: ../src/info-notification.vala:57
+msgid "Headphones"
+msgstr ""
+
+#: ../src/info-notification.vala:59
+msgid "Bluetooth headphones"
+msgstr ""
+
+#: ../src/info-notification.vala:61
+msgid "Bluetooth speaker"
+msgstr ""
+
+#: ../src/info-notification.vala:63
+msgid "Usb speaker"
+msgstr ""
+
+#: ../src/info-notification.vala:65
+msgid "Usb headphones"
+msgstr ""
+
+#: ../src/info-notification.vala:67
+msgid "HDMI speaker"
+msgstr ""
+
+#: ../src/info-notification.vala:69
+msgid "HDMI headphones"
+msgstr ""
+
+#: ../src/sound-menu.vala:50
+msgid "Mute"
+msgstr ""
+
+#: ../src/sound-menu.vala:52
+msgid "Silent Mode"
+msgstr ""
+
+#: ../src/sound-menu.vala:66
+msgid "Sound Settings…"
+msgstr ""
+
+#: ../src/sound-menu.vala:123
+msgid "Microphone Volume"
+msgstr ""
+
+#. NOTE: Action doesn't really exist, just used to find below when removing
+#: ../src/sound-menu.vala:146 ../src/warn-notification.vala:32
+msgid "High volume can damage your hearing."
+msgstr ""
+
+#: ../src/sound-menu.vala:254
+msgid "Volume (Headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:257
+msgid "Volume (Bluetooth)"
+msgstr ""
+
+#: ../src/sound-menu.vala:260
+msgid "Volume (Usb)"
+msgstr ""
+
+#: ../src/sound-menu.vala:263
+msgid "Volume (HDMI)"
+msgstr ""
+
+#: ../src/sound-menu.vala:266
+msgid "Volume (Bluetooth headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:269
+msgid "Volume (Usb headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:272
+msgid "Volume (HDMI headphones)"
+msgstr ""
+
+#: ../src/sound-menu.vala:445
+msgid "Choose Playlist"
+msgstr ""
+
+#: ../src/warn-notification.vala:49
+msgid "OK"
+msgstr ""
+
+#: ../src/warn-notification.vala:52
+msgid "Cancel"
+msgstr ""
+
+#: ../src/service.vala:293
+msgid "Volume (muted)"
+msgstr ""
+
+#: ../src/service.vala:296
+msgid "silent"
+msgstr ""
+
+#: ../src/service.vala:304
+msgid "Sound"
+msgstr ""