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

[Larry Price]

Avoid automatic translations during development builds.

Avoid automatic translations during development builds.

[lp:~larryprice/acolyterm/avoid-automatic-translations]

227. By Larry Price on 2016-06-29

merge

[Libertine CI Bot (libertine-ci-bot)]

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)

[Libertine CI Bot (libertine-ci-bot)]

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)

[Christopher Townsend (townsend)]

Ok

review: Approve

=== 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 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCLICK_MODE=OFF
+
+override_dh_auto_build:
+	dh_auto_build -- all translations

=== 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 @@
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 
-add_custom_target(${POT_FILE} ALL
-    COMMENT "Generating translation template..."
-    COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
-        --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
-    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
-        -D ${CMAKE_CURRENT_SOURCE_DIR}
-        -D ${CMAKE_CURRENT_BINARY_DIR}
-        --from-code=UTF-8
-        --c++ --qt --add-comments=TRANSLATORS
-        --keyword=tr --keyword=tr:1,2 --keyword=N_
-        --package-name='${PROJECT}'
-        --copyright-holder='Canonical Ltd.'
-        ${I18N_SRC_FILES}
-    COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
+add_custom_target(translations
+  COMMENT "Generating translation template..."
+  COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+      --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
+  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+      -D ${CMAKE_CURRENT_SOURCE_DIR}
+      -D ${CMAKE_CURRENT_BINARY_DIR}
+      --from-code=UTF-8
+      --c++ --qt --add-comments=TRANSLATORS
+      --keyword=tr --keyword=tr:1,2 --keyword=N_
+      --package-name='${PROJECT}'
+      --copyright-holder='Canonical Ltd.'
+      ${I18N_SRC_FILES}
+    COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS pofiles)
 
 foreach(PO_FILE ${PO_FILES})
-    get_filename_component(LANG ${PO_FILE} NAME_WE)
-    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
-    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
-            DESTINATION ${INSTALL_DIR}
-            RENAME ${DOMAIN}.mo)
+  get_filename_component(LANG ${PO_FILE} NAME_WE)
+  gettext_process_po_files(${LANG} PO_FILES ${PO_FILE})
+  set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+          DESTINATION ${INSTALL_DIR}
+          RENAME ${DOMAIN}.mo)
 endforeach(PO_FILE)

=== 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 @@
-# 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: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-07 19:27+0100\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=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/app/qml/AlternateActionPopover.qml:13
-msgid "Select"
-msgstr ""
-
-#: ../src/app/qml/AlternateActionPopover.qml:17
-msgid "Copy"
-msgstr ""
-
-#: ../src/app/qml/AlternateActionPopover.qml:21
-msgid "Paste"
-msgstr ""
-
-#: ../src/app/qml/AuthenticationDialog.qml:25
-msgid "Authentication required"
-msgstr ""
-
-#: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
-
-#: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
-
-#: ../src/app/qml/AuthenticationDialog.qml:50
-msgid "OK"
-msgstr ""
-
-#: ../src/app/qml/AuthenticationDialog.qml:62
-msgid "Cancel"
-msgstr ""
-
-#: ../src/app/qml/AuthenticationService.qml:55
-msgid "Authentication failed"
-msgstr ""
-
-#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
-msgid "Color Scheme"
-msgstr ""
-
-#: ../src/app/qml/KeyboardBar.qml:174
-msgid "Change Keyboard"
-msgstr ""
-
-#. TRANSLATORS: This a keyboard layout name
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
-msgid "Control Keys"
-msgstr ""
-
-#. TRANSLATORS: This a keyboard layout name
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
-msgid "Function Keys"
-msgstr ""
-
-#. TRANSLATORS: This a keyboard layout name
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
-msgid "Scroll Keys"
-msgstr ""
-
-#. TRANSLATORS: This a keyboard layout name
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
-msgid "Command Keys"
-msgstr ""
-
-#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
-#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
-msgid "CTRL"
-msgstr ""
-
-#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
-msgid "FNS"
-msgstr ""
-
-#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
-msgid "SCR"
-msgstr ""
-
-#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
-msgid "CMD"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
-msgid "ALT"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
-msgid "SHIFT"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
-msgid "ESC"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:83
-msgid "PG_UP"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:86
-msgid "PG_DN"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Delete key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:89
-msgid "DEL"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Home key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:92
-msgid "HOME"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the End key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:95
-msgid "END"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98
-msgid "TAB"
-msgstr ""
-
-#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase!
-#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101
-msgid "ENTER"
-msgstr ""
-
-#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41
-msgid "Layouts"
-msgstr ""
-
-#: ../src/app/qml/SettingsPage.qml:26
-msgid "Settings"
-msgstr ""
-
-#: ../src/app/qml/SettingsPage.qml:57
-msgid "Show Keyboard Bar"
-msgstr ""
-
-#: ../src/app/qml/SettingsPage.qml:73
-msgid "Show Keyboard Button"
-msgstr ""
-
-#: ../src/app/qml/SettingsPage.qml:96
-msgid "Font Size:"
-msgstr ""
-
-#: ../src/app/qml/TabsPage.qml:7
-msgid "Tabs"
-msgstr ""
-
-#: ../src/app/qml/TabsPage.qml:13
-msgid "New tab"
-msgstr ""
-
-#: ../src/app/qml/TerminalPage.qml:170
-msgid "Selection Mode"
-msgstr ""
-
-#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Green on black"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "White on black"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Black on white"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Black on random light"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Linux"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Cool retro term"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Dark pastels / Ubuntu (old)"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Black on light yellow"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-terminal-app.qml:128
-msgid "Ubuntu"
-msgstr ""
-
-#: ../src/plugin/konsole/ColorScheme.cpp:276
-#: ../src/plugin/konsole/ColorScheme.cpp:291
-#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
-#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
-msgid "Un-named Color Scheme"
-msgstr ""
-
-#: ../src/plugin/konsole/ColorScheme.cpp:426
-#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:427
-msgid "Accessible Color Scheme"
-msgstr ""
-
-#: ../src/plugin/konsole/Filter.cpp:518
-#: ../src/plugin/qmltermwidget/lib/Filter.cpp:533
-msgid "Open Link"
-msgstr ""
-
-#: ../src/plugin/konsole/Filter.cpp:519
-#: ../src/plugin/qmltermwidget/lib/Filter.cpp:534
-msgid "Copy Link Address"
-msgstr ""
-
-#: ../src/plugin/konsole/Filter.cpp:523
-#: ../src/plugin/qmltermwidget/lib/Filter.cpp:538
-msgid "Send Email To..."
-msgstr ""
-
-#: ../src/plugin/konsole/Filter.cpp:524
-#: ../src/plugin/qmltermwidget/lib/Filter.cpp:539
-msgid "Copy Email Address"
-msgstr ""
-
-#: ../src/plugin/konsole/Vt102Emulation.cpp:961
-#: ../src/plugin/qmltermwidget/lib/Vt102Emulation.cpp:977
-msgid ""
-"No keyboard translator available.  The information needed to convert key "
-"presses into characters to send to the terminal is missing."
-msgstr ""
-
-#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:39
-msgid "Match case"
-msgstr ""
-
-#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:45
-msgid "Regular expression"
-msgstr ""
-
-#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:49
-msgid "Higlight all matches"
-msgstr ""
-
-#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:405
-msgid "Color Scheme Error"
-msgstr ""
-
-#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:406
-#, qt-format
-msgid "Cannot load color scheme: %1"
-msgstr ""
-
-#: com.ubuntu.terminal.desktop.in.in.h:1
-msgid "Terminal"
-msgstr ""