Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-translations-151201 into lp:ubuntu-docviewer-app

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 219
Merged at revision: 219
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-translations-151201
Merge into: lp:ubuntu-docviewer-app
Diff against target: 116 lines (+13/-15)
3 files modified
po/com.ubuntu.docviewer.pot (+8/-10)
src/app/qml/common/CommandLineProxy.qml (+4/-4)
src/app/qml/common/UnknownTypeDialog.qml (+1/-1)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-translations-151201
Reviewer Review Type Date Requested Status
Roman Shchekin Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+279052@code.launchpad.net

Commit message

Fixed translatable strings

Description of the change

Fixed translatable strings

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
219. By Stefano Verzegnassi

Fixed a further string

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote :

LGTM

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.docviewer.pot'
2--- po/com.ubuntu.docviewer.pot 2015-11-30 12:12:10 +0000
3+++ po/com.ubuntu.docviewer.pot 2015-11-30 23:31:28 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2015-11-30 13:11+0100\n"
9+"POT-Creation-Date: 2015-12-01 00:30+0100\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@@ -19,11 +19,11 @@
14 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
15
16 #: ../src/app/qml/common/CommandLineProxy.qml:49
17-msgid "Some of the provided arguments is not valid."
18+msgid "Some of the provided arguments are not valid."
19 msgstr ""
20
21 #: ../src/app/qml/common/CommandLineProxy.qml:58
22-msgid "Opens ubuntu-docviewer-app displaying the selected file"
23+msgid "Open ubuntu-docviewer-app displaying the selected file"
24 msgstr ""
25
26 #: ../src/app/qml/common/CommandLineProxy.qml:65
27@@ -31,13 +31,12 @@
28 msgstr ""
29
30 #: ../src/app/qml/common/CommandLineProxy.qml:71
31-msgid "Open ubuntu-docviewer-app in pick mode. Use it for tests only."
32+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
33 msgstr ""
34
35 #: ../src/app/qml/common/CommandLineProxy.qml:77
36 msgid ""
37-"Load the list of documents from the given folder, instead of default ~/"
38-"Documents.\n"
39+"Show documents from the given folder, instead of ~/Documents.\n"
40 "The path must exist prior to running ubuntu-docviewer-app"
41 msgstr ""
42
43@@ -106,8 +105,7 @@
44
45 #: ../src/app/qml/common/UnknownTypeDialog.qml:28
46 msgid ""
47-"Sorry but we can't find a way to display this file.\n"
48-"\n"
49+"This file is not supported.\n"
50 "Do you want to open it as a plain text?"
51 msgstr ""
52
53@@ -436,10 +434,10 @@
54 msgid "copy %1"
55 msgstr ""
56
57-#: /tmp/build-ubuntu-docviewer-app-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
58+#: /tmp/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
59 msgid "Document Viewer"
60 msgstr ""
61
62-#: /tmp/build-ubuntu-docviewer-app-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
63+#: /tmp/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
64 msgid "documents;viewer;pdf;reader;"
65 msgstr ""
66
67=== modified file 'src/app/qml/common/CommandLineProxy.qml'
68--- src/app/qml/common/CommandLineProxy.qml 2015-10-23 11:19:19 +0000
69+++ src/app/qml/common/CommandLineProxy.qml 2015-11-30 23:31:28 +0000
70@@ -46,7 +46,7 @@
71 // This does not include any argument which is not expected: they are
72 // just skipped.
73 if (args.error) {
74- var errorString = i18n.tr("Some of the provided arguments is not valid.")
75+ var errorString = i18n.tr("Some of the provided arguments are not valid.")
76 args.quitWithError(errorString)
77 }
78 }
79@@ -55,7 +55,7 @@
80 id: args
81
82 defaultArgument {
83- help: i18n.tr("Opens ubuntu-docviewer-app displaying the selected file")
84+ help: i18n.tr("Open ubuntu-docviewer-app displaying the selected file")
85 valueNames: ["file_path"]
86 required: false
87 }
88@@ -68,13 +68,13 @@
89
90 Argument {
91 name: "pickMode"
92- help: i18n.tr("Open ubuntu-docviewer-app in pick mode. Use it for tests only.")
93+ help: i18n.tr("Open ubuntu-docviewer-app in pick mode. Used for tests only.")
94 required: false
95 }
96
97 Argument {
98 name: "documentsDir"
99- help: i18n.tr("Load the list of documents from the given folder, instead of default ~/Documents.\nThe path must exist prior to running ubuntu-docviewer-app")
100+ help: i18n.tr("Show documents from the given folder, instead of ~/Documents.\nThe path must exist prior to running ubuntu-docviewer-app")
101 valueNames: ["PATH"]
102 required: false
103 }
104
105=== modified file 'src/app/qml/common/UnknownTypeDialog.qml'
106--- src/app/qml/common/UnknownTypeDialog.qml 2015-10-23 11:19:19 +0000
107+++ src/app/qml/common/UnknownTypeDialog.qml 2015-11-30 23:31:28 +0000
108@@ -25,7 +25,7 @@
109 id: unknownDialog
110 objectName: "unknownDialog"
111 title: i18n.tr("Unknown file type")
112- text: i18n.tr("Sorry but we can't find a way to display this file.\n\nDo you want to open it as a plain text?")
113+ text: i18n.tr("This file is not supported.\nDo you want to open it as a plain text?")
114
115 RowLayout {
116 anchors {

Subscribers

People subscribed via source and target branches