Merge lp:~osomon/webbrowser-app/hud-keywords-translators into lp:webbrowser-app

[Olivier Tilloy]

Add translators comments for the keywords associated to HUD actions.

[David Planella (dpm)]

That looks perfect. This provides good context to translators to ensure the translations work well with the HUD.

[David Planella (dpm)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/13
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1872

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/130/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1881

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/134/rebuild

review: Approve (continuous-integration)

=== modified file 'po/webbrowser-app.pot'
--- po/webbrowser-app.pot	2013-05-16 16:30:47 +0000
+++ po/webbrowser-app.pot	2013-06-05 08:26:00 +0000
@@ -1,96 +1,117 @@
-# Ubuntu webbrowser app translation.
-# Copyright 2013 Canonical Ltd.
-# This file is distributed under the same license as the webbrowser-app package.
+# 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"
+"Project-Id-Version: webbrowser-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-16 18:13+0200\n"
+"POT-Creation-Date: 2013-06-05 09:59+0200\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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Ubuntu/Browser/SelectionPopover.qml:40
-msgid "Share"
-msgstr ""
-
-#: src/Ubuntu/Browser/SelectionPopover.qml:50
-msgid "Save"
-msgstr ""
-
-#: src/Ubuntu/Browser/SelectionPopover.qml:60
-msgid "Copy"
-msgstr ""
-
-#: src/Ubuntu/Browser/ErrorSheet.qml:38
-msgid "Network Error"
-msgstr ""
-
-#: src/Ubuntu/Browser/ErrorSheet.qml:43
-#, qt-format
-msgid "It appears you are having trouble viewing: %1."
-msgstr ""
-
-#: src/Ubuntu/Browser/ErrorSheet.qml:49
-msgid ""
-"Ubuntu suggests you check your network settings and try refreshing the page."
-msgstr ""
-
-#: src/Ubuntu/Browser/ErrorSheet.qml:54
-msgid "Refresh page"
-msgstr ""
-
-#: src/Ubuntu/Browser/Chrome.qml:66 src/Ubuntu/Browser/Browser.qml:73
-msgid "Back"
-msgstr ""
-
-#: src/Ubuntu/Browser/Chrome.qml:76 src/Ubuntu/Browser/Browser.qml:79
-msgid "Forward"
-msgstr ""
-
-#: src/Ubuntu/Browser/Browser.qml:68
+#: src/Ubuntu/Browser/Browser.qml:64
 msgid "Goto"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:69
+#. TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Goto' action.
+#. Keywords may actually be sentences, and must be separated by semi-colons.
+#: src/Ubuntu/Browser/Browser.qml:67
 msgid "Address;URL;www"
 msgstr ""
 
+#: src/Ubuntu/Browser/Browser.qml:71 src/Ubuntu/Browser/Chrome.qml:68
+msgid "Back"
+msgstr ""
+
+#. TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Back' action.
+#. Keywords may actually be sentences, and must be separated by semi-colons.
 #: src/Ubuntu/Browser/Browser.qml:74
 msgid "Older Page"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:80
+#: src/Ubuntu/Browser/Browser.qml:79 src/Ubuntu/Browser/Chrome.qml:78
+msgid "Forward"
+msgstr ""
+
+#. TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Forward' action.
+#. Keywords may actually be sentences, and must be separated by semi-colons.
+#: src/Ubuntu/Browser/Browser.qml:82
 msgid "Newer Page"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:85
+#: src/Ubuntu/Browser/Browser.qml:87
 msgid "Reload"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:86
+#. TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Reload' action.
+#. Keywords may actually be sentences, and must be separated by semi-colons.
+#: src/Ubuntu/Browser/Browser.qml:90
 msgid "Leave Page"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:90
+#: src/Ubuntu/Browser/Browser.qml:94
 msgid "Bookmark"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:91
+#. TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Bookmark' action.
+#. Keywords may actually be sentences, and must be separated by semi-colons.
+#: src/Ubuntu/Browser/Browser.qml:97
 msgid "Add This Page to Bookmarks"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:95
+#: src/Ubuntu/Browser/Browser.qml:101
 msgid "New Tab"
 msgstr ""
 
-#: src/Ubuntu/Browser/Browser.qml:96
+#. TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'New Tab' action.
+#. Keywords may actually be sentences, and must be separated by semi-colons.
+#: src/Ubuntu/Browser/Browser.qml:104
 msgid "Open a New Tab"
 msgstr ""
+
+#: src/Ubuntu/Browser/ErrorSheet.qml:38
+msgid "Network Error"
+msgstr ""
+
+#: src/Ubuntu/Browser/ErrorSheet.qml:43
+#, qt-format
+msgid "It appears you are having trouble viewing: %1."
+msgstr ""
+
+#: src/Ubuntu/Browser/ErrorSheet.qml:49
+msgid ""
+"Ubuntu suggests you check your network settings and try refreshing the page."
+msgstr ""
+
+#: src/Ubuntu/Browser/ErrorSheet.qml:54
+msgid "Refresh page"
+msgstr ""
+
+#: src/Ubuntu/Browser/SelectionPopover.qml:40
+msgid "Share"
+msgstr ""
+
+#: src/Ubuntu/Browser/SelectionPopover.qml:50
+msgid "Save"
+msgstr ""
+
+#: src/Ubuntu/Browser/SelectionPopover.qml:60
+msgid "Copy"
+msgstr ""
+
+#: src/Ubuntu/Browser/webbrowser-app.qml:33
+#, qt-format
+msgid "%1 - Ubuntu Web Browser"
+msgstr ""
+
+#: src/Ubuntu/Browser/webbrowser-app.qml:34
+msgid "Ubuntu Web Browser"
+msgstr ""

=== modified file 'src/Ubuntu/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml	2013-05-31 17:41:50 +0000
+++ src/Ubuntu/Browser/Browser.qml	2013-06-05 08:26:00 +0000
@@ -62,33 +62,45 @@
         HUD.Context {
             HUD.Action {
                 label: i18n.tr("Goto")
+                // TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Goto' action.
+                // Keywords may actually be sentences, and must be separated by semi-colons.
                 keywords: i18n.tr("Address;URL;www")
                 enabled: false // TODO: parametrized action
             }
             HUD.Action {
                 label: i18n.tr("Back")
+                // TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Back' action.
+                // Keywords may actually be sentences, and must be separated by semi-colons.
                 keywords: i18n.tr("Older Page")
                 enabled: webview.canGoBack
                 onTriggered: webview.goBack()
             }
             HUD.Action {
                 label: i18n.tr("Forward")
+                // TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Forward' action.
+                // Keywords may actually be sentences, and must be separated by semi-colons.
                 keywords: i18n.tr("Newer Page")
                 enabled: webview.canGoForward
                 onTriggered: webview.goForward()
             }
             HUD.Action {
                 label: i18n.tr("Reload")
+                // TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Reload' action.
+                // Keywords may actually be sentences, and must be separated by semi-colons.
                 keywords: i18n.tr("Leave Page")
                 onTriggered: webview.reload()
             }
             HUD.Action {
                 label: i18n.tr("Bookmark")
+                // TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'Bookmark' action.
+                // Keywords may actually be sentences, and must be separated by semi-colons.
                 keywords: i18n.tr("Add This Page to Bookmarks")
                 enabled: false // TODO: implement bookmarks
             }
             HUD.Action {
                 label: i18n.tr("New Tab")
+                // TRANSLATORS: This is a free-form list of keywords associated to the HUD’s 'New Tab' action.
+                // Keywords may actually be sentences, and must be separated by semi-colons.
                 keywords: i18n.tr("Open a New Tab")
                 enabled: false // TODO: implement tabs
             }