Ubuntu Terminal App

Merge lp:~vrruiz/ubuntu-terminal-app/i18n-strings into lp:ubuntu-terminal-app

  1. i18n-strings
  2. Merge into trunk
Proposed by Víctor R. Ruiz
Status: Merged
Approved by: Leo Arias
Approved revision: 123
Merged at revision: 123
Proposed branch: lp:~vrruiz/ubuntu-terminal-app/i18n-strings
Merge into: lp:ubuntu-terminal-app
Diff against target: 97 lines (+31/-7)
2 files modified
po/com.ubuntu.terminal.pot (+25/-1)
src/app/qml/extraPanel/ScrlKeys.qml (+6/-6)
To merge this branch: bzr merge lp:~vrruiz/ubuntu-terminal-app/i18n-strings
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+232096@code.launchpad.net

Commit message

Mark strings for translation.

Description of the change

Mark strings for translation.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:123
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/79/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1687
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1687/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/23

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/79/rebuild

review: Approve (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

Thanks Victor.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot 2014-08-13 08:27:01 +0000
+++ po/com.ubuntu.terminal.pot 2014-08-25 14:39:00 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-08-13 10:24+0200\n"11"POT-Creation-Date: 2014-08-25 13:55+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -109,6 +109,30 @@
109msgid "Death Star;Skywalker;Leia;Darth Vader"109msgid "Death Star;Skywalker;Leia;Darth Vader"
110msgstr ""110msgstr ""
111111
112#: ../src/app/qml/extraPanel/ScrlKeys.qml:25
113msgid "PG_UP"
114msgstr ""
115
116#: ../src/app/qml/extraPanel/ScrlKeys.qml:31
117msgid "TAB"
118msgstr ""
119
120#: ../src/app/qml/extraPanel/ScrlKeys.qml:43
121msgid "DEL"
122msgstr ""
123
124#: ../src/app/qml/extraPanel/ScrlKeys.qml:49
125msgid "HOME"
126msgstr ""
127
128#: ../src/app/qml/extraPanel/ScrlKeys.qml:59
129msgid "PG_DN"
130msgstr ""
131
132#: ../src/app/qml/extraPanel/ScrlKeys.qml:83
133msgid "END"
134msgstr ""
135
112#: ../src/app/qml/ubuntu-terminal-app.qml:29136#: ../src/app/qml/ubuntu-terminal-app.qml:29
113#: com.ubuntu.terminal.desktop.in.in.h:1137#: com.ubuntu.terminal.desktop.in.in.h:1
114msgid "Terminal"138msgid "Terminal"
115139
=== modified file 'src/app/qml/extraPanel/ScrlKeys.qml'
--- src/app/qml/extraPanel/ScrlKeys.qml 2013-12-14 01:19:17 +0000
+++ src/app/qml/extraPanel/ScrlKeys.qml 2014-08-25 14:39:00 +0000
@@ -22,13 +22,13 @@
22 spacing: units.gu(1)22 spacing: units.gu(1)
2323
24 Button {24 Button {
25 Label {text: "PG_UP"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}25 Label {text: i18n.tr("PG_UP"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
26 width: btn_width*1.526 width: btn_width*1.5
27 onClicked: keyPressed(Qt.Key_PageUp, Qt.NoModifier)27 onClicked: keyPressed(Qt.Key_PageUp, Qt.NoModifier)
28 }28 }
2929
30 Button {30 Button {
31 Label {text: "TAB"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}31 Label {text: i18n.tr("TAB"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
32 width: btn_width32 width: btn_width
33 onClicked: keyPressed(Qt.Key_Tab, Qt.NoModifier)33 onClicked: keyPressed(Qt.Key_Tab, Qt.NoModifier)
34 }34 }
@@ -40,13 +40,13 @@
40 }40 }
4141
42 Button {42 Button {
43 Label {text: "DEL"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}43 Label {text: i18n.tr("DEL"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
44 width: btn_width44 width: btn_width
45 onClicked: keyPressed(Qt.Key_Delete, Qt.NoModifier)45 onClicked: keyPressed(Qt.Key_Delete, Qt.NoModifier)
46 }46 }
4747
48 Button {48 Button {
49 Label {text: "HOME"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}49 Label {text: i18n.tr("HOME"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
50 width: btn_width*1.550 width: btn_width*1.5
51 onClicked: keyPressed(Qt.Key_Home, Qt.NoModifier)51 onClicked: keyPressed(Qt.Key_Home, Qt.NoModifier)
52 }52 }
@@ -56,7 +56,7 @@
56 spacing: units.gu(1)56 spacing: units.gu(1)
5757
58 Button {58 Button {
59 Label {text: "PG_DN"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}59 Label {text: i18n.tr("PG_DN"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
60 width: btn_width*1.560 width: btn_width*1.5
61 onClicked: keyPressed(Qt.Key_PageDown, Qt.NoModifier)61 onClicked: keyPressed(Qt.Key_PageDown, Qt.NoModifier)
62 }62 }
@@ -80,7 +80,7 @@
80 }80 }
8181
82 Button {82 Button {
83 Label {text: "END"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}83 Label {text: i18n.tr("END"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
84 width: btn_width*1.584 width: btn_width*1.5
85 onClicked: keyPressed(Qt.Key_End, Qt.NoModifier)85 onClicked: keyPressed(Qt.Key_End, Qt.NoModifier)
86 }86 }

Subscribers

People subscribed via source and target branches