acolyterm

Merge lp:~larryprice/acolyterm/avoid-automatic-translations into lp:acolyterm

  1. avoid-automatic-translations
  2. Merge into trunk
Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 227
Merged at revision: 216
Proposed branch: lp:~larryprice/acolyterm/avoid-automatic-translations
Merge into: lp:acolyterm
Prerequisite: lp:~larryprice/acolyterm/no-desktop-file
Diff against target: 354 lines (+24/-307)
3 files modified
debian/rules (+3/-0)
po/CMakeLists.txt (+21/-20)
po/com.ubuntu.terminal.pot (+0/-287)
To merge this branch: bzr merge lp:~larryprice/acolyterm/avoid-automatic-translations
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+298660@code.launchpad.net

Commit message

Avoid automatic translations during development builds.

Description of the change

Avoid automatic translations during development builds.

To post a comment you must log in.
lp:~larryprice/acolyterm/avoid-automatic-translations updated
227. By Larry Price

merge

Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:226
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/33/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/130
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/92
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/92
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/92
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/92
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/92
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/92
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/106/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/133
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/118
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/118
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/118
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/111
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/111/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/111
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/111/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/111
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/111/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/111
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/111/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/111
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/111/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/111
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/111/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/33/rebuild

review: Approve (continuous-integration)
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:227
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/36/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/133
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/94
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/94
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/94
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/94
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/94
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/94
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/109/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/136
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/121
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/121
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/121
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/114
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/114
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/114
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/114
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/114
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/114/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/114
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/114/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/36/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/rules'
--- debian/rules 2016-06-22 17:13:26 +0000
+++ debian/rules 2016-06-29 15:02:39 +0000
@@ -11,3 +11,6 @@
1111
12override_dh_auto_configure:12override_dh_auto_configure:
13 dh_auto_configure -- -DCLICK_MODE=OFF13 dh_auto_configure -- -DCLICK_MODE=OFF
14
15override_dh_auto_build:
16 dh_auto_build -- all translations
1417
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt 2014-10-25 04:42:31 +0000
+++ po/CMakeLists.txt 2016-06-29 15:02:39 +0000
@@ -5,26 +5,27 @@
5set(POT_FILE ${DOMAIN}.pot)5set(POT_FILE ${DOMAIN}.pot)
6file(GLOB PO_FILES *.po)6file(GLOB PO_FILES *.po)
77
8add_custom_target(${POT_FILE} ALL8add_custom_target(translations
9 COMMENT "Generating translation template..."9 COMMENT "Generating translation template..."
10 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini10 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
11 --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in11 --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
12 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}12 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
13 -D ${CMAKE_CURRENT_SOURCE_DIR}13 -D ${CMAKE_CURRENT_SOURCE_DIR}
14 -D ${CMAKE_CURRENT_BINARY_DIR}14 -D ${CMAKE_CURRENT_BINARY_DIR}
15 --from-code=UTF-815 --from-code=UTF-8
16 --c++ --qt --add-comments=TRANSLATORS16 --c++ --qt --add-comments=TRANSLATORS
17 --keyword=tr --keyword=tr:1,2 --keyword=N_17 --keyword=tr --keyword=tr:1,2 --keyword=N_
18 --package-name='${PROJECT}'18 --package-name='${PROJECT}'
19 --copyright-holder='Canonical Ltd.'19 --copyright-holder='Canonical Ltd.'
20 ${I18N_SRC_FILES}20 ${I18N_SRC_FILES}
21 COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})21 COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}
22 DEPENDS pofiles)
2223
23foreach(PO_FILE ${PO_FILES})24foreach(PO_FILE ${PO_FILES})
24 get_filename_component(LANG ${PO_FILE} NAME_WE)25 get_filename_component(LANG ${PO_FILE} NAME_WE)
25 gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})26 gettext_process_po_files(${LANG} PO_FILES ${PO_FILE})
26 set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)27 set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
27 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo28 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
28 DESTINATION ${INSTALL_DIR}29 DESTINATION ${INSTALL_DIR}
29 RENAME ${DOMAIN}.mo)30 RENAME ${DOMAIN}.mo)
30endforeach(PO_FILE)31endforeach(PO_FILE)
3132
=== removed file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot 2016-03-07 21:17:56 +0000
+++ po/com.ubuntu.terminal.pot 1970-01-01 00:00:00 +0000
@@ -1,287 +0,0 @@
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: \n"
10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-02-07 19:27+0100\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=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#: ../src/app/qml/AlternateActionPopover.qml:13
21msgid "Select"
22msgstr ""
23
24#: ../src/app/qml/AlternateActionPopover.qml:17
25msgid "Copy"
26msgstr ""
27
28#: ../src/app/qml/AlternateActionPopover.qml:21
29msgid "Paste"
30msgstr ""
31
32#: ../src/app/qml/AuthenticationDialog.qml:25
33msgid "Authentication required"
34msgstr ""
35
36#: ../src/app/qml/AuthenticationDialog.qml:27
37msgid "Enter passcode or passphrase:"
38msgstr ""
39
40#: ../src/app/qml/AuthenticationDialog.qml:40
41msgid "passcode or passphrase"
42msgstr ""
43
44#: ../src/app/qml/AuthenticationDialog.qml:50
45msgid "OK"
46msgstr ""
47
48#: ../src/app/qml/AuthenticationDialog.qml:62
49msgid "Cancel"
50msgstr ""
51
52#: ../src/app/qml/AuthenticationService.qml:55
53msgid "Authentication failed"
54msgstr ""
55
56#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
57msgid "Color Scheme"
58msgstr ""
59
60#: ../src/app/qml/KeyboardBar.qml:174
61msgid "Change Keyboard"
62msgstr ""
63
64#. TRANSLATORS: This a keyboard layout name
65#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
66msgid "Control Keys"
67msgstr ""
68
69#. TRANSLATORS: This a keyboard layout name
70#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
71msgid "Function Keys"
72msgstr ""
73
74#. TRANSLATORS: This a keyboard layout name
75#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
76msgid "Scroll Keys"
77msgstr ""
78
79#. TRANSLATORS: This a keyboard layout name
80#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
81msgid "Command Keys"
82msgstr ""
83
84#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
85#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
86#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
87#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
88msgid "CTRL"
89msgstr ""
90
91#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
92#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
93msgid "FNS"
94msgstr ""
95
96#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
97#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
98msgid "SCR"
99msgstr ""
100
101#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
102#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
103msgid "CMD"
104msgstr ""
105
106#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
107#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
108msgid "ALT"
109msgstr ""
110
111#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
112#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
113msgid "SHIFT"
114msgstr ""
115
116#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
117#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
118msgid "ESC"
119msgstr ""
120
121#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
122#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:83
123msgid "PG_UP"
124msgstr ""
125
126#. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase!
127#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:86
128msgid "PG_DN"
129msgstr ""
130
131#. TRANSLATORS: This is the name of the Delete key. All letters should be uppercase!
132#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:89
133msgid "DEL"
134msgstr ""
135
136#. TRANSLATORS: This is the name of the Home key. All letters should be uppercase!
137#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:92
138msgid "HOME"
139msgstr ""
140
141#. TRANSLATORS: This is the name of the End key. All letters should be uppercase!
142#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:95
143msgid "END"
144msgstr ""
145
146#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
147#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98
148msgid "TAB"
149msgstr ""
150
151#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase!
152#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101
153msgid "ENTER"
154msgstr ""
155
156#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41
157msgid "Layouts"
158msgstr ""
159
160#: ../src/app/qml/SettingsPage.qml:26
161msgid "Settings"
162msgstr ""
163
164#: ../src/app/qml/SettingsPage.qml:57
165msgid "Show Keyboard Bar"
166msgstr ""
167
168#: ../src/app/qml/SettingsPage.qml:73
169msgid "Show Keyboard Button"
170msgstr ""
171
172#: ../src/app/qml/SettingsPage.qml:96
173msgid "Font Size:"
174msgstr ""
175
176#: ../src/app/qml/TabsPage.qml:7
177msgid "Tabs"
178msgstr ""
179
180#: ../src/app/qml/TabsPage.qml:13
181msgid "New tab"
182msgstr ""
183
184#: ../src/app/qml/TerminalPage.qml:170
185msgid "Selection Mode"
186msgstr ""
187
188#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
189#: ../src/app/qml/ubuntu-terminal-app.qml:128
190msgid "Green on black"
191msgstr ""
192
193#: ../src/app/qml/ubuntu-terminal-app.qml:128
194msgid "White on black"
195msgstr ""
196
197#: ../src/app/qml/ubuntu-terminal-app.qml:128
198msgid "Black on white"
199msgstr ""
200
201#: ../src/app/qml/ubuntu-terminal-app.qml:128
202msgid "Black on random light"
203msgstr ""
204
205#: ../src/app/qml/ubuntu-terminal-app.qml:128
206msgid "Linux"
207msgstr ""
208
209#: ../src/app/qml/ubuntu-terminal-app.qml:128
210msgid "Cool retro term"
211msgstr ""
212
213#: ../src/app/qml/ubuntu-terminal-app.qml:128
214msgid "Dark pastels / Ubuntu (old)"
215msgstr ""
216
217#: ../src/app/qml/ubuntu-terminal-app.qml:128
218msgid "Black on light yellow"
219msgstr ""
220
221#: ../src/app/qml/ubuntu-terminal-app.qml:128
222msgid "Ubuntu"
223msgstr ""
224
225#: ../src/plugin/konsole/ColorScheme.cpp:276
226#: ../src/plugin/konsole/ColorScheme.cpp:291
227#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
228#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
229msgid "Un-named Color Scheme"
230msgstr ""
231
232#: ../src/plugin/konsole/ColorScheme.cpp:426
233#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:427
234msgid "Accessible Color Scheme"
235msgstr ""
236
237#: ../src/plugin/konsole/Filter.cpp:518
238#: ../src/plugin/qmltermwidget/lib/Filter.cpp:533
239msgid "Open Link"
240msgstr ""
241
242#: ../src/plugin/konsole/Filter.cpp:519
243#: ../src/plugin/qmltermwidget/lib/Filter.cpp:534
244msgid "Copy Link Address"
245msgstr ""
246
247#: ../src/plugin/konsole/Filter.cpp:523
248#: ../src/plugin/qmltermwidget/lib/Filter.cpp:538
249msgid "Send Email To..."
250msgstr ""
251
252#: ../src/plugin/konsole/Filter.cpp:524
253#: ../src/plugin/qmltermwidget/lib/Filter.cpp:539
254msgid "Copy Email Address"
255msgstr ""
256
257#: ../src/plugin/konsole/Vt102Emulation.cpp:961
258#: ../src/plugin/qmltermwidget/lib/Vt102Emulation.cpp:977
259msgid ""
260"No keyboard translator available. The information needed to convert key "
261"presses into characters to send to the terminal is missing."
262msgstr ""
263
264#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:39
265msgid "Match case"
266msgstr ""
267
268#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:45
269msgid "Regular expression"
270msgstr ""
271
272#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:49
273msgid "Higlight all matches"
274msgstr ""
275
276#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:405
277msgid "Color Scheme Error"
278msgstr ""
279
280#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:406
281#, qt-format
282msgid "Cannot load color scheme: %1"
283msgstr ""
284
285#: com.ubuntu.terminal.desktop.in.in.h:1
286msgid "Terminal"
287msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: