The Sound Menu

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

  1. fix-i18n
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 548
Merged at revision: 550
Proposed branch: lp:~dobey/indicator-sound/fix-i18n
Merge into: lp:indicator-sound
Prerequisite: lp:~dobey/indicator-sound/fix-coverage
Diff against target: 221 lines (+148/-32)
6 files modified
.bzrignore (+3/-25)
CMakeLists.txt (+1/-0)
debian/control (+1/-0)
po/CMakeLists.txt (+12/-0)
po/POTFILES.in (+0/-7)
po/indicator-sound.pot (+131/-0)
To merge this branch: bzr merge lp:~dobey/indicator-sound/fix-i18n
Reviewer Review Type Date Requested Status
Pete Woods (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+316644@code.launchpad.net

Commit message

Use intltool support from cmake-extras.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

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)
Revision history for this message
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2014-02-10 15:51:57 +0000
+++ .bzrignore 2017-02-07 22:07:16 +0000
@@ -1,25 +1,3 @@
1/po/POTFILES1build/
2/po/stamp-it2po/Makefile.in.in
33po/POTFILES.in
4/data/indicator-sound.conf
5
6/src/indicator-sound-service
7/src/indicator_sound_service_vala.stamp
8/src/main.c
9/src/media-player-list.c
10/src/media-player.c
11/src/mpris2-interfaces.c
12/src/mpris2-watcher.c
13/src/service.c
14/src/volume-control.c
15/src/freedesktop-interfaces.c
16
17# CMake Generated Files
18CMakeFiles/
19Makefile
20cmake_install.cmake
21CMakeCache.txt
22CTestTestfile.cmake
23config.h
24
25
264
=== 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 @@
7575
76add_subdirectory(data)76add_subdirectory(data)
77add_subdirectory(src)77add_subdirectory(src)
78add_subdirectory(po)
7879
79enable_testing()80enable_testing()
80add_subdirectory(tests)81add_subdirectory(tests)
8182
=== 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 @@
14 gnome-common,14 gnome-common,
15 googletest | google-mock (>= 1.6.0+svn437),15 googletest | google-mock (>= 1.6.0+svn437),
16 gsettings-ubuntu-schemas,16 gsettings-ubuntu-schemas,
17 intltool,
17 autotools-dev,18 autotools-dev,
18 valac (>= 0.20),19 valac (>= 0.20),
19 lcov,20 lcov,
2021
=== 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 @@
1find_package(Intltool REQUIRED)
2
3intltool_update_potfile(
4 KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
5 GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
6 COPYRIGHT_HOLDER "Canonical Ltd."
7)
8
9intltool_install_translations(
10 ALL
11 GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
12)
013
=== 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 @@
1[encoding: UTF-8]
2src/info-notification.vala
3src/options-gsettings.vala
4src/service.vala
5src/sound-menu.vala
6src/warn-notification.vala
7
80
=== 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 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2017-02-07 17:03-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#: ../src/info-notification.vala:25 ../src/info-notification.vala:42
21#: ../src/sound-menu.vala:57 ../src/sound-menu.vala:251
22#: ../src/warn-notification.vala:31 ../src/service.vala:296
23#: ../src/service.vala:299
24#, c-format
25msgid "Volume"
26msgstr ""
27
28#: ../src/info-notification.vala:55
29msgid "Speakers"
30msgstr ""
31
32#: ../src/info-notification.vala:57
33msgid "Headphones"
34msgstr ""
35
36#: ../src/info-notification.vala:59
37msgid "Bluetooth headphones"
38msgstr ""
39
40#: ../src/info-notification.vala:61
41msgid "Bluetooth speaker"
42msgstr ""
43
44#: ../src/info-notification.vala:63
45msgid "Usb speaker"
46msgstr ""
47
48#: ../src/info-notification.vala:65
49msgid "Usb headphones"
50msgstr ""
51
52#: ../src/info-notification.vala:67
53msgid "HDMI speaker"
54msgstr ""
55
56#: ../src/info-notification.vala:69
57msgid "HDMI headphones"
58msgstr ""
59
60#: ../src/sound-menu.vala:50
61msgid "Mute"
62msgstr ""
63
64#: ../src/sound-menu.vala:52
65msgid "Silent Mode"
66msgstr ""
67
68#: ../src/sound-menu.vala:66
69msgid "Sound Settings…"
70msgstr ""
71
72#: ../src/sound-menu.vala:123
73msgid "Microphone Volume"
74msgstr ""
75
76#. NOTE: Action doesn't really exist, just used to find below when removing
77#: ../src/sound-menu.vala:146 ../src/warn-notification.vala:32
78msgid "High volume can damage your hearing."
79msgstr ""
80
81#: ../src/sound-menu.vala:254
82msgid "Volume (Headphones)"
83msgstr ""
84
85#: ../src/sound-menu.vala:257
86msgid "Volume (Bluetooth)"
87msgstr ""
88
89#: ../src/sound-menu.vala:260
90msgid "Volume (Usb)"
91msgstr ""
92
93#: ../src/sound-menu.vala:263
94msgid "Volume (HDMI)"
95msgstr ""
96
97#: ../src/sound-menu.vala:266
98msgid "Volume (Bluetooth headphones)"
99msgstr ""
100
101#: ../src/sound-menu.vala:269
102msgid "Volume (Usb headphones)"
103msgstr ""
104
105#: ../src/sound-menu.vala:272
106msgid "Volume (HDMI headphones)"
107msgstr ""
108
109#: ../src/sound-menu.vala:445
110msgid "Choose Playlist"
111msgstr ""
112
113#: ../src/warn-notification.vala:49
114msgid "OK"
115msgstr ""
116
117#: ../src/warn-notification.vala:52
118msgid "Cancel"
119msgstr ""
120
121#: ../src/service.vala:293
122msgid "Volume (muted)"
123msgstr ""
124
125#: ../src/service.vala:296
126msgid "silent"
127msgstr ""
128
129#: ../src/service.vala:304
130msgid "Sound"
131msgstr ""

Subscribers

People subscribed via source and target branches