Merge lp:~developersw/ubuntu-terminal-app/make-strings-translatable into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Carlo Giordano
Status: Merged
Merged at revision: 28
Proposed branch: lp:~developersw/ubuntu-terminal-app/make-strings-translatable
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 66 lines (+21/-5)
2 files modified
po/com.ubuntu.terminal.pot (+17/-1)
src/app/qml/KeyboardBar.qml (+4/-4)
To merge this branch: bzr merge lp:~developersw/ubuntu-terminal-app/make-strings-translatable
Reviewer Review Type Date Requested Status
Filippo Scognamiglio Approve
Review via email: mp+244235@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Filippo Scognamiglio (flscogna) wrote :

Thank you Carlo. Branch merged.

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-12-07 16:57:32 +0000
+++ po/com.ubuntu.terminal.pot 2014-12-09 22:18:16 +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-12-07 17:55+0100\n"11"POT-Creation-Date: 2014-12-08 21:43+0000\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"
@@ -41,6 +41,22 @@
41msgid "Authentication failed"41msgid "Authentication failed"
42msgstr ""42msgstr ""
4343
44#: ../src/app/qml/KeyboardBar.qml:43
45msgid "Scroll Keys"
46msgstr ""
47
48#: ../src/app/qml/KeyboardBar.qml:48
49msgid "Functions Keys"
50msgstr ""
51
52#: ../src/app/qml/KeyboardBar.qml:53
53msgid "Command Keys"
54msgstr ""
55
56#: ../src/app/qml/KeyboardBar.qml:58
57msgid "Control Keys"
58msgstr ""
59
44#: ../src/app/qml/SettingsPage.qml:2760#: ../src/app/qml/SettingsPage.qml:27
45msgid "Settings"61msgid "Settings"
46msgstr ""62msgstr ""
4763
=== modified file 'src/app/qml/KeyboardBar.qml'
--- src/app/qml/KeyboardBar.qml 2014-12-07 16:11:58 +0000
+++ src/app/qml/KeyboardBar.qml 2014-12-09 22:18:16 +0000
@@ -40,22 +40,22 @@
40 actions: [40 actions: [
41 Action {41 Action {
42 text: "SCR"42 text: "SCR"
43 description: "Scroll Keys"43 description: i18n.tr("Scroll Keys")
44 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ScrollKeysLayout.qml"44 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ScrollKeysLayout.qml"
45 },45 },
46 Action {46 Action {
47 text: "FN"47 text: "FN"
48 description: "Functions Keys"48 description: i18n.tr("Functions Keys")
49 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/FunctionKeysLayout.qml"49 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/FunctionKeysLayout.qml"
50 },50 },
51 Action {51 Action {
52 text: "CMD"52 text: "CMD"
53 description: "Command Keys"53 description: i18n.tr("Command Keys")
54 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/SimpleCommandsLayout.qml"54 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/SimpleCommandsLayout.qml"
55 },55 },
56 Action {56 Action {
57 text: "CTRL"57 text: "CTRL"
58 description: "Control Keys"58 description: i18n.tr("Control Keys")
59 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ControlKeysLayout.qml"59 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ControlKeysLayout.qml"
60 }60 }
61 ]61 ]

Subscribers

People subscribed via source and target branches