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
=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot 2015-11-30 12:12:10 +0000
+++ po/com.ubuntu.docviewer.pot 2015-11-30 23:31:28 +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: 2015-11-30 13:11+0100\n"11"POT-Creation-Date: 2015-12-01 00:30+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"
@@ -19,11 +19,11 @@
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../src/app/qml/common/CommandLineProxy.qml:4921#: ../src/app/qml/common/CommandLineProxy.qml:49
22msgid "Some of the provided arguments is not valid."22msgid "Some of the provided arguments are not valid."
23msgstr ""23msgstr ""
2424
25#: ../src/app/qml/common/CommandLineProxy.qml:5825#: ../src/app/qml/common/CommandLineProxy.qml:58
26msgid "Opens ubuntu-docviewer-app displaying the selected file"26msgid "Open ubuntu-docviewer-app displaying the selected file"
27msgstr ""27msgstr ""
2828
29#: ../src/app/qml/common/CommandLineProxy.qml:6529#: ../src/app/qml/common/CommandLineProxy.qml:65
@@ -31,13 +31,12 @@
31msgstr ""31msgstr ""
3232
33#: ../src/app/qml/common/CommandLineProxy.qml:7133#: ../src/app/qml/common/CommandLineProxy.qml:71
34msgid "Open ubuntu-docviewer-app in pick mode. Use it for tests only."34msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
35msgstr ""35msgstr ""
3636
37#: ../src/app/qml/common/CommandLineProxy.qml:7737#: ../src/app/qml/common/CommandLineProxy.qml:77
38msgid ""38msgid ""
39"Load the list of documents from the given folder, instead of default ~/"39"Show documents from the given folder, instead of ~/Documents.\n"
40"Documents.\n"
41"The path must exist prior to running ubuntu-docviewer-app"40"The path must exist prior to running ubuntu-docviewer-app"
42msgstr ""41msgstr ""
4342
@@ -106,8 +105,7 @@
106105
107#: ../src/app/qml/common/UnknownTypeDialog.qml:28106#: ../src/app/qml/common/UnknownTypeDialog.qml:28
108msgid ""107msgid ""
109"Sorry but we can't find a way to display this file.\n"108"This file is not supported.\n"
110"\n"
111"Do you want to open it as a plain text?"109"Do you want to open it as a plain text?"
112msgstr ""110msgstr ""
113111
@@ -436,10 +434,10 @@
436msgid "copy %1"434msgid "copy %1"
437msgstr ""435msgstr ""
438436
439#: /tmp/build-ubuntu-docviewer-app-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1437#: /tmp/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
440msgid "Document Viewer"438msgid "Document Viewer"
441msgstr ""439msgstr ""
442440
443#: /tmp/build-ubuntu-docviewer-app-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2441#: /tmp/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
444msgid "documents;viewer;pdf;reader;"442msgid "documents;viewer;pdf;reader;"
445msgstr ""443msgstr ""
446444
=== modified file 'src/app/qml/common/CommandLineProxy.qml'
--- src/app/qml/common/CommandLineProxy.qml 2015-10-23 11:19:19 +0000
+++ src/app/qml/common/CommandLineProxy.qml 2015-11-30 23:31:28 +0000
@@ -46,7 +46,7 @@
46 // This does not include any argument which is not expected: they are46 // This does not include any argument which is not expected: they are
47 // just skipped.47 // just skipped.
48 if (args.error) {48 if (args.error) {
49 var errorString = i18n.tr("Some of the provided arguments is not valid.")49 var errorString = i18n.tr("Some of the provided arguments are not valid.")
50 args.quitWithError(errorString)50 args.quitWithError(errorString)
51 }51 }
52 }52 }
@@ -55,7 +55,7 @@
55 id: args55 id: args
5656
57 defaultArgument {57 defaultArgument {
58 help: i18n.tr("Opens ubuntu-docviewer-app displaying the selected file")58 help: i18n.tr("Open ubuntu-docviewer-app displaying the selected file")
59 valueNames: ["file_path"]59 valueNames: ["file_path"]
60 required: false60 required: false
61 }61 }
@@ -68,13 +68,13 @@
6868
69 Argument {69 Argument {
70 name: "pickMode"70 name: "pickMode"
71 help: i18n.tr("Open ubuntu-docviewer-app in pick mode. Use it for tests only.")71 help: i18n.tr("Open ubuntu-docviewer-app in pick mode. Used for tests only.")
72 required: false72 required: false
73 }73 }
7474
75 Argument {75 Argument {
76 name: "documentsDir"76 name: "documentsDir"
77 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")77 help: i18n.tr("Show documents from the given folder, instead of ~/Documents.\nThe path must exist prior to running ubuntu-docviewer-app")
78 valueNames: ["PATH"]78 valueNames: ["PATH"]
79 required: false79 required: false
80 }80 }
8181
=== modified file 'src/app/qml/common/UnknownTypeDialog.qml'
--- src/app/qml/common/UnknownTypeDialog.qml 2015-10-23 11:19:19 +0000
+++ src/app/qml/common/UnknownTypeDialog.qml 2015-11-30 23:31:28 +0000
@@ -25,7 +25,7 @@
25 id: unknownDialog25 id: unknownDialog
26 objectName: "unknownDialog"26 objectName: "unknownDialog"
27 title: i18n.tr("Unknown file type")27 title: i18n.tr("Unknown file type")
28 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?")28 text: i18n.tr("This file is not supported.\nDo you want to open it as a plain text?")
2929
30 RowLayout {30 RowLayout {
31 anchors {31 anchors {

Subscribers

People subscribed via source and target branches