Ubuntu Document Viewer App

Merge lp:~mutse-young/ubuntu-docviewer-app/trunk into lp:ubuntu-docviewer-app/trunk

  1. trunk
  2. Merge into trunk
Proposed by mutse
Status: Rejected
Rejected by: Stefano Verzegnassi
Proposed branch: lp:~mutse-young/ubuntu-docviewer-app/trunk
Merge into: lp:ubuntu-docviewer-app/trunk
Diff against target: 376 lines (+64/-64)
2 files modified
po/com.ubuntu.docviewer.pot (+3/-3)
po/zh_CN.po (+61/-61)
To merge this branch: bzr merge lp:~mutse-young/ubuntu-docviewer-app/trunk
Reviewer Review Type Date Requested Status
Stefano Verzegnassi Disapprove
Review via email: mp+277512@code.launchpad.net

Commit message

update zh_CN.po

To post a comment you must log in.
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

Hi, nice to see you again! :)

Thanks for your contribution. Unfortunately, I have to disapprove and reject this merge proposal for technical reasons.

All the translations are automatically managed by Launchpad itself, so, if you want to improve the translations for your language, you should do it at this page:

https://translations.launchpad.net/ubuntu-docviewer-app

If I approved and merged your branch, Launchpad would have no way to know about your changes and it would remove them as soon as it'd have to synchronize the new translations.

For further informations, you can ask to the team responsible for your locale:

https://launchpad.net/~ubuntu-l10n-zh-cn
http://wiki.ubuntu.org.cn/TranslatorsGuideline

review: Disapprove
Revision history for this message
mutse (mutse-young) wrote :

Thank you very much! I have done it at launchpad translations page.

By the way, I want to know that when you will publish the new version of
ut-tweak-tool.

Best Wishes

2015-11-15 18:37 GMT+08:00 Stefano Verzegnassi <email address hidden>:

> The proposal to merge lp:~mutse-young/ubuntu-docviewer-app/trunk into
> lp:ubuntu-docviewer-app has been updated.
>
> Status: Needs review => Rejected
>
> For more details, see:
>
> https://code.launchpad.net/~mutse-young/ubuntu-docviewer-app/trunk/+merge/277512
> --
> You are the owner of lp:~mutse-young/ubuntu-docviewer-app/trunk.
>

Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

> Thank you very much! I have done it at launchpad translations page.

Thanks again!

> By the way, I want to know that when you will publish the new
> version of ut-tweak-tool.

My fault! The implementation of LibreOfficeKit into DocViewer is taking more time than expected.
At the time, I planned to spend some time on ut-tweak-tool after the official release of DocViewer 2.0 (which were expected in October).

The biggest and hardest DocViewer tasks have been already completed, so I'll start to work on ut-tweak-tool from the next week.

We're about to get some new Ubuntu Toolkit APIs from OTA-8 (which should be released during this week). They will provide some change in the header APIs.
From a certain point of view, I'm happy of being in late with ut-tweak-tool since I don't have to do some change twice (this is not an excuse for being late, just a statement that the work on the next release should be a bit faster).

Also, I've already started to work on some new feature some month ago (i.e. porting some code from Tweak Geek).

I definitely think it will be ready for being released in December.
I'm really sorry for this.

Feel free to ping me on Hangouts (you should be able to find the link on my G+ profile).

Unmerged revisions

197. By mutse

