Ubuntu Terminal App

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

  1. make-strings-translatable
  2. Merge into 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
1=== modified file 'po/com.ubuntu.terminal.pot'
2--- po/com.ubuntu.terminal.pot 2014-12-07 16:57:32 +0000
3+++ po/com.ubuntu.terminal.pot 2014-12-09 22:18:16 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-12-07 17:55+0100\n"
9+"POT-Creation-Date: 2014-12-08 21:43+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -41,6 +41,22 @@
14 msgid "Authentication failed"
15 msgstr ""
16
17+#: ../src/app/qml/KeyboardBar.qml:43
18+msgid "Scroll Keys"
19+msgstr ""
20+
21+#: ../src/app/qml/KeyboardBar.qml:48
22+msgid "Functions Keys"
23+msgstr ""
24+
25+#: ../src/app/qml/KeyboardBar.qml:53
26+msgid "Command Keys"
27+msgstr ""
28+
29+#: ../src/app/qml/KeyboardBar.qml:58
30+msgid "Control Keys"
31+msgstr ""
32+
33 #: ../src/app/qml/SettingsPage.qml:27
34 msgid "Settings"
35 msgstr ""
36
37=== modified file 'src/app/qml/KeyboardBar.qml'
38--- src/app/qml/KeyboardBar.qml 2014-12-07 16:11:58 +0000
39+++ src/app/qml/KeyboardBar.qml 2014-12-09 22:18:16 +0000
40@@ -40,22 +40,22 @@
41 actions: [
42 Action {
43 text: "SCR"
44- description: "Scroll Keys"
45+ description: i18n.tr("Scroll Keys")
46 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ScrollKeysLayout.qml"
47 },
48 Action {
49 text: "FN"
50- description: "Functions Keys"
51+ description: i18n.tr("Functions Keys")
52 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/FunctionKeysLayout.qml"
53 },
54 Action {
55 text: "CMD"
56- description: "Command Keys"
57+ description: i18n.tr("Command Keys")
58 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/SimpleCommandsLayout.qml"
59 },
60 Action {
61 text: "CTRL"
62- description: "Control Keys"
63+ description: i18n.tr("Control Keys")
64 onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ControlKeysLayout.qml"
65 }
66 ]

Subscribers

People subscribed via source and target branches