update zh_CN.po

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-07-24 09:12:38 +0000
3+++ po/com.ubuntu.docviewer.pot 2015-11-15 09:08:41 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2015-07-24 11:10+0200\n"
9+"POT-Creation-Date: 2015-11-15 16:46+0800\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@@ -33,7 +33,7 @@
14 msgstr ""
15
16 #: ../src/app/docviewer-application.cpp:171
17-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
18+#: /home/mutse/workspace/utouch-apps/build/po/com.ubuntu.docviewer.desktop.in.in.h:1
19 msgid "Document Viewer"
20 msgstr ""
21
22@@ -369,6 +369,6 @@
23 msgid "Open"
24 msgstr ""
25
26-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
27+#: /home/mutse/workspace/utouch-apps/build/po/com.ubuntu.docviewer.desktop.in.in.h:2
28 msgid "documents;viewer;pdf;reader;"
29 msgstr ""
30
31=== modified file 'po/zh_CN.po'
32--- po/zh_CN.po 2015-08-18 05:56:20 +0000
33+++ po/zh_CN.po 2015-11-15 09:08:41 +0000
34@@ -30,12 +30,12 @@
35 #: ../src/app/content-communicator.cpp:105
36 #, qt-format
37 msgid "copy %1"
38-msgstr ""
39+msgstr "复制 %1"
40
41 #: ../src/app/docviewer-application.cpp:171
42 #: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
43 msgid "Document Viewer"
44-msgstr ""
45+msgstr "文档浏览器"
46
47 #: ../src/app/qml/common/DetailsPage.qml:27
48 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
49@@ -79,49 +79,49 @@
50 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
51 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
52 msgid "Close"
53-msgstr ""
54+msgstr "关闭"
55
56 #: ../src/app/qml/common/PickImportedDialog.qml:29
57 msgid "Multiple documents imported"
58-msgstr ""
59+msgstr "已导入多个文档"
60
61 #: ../src/app/qml/common/PickImportedDialog.qml:30
62 msgid "Choose which one to open:"
63-msgstr ""
64+msgstr "请选择一个文件打开："
65
66 #: ../src/app/qml/common/RejectedImportDialog.qml:28
67 msgid "File not supported"
68 msgid_plural "Files not supported"
69-msgstr[0] ""
70-msgstr[1] ""
71+msgstr[0] "文件不支持"
72+msgstr[1] "文件不支持"
73
74 #: ../src/app/qml/common/RejectedImportDialog.qml:29
75 msgid "Following document has not been imported:"
76 msgid_plural "Following documents have not been imported:"
77-msgstr[0] ""
78-msgstr[1] ""
79+msgstr[0] "以下文档未导入："
80+msgstr[1] "以下文档未导入："
81
82 #: ../src/app/qml/common/ToastWithAction.qml:97
83 msgid "Dismiss"
84-msgstr ""
85+msgstr "丢弃"
86
87 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
88 msgid "Unknown file type"
89-msgstr ""
90+msgstr "未知文件类型"
91
92 #: ../src/app/qml/common/UnknownTypeDialog.qml:27
93 msgid ""
94 "Sorry but we can't find a way to display this file. Do you want to open it "
95 "as a plain text?"
96-msgstr ""
97+msgstr "抱歉，无法显示这个文件。请问是否以无格式文本的方式打开它？"
98
99 #: ../src/app/qml/common/UnknownTypeDialog.qml:29
100 msgid "Yes"
101-msgstr ""
102+msgstr "是"
103
104 #: ../src/app/qml/common/UnknownTypeDialog.qml:38
105 msgid "No"
106-msgstr ""
107+msgstr "不是"
108
109 #. TRANSLATORS: %1 is the size of a file, expressed in GB
110 #: ../src/app/qml/common/utils.js:22
111@@ -145,47 +145,47 @@
112 #: ../src/app/qml/common/utils.js:33
113 #, qt-format
114 msgid "%1 byte"
115-msgstr ""
116+msgstr "%1 字节"
117
118 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
119 msgid "Delete file"
120-msgstr ""
121+msgstr "删除文件"
122
123 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
124 #, qt-format
125 msgid "Delete %1 file"
126 msgid_plural "Delete %1 files"
127-msgstr[0] ""
128-msgstr[1] ""
129+msgstr[0] "删除文件 %1"
130+msgstr[1] "删除文件 %1"
131
132 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
133 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
134 msgid "Are you sure you want to permanently delete this file?"
135 msgid_plural "Are you sure you want to permanently delete these files?"
136-msgstr[0] ""
137-msgstr[1] ""
138+msgstr[0] "请确认是否永久删除这个文件？"
139+msgstr[1] "请确认时候永久删除这些文件？"
140
141 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
142 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
143 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
144 msgid "Cancel"
145-msgstr ""
146+msgstr "取消"
147
148 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
149 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
150 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
151 msgid "Delete"
152-msgstr ""
153+msgstr "删除"
154
155 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
156 msgid "No document found"
157-msgstr ""
158+msgstr "文件未找到"
159
160 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
161 msgid ""
162 "Connect your device to any computer and simply drag files to the Documents "
163 "folder."
164-msgstr ""
165+msgstr "请将您的设备连接至任一台电脑上，然后将文件拖至文档目录下。"
166
167 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
168 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
169@@ -193,7 +193,7 @@
170 #: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
171 #, qt-format
172 msgid "Today, %1"
173-msgstr ""
174+msgstr "今天，%1"
175
176 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
177 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
178@@ -201,7 +201,7 @@
179 #: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
180 #, qt-format
181 msgid "Yesterday, %1"
182-msgstr ""
183+msgstr "昨天，%1"
184
185 #. TRANSLATORS: this is a datetime formatting string,
186 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
187@@ -220,154 +220,154 @@
188
189 #: ../src/app/qml/documentPage/DocumentListView.qml:157
190 msgid "Today"
191-msgstr ""
192+msgstr "今天"
193
194 #: ../src/app/qml/documentPage/DocumentListView.qml:160
195 msgid "Yesterday"
196-msgstr ""
197+msgstr "昨天"
198
199 #: ../src/app/qml/documentPage/DocumentListView.qml:163
200 msgid "Earlier this week"
201-msgstr ""
202+msgstr "本周早前"
203
204 #: ../src/app/qml/documentPage/DocumentListView.qml:166
205 msgid "Earlier this month"
206-msgstr ""
207+msgstr "本月早前"
208
209 #: ../src/app/qml/documentPage/DocumentListView.qml:168
210 msgid "Even earlier..."
211-msgstr ""
212+msgstr "更早些..."
213
214 #: ../src/app/qml/documentPage/DocumentPage.qml:24
215 msgid "Documents"
216-msgstr ""
217+msgstr "文档"
218
219 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
220 msgid "Search..."
221-msgstr ""
222+msgstr "搜索"
223
224 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
225 msgid "Sorting settings..."
226-msgstr ""
227+msgstr "排序设置..."
228
229 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
230 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
231 msgid "Switch to single column list"
232-msgstr ""
233+msgstr "切换单栏列表"
234
235 #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
236 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
237 msgid "Switch to grid"
238-msgstr ""
239+msgstr "切换表格"
240
241 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
242 msgid "Pick"
243-msgstr ""
244+msgstr "精选"
245
246 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
247 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
248 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
249 msgid "Back"
250-msgstr ""
251+msgstr "返回"
252
253 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
254 msgid "search in documents..."
255-msgstr ""
256+msgstr "在文档中搜索"
257
258 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
259 msgid "Select None"
260-msgstr ""
261+msgstr "未选择"
262
263 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
264 msgid "Select All"
265-msgstr ""
266+msgstr "全选"
267
268 #: ../src/app/qml/documentPage/SearchEmptyState.qml:24
269 msgid "No matching document found"
270-msgstr ""
271+msgstr "未找到匹配的文档"
272
273 #: ../src/app/qml/documentPage/SearchEmptyState.qml:26
274 msgid ""
275 "Please ensure that your query is not misspelled and/or try a different query."
276-msgstr ""
277+msgstr "请确认您的查询没有拼写错或尝试不同的查询。"
278
279 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
280 msgid "Sorting settings"
281-msgstr ""
282+msgstr "排序设置"
283
284 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
285 msgid "Sort by date (Latest first)"
286-msgstr ""
287+msgstr "按时间排序（最近优先）"
288
289 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
290 msgid "Sort by name (A-Z)"
291-msgstr ""
292+msgstr "按名字排序（A-Z）"
293
294 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
295 msgid "Sort by size (Smaller first)"
296-msgstr ""
297+msgstr "按大小排序（最小优先）"
298
299 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
300 msgid "Reverse order"
301-msgstr ""
302+msgstr "反序"
303
304 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
305 #: ../src/app/qml/pdfView/PdfContentsPage.qml:32
306 #: ../src/app/qml/pdfView/PdfView.qml:37
307 msgid "Contents"
308-msgstr ""
309+msgstr "内容"
310
311 #: ../src/app/qml/pdfView/PdfContentsPage.qml:38
312 msgid "Hide table of contents"
313-msgstr ""
314+msgstr "隐藏内容目录"
315
316 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
317 #. while the second one (%2) refers to the total pages count.
318 #: ../src/app/qml/pdfView/PdfView.qml:34
319 #, qt-format
320 msgid "Page %1 of %2"
321-msgstr ""
322+msgstr "第 %1 页 共 %2 页"
323
324 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
325 msgid "Go to page..."
326-msgstr ""
327+msgstr "跳至页面..."
328
329 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
330 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
331 msgid "Disable night mode"
332-msgstr ""
333+msgstr "禁用夜间模式"
334
335 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
336 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
337 msgid "Enable night mode"
338-msgstr ""
339+msgstr "启用夜间模式"
340
341 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
342 msgid "Go to page"
343-msgstr ""
344+msgstr "跳至页面"
345
346 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
347 #, qt-format
348 msgid "Choose a page between 1 and %1"
349-msgstr ""
350+msgstr "请从第 1 页至 %1 之间选择一页"
351
352 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
353 msgid "GO!"
354-msgstr ""
355+msgstr "跳转！"
356
357 #: ../src/app/qml/textView/TextView.qml:42
358 msgid "Loading..."
359-msgstr ""
360+msgstr "加载..."
361
362 #: ../src/app/qml/ubuntu-docviewer-app.qml:240
363 msgid "Document successfully imported!"
364 msgid_plural "Documents successfully imported!"
365-msgstr[0] ""
366-msgstr[1] ""
367+msgstr[0] "文档成功导入！"
368+msgstr[1] "文档成功导入！"
369
370 #: ../src/app/qml/ubuntu-docviewer-app.qml:243
371 msgid "Open"
372-msgstr ""
373+msgstr "打开"
374
375 #: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
376 msgid "documents;viewer;pdf;reader;"

Subscribers

People subscribed via source and target branches