Merge lp:~popey/ubuntu-docviewer-app/fix-unconfined into lp:ubuntu-docviewer-app/trunk
- fix-unconfined
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~popey/ubuntu-docviewer-app/fix-unconfined |
Merge into: | lp:ubuntu-docviewer-app/trunk |
Diff against target: |
18727 lines (+7785/-5853) (has conflicts) 149 files modified
CMakeLists.txt (+25/-0) README (+27/-8) debian/control (+5/-2) docviewer-libs.json (+94/-0) get-click-deps (+451/-0) po/am.po (+36/-15) po/ast.po (+36/-15) po/br.po (+36/-15) po/ca.po (+32/-16) po/com.ubuntu.docviewer.pot (+229/-136) po/cs.po (+32/-16) po/da.po (+32/-16) po/de.po (+42/-28) po/el.po (+76/-62) po/en_AU.po (+32/-16) po/en_GB.po (+44/-29) po/eo.po (+56/-40) po/es.po (+32/-16) po/eu.po (+32/-16) po/fa.po (+43/-29) po/fi.po (+33/-17) po/fr.po (+44/-30) po/gd.po (+32/-16) po/gl.po (+37/-16) po/hu.po (+32/-16) po/id.po (+32/-16) po/it.po (+33/-17) po/lo.po (+32/-16) po/lv.po (+32/-16) po/nb.po (+37/-15) po/nl.po (+33/-17) po/ny.po (+32/-16) po/pa.po (+43/-29) po/pl.po (+41/-22) po/pt.po (+34/-18) po/pt_BR.po (+32/-16) po/ru.po (+32/-16) po/sl.po (+62/-58) po/tr.po (+32/-16) po/uk.po (+32/-16) po/uz.po (+395/-0) po/zh_CN.po (+32/-16) po/zh_TW.po (+32/-16) src/app/CMakeLists.txt (+11/-11) src/app/command-line-parser.cpp (+0/-134) src/app/command-line-parser.h (+0/-60) src/app/config.h.in (+45/-0) src/app/content-communicator.cpp (+0/-251) src/app/content-communicator.h (+0/-74) src/app/docviewer-application.cpp (+0/-351) src/app/docviewer-application.h (+0/-100) src/app/graphics/select-none.svg (+0/-153) src/app/graphics/select.svg (+0/-158) src/app/graphics/settings_alt.svg (+0/-138) src/app/main.cpp (+54/-16) src/app/qml/common/CommandLineProxy.qml (+82/-0) src/app/qml/common/ContentHubProxy.qml (+149/-0) src/app/qml/common/DetailsPage.qml (+15/-11) src/app/qml/common/FileNotFoundDialog.qml (+2/-2) src/app/qml/common/NightModeShader.qml (+1/-1) src/app/qml/common/PickImportedDialog.qml (+14/-8) src/app/qml/common/RejectedImportDialog.qml (+6/-6) src/app/qml/common/SubtitledListItem.qml (+41/-0) src/app/qml/common/Toast.qml (+0/-82) src/app/qml/common/ToastWithAction.qml (+0/-117) src/app/qml/common/UnknownTypeDialog.qml (+28/-16) src/app/qml/common/loadComponent.js (+10/-0) src/app/qml/common/utils.js (+28/-0) src/app/qml/documentPage/DeleteFileDialog.qml (+48/-35) src/app/qml/documentPage/DocumentDelegateActions.qml (+15/-4) src/app/qml/documentPage/DocumentEmptyState.qml (+2/-5) src/app/qml/documentPage/DocumentGridDelegate.qml (+0/-113) src/app/qml/documentPage/DocumentGridView.qml (+0/-84) src/app/qml/documentPage/DocumentListDelegate.qml (+89/-103) src/app/qml/documentPage/DocumentListView.qml (+71/-152) src/app/qml/documentPage/DocumentPage.qml (+25/-15) src/app/qml/documentPage/DocumentPageDefaultHeader.qml (+6/-8) src/app/qml/documentPage/DocumentPagePickModeHeader.qml (+15/-8) src/app/qml/documentPage/DocumentPageSearchHeader.qml (+2/-2) src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml (+39/-59) src/app/qml/documentPage/SearchEmptyState.qml (+1/-1) src/app/qml/documentPage/SectionHeader.qml (+29/-0) src/app/qml/documentPage/SharePage.qml (+56/-0) src/app/qml/documentPage/SortSettingsDialog.qml (+3/-2) src/app/qml/documentPage/TileBase.qml (+0/-369) src/app/qml/loView/KeybHelper.js (+144/-0) src/app/qml/loView/LOViewDefaultHeader.qml (+111/-0) src/app/qml/loView/LOViewGotoDialog.qml (+75/-0) src/app/qml/loView/LOViewPage.qml (+221/-0) src/app/qml/loView/LOViewZoomHeader.qml (+59/-0) src/app/qml/loView/PanelButton.qml (+31/-0) src/app/qml/loView/PartsView.qml (+91/-0) src/app/qml/loView/SlideControllerPanel.qml (+87/-0) src/app/qml/loView/ZoomSelector.qml (+149/-0) src/app/qml/pdfView/PdfContentsPage.qml (+43/-36) src/app/qml/pdfView/PdfView.qml (+4/-4) src/app/qml/pdfView/PdfViewDefaultHeader.qml (+2/-2) src/app/qml/pdfView/PdfViewDelegate.qml (+2/-2) src/app/qml/pdfView/PdfViewGotoDialog.qml (+25/-14) src/app/qml/textView/TextView.qml (+3/-3) src/app/qml/textView/TextViewDefaultHeader.qml (+2/-2) src/app/qml/ubuntu-docviewer-app.qml (+51/-128) src/app/qml/upstreamComponents/EmptyState.qml (+2/-2) src/app/qml/upstreamComponents/HeaderButton.qml (+0/-65) src/app/qml/upstreamComponents/ListItemWithActions.qml (+0/-453) src/app/qml/upstreamComponents/ListItemWithActionsCheckBox.qml (+0/-25) src/app/qml/upstreamComponents/MultipleSelectionGridView.qml (+0/-199) src/app/qml/upstreamComponents/MultipleSelectionListView.qml (+0/-199) src/app/qml/upstreamComponents/MultipleSelectionVisualModel.qml (+0/-31) src/app/qml/upstreamComponents/PageWithBottomEdge.qml (+2/-2) src/app/urlhandler.cpp (+0/-70) src/app/urlhandler.h (+0/-43) src/plugin/CMakeLists.txt (+1/-0) src/plugin/file-qml-plugin/CMakeLists.txt (+5/-6) src/plugin/file-qml-plugin/backend.cpp (+12/-0) src/plugin/file-qml-plugin/documentmodel.cpp (+3/-6) src/plugin/file-qml-plugin/docviewerutils.cpp (+169/-0) src/plugin/file-qml-plugin/docviewerutils.h (+42/-0) src/plugin/file-qml-plugin/qstorageinfo.cpp (+0/-378) src/plugin/file-qml-plugin/qstorageinfo.h (+0/-102) src/plugin/file-qml-plugin/qstorageinfo_p.h (+0/-84) src/plugin/file-qml-plugin/qstorageinfo_unix.cpp (+0/-442) src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt (+54/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKit.h (+171/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKit.hxx (+310/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitEnums.h (+229/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitGtk.h (+86/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitInit.h (+257/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitTypes.h (+30/-0) src/plugin/libreofficetoolkit-qml-plugin/config.h (+98/-0) src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp (+234/-0) src/plugin/libreofficetoolkit-qml-plugin/lodocument.h (+93/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.cpp (+54/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.h (+40/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.cpp (+126/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.h (+81/-0) src/plugin/libreofficetoolkit-qml-plugin/loview.cpp (+396/-0) src/plugin/libreofficetoolkit-qml-plugin/loview.h (+113/-0) src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp (+39/-0) src/plugin/libreofficetoolkit-qml-plugin/plugin.h (+33/-0) src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml (+96/-0) src/plugin/libreofficetoolkit-qml-plugin/qmldir (+4/-0) src/plugin/libreofficetoolkit-qml-plugin/renderengine.cpp (+120/-0) src/plugin/libreofficetoolkit-qml-plugin/renderengine.h (+58/-0) src/plugin/libreofficetoolkit-qml-plugin/rendertask.cpp (+1/-0) src/plugin/libreofficetoolkit-qml-plugin/rendertask.h (+81/-0) src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp (+87/-0) src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h (+44/-0) src/plugin/libreofficetoolkit-qml-plugin/twips.h (+59/-0) Text conflict in po/am.po Contents conflict in po/ar.po Text conflict in po/ast.po Text conflict in po/br.po Contents conflict in po/bs.po Text conflict in po/ca.po Text conflict in po/cs.po Contents conflict in po/cy.po Text conflict in po/da.po Text conflict in po/de.po Text conflict in po/el.po Text conflict in po/en_AU.po Text conflict in po/en_GB.po Text conflict in po/eo.po Text conflict in po/es.po Text conflict in po/eu.po Text conflict in po/fa.po Text conflict in po/fi.po Text conflict in po/fr.po Text conflict in po/gd.po Text conflict in po/gl.po Text conflict in po/hu.po Text conflict in po/id.po Text conflict in po/it.po Text conflict in po/lo.po Text conflict in po/lv.po Text conflict in po/nb.po Text conflict in po/nl.po Text conflict in po/ny.po Text conflict in po/pa.po Text conflict in po/pl.po Text conflict in po/pt.po Text conflict in po/pt_BR.po Text conflict in po/ru.po Text conflict in po/sl.po Text conflict in po/tr.po Text conflict in po/uk.po Conflict adding file po/uz.po. Moved existing file to po/uz.po.moved. Text conflict in po/zh_CN.po Text conflict in po/zh_TW.po |
To merge this branch: | bzr merge lp:~popey/ubuntu-docviewer-app/fix-unconfined |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Needs Fixing | |
Ubuntu Document Viewer Developers | Pending | ||
Review via email: mp+276854@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-11-06.
Commit message
Remove unconfined from apparmor profile. Tested on device, and we're still able to open pdfs and office docs just fine.
Description of the change
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
Unmerged revisions
- 193. By Alan Pope 🍺🐧🐱 🦄
-
No longer need to be unconfined
- 192. By Stefano Verzegnassi
-
Automatically fetch dependencies for LibreOffice viewer and put them inside the .click package.
Approved by Alan Pope , Ubuntu Phone Apps Jenkins Bot.
- 191. By Stefano Verzegnassi
-
* Switch to Ubuntu.Components 1.2
* Minor UI changes
* Temporarily removed GridView from documents browser page
* Fixed wrong default date format (now it is middle-endian format, default for US English)
* Limit ListViews width to units.gu(80) on wide screens. Fixes: https://bugs.launchpad .net/bugs/ 1470897. Approved by Ubuntu Phone Apps Jenkins Bot.
- 190. By Stefano Verzegnassi
-
* Refactored cpp init
* Moved command line parser to QML.Approved by Ubuntu Phone Apps Jenkins Bot, Stefano Verzegnassi, Roman Shchekin.
- 189. By Roman Shchekin
-
More OOP in RenderEngine (preparations for migration of PDF plugin to tile rendering).
Approved by Ubuntu Phone Apps Jenkins Bot, Stefano Verzegnassi.
- 188. By Stefano Verzegnassi
-
[loviewer] Fixed 'singleShot' property not set for m_updateTimer.
Approved by Ubuntu Phone Apps Jenkins Bot.
- 187. By Stefano Verzegnassi
-
[loview] Fixed leak and tiles that stay visible even after their removal.
Approved by Roman Shchekin, Ubuntu Phone Apps Jenkins Bot.
- 186. By Roman Shchekin
-
RenderEngine - impress support.
Approved by Ubuntu Phone Apps Jenkins Bot, Stefano Verzegnassi.
- 185. By Stefano Verzegnassi
-
* [loviewer] Improved support for presentation document type
* [loviewer] Added keyboard shortcuts.
* [loviewer] Added an image provider for slides thumbnails, sync'd with RenderEngine
* [loviewer] Conditional layout for the presentation view: use a bottom edge or a sidebar to show the list of slides
* [loviewer] Moved zoom controls into a separate page head
* Updated translation template.Approved by Ubuntu Phone Apps Jenkins Bot.
- 184. By Stefano Verzegnassi
-
[loviewer] Implemented zoom:
* Added a manual zoom mode
* Added an automatic zoom mode (fit zoom to flickable width)
* Added a bottom panel with a zoom selector (which includes a TextField and an OptionSelector).Approved by Ubuntu Phone Apps Jenkins Bot.
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2015-06-24 20:50:40 +0000 |
3 | +++ CMakeLists.txt 2015-11-06 11:00:18 +0000 |
4 | @@ -121,3 +121,28 @@ |
5 | add_subdirectory(src) |
6 | add_subdirectory(tests) |
7 | add_subdirectory(po) |
8 | + |
9 | +# If running in CLICK_MODE, include binary dependencies of docviewer |
10 | +if(CLICK_MODE) |
11 | + MESSAGE("Grabbing upstream libs to ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs") |
12 | + execute_process( |
13 | + COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs |
14 | + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get-click-deps -d ${CMAKE_CURRENT_SOURCE_DIR}/docviewer-libs.json ${CLICK_ARCH} ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs |
15 | + ) |
16 | + |
17 | + MESSAGE("Installing upstream libs from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}") |
18 | + file(GLOB_RECURSE UPSTREAM_LIBS "${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/*") |
19 | + foreach(ITEM ${UPSTREAM_LIBS}) |
20 | + IF( IS_DIRECTORY "${ITEM}" ) |
21 | + LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" ) |
22 | + ELSE() |
23 | + LIST( APPEND FILES_TO_DEPLOY "${ITEM}" ) |
24 | + ENDIF() |
25 | + endforeach() |
26 | + MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}") |
27 | + INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} ) |
28 | + |
29 | + |
30 | + MESSAGE("Installing LibreOffice from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice") |
31 | + INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice ) |
32 | +endif(CLICK_MODE) |
33 | |
34 | === modified file 'README' |
35 | --- README 2015-01-30 19:20:39 +0000 |
36 | +++ README 2015-11-06 11:00:18 +0000 |
37 | @@ -8,13 +8,32 @@ |
38 | ========= |
39 | |
40 | Install poppler's development files: |
41 | -sudo apt-get install libpoppler-qt5-dev |
42 | + sudo apt install libpoppler-qt5-dev |
43 | |
44 | Install Qt5 private development files: |
45 | -sudo apt-get install qtdeclarative5-private-dev qtbase5-private-dev |
46 | - |
47 | -If you want to compile an arm click package, you need to install that package to the arm compilation environment. For example when using QtCreator for Ubuntu Touch, open Options -> Ubuntu -> Maintain, and then enter: |
48 | - |
49 | -apt-get install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf |
50 | - |
51 | - |
52 | + sudo apt install qtdeclarative5-private-dev qtbase5-private-dev |
53 | + |
54 | +If you want to compile an arm click package, you need to install that package |
55 | +to the arm compilation environment. For example when using QtCreator for |
56 | +Ubuntu Touch, open Options -> Ubuntu -> Maintain, and then enter: |
57 | + |
58 | + apt install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf |
59 | + |
60 | +LibreOffice viewer support |
61 | +========================== |
62 | + |
63 | +If you want to enable the LibreOffice viewer feature, you'll need to have a |
64 | +LibreOffice 5.0 installation on your development environment. At the time of |
65 | +writing, LibreOffice 5.0 is not yet in the archive, but you can easily install |
66 | +it from the pre-releases PPA. To do so, type the following commands on a |
67 | +terminal: |
68 | + |
69 | + sudo apt-get purge libreoffice-core |
70 | + sudo add-apt-repository ppa:libreoffice/libreoffice-prereleases |
71 | + sudo apt-get update |
72 | + sudo apt-get install libreoffice |
73 | + |
74 | +Then to compile the LibreOffice viewer plugin you'll simply need to install |
75 | +the LibreOffice Kit development files: |
76 | + |
77 | + sudo apt install libreofficekit-dev |
78 | |
79 | === modified file 'debian/control' |
80 | --- debian/control 2015-02-23 12:49:52 +0000 |
81 | +++ debian/control 2015-11-06 11:00:18 +0000 |
82 | @@ -4,14 +4,13 @@ |
83 | Build-Depends: cmake, |
84 | debhelper (>= 9), |
85 | intltool, |
86 | - libcontent-hub-dev (>= 0.0+13.10.20130930.1), |
87 | libpoppler-qt5-dev, |
88 | pep8, |
89 | pkg-config, |
90 | pkg-kde-tools, |
91 | python3-all, |
92 | qt5-default, |
93 | - qtbase5-dev, |
94 | + qtbase5-dev (>= 5.4.0), |
95 | qtchooser, |
96 | qtdeclarative5-dev, |
97 | qtdeclarative5-dev-tools, |
98 | @@ -28,6 +27,10 @@ |
99 | Architecture: any |
100 | Depends: qtdeclarative5-qtquick2-plugin, |
101 | qtdeclarative5-ubuntu-ui-toolkit-plugin, |
102 | + qtdeclarative5-ubuntu-content1, |
103 | + qtdeclarative5-quicklayouts-plugin, |
104 | + qtdeclarative5-window-plugin, |
105 | + suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1), |
106 | ${misc:Depends} |
107 | Description: Document Viewer application |
108 | Core Document Viewer application |
109 | |
110 | === added file 'docviewer-libs.json' |
111 | --- docviewer-libs.json 1970-01-01 00:00:00 +0000 |
112 | +++ docviewer-libs.json 2015-11-06 11:00:18 +0000 |
113 | @@ -0,0 +1,94 @@ |
114 | +{ |
115 | + "armhf": [ |
116 | + { |
117 | + "url": "http://ports.ubuntu.com/ubuntu-ports", |
118 | + "dist": "vivid", |
119 | + "component": "main", |
120 | + "packages": [ |
121 | + "libboost-date-time1.55.0", |
122 | + "libgl1-mesa-glx", |
123 | + "libxcb-dri3-0", |
124 | + "libxcb-glx0", |
125 | + "libxcb-present0", |
126 | + "libxshmfence1", |
127 | + "libxslt1.1", |
128 | + "libxt6", |
129 | + "libxxf86vm1", |
130 | + "gconf-service", |
131 | + "gconf-service-backend", |
132 | + "gconf2-common", |
133 | + "libgconf-2-4" |
134 | + ] |
135 | + }, |
136 | + { |
137 | + "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu", |
138 | + "dist": "vivid", |
139 | + "component": "main", |
140 | + "packages": [ |
141 | + "libreoffice-vanilla" |
142 | + ] |
143 | + } |
144 | + ], |
145 | + |
146 | + "i386": [ |
147 | + { |
148 | + "url": "http://archive.ubuntu.com/ubuntu", |
149 | + "dist": "vivid", |
150 | + "component": "main", |
151 | + "packages": [ |
152 | + "libboost-date-time1.55.0", |
153 | + "libgl1-mesa-glx", |
154 | + "libxcb-dri3-0", |
155 | + "libxcb-glx0", |
156 | + "libxcb-present0", |
157 | + "libxshmfence1", |
158 | + "libxslt1.1", |
159 | + "libxt6", |
160 | + "libxxf86vm1", |
161 | + "gconf-service", |
162 | + "gconf-service-backend", |
163 | + "gconf2-common", |
164 | + "libgconf-2-4" |
165 | + ] |
166 | + }, |
167 | + { |
168 | + "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu", |
169 | + "dist": "vivid", |
170 | + "component": "main", |
171 | + "packages": [ |
172 | + "libreoffice-vanilla" |
173 | + ] |
174 | + } |
175 | + ], |
176 | + |
177 | + "amd64": [ |
178 | + { |
179 | + "url": "http://archive.ubuntu.com/ubuntu", |
180 | + "dist": "vivid", |
181 | + "component": "main", |
182 | + "packages": [ |
183 | + "libboost-date-time1.55.0", |
184 | + "libgl1-mesa-glx", |
185 | + "libxcb-dri3-0", |
186 | + "libxcb-glx0", |
187 | + "libxcb-present0", |
188 | + "libxshmfence1", |
189 | + "libxslt1.1", |
190 | + "libxt6", |
191 | + "libxxf86vm1", |
192 | + "gconf-service", |
193 | + "gconf-service-backend", |
194 | + "gconf2-common", |
195 | + "libgconf-2-4" |
196 | + ] |
197 | + }, |
198 | + { |
199 | + "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu", |
200 | + "dist": "vivid", |
201 | + "component": "main", |
202 | + "packages": [ |
203 | + "libreoffice-vanilla" |
204 | + ] |
205 | + } |
206 | + ] |
207 | +} |
208 | |
209 | === added file 'get-click-deps' |
210 | --- get-click-deps 1970-01-01 00:00:00 +0000 |
211 | +++ get-click-deps 2015-11-06 11:00:18 +0000 |
212 | @@ -0,0 +1,451 @@ |
213 | +#!/usr/bin/python3 |
214 | + |
215 | +# Copyright (C) 2015 Stefano Verzegnassi <verzegnassi.stefano@gmail.com> |
216 | +# Copyright (C) 2015 Didier Roche <didrocks@ubuntu.com> |
217 | +# |
218 | +# This program is free software: you can redistribute it and/or modify it |
219 | +# under the terms of the GNU General Public License version 3, as published |
220 | +# by the Free Software Foundation. |
221 | +# |
222 | +# This program is distributed in the hope that it will be useful, but |
223 | +# WITHOUT ANY WARRANTY; without even the implied warranties of |
224 | +# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR |
225 | +# PURPOSE. See the GNU General Public License for more details. |
226 | +# |
227 | +# You should have received a copy of the GNU General Public License along |
228 | +# with this program. If not, see <http://www.gnu.org/licenses/>. |
229 | + |
230 | +# |
231 | +# Source code at: |
232 | +# https://code.launchpad.net/~verzegnassi-stefano/+junk/get-click-deps |
233 | +# |
234 | +# A script to automate the fetching all the external dependencies of a |
235 | +# Click packaged application from internet, and copying them in a given |
236 | +# folder, so that the click packaging tool can easily build them in the |
237 | +# package. |
238 | +# |
239 | +# usage: get-click-deps [-h] [-f] [-d] [-e] [-c SCRIPT_PATH] |
240 | +# manifest_path {amd64,i386,armhf} target_path |
241 | +# |
242 | +# A tool for adding external libraries to a Ubuntu SDK application or scope. |
243 | +# |
244 | +# positional arguments: |
245 | +# manifest_path path of json file containing the list of packages to |
246 | +# be downloaded. |
247 | +# {amd64,i386,armhf} CPU architecture ("amd64", "i386" or "armhf") |
248 | +# target_path path to the target (a click package or a folder) |
249 | +# where this tool will include the downloaded binaries. |
250 | +# If the folder does not exist, it will be created. |
251 | +# |
252 | +# optional arguments: |
253 | +# -h, --help show this help message and exit |
254 | +# -f, --force-download force a new download of the packages |
255 | +# -d, --delete-temp delete temp files at the end of the process |
256 | +# -e, --extract-only only create temp directory and extract the content of |
257 | +# downloaded packages |
258 | +# -c SCRIPT_PATH, --custom-script SCRIPT_PATH |
259 | +# run a custom script after the extraction of Debian |
260 | +# packages and before copying their content to the |
261 | +# target destination. The tool will execute the script |
262 | +# with the path to the packages dump as argument. If |
263 | +# the '-e' flag has been specified, the script will be |
264 | +# anyway executed. This option is useful when you need |
265 | +# to automatically modify the content of temp folder |
266 | +# (e.g. when you need to fix some path before including |
267 | +# the files in a click package). |
268 | +# |
269 | +# |
270 | +# USAGE EXAMPLE: |
271 | +# get-click-deps packages.json armhf <path/to/package.click> |
272 | +# |
273 | +# package.json is the package manifest, and contains all the references to the |
274 | +# .deb packages to be included into the Ubuntu SDK project. |
275 | +# If you're familiar to the Debian/Ubuntu world, you'll see that it's pretty |
276 | +# similar to therepository management of these distros: |
277 | +# see https://wiki.debian.org/SourcesList for further informations. |
278 | +# |
279 | +# An example of packages.json file is: |
280 | +# { |
281 | +# "armhf": [ |
282 | +# { |
283 | +# "url": "http://ports.ubuntu.com/ubuntu-ports/", |
284 | +# "dist": "vivid", |
285 | +# "component": "main", |
286 | +# "packages": [ |
287 | +# "libgl1-mesa-glx", |
288 | +# "libxslt1.1", |
289 | +# "libxcb-glx0", |
290 | +# "libxcb-dri3-0", |
291 | +# "libxcb-present0", |
292 | +# "libxshmfence1", |
293 | +# "libxxf86vm1" |
294 | +# ] |
295 | +# }, |
296 | +# |
297 | +# { |
298 | +# "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu", |
299 | +# "dist": "vivid", |
300 | +# "component": "main", |
301 | +# "packages": [ |
302 | +# "libreoffice-vanilla" |
303 | +# ] |
304 | +# } |
305 | +# ], |
306 | +# |
307 | +# "amd64": [ |
308 | +# "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu", |
309 | +# "dist": "vivid", |
310 | +# "component": "main", |
311 | +# "packages": [ |
312 | +# "libreoffice-vanilla" |
313 | +# ] |
314 | +# } |
315 | +# ] |
316 | +# } |
317 | +# |
318 | +# Instead of a click package, you can specify the build folder used by Ubuntu |
319 | +# SDK for compiling the sources of your project. This way the binaries |
320 | +# downloaded by this tool will be automatically included in the .click package |
321 | +# the next time you ask Ubuntu SDK to create a new package. |
322 | +# |
323 | + |
324 | +# TODO: Complete error handling |
325 | +# TODO: Make target_path optional if the '-e' flag has been specified. |
326 | + |
327 | +import sys |
328 | +import os |
329 | +import stat |
330 | +import time |
331 | +import argparse |
332 | +import json |
333 | +import gzip |
334 | +import subprocess |
335 | +import urllib.request, urllib.error, urllib.parse |
336 | + |
337 | +def get_timestamp(): |
338 | + return time.time() |
339 | + |
340 | + |
341 | +def check_internet_connection(): |
342 | + try: |
343 | + urllib.request.urlopen('http://www.google.com', timeout=20) |
344 | + return True |
345 | + except urllib2.error.URLError as err: |
346 | + pass |
347 | + return False |
348 | + |
349 | + |
350 | +def get_arch_triplet(arch): |
351 | + return subprocess.check_output([ |
352 | + 'dpkg-architecture', |
353 | + '-A', |
354 | + arch, |
355 | + '-qDEB_TARGET_MULTIARCH']) |
356 | + |
357 | + |
358 | +def download_file(url, dest, verbose=True): |
359 | + if verbose: |
360 | + print ("\nDownloading:\n{}".format(url)) |
361 | + # TODO: Switch to subprocess |
362 | + os.system('cd %s && { curl -# -O %s ; cd - ; }' % (dest, url)) |
363 | + |
364 | + |
365 | +def download_file_and_rename(url, dest, new_filename, verbose=True): |
366 | + if verbose: |
367 | + print ("\nDownloading:\n{}".format(url)) |
368 | + new_path = os.path.join(dest, new_filename) |
369 | + subprocess.call(['curl', url, '-#', '-o', new_path]) |
370 | + |
371 | + return new_path |
372 | + |
373 | + |
374 | +def get_package_download_url(package_name, packages_list, base_url): |
375 | + pkgs_list = packages_list.decode('utf-8').split('\n') |
376 | + index = pkgs_list.index('Package: %s' % package_name) |
377 | + |
378 | + for i in range(index, len(pkgs_list)): |
379 | + if pkgs_list[i].find('Filename:') > -1: |
380 | + return "%s/%s" % (base_url, pkgs_list[i].replace('Filename: ', '')) |
381 | + |
382 | + |
383 | +def get_URLs_for_arch(manifest_path, arch, destpath): |
384 | + urls = [] |
385 | + |
386 | + f = open(manifest_path) |
387 | + content = json.load(f) |
388 | + f.close() |
389 | + |
390 | + # Download repository index for each repository in the JSON package |
391 | + # manifest. |
392 | + try: |
393 | + repo_index = 0 |
394 | + for repo in content[arch]: |
395 | + repo_index_url = '%s/dists/%s/%s/binary-%s/Packages.gz' % ( |
396 | + repo['url'], |
397 | + repo['dist'], |
398 | + repo['component'], |
399 | + arch) |
400 | + |
401 | + print ("\nDownloading repository index at:\n".format(repo_index_url)) |
402 | + |
403 | + repo_index_zip = download_file_and_rename( |
404 | + repo_index_url, |
405 | + destpath, |
406 | + 'repo-index-%s-%s.gz' % (arch, repo_index), |
407 | + False) |
408 | + |
409 | + with gzip.open(repo_index_zip, 'r') as f: |
410 | + repo_index_content = f.read() |
411 | + f.close() |
412 | + |
413 | + # Get the download URL of each package of the repository. |
414 | + packages = repo['packages'] |
415 | + for package in packages: |
416 | + urls.append(get_package_download_url( |
417 | + package, |
418 | + repo_index_content, |
419 | + repo['url'])) |
420 | + |
421 | + repo_index += 1 |
422 | + except KeyError: |
423 | + # Arch not found in the manifest. Exit with no error, since there's no |
424 | + # need to run the script for this arch. |
425 | + print ("\n\nRequested arch has been not specified in the manifest. \ |
426 | + Exiting...") |
427 | + sys.exit(0) |
428 | + print ("\nObtained packages informations") |
429 | + return urls |
430 | + |
431 | + |
432 | +def check_if_temp_folder_already_exists(path): |
433 | + return os.path.isdir(path) |
434 | + |
435 | + |
436 | +def copy_directory_content(sourcepath, destpath): |
437 | + subprocess.call(['cp', '-r', '%s/.' % sourcepath, destpath]) |
438 | + |
439 | + |
440 | +def delete_folder(path, recursive=False): |
441 | + if recursive: |
442 | + flag = '-rf' |
443 | + else: |
444 | + flag = '-f' |
445 | + subprocess.call(['rm', flag, path]) |
446 | + |
447 | + |
448 | +def extract_deb_package(deb_path, destpath): |
449 | + subprocess.call(['dpkg-deb', '-x', deb_path, destpath]) |
450 | + |
451 | + |
452 | +def extract_click_package(click_path, destpath): |
453 | + extract_deb_package(click_path, destpath) |
454 | + |
455 | + manifest = subprocess.check_output(['click', 'info', click_path]) |
456 | + |
457 | + # The manifest we get has an 'installed-size' key with the value of the |
458 | + # previous package. Anyway this value will be replaced when we'll run |
459 | + # 'click build <pkg>', so there's no reason for removing it here. |
460 | + f = open(os.path.join(destpath, 'manifest.json'), 'w') |
461 | + f.write(manifest) |
462 | + f.close() |
463 | + |
464 | + return destpath |
465 | + |
466 | + |
467 | +def build_click_package(source_dirpath): |
468 | + output = subprocess.check_output(['click', 'build', source_dirpath]) |
469 | + |
470 | + for line in output.split(os.linesep): |
471 | + if line.find('Successfully built package in ') > -1: |
472 | + # FIXME: Very ugly. |
473 | + path = line.replace('Successfully built package in \'', '') |
474 | + path = path.replace('\'.', '') |
475 | + return path |
476 | + |
477 | + |
478 | +def copy_file(sourcepath, destpath, overwrite=False): |
479 | + flag = '' |
480 | + |
481 | + if not overwrite: |
482 | + flag = '-n' |
483 | + |
484 | + subprocess.call(['cp', flag, sourcepath, destpath]) |
485 | + |
486 | + |
487 | +# Argument parser |
488 | +parser = argparse.ArgumentParser( |
489 | + description="A tool for adding external libraries to a Ubuntu SDK \ |
490 | + application or scope.") |
491 | + |
492 | +parser.add_argument( |
493 | + '-f', |
494 | + '--force-download', |
495 | + dest='force_download', |
496 | + action='store_true', |
497 | + help='force a new download of the packages') |
498 | + |
499 | +parser.add_argument( |
500 | + '-d', |
501 | + '--delete-temp', |
502 | + dest='delete_temp', |
503 | + action='store_true', |
504 | + help='delete temp files at the end of the process') |
505 | + |
506 | +parser.add_argument( |
507 | + '-e', |
508 | + '--extract-only', |
509 | + dest='extract_only', |
510 | + action='store_true', |
511 | + help='only create temp directory and extract the content of downloaded \ |
512 | + packages') |
513 | + |
514 | +parser.add_argument( |
515 | + '-c', |
516 | + '--custom-script', |
517 | + dest='script_path', |
518 | + type=str, |
519 | + help='run a custom script after the extraction of Debian packages and \ |
520 | + before copying their content to the target destination. The tool will \ |
521 | + execute the script with the path to the packages dump as argument. If \ |
522 | + the \'-e\' flag has been specified, the script will be anyway \ |
523 | + executed. This option is useful when you need to automatically modify \ |
524 | + the content of temp folder (e.g. when you need to fix some path \ |
525 | + before including the files in a click package).') |
526 | + |
527 | +parser.add_argument( |
528 | + 'manifest_path', |
529 | + type=str, |
530 | + help='path of json file containing the list of packages to be downloaded.') |
531 | + |
532 | +parser.add_argument( |
533 | + 'arch', |
534 | + type=str, |
535 | + choices=['amd64', 'i386', 'armhf'], |
536 | + help='CPU architecture ("amd64", "i386" or "armhf")') |
537 | + |
538 | +parser.add_argument( |
539 | + 'target_path', |
540 | + type=str, |
541 | + help='path to the target (a click package or a folder) where this \ |
542 | + tool will include the downloaded binaries. If the folder does not \ |
543 | + exist, it will be created.') |
544 | + |
545 | +args = parser.parse_args() |
546 | + |
547 | +# Variables |
548 | +manifest_path = args.manifest_path |
549 | +target_path = args.target_path |
550 | +manifest_stat = os.stat(manifest_path) |
551 | +temp_folder = os.path.join( |
552 | + '/tmp/', |
553 | + 'tmp-click-deps-%s-%s-%s-%s' % ( |
554 | + manifest_stat.st_dev, |
555 | + manifest_stat.st_ino, |
556 | + manifest_stat.st_size, |
557 | + manifest_stat.st_mtime)) |
558 | +temp_arch_folder = os.path.join(temp_folder, args.arch) |
559 | +is_click_target = os.path.isfile(args.target_path) |
560 | + |
561 | +# Check command line arguments |
562 | +if not os.path.isfile(manifest_path): |
563 | + sys.exit("\n\nERROR: Package manifest is not a valid file. Exit...") |
564 | + |
565 | +if not os.path.isfile(target_path) and target_path.endswith('.click'): |
566 | + sys.exit("\n\nERROR: The specified target .click does not exists.") |
567 | +elif not os.path.isdir(target_path): |
568 | + print ("\n\nCreating dest folder\n{}".format(target_path)) |
569 | + os.mkdir(target_path) |
570 | + |
571 | +# Check if the script exist, if specified any. |
572 | +if args.script_path and not os.path.exists(args.script_path): |
573 | + sys.exit("\n\nERROR: The specified script does not exists.") |
574 | + |
575 | +# If -f argument has been specified, remove all the existing data before |
576 | +# running this script. |
577 | +if args.force_download: |
578 | + if os.path.isdir(temp_folder): |
579 | + print ("\nRemoving temp data of the previous run, as requested") |
580 | + delete_folder(temp_folder, True) |
581 | + |
582 | +# Check if we already have run this script for the same target. |
583 | +if not check_if_temp_folder_already_exists(temp_arch_folder): |
584 | + # Check internet connection |
585 | + if not check_internet_connection(): |
586 | + sys.exit("\n\nERROR: An internet connection is required in order to \ |
587 | + download packages from repositories.") |
588 | + |
589 | + # Create temp folder in /tmp |
590 | + print ("\nCreating temp folder in {}".format(temp_folder)) |
591 | + os.mkdir(temp_folder) |
592 | + os.mkdir(temp_arch_folder) |
593 | + |
594 | + # Parse the JSON package list and get the download URL of the packages. |
595 | + debs_url_list = get_URLs_for_arch( |
596 | + manifest_path, |
597 | + args.arch, |
598 | + temp_folder) |
599 | + |
600 | + # Download packages from web |
601 | + for url in debs_url_list: |
602 | + download_file(url, temp_folder) |
603 | + |
604 | + # Extract DEBs packages |
605 | + print ("\nExtracting .deb packages to {}".format(temp_arch_folder)) |
606 | + deb_pkgs_list = [] |
607 | + for file in os.listdir(temp_folder): |
608 | + if file.endswith('.deb'): |
609 | + deb_pkgs_list.append(file) |
610 | + |
611 | + for deb_pkg in deb_pkgs_list: |
612 | + extract_deb_package( |
613 | + os.path.join(temp_folder, deb_pkg), |
614 | + temp_arch_folder) |
615 | + |
616 | + # If a script has been specified, run it. |
617 | + if args.script_path: |
618 | + print ("\nRunning the script at: {}\n".format(args.script_path)) |
619 | + |
620 | + # Ensure that we can run the script, otherwise we don't have the |
621 | + # permission |
622 | + subprocess.call(['chmod', '+x', args.script_path]) |
623 | + subprocess.call([ |
624 | + args.script_path, |
625 | + temp_arch_folder, |
626 | + get_arch_triplet(args.arch)]) |
627 | +else: |
628 | + print ("\nPackages are already downloaded. Use them...") |
629 | + |
630 | +# If -e or --extract-only flags have been specified, we have completed our work |
631 | +if args.extract_only: |
632 | + print ("\n\nCompleted successfully.") |
633 | + sys.exit(0) |
634 | + |
635 | +# Copy temp_arch folder content to its destination |
636 | +if is_click_target: |
637 | + print ("\nExtracting target .click package") |
638 | + temp_click_folder = extract_click_package( |
639 | + args.target_path, |
640 | + os.path.join('/tmp/', str(get_timestamp()))) |
641 | + |
642 | + print ("\nAdding extracted binaries to the package") |
643 | + copy_directory_content(temp_arch_folder, temp_click_folder) |
644 | + |
645 | + new_click_package_path = build_click_package(temp_click_folder) |
646 | + print ("\nCreated new .click package at:\n{}".format(new_click_package_path)) |
647 | + |
648 | + print ("\nReplacing older .click package") |
649 | + copy_file(new_click_package_path, args.target_path, True) |
650 | + |
651 | + delete_folder(temp_click_folder, True) |
652 | + |
653 | +else: |
654 | + print ("\nCopying extracted binaries to their destination") |
655 | + copy_directory_content(temp_arch_folder, args.target_path) |
656 | + |
657 | +# Delete temp files |
658 | +if args.delete_temp: |
659 | + print ("\)nRemoving temp files and directory, as requested") |
660 | + delete_folder(temp_folder, True) |
661 | + |
662 | +# Exit |
663 | +print ("\n\nCompleted successfully.") |
664 | |
665 | === modified file 'po/am.po' |
666 | --- po/am.po 2015-09-23 06:28:55 +0000 |
667 | +++ po/am.po 2015-11-06 11:00:18 +0000 |
668 | @@ -7,16 +7,26 @@ |
669 | msgstr "" |
670 | "Project-Id-Version: ubuntu-docviewer-app\n" |
671 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
672 | +<<<<<<< TREE |
673 | "POT-Creation-Date: 2015-07-24 11:10+0200\n" |
674 | "PO-Revision-Date: 2015-09-22 22:55+0000\n" |
675 | +======= |
676 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
677 | +"PO-Revision-Date: 2015-03-08 19:28+0000\n" |
678 | +>>>>>>> MERGE-SOURCE |
679 | "Last-Translator: samson <Unknown>\n" |
680 | "Language-Team: Amharic <am@li.org>\n" |
681 | "MIME-Version: 1.0\n" |
682 | "Content-Type: text/plain; charset=UTF-8\n" |
683 | "Content-Transfer-Encoding: 8bit\n" |
684 | "Plural-Forms: nplurals=2; plural=n > 1;\n" |
685 | +<<<<<<< TREE |
686 | "X-Launchpad-Export-Date: 2015-09-23 06:28+0000\n" |
687 | "X-Generator: Launchpad (build 17749)\n" |
688 | +======= |
689 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
690 | +"X-Generator: Launchpad (build 17578)\n" |
691 | +>>>>>>> MERGE-SOURCE |
692 | |
693 | #. TRANSLATORS: This string is used for renaming a copied file, |
694 | #. when a file with the same name already exists in user's |
695 | @@ -33,7 +43,7 @@ |
696 | msgstr "ኮፒ %1" |
697 | |
698 | #: ../src/app/docviewer-application.cpp:171 |
699 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
700 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
701 | msgid "Document Viewer" |
702 | msgstr "ሰነድ መመልከቻ" |
703 | |
704 | @@ -147,32 +157,31 @@ |
705 | msgid "%1 byte" |
706 | msgstr "%1 ባይት" |
707 | |
708 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
709 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
710 | msgid "Delete file" |
711 | msgstr "ፋይል ማጥፊያ" |
712 | |
713 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
714 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
715 | #, qt-format |
716 | msgid "Delete %1 file" |
717 | msgid_plural "Delete %1 files" |
718 | msgstr[0] "ማጥፊያ %1 ፋይል" |
719 | msgstr[1] "ማጥፊያ %1 ፋይሎች" |
720 | |
721 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
722 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
723 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
724 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
725 | msgid "Are you sure you want to permanently delete this file?" |
726 | msgid_plural "Are you sure you want to permanently delete these files?" |
727 | msgstr[0] "ይህን ፋይል በ እርግጥ በቋሚነት ማጥፋት ይፈልጋሉ?" |
728 | msgstr[1] "እነዚህን ፋይሎች በ እርግጥ በቋሚነት ማጥፋት ይፈልጋሉ?" |
729 | |
730 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
731 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
732 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
733 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
734 | msgid "Cancel" |
735 | msgstr "መሰረዣ" |
736 | |
737 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
738 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
739 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
740 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
741 | msgid "Delete" |
742 | msgstr "ማጥፊያ" |
743 | @@ -189,35 +198,47 @@ |
744 | |
745 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
746 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
747 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
748 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
749 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
750 | #, qt-format |
751 | msgid "Today, %1" |
752 | msgstr "ዛሬ, %1" |
753 | |
754 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
755 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
756 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
757 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
758 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
759 | #, qt-format |
760 | msgid "Yesterday, %1" |
761 | msgstr "ትናንትና, %1" |
762 | |
763 | #. TRANSLATORS: this is a datetime formatting string, |
764 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
765 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
766 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
767 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
768 | msgid "dddd, hh:mm" |
769 | msgstr "dddd, hh:mm" |
770 | |
771 | #. TRANSLATORS: this is a datetime formatting string, |
772 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
773 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
774 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
775 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
776 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
777 | msgid "dd-MM-yyyy hh:mm" |
778 | msgstr "dd-MM-yyyy hh:mm" |
779 | |
780 | +#. TRANSLATORS: this is a datetime formatting string, and the |
781 | +#. singlequote is an escape character. |
782 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
783 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
784 | +msgid "'Today', hh:mm" |
785 | +msgstr "" |
786 | + |
787 | +#. TRANSLATORS: this is a datetime formatting string, and the |
788 | +#. singlequote is an escape character. |
789 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
790 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
791 | +msgid "'Yesterday', hh:mm" |
792 | +msgstr "" |
793 | + |
794 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
795 | msgid "Today" |
796 | msgstr "ዛሬ" |
797 | @@ -369,6 +390,6 @@ |
798 | msgid "Open" |
799 | msgstr "መክፈቻ" |
800 | |
801 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
802 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
803 | msgid "documents;viewer;pdf;reader;" |
804 | msgstr "ሰነዶች: መመልከቻ: pdf: ማንበቢያ:" |
805 | |
806 | === renamed file 'po/ar.po' => 'po/ar.po.THIS' |
807 | === modified file 'po/ast.po' |
808 | --- po/ast.po 2015-11-03 05:30:48 +0000 |
809 | +++ po/ast.po 2015-11-06 11:00:18 +0000 |
810 | @@ -7,16 +7,26 @@ |
811 | msgstr "" |
812 | "Project-Id-Version: ubuntu-docviewer-app\n" |
813 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
814 | +<<<<<<< TREE |
815 | "POT-Creation-Date: 2015-07-24 11:10+0200\n" |
816 | "PO-Revision-Date: 2015-11-02 17:44+0000\n" |
817 | +======= |
818 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
819 | +"PO-Revision-Date: 2015-06-12 10:44+0000\n" |
820 | +>>>>>>> MERGE-SOURCE |
821 | "Last-Translator: enolp <enolp@softastur.org>\n" |
822 | "Language-Team: Asturian <ast@li.org>\n" |
823 | "MIME-Version: 1.0\n" |
824 | "Content-Type: text/plain; charset=UTF-8\n" |
825 | "Content-Transfer-Encoding: 8bit\n" |
826 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
827 | +<<<<<<< TREE |
828 | "X-Launchpad-Export-Date: 2015-11-03 05:30+0000\n" |
829 | "X-Generator: Launchpad (build 17838)\n" |
830 | +======= |
831 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
832 | +"X-Generator: Launchpad (build 17578)\n" |
833 | +>>>>>>> MERGE-SOURCE |
834 | |
835 | #. TRANSLATORS: This string is used for renaming a copied file, |
836 | #. when a file with the same name already exists in user's |
837 | @@ -33,7 +43,7 @@ |
838 | msgstr "copiar %1" |
839 | |
840 | #: ../src/app/docviewer-application.cpp:171 |
841 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
842 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
843 | msgid "Document Viewer" |
844 | msgstr "Visor de documentos" |
845 | |
846 | @@ -149,32 +159,31 @@ |
847 | msgid "%1 byte" |
848 | msgstr "%1 byte" |
849 | |
850 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
851 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
852 | msgid "Delete file" |
853 | msgstr "Desaniciar ficheru" |
854 | |
855 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
856 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
857 | #, qt-format |
858 | msgid "Delete %1 file" |
859 | msgid_plural "Delete %1 files" |
860 | msgstr[0] "Desaniciar %1 ficheru" |
861 | msgstr[1] "Desaniciar %1 ficheros" |
862 | |
863 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
864 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
865 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
866 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
867 | msgid "Are you sure you want to permanently delete this file?" |
868 | msgid_plural "Are you sure you want to permanently delete these files?" |
869 | msgstr[0] "¿De xuru que quies desaniciar dafechu esti ficheru?" |
870 | msgstr[1] "¿De xuru que quies desaniciar dafechu estos ficheros?" |
871 | |
872 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
873 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
874 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
875 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
876 | msgid "Cancel" |
877 | msgstr "Encaboxar" |
878 | |
879 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
880 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
881 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
882 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
883 | msgid "Delete" |
884 | msgstr "Desaniciar" |
885 | @@ -193,35 +202,47 @@ |
886 | |
887 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
888 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
889 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
890 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
891 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
892 | #, qt-format |
893 | msgid "Today, %1" |
894 | msgstr "Güei, %1" |
895 | |
896 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
897 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
898 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
899 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
900 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
901 | #, qt-format |
902 | msgid "Yesterday, %1" |
903 | msgstr "Ayeri, %1" |
904 | |
905 | #. TRANSLATORS: this is a datetime formatting string, |
906 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
907 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
908 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
909 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
910 | msgid "dddd, hh:mm" |
911 | msgstr "dddd, hh:mm" |
912 | |
913 | #. TRANSLATORS: this is a datetime formatting string, |
914 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
915 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
916 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
917 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
918 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
919 | msgid "dd-MM-yyyy hh:mm" |
920 | msgstr "dd-MM-yyyy hh:mm" |
921 | |
922 | +#. TRANSLATORS: this is a datetime formatting string, and the |
923 | +#. singlequote is an escape character. |
924 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
925 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
926 | +msgid "'Today', hh:mm" |
927 | +msgstr "" |
928 | + |
929 | +#. TRANSLATORS: this is a datetime formatting string, and the |
930 | +#. singlequote is an escape character. |
931 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
932 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
933 | +msgid "'Yesterday', hh:mm" |
934 | +msgstr "" |
935 | + |
936 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
937 | msgid "Today" |
938 | msgstr "Güei" |
939 | @@ -375,6 +396,6 @@ |
940 | msgid "Open" |
941 | msgstr "Abrir" |
942 | |
943 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
944 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
945 | msgid "documents;viewer;pdf;reader;" |
946 | msgstr "documentos;visor;pdf;llector;" |
947 | |
948 | === modified file 'po/br.po' |
949 | --- po/br.po 2015-08-26 06:10:38 +0000 |
950 | +++ po/br.po 2015-11-06 11:00:18 +0000 |
951 | @@ -7,16 +7,26 @@ |
952 | msgstr "" |
953 | "Project-Id-Version: ubuntu-docviewer-app\n" |
954 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
955 | +<<<<<<< TREE |
956 | "POT-Creation-Date: 2015-07-24 11:10+0200\n" |
957 | "PO-Revision-Date: 2015-08-25 14:07+0000\n" |
958 | +======= |
959 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
960 | +"PO-Revision-Date: 2015-04-28 08:02+0000\n" |
961 | +>>>>>>> MERGE-SOURCE |
962 | "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n" |
963 | "Language-Team: Breton <br@li.org>\n" |
964 | "MIME-Version: 1.0\n" |
965 | "Content-Type: text/plain; charset=UTF-8\n" |
966 | "Content-Transfer-Encoding: 8bit\n" |
967 | "Plural-Forms: nplurals=2; plural=n > 1;\n" |
968 | +<<<<<<< TREE |
969 | "X-Launchpad-Export-Date: 2015-08-26 06:10+0000\n" |
970 | "X-Generator: Launchpad (build 17690)\n" |
971 | +======= |
972 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
973 | +"X-Generator: Launchpad (build 17578)\n" |
974 | +>>>>>>> MERGE-SOURCE |
975 | |
976 | #. TRANSLATORS: This string is used for renaming a copied file, |
977 | #. when a file with the same name already exists in user's |
978 | @@ -33,7 +43,7 @@ |
979 | msgstr "eilañ %1" |
980 | |
981 | #: ../src/app/docviewer-application.cpp:171 |
982 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
983 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
984 | msgid "Document Viewer" |
985 | msgstr "Lenner teulioù" |
986 | |
987 | @@ -149,32 +159,31 @@ |
988 | msgid "%1 byte" |
989 | msgstr "%1 okted" |
990 | |
991 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
992 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
993 | msgid "Delete file" |
994 | msgstr "Diverkañ ar restr" |
995 | |
996 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
997 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
998 | #, qt-format |
999 | msgid "Delete %1 file" |
1000 | msgid_plural "Delete %1 files" |
1001 | msgstr[0] "Diverkañ %1 restr" |
1002 | msgstr[1] "Diverkañ %1 restr" |
1003 | |
1004 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
1005 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
1006 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
1007 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
1008 | msgid "Are you sure you want to permanently delete this file?" |
1009 | msgid_plural "Are you sure you want to permanently delete these files?" |
1010 | msgstr[0] "Ha sur oc'h e fell deoc'h diverkañ ar restr-mañ da viken ?" |
1011 | msgstr[1] "Ha sur oc'h e fell deoc'h diverkañ ar restroù-mañ da viken ?" |
1012 | |
1013 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
1014 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1015 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
1016 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
1017 | msgid "Cancel" |
1018 | msgstr "Nullañ" |
1019 | |
1020 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
1021 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
1022 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
1023 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
1024 | msgid "Delete" |
1025 | msgstr "Diverkañ" |
1026 | @@ -193,35 +202,47 @@ |
1027 | |
1028 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1029 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1030 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
1031 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
1032 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
1033 | #, qt-format |
1034 | msgid "Today, %1" |
1035 | msgstr "Hiziv, da %1" |
1036 | |
1037 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1038 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1039 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
1040 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1041 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
1042 | #, qt-format |
1043 | msgid "Yesterday, %1" |
1044 | msgstr "Dec'h, da %1" |
1045 | |
1046 | #. TRANSLATORS: this is a datetime formatting string, |
1047 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1048 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
1049 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
1050 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
1051 | msgid "dddd, hh:mm" |
1052 | msgstr "dddd, hh:mm" |
1053 | |
1054 | #. TRANSLATORS: this is a datetime formatting string, |
1055 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1056 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
1057 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
1058 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
1059 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
1060 | msgid "dd-MM-yyyy hh:mm" |
1061 | msgstr "dd-MM-yyyy hh:mm" |
1062 | |
1063 | +#. TRANSLATORS: this is a datetime formatting string, and the |
1064 | +#. singlequote is an escape character. |
1065 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1066 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
1067 | +msgid "'Today', hh:mm" |
1068 | +msgstr "" |
1069 | + |
1070 | +#. TRANSLATORS: this is a datetime formatting string, and the |
1071 | +#. singlequote is an escape character. |
1072 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1073 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1074 | +msgid "'Yesterday', hh:mm" |
1075 | +msgstr "" |
1076 | + |
1077 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
1078 | msgid "Today" |
1079 | msgstr "Hiziv" |
1080 | @@ -373,6 +394,6 @@ |
1081 | msgid "Open" |
1082 | msgstr "Digeriñ" |
1083 | |
1084 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1085 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1086 | msgid "documents;viewer;pdf;reader;" |
1087 | msgstr "teulioù;diskouezer;pdf;lenner" |
1088 | |
1089 | === renamed file 'po/bs.po' => 'po/bs.po.THIS' |
1090 | === modified file 'po/ca.po' |
1091 | --- po/ca.po 2015-08-18 05:56:20 +0000 |
1092 | +++ po/ca.po 2015-11-06 11:00:18 +0000 |
1093 | @@ -7,7 +7,7 @@ |
1094 | msgstr "" |
1095 | "Project-Id-Version: ubuntu-docviewer-app\n" |
1096 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1097 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
1098 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
1099 | "PO-Revision-Date: 2015-06-25 06:34+0000\n" |
1100 | "Last-Translator: David Planella <david.planella@ubuntu.com>\n" |
1101 | "Language-Team: Catalan <ca@li.org>\n" |
1102 | @@ -15,8 +15,13 @@ |
1103 | "Content-Type: text/plain; charset=UTF-8\n" |
1104 | "Content-Transfer-Encoding: 8bit\n" |
1105 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1106 | +<<<<<<< TREE |
1107 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
1108 | "X-Generator: Launchpad (build 17690)\n" |
1109 | +======= |
1110 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
1111 | +"X-Generator: Launchpad (build 17578)\n" |
1112 | +>>>>>>> MERGE-SOURCE |
1113 | |
1114 | #. TRANSLATORS: This string is used for renaming a copied file, |
1115 | #. when a file with the same name already exists in user's |
1116 | @@ -33,7 +38,7 @@ |
1117 | msgstr "còpia %1" |
1118 | |
1119 | #: ../src/app/docviewer-application.cpp:171 |
1120 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1121 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1122 | msgid "Document Viewer" |
1123 | msgstr "Visualitzador de documents" |
1124 | |
1125 | @@ -147,32 +152,31 @@ |
1126 | msgid "%1 byte" |
1127 | msgstr "%1 byte" |
1128 | |
1129 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1130 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
1131 | msgid "Delete file" |
1132 | msgstr "Suprimeix el fitxer" |
1133 | |
1134 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
1135 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
1136 | #, qt-format |
1137 | msgid "Delete %1 file" |
1138 | msgid_plural "Delete %1 files" |
1139 | msgstr[0] "Suprimeix %1 fitxer" |
1140 | msgstr[1] "Suprimeix %1 fitxers" |
1141 | |
1142 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
1143 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
1144 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
1145 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
1146 | msgid "Are you sure you want to permanently delete this file?" |
1147 | msgid_plural "Are you sure you want to permanently delete these files?" |
1148 | msgstr[0] "Segur que voleu suprimir permanentment aquest fitxer?" |
1149 | msgstr[1] "Segur que voleu suprimir permanentment aquests fitxers?" |
1150 | |
1151 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
1152 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1153 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
1154 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
1155 | msgid "Cancel" |
1156 | msgstr "Cancel·la" |
1157 | |
1158 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
1159 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
1160 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
1161 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
1162 | msgid "Delete" |
1163 | msgstr "Suprimeix" |
1164 | @@ -189,35 +193,47 @@ |
1165 | |
1166 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1167 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1168 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
1169 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
1170 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
1171 | #, qt-format |
1172 | msgid "Today, %1" |
1173 | msgstr "Avui, a les %1" |
1174 | |
1175 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1176 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1177 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
1178 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1179 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
1180 | #, qt-format |
1181 | msgid "Yesterday, %1" |
1182 | msgstr "Ahir, a les %1" |
1183 | |
1184 | #. TRANSLATORS: this is a datetime formatting string, |
1185 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1186 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
1187 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
1188 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
1189 | msgid "dddd, hh:mm" |
1190 | msgstr "dddd, H.mm" |
1191 | |
1192 | #. TRANSLATORS: this is a datetime formatting string, |
1193 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1194 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
1195 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
1196 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
1197 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
1198 | msgid "dd-MM-yyyy hh:mm" |
1199 | msgstr "dd/MM/yyyy H.mm" |
1200 | |
1201 | +#. TRANSLATORS: this is a datetime formatting string, and the |
1202 | +#. singlequote is an escape character. |
1203 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1204 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
1205 | +msgid "'Today', hh:mm" |
1206 | +msgstr "'Avui', a les H.mm" |
1207 | + |
1208 | +#. TRANSLATORS: this is a datetime formatting string, and the |
1209 | +#. singlequote is an escape character. |
1210 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1211 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1212 | +msgid "'Yesterday', hh:mm" |
1213 | +msgstr "'Ahir', a les H.mm" |
1214 | + |
1215 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
1216 | msgid "Today" |
1217 | msgstr "Avui" |
1218 | @@ -369,6 +385,6 @@ |
1219 | msgid "Open" |
1220 | msgstr "Obre" |
1221 | |
1222 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1223 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1224 | msgid "documents;viewer;pdf;reader;" |
1225 | msgstr "documents;visualitzador;pdf;lector;" |
1226 | |
1227 | === modified file 'po/com.ubuntu.docviewer.pot' |
1228 | --- po/com.ubuntu.docviewer.pot 2015-07-24 09:12:38 +0000 |
1229 | +++ po/com.ubuntu.docviewer.pot 2015-11-06 11:00:18 +0000 |
1230 | @@ -8,7 +8,7 @@ |
1231 | msgstr "" |
1232 | "Project-Id-Version: \n" |
1233 | "Report-Msgid-Bugs-To: \n" |
1234 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
1235 | +"POT-Creation-Date: 2015-10-20 20:21+0200\n" |
1236 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
1237 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1238 | "Language-Team: LANGUAGE <LL@li.org>\n" |
1239 | @@ -18,48 +18,53 @@ |
1240 | "Content-Transfer-Encoding: 8bit\n" |
1241 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
1242 | |
1243 | -#. TRANSLATORS: This string is used for renaming a copied file, |
1244 | -#. when a file with the same name already exists in user's |
1245 | -#. Documents folder. |
1246 | -#. |
1247 | -#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become |
1248 | -#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf" |
1249 | -#. |
1250 | -#. where "2" is given by the argument "%1" |
1251 | -#. |
1252 | -#: ../src/app/content-communicator.cpp:105 |
1253 | -#, qt-format |
1254 | -msgid "copy %1" |
1255 | -msgstr "" |
1256 | - |
1257 | -#: ../src/app/docviewer-application.cpp:171 |
1258 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1259 | -msgid "Document Viewer" |
1260 | -msgstr "" |
1261 | - |
1262 | -#: ../src/app/qml/common/DetailsPage.qml:27 |
1263 | +#: ../src/app/qml/common/CommandLineProxy.qml:49 |
1264 | +msgid "Some of the provided arguments is not valid." |
1265 | +msgstr "" |
1266 | + |
1267 | +#: ../src/app/qml/common/CommandLineProxy.qml:58 |
1268 | +msgid "Opens ubuntu-docviewer-app displaying the selected file" |
1269 | +msgstr "" |
1270 | + |
1271 | +#: ../src/app/qml/common/CommandLineProxy.qml:65 |
1272 | +msgid "Run fullscreen" |
1273 | +msgstr "" |
1274 | + |
1275 | +#: ../src/app/qml/common/CommandLineProxy.qml:71 |
1276 | +msgid "Open ubuntu-docviewer-app in pick mode. Use it for tests only." |
1277 | +msgstr "" |
1278 | + |
1279 | +#: ../src/app/qml/common/CommandLineProxy.qml:77 |
1280 | +msgid "" |
1281 | +"Load the list of documents from the given folder, instead of default ~/" |
1282 | +"Documents.\n" |
1283 | +"The path must exist prior to running ubuntu-docviewer-app" |
1284 | +msgstr "" |
1285 | + |
1286 | +#: ../src/app/qml/common/DetailsPage.qml:25 |
1287 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:106 |
1288 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97 |
1289 | #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83 |
1290 | msgid "Details" |
1291 | msgstr "" |
1292 | |
1293 | -#: ../src/app/qml/common/DetailsPage.qml:33 |
1294 | +#: ../src/app/qml/common/DetailsPage.qml:36 |
1295 | msgid "Location" |
1296 | msgstr "" |
1297 | |
1298 | -#: ../src/app/qml/common/DetailsPage.qml:37 |
1299 | +#: ../src/app/qml/common/DetailsPage.qml:41 |
1300 | msgid "Size" |
1301 | msgstr "" |
1302 | |
1303 | -#: ../src/app/qml/common/DetailsPage.qml:42 |
1304 | +#: ../src/app/qml/common/DetailsPage.qml:46 |
1305 | msgid "Created" |
1306 | msgstr "" |
1307 | |
1308 | -#: ../src/app/qml/common/DetailsPage.qml:47 |
1309 | +#: ../src/app/qml/common/DetailsPage.qml:51 |
1310 | msgid "Last modified" |
1311 | msgstr "" |
1312 | |
1313 | -#: ../src/app/qml/common/DetailsPage.qml:54 |
1314 | +#: ../src/app/qml/common/DetailsPage.qml:58 |
1315 | msgid "MIME type" |
1316 | msgstr "" |
1317 | |
1318 | @@ -72,20 +77,21 @@ |
1319 | msgstr "" |
1320 | |
1321 | #: ../src/app/qml/common/FileNotFoundDialog.qml:28 |
1322 | -#: ../src/app/qml/common/PickImportedDialog.qml:47 |
1323 | +#: ../src/app/qml/common/PickImportedDialog.qml:53 |
1324 | #: ../src/app/qml/common/RejectedImportDialog.qml:38 |
1325 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32 |
1326 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:33 |
1327 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53 |
1328 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:70 |
1329 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61 |
1330 | #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61 |
1331 | msgid "Close" |
1332 | msgstr "" |
1333 | |
1334 | +#: ../src/app/qml/common/PickImportedDialog.qml:28 |
1335 | +msgid "Multiple documents imported" |
1336 | +msgstr "" |
1337 | + |
1338 | #: ../src/app/qml/common/PickImportedDialog.qml:29 |
1339 | -msgid "Multiple documents imported" |
1340 | -msgstr "" |
1341 | - |
1342 | -#: ../src/app/qml/common/PickImportedDialog.qml:30 |
1343 | msgid "Choose which one to open:" |
1344 | msgstr "" |
1345 | |
1346 | @@ -101,28 +107,29 @@ |
1347 | msgstr[0] "" |
1348 | msgstr[1] "" |
1349 | |
1350 | -#: ../src/app/qml/common/ToastWithAction.qml:97 |
1351 | -msgid "Dismiss" |
1352 | -msgstr "" |
1353 | - |
1354 | -#: ../src/app/qml/common/UnknownTypeDialog.qml:26 |
1355 | +#: ../src/app/qml/common/UnknownTypeDialog.qml:27 |
1356 | msgid "Unknown file type" |
1357 | msgstr "" |
1358 | |
1359 | -#: ../src/app/qml/common/UnknownTypeDialog.qml:27 |
1360 | +#: ../src/app/qml/common/UnknownTypeDialog.qml:28 |
1361 | msgid "" |
1362 | -"Sorry but we can't find a way to display this file. Do you want to open it " |
1363 | -"as a plain text?" |
1364 | -msgstr "" |
1365 | - |
1366 | -#: ../src/app/qml/common/UnknownTypeDialog.qml:29 |
1367 | +"Sorry but we can't find a way to display this file.\n" |
1368 | +"\n" |
1369 | +"Do you want to open it as a plain text?" |
1370 | +msgstr "" |
1371 | + |
1372 | +#: ../src/app/qml/common/UnknownTypeDialog.qml:38 |
1373 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55 |
1374 | +#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28 |
1375 | +#: ../src/app/qml/loView/LOViewGotoDialog.qml:53 |
1376 | +#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51 |
1377 | +msgid "Cancel" |
1378 | +msgstr "" |
1379 | + |
1380 | +#: ../src/app/qml/common/UnknownTypeDialog.qml:44 |
1381 | msgid "Yes" |
1382 | msgstr "" |
1383 | |
1384 | -#: ../src/app/qml/common/UnknownTypeDialog.qml:38 |
1385 | -msgid "No" |
1386 | -msgstr "" |
1387 | - |
1388 | #. TRANSLATORS: %1 is the size of a file, expressed in GB |
1389 | #: ../src/app/qml/common/utils.js:22 |
1390 | #, qt-format |
1391 | @@ -147,98 +154,72 @@ |
1392 | msgid "%1 byte" |
1393 | msgstr "" |
1394 | |
1395 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1396 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
1397 | msgid "Delete file" |
1398 | msgstr "" |
1399 | |
1400 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
1401 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40 |
1402 | #, qt-format |
1403 | msgid "Delete %1 file" |
1404 | msgid_plural "Delete %1 files" |
1405 | msgstr[0] "" |
1406 | msgstr[1] "" |
1407 | |
1408 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
1409 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
1410 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
1411 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42 |
1412 | msgid "Are you sure you want to permanently delete this file?" |
1413 | msgid_plural "Are you sure you want to permanently delete these files?" |
1414 | msgstr[0] "" |
1415 | msgstr[1] "" |
1416 | |
1417 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
1418 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
1419 | -#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
1420 | -msgid "Cancel" |
1421 | -msgstr "" |
1422 | - |
1423 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
1424 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
1425 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
1426 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61 |
1427 | +#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:27 |
1428 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:55 |
1429 | msgid "Delete" |
1430 | msgstr "" |
1431 | |
1432 | +#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:46 |
1433 | +msgid "Share" |
1434 | +msgstr "" |
1435 | + |
1436 | #: ../src/app/qml/documentPage/DocumentEmptyState.qml:24 |
1437 | msgid "No document found" |
1438 | msgstr "" |
1439 | |
1440 | -#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28 |
1441 | +#: ../src/app/qml/documentPage/DocumentEmptyState.qml:25 |
1442 | msgid "" |
1443 | "Connect your device to any computer and simply drag files to the Documents " |
1444 | -"folder." |
1445 | +"folder or insert removable media with documents." |
1446 | msgstr "" |
1447 | |
1448 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1449 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1450 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
1451 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
1452 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:95 |
1453 | #, qt-format |
1454 | msgid "Today, %1" |
1455 | msgstr "" |
1456 | |
1457 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1458 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1459 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
1460 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1461 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100 |
1462 | #, qt-format |
1463 | msgid "Yesterday, %1" |
1464 | msgstr "" |
1465 | |
1466 | #. TRANSLATORS: this is a datetime formatting string, |
1467 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1468 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
1469 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
1470 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:107 |
1471 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:126 |
1472 | +msgid "yyyy/MM/dd hh:mm" |
1473 | +msgstr "" |
1474 | + |
1475 | +#. TRANSLATORS: this is a datetime formatting string, |
1476 | +#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1477 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:120 |
1478 | msgid "dddd, hh:mm" |
1479 | msgstr "" |
1480 | |
1481 | -#. TRANSLATORS: this is a datetime formatting string, |
1482 | -#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1483 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
1484 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
1485 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
1486 | -msgid "dd-MM-yyyy hh:mm" |
1487 | -msgstr "" |
1488 | - |
1489 | -#: ../src/app/qml/documentPage/DocumentListView.qml:157 |
1490 | -msgid "Today" |
1491 | -msgstr "" |
1492 | - |
1493 | -#: ../src/app/qml/documentPage/DocumentListView.qml:160 |
1494 | -msgid "Yesterday" |
1495 | -msgstr "" |
1496 | - |
1497 | -#: ../src/app/qml/documentPage/DocumentListView.qml:163 |
1498 | -msgid "Earlier this week" |
1499 | -msgstr "" |
1500 | - |
1501 | -#: ../src/app/qml/documentPage/DocumentListView.qml:166 |
1502 | -msgid "Earlier this month" |
1503 | -msgstr "" |
1504 | - |
1505 | -#: ../src/app/qml/documentPage/DocumentListView.qml:168 |
1506 | -msgid "Even earlier..." |
1507 | -msgstr "" |
1508 | - |
1509 | -#: ../src/app/qml/documentPage/DocumentPage.qml:24 |
1510 | +#: ../src/app/qml/documentPage/DocumentPage.qml:23 |
1511 | msgid "Documents" |
1512 | msgstr "" |
1513 | |
1514 | @@ -246,25 +227,25 @@ |
1515 | msgid "Search..." |
1516 | msgstr "" |
1517 | |
1518 | -#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37 |
1519 | +#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36 |
1520 | msgid "Sorting settings..." |
1521 | msgstr "" |
1522 | |
1523 | -#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46 |
1524 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35 |
1525 | +#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41 |
1526 | msgid "Switch to single column list" |
1527 | msgstr "" |
1528 | |
1529 | -#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46 |
1530 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35 |
1531 | +#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41 |
1532 | msgid "Switch to grid" |
1533 | msgstr "" |
1534 | |
1535 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43 |
1536 | +#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49 |
1537 | msgid "Pick" |
1538 | msgstr "" |
1539 | |
1540 | #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27 |
1541 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:70 |
1542 | +#: ../src/app/qml/loView/LOViewPage.qml:191 |
1543 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61 |
1544 | #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61 |
1545 | msgid "Back" |
1546 | @@ -274,11 +255,11 @@ |
1547 | msgid "search in documents..." |
1548 | msgstr "" |
1549 | |
1550 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52 |
1551 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:42 |
1552 | msgid "Select None" |
1553 | msgstr "" |
1554 | |
1555 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54 |
1556 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:42 |
1557 | msgid "Select All" |
1558 | msgstr "" |
1559 | |
1560 | @@ -291,6 +272,30 @@ |
1561 | "Please ensure that your query is not misspelled and/or try a different query." |
1562 | msgstr "" |
1563 | |
1564 | +#: ../src/app/qml/documentPage/SectionHeader.qml:13 |
1565 | +msgid "Today" |
1566 | +msgstr "" |
1567 | + |
1568 | +#: ../src/app/qml/documentPage/SectionHeader.qml:16 |
1569 | +msgid "Yesterday" |
1570 | +msgstr "" |
1571 | + |
1572 | +#: ../src/app/qml/documentPage/SectionHeader.qml:19 |
1573 | +msgid "Earlier this week" |
1574 | +msgstr "" |
1575 | + |
1576 | +#: ../src/app/qml/documentPage/SectionHeader.qml:22 |
1577 | +msgid "Earlier this month" |
1578 | +msgstr "" |
1579 | + |
1580 | +#: ../src/app/qml/documentPage/SectionHeader.qml:24 |
1581 | +msgid "Even earlier..." |
1582 | +msgstr "" |
1583 | + |
1584 | +#: ../src/app/qml/documentPage/SharePage.qml:23 |
1585 | +msgid "Share to" |
1586 | +msgstr "" |
1587 | + |
1588 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26 |
1589 | msgid "Sorting settings" |
1590 | msgstr "" |
1591 | @@ -311,6 +316,104 @@ |
1592 | msgid "Reverse order" |
1593 | msgstr "" |
1594 | |
1595 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:47 |
1596 | +#: ../src/app/qml/textView/TextView.qml:42 |
1597 | +msgid "Loading..." |
1598 | +msgstr "" |
1599 | + |
1600 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51 |
1601 | +msgid "LibreOffice text document" |
1602 | +msgstr "" |
1603 | + |
1604 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:53 |
1605 | +msgid "LibreOffice spread sheet" |
1606 | +msgstr "" |
1607 | + |
1608 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55 |
1609 | +msgid "LibreOffice presentation" |
1610 | +msgstr "" |
1611 | + |
1612 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57 |
1613 | +msgid "LibreOffice Draw document" |
1614 | +msgstr "" |
1615 | + |
1616 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59 |
1617 | +msgid "Unknown LibreOffice document" |
1618 | +msgstr "" |
1619 | + |
1620 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61 |
1621 | +msgid "Unknown type document" |
1622 | +msgstr "" |
1623 | + |
1624 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:86 |
1625 | +msgid "Show zoom controls" |
1626 | +msgstr "" |
1627 | + |
1628 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:93 |
1629 | +msgid "Go to position..." |
1630 | +msgstr "" |
1631 | + |
1632 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100 |
1633 | +#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91 |
1634 | +#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77 |
1635 | +msgid "Disable night mode" |
1636 | +msgstr "" |
1637 | + |
1638 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100 |
1639 | +#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91 |
1640 | +#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77 |
1641 | +msgid "Enable night mode" |
1642 | +msgstr "" |
1643 | + |
1644 | +#: ../src/app/qml/loView/LOViewGotoDialog.qml:28 |
1645 | +msgid "Go to position" |
1646 | +msgstr "" |
1647 | + |
1648 | +#: ../src/app/qml/loView/LOViewGotoDialog.qml:29 |
1649 | +msgid "Choose a position between 1% and 100%" |
1650 | +msgstr "" |
1651 | + |
1652 | +#: ../src/app/qml/loView/LOViewGotoDialog.qml:60 |
1653 | +#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58 |
1654 | +msgid "GO!" |
1655 | +msgstr "" |
1656 | + |
1657 | +#: ../src/app/qml/loView/LOViewPage.qml:34 |
1658 | +#: ../src/app/qml/loView/LOViewPage.qml:189 |
1659 | +msgid "Slides" |
1660 | +msgstr "" |
1661 | + |
1662 | +#: ../src/app/qml/loView/LOViewZoomHeader.qml:42 |
1663 | +msgid "Hide zoom controls" |
1664 | +msgstr "" |
1665 | + |
1666 | +#: ../src/app/qml/loView/LOViewZoomHeader.qml:49 |
1667 | +msgid "Zoom in" |
1668 | +msgstr "" |
1669 | + |
1670 | +#: ../src/app/qml/loView/LOViewZoomHeader.qml:55 |
1671 | +msgid "Zoom out" |
1672 | +msgstr "" |
1673 | + |
1674 | +#: ../src/app/qml/loView/SlideControllerPanel.qml:62 |
1675 | +#, qt-format |
1676 | +msgid "Slide %1 of %2" |
1677 | +msgstr "" |
1678 | + |
1679 | +#: ../src/app/qml/loView/ZoomSelector.qml:29 |
1680 | +msgid "Automatic (Fit width)" |
1681 | +msgstr "" |
1682 | + |
1683 | +#: ../src/app/qml/loView/ZoomSelector.qml:94 |
1684 | +#, qt-format |
1685 | +msgid "Automatic (%1%)" |
1686 | +msgstr "" |
1687 | + |
1688 | +#: ../src/app/qml/loView/ZoomSelector.qml:95 |
1689 | +#, qt-format |
1690 | +msgid "Zoom: %1%" |
1691 | +msgstr "" |
1692 | + |
1693 | #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document. |
1694 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:32 |
1695 | #: ../src/app/qml/pdfView/PdfView.qml:37 |
1696 | @@ -332,43 +435,33 @@ |
1697 | msgid "Go to page..." |
1698 | msgstr "" |
1699 | |
1700 | -#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91 |
1701 | -#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77 |
1702 | -msgid "Disable night mode" |
1703 | -msgstr "" |
1704 | - |
1705 | -#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91 |
1706 | -#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77 |
1707 | -msgid "Enable night mode" |
1708 | -msgstr "" |
1709 | - |
1710 | -#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25 |
1711 | +#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26 |
1712 | msgid "Go to page" |
1713 | msgstr "" |
1714 | |
1715 | -#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26 |
1716 | +#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27 |
1717 | #, qt-format |
1718 | msgid "Choose a page between 1 and %1" |
1719 | msgstr "" |
1720 | |
1721 | -#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44 |
1722 | -msgid "GO!" |
1723 | -msgstr "" |
1724 | - |
1725 | -#: ../src/app/qml/textView/TextView.qml:42 |
1726 | -msgid "Loading..." |
1727 | -msgstr "" |
1728 | - |
1729 | -#: ../src/app/qml/ubuntu-docviewer-app.qml:240 |
1730 | -msgid "Document successfully imported!" |
1731 | -msgid_plural "Documents successfully imported!" |
1732 | -msgstr[0] "" |
1733 | -msgstr[1] "" |
1734 | - |
1735 | -#: ../src/app/qml/ubuntu-docviewer-app.qml:243 |
1736 | -msgid "Open" |
1737 | -msgstr "" |
1738 | - |
1739 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1740 | +#. TRANSLATORS: This string is used for renaming a copied file, |
1741 | +#. when a file with the same name already exists in user's |
1742 | +#. Documents folder. |
1743 | +#. |
1744 | +#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become |
1745 | +#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf" |
1746 | +#. |
1747 | +#. where "2" is given by the argument "%1" |
1748 | +#. |
1749 | +#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111 |
1750 | +#, qt-format |
1751 | +msgid "copy %1" |
1752 | +msgstr "" |
1753 | + |
1754 | +#: /tmp/build-reboot-uitk12-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1755 | +msgid "Document Viewer" |
1756 | +msgstr "" |
1757 | + |
1758 | +#: /tmp/build-reboot-uitk12-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1759 | msgid "documents;viewer;pdf;reader;" |
1760 | msgstr "" |
1761 | |
1762 | === modified file 'po/cs.po' |
1763 | --- po/cs.po 2015-08-18 05:56:20 +0000 |
1764 | +++ po/cs.po 2015-11-06 11:00:18 +0000 |
1765 | @@ -7,7 +7,7 @@ |
1766 | msgstr "" |
1767 | "Project-Id-Version: ubuntu-docviewer-app\n" |
1768 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1769 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
1770 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
1771 | "PO-Revision-Date: 2015-03-04 13:53+0000\n" |
1772 | "Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n" |
1773 | "Language-Team: Czech <cs@li.org>\n" |
1774 | @@ -15,8 +15,13 @@ |
1775 | "Content-Type: text/plain; charset=UTF-8\n" |
1776 | "Content-Transfer-Encoding: 8bit\n" |
1777 | "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" |
1778 | +<<<<<<< TREE |
1779 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
1780 | "X-Generator: Launchpad (build 17690)\n" |
1781 | +======= |
1782 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
1783 | +"X-Generator: Launchpad (build 17578)\n" |
1784 | +>>>>>>> MERGE-SOURCE |
1785 | |
1786 | #. TRANSLATORS: This string is used for renaming a copied file, |
1787 | #. when a file with the same name already exists in user's |
1788 | @@ -33,7 +38,7 @@ |
1789 | msgstr "" |
1790 | |
1791 | #: ../src/app/docviewer-application.cpp:171 |
1792 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1793 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1794 | msgid "Document Viewer" |
1795 | msgstr "" |
1796 | |
1797 | @@ -147,32 +152,31 @@ |
1798 | msgid "%1 byte" |
1799 | msgstr "" |
1800 | |
1801 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1802 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
1803 | msgid "Delete file" |
1804 | msgstr "Smazat soubor" |
1805 | |
1806 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
1807 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
1808 | #, qt-format |
1809 | msgid "Delete %1 file" |
1810 | msgid_plural "Delete %1 files" |
1811 | msgstr[0] "" |
1812 | msgstr[1] "" |
1813 | |
1814 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
1815 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
1816 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
1817 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
1818 | msgid "Are you sure you want to permanently delete this file?" |
1819 | msgid_plural "Are you sure you want to permanently delete these files?" |
1820 | msgstr[0] "" |
1821 | msgstr[1] "" |
1822 | |
1823 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
1824 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1825 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
1826 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
1827 | msgid "Cancel" |
1828 | msgstr "Zrušit" |
1829 | |
1830 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
1831 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
1832 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
1833 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
1834 | msgid "Delete" |
1835 | msgstr "Smazat" |
1836 | @@ -189,35 +193,47 @@ |
1837 | |
1838 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1839 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1840 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
1841 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
1842 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
1843 | #, qt-format |
1844 | msgid "Today, %1" |
1845 | msgstr "" |
1846 | |
1847 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1848 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1849 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
1850 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1851 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
1852 | #, qt-format |
1853 | msgid "Yesterday, %1" |
1854 | msgstr "" |
1855 | |
1856 | #. TRANSLATORS: this is a datetime formatting string, |
1857 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1858 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
1859 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
1860 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
1861 | msgid "dddd, hh:mm" |
1862 | msgstr "dddd, hh:mm" |
1863 | |
1864 | #. TRANSLATORS: this is a datetime formatting string, |
1865 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1866 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
1867 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
1868 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
1869 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
1870 | msgid "dd-MM-yyyy hh:mm" |
1871 | msgstr "dd-MM-yyyy hh:mm" |
1872 | |
1873 | +#. TRANSLATORS: this is a datetime formatting string, and the |
1874 | +#. singlequote is an escape character. |
1875 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1876 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
1877 | +msgid "'Today', hh:mm" |
1878 | +msgstr "" |
1879 | + |
1880 | +#. TRANSLATORS: this is a datetime formatting string, and the |
1881 | +#. singlequote is an escape character. |
1882 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1883 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1884 | +msgid "'Yesterday', hh:mm" |
1885 | +msgstr "" |
1886 | + |
1887 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
1888 | msgid "Today" |
1889 | msgstr "Dnes" |
1890 | @@ -369,6 +385,6 @@ |
1891 | msgid "Open" |
1892 | msgstr "" |
1893 | |
1894 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1895 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
1896 | msgid "documents;viewer;pdf;reader;" |
1897 | msgstr "" |
1898 | |
1899 | === renamed file 'po/cy.po' => 'po/cy.po.THIS' |
1900 | === modified file 'po/da.po' |
1901 | --- po/da.po 2015-08-18 05:56:20 +0000 |
1902 | +++ po/da.po 2015-11-06 11:00:18 +0000 |
1903 | @@ -7,7 +7,7 @@ |
1904 | msgstr "" |
1905 | "Project-Id-Version: ubuntu-docviewer-app\n" |
1906 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1907 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
1908 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
1909 | "PO-Revision-Date: 2015-03-26 14:46+0000\n" |
1910 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1911 | "Language-Team: Danish <da@li.org>\n" |
1912 | @@ -15,8 +15,13 @@ |
1913 | "Content-Type: text/plain; charset=UTF-8\n" |
1914 | "Content-Transfer-Encoding: 8bit\n" |
1915 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1916 | +<<<<<<< TREE |
1917 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
1918 | "X-Generator: Launchpad (build 17690)\n" |
1919 | +======= |
1920 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
1921 | +"X-Generator: Launchpad (build 17578)\n" |
1922 | +>>>>>>> MERGE-SOURCE |
1923 | |
1924 | #. TRANSLATORS: This string is used for renaming a copied file, |
1925 | #. when a file with the same name already exists in user's |
1926 | @@ -33,7 +38,7 @@ |
1927 | msgstr "" |
1928 | |
1929 | #: ../src/app/docviewer-application.cpp:171 |
1930 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1931 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
1932 | msgid "Document Viewer" |
1933 | msgstr "" |
1934 | |
1935 | @@ -147,32 +152,31 @@ |
1936 | msgid "%1 byte" |
1937 | msgstr "" |
1938 | |
1939 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1940 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
1941 | msgid "Delete file" |
1942 | msgstr "" |
1943 | |
1944 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
1945 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
1946 | #, qt-format |
1947 | msgid "Delete %1 file" |
1948 | msgid_plural "Delete %1 files" |
1949 | msgstr[0] "" |
1950 | msgstr[1] "" |
1951 | |
1952 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
1953 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
1954 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
1955 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
1956 | msgid "Are you sure you want to permanently delete this file?" |
1957 | msgid_plural "Are you sure you want to permanently delete these files?" |
1958 | msgstr[0] "" |
1959 | msgstr[1] "" |
1960 | |
1961 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
1962 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
1963 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
1964 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
1965 | msgid "Cancel" |
1966 | msgstr "" |
1967 | |
1968 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
1969 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
1970 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
1971 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
1972 | msgid "Delete" |
1973 | msgstr "" |
1974 | @@ -189,35 +193,47 @@ |
1975 | |
1976 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1977 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1978 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
1979 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
1980 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
1981 | #, qt-format |
1982 | msgid "Today, %1" |
1983 | msgstr "" |
1984 | |
1985 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
1986 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
1987 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
1988 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
1989 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
1990 | #, qt-format |
1991 | msgid "Yesterday, %1" |
1992 | msgstr "" |
1993 | |
1994 | #. TRANSLATORS: this is a datetime formatting string, |
1995 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
1996 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
1997 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
1998 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
1999 | msgid "dddd, hh:mm" |
2000 | msgstr "" |
2001 | |
2002 | #. TRANSLATORS: this is a datetime formatting string, |
2003 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2004 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
2005 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
2006 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
2007 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
2008 | msgid "dd-MM-yyyy hh:mm" |
2009 | msgstr "" |
2010 | |
2011 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2012 | +#. singlequote is an escape character. |
2013 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2014 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
2015 | +msgid "'Today', hh:mm" |
2016 | +msgstr "" |
2017 | + |
2018 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2019 | +#. singlequote is an escape character. |
2020 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2021 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2022 | +msgid "'Yesterday', hh:mm" |
2023 | +msgstr "" |
2024 | + |
2025 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
2026 | msgid "Today" |
2027 | msgstr "" |
2028 | @@ -369,6 +385,6 @@ |
2029 | msgid "Open" |
2030 | msgstr "" |
2031 | |
2032 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2033 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2034 | msgid "documents;viewer;pdf;reader;" |
2035 | msgstr "" |
2036 | |
2037 | === modified file 'po/de.po' |
2038 | --- po/de.po 2015-08-18 05:56:20 +0000 |
2039 | +++ po/de.po 2015-11-06 11:00:18 +0000 |
2040 | @@ -7,16 +7,21 @@ |
2041 | msgstr "" |
2042 | "Project-Id-Version: ubuntu-docviewer-app\n" |
2043 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2044 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
2045 | -"PO-Revision-Date: 2015-06-29 12:21+0000\n" |
2046 | -"Last-Translator: Torsten Franz <Unknown>\n" |
2047 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
2048 | +"PO-Revision-Date: 2015-06-26 14:06+0000\n" |
2049 | +"Last-Translator: Phillip Sz <Unknown>\n" |
2050 | "Language-Team: German <de@li.org>\n" |
2051 | "MIME-Version: 1.0\n" |
2052 | "Content-Type: text/plain; charset=UTF-8\n" |
2053 | "Content-Transfer-Encoding: 8bit\n" |
2054 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2055 | +<<<<<<< TREE |
2056 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
2057 | "X-Generator: Launchpad (build 17690)\n" |
2058 | +======= |
2059 | +"X-Launchpad-Export-Date: 2015-06-27 05:35+0000\n" |
2060 | +"X-Generator: Launchpad (build 17578)\n" |
2061 | +>>>>>>> MERGE-SOURCE |
2062 | |
2063 | #. TRANSLATORS: This string is used for renaming a copied file, |
2064 | #. when a file with the same name already exists in user's |
2065 | @@ -33,7 +38,7 @@ |
2066 | msgstr "Kopie %1" |
2067 | |
2068 | #: ../src/app/docviewer-application.cpp:171 |
2069 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2070 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2071 | msgid "Document Viewer" |
2072 | msgstr "Dokumentenbetrachter" |
2073 | |
2074 | @@ -149,33 +154,32 @@ |
2075 | msgid "%1 byte" |
2076 | msgstr "%1 Byte" |
2077 | |
2078 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2079 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
2080 | msgid "Delete file" |
2081 | msgstr "Datei löschen" |
2082 | |
2083 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
2084 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
2085 | #, qt-format |
2086 | msgid "Delete %1 file" |
2087 | msgid_plural "Delete %1 files" |
2088 | msgstr[0] "%1 Datei löschen" |
2089 | msgstr[1] "%1 Dateien löschen" |
2090 | |
2091 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
2092 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
2093 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
2094 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
2095 | msgid "Are you sure you want to permanently delete this file?" |
2096 | msgid_plural "Are you sure you want to permanently delete these files?" |
2097 | msgstr[0] "Sind Sie sicher, dass Sie diese Datei dauerhaft löschen möchten?" |
2098 | msgstr[1] "" |
2099 | "Sind Sie sicher, dass Sie diese Dateien dauerhaft löschen möchten?" |
2100 | |
2101 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
2102 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2103 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
2104 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
2105 | msgid "Cancel" |
2106 | msgstr "Abbrechen" |
2107 | |
2108 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
2109 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
2110 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
2111 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
2112 | msgid "Delete" |
2113 | msgstr "Löschen" |
2114 | @@ -194,35 +198,47 @@ |
2115 | |
2116 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2117 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2118 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
2119 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
2120 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
2121 | #, qt-format |
2122 | msgid "Today, %1" |
2123 | msgstr "Heute, %1" |
2124 | |
2125 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2126 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2127 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
2128 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2129 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
2130 | #, qt-format |
2131 | msgid "Yesterday, %1" |
2132 | msgstr "Gestern, %1" |
2133 | |
2134 | #. TRANSLATORS: this is a datetime formatting string, |
2135 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2136 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
2137 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
2138 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
2139 | msgid "dddd, hh:mm" |
2140 | msgstr "dddd, hh:mm" |
2141 | |
2142 | #. TRANSLATORS: this is a datetime formatting string, |
2143 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2144 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
2145 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
2146 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
2147 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
2148 | msgid "dd-MM-yyyy hh:mm" |
2149 | msgstr "dd.MM.yyyy hh:mm" |
2150 | |
2151 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2152 | +#. singlequote is an escape character. |
2153 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2154 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
2155 | +msgid "'Today', hh:mm" |
2156 | +msgstr "" |
2157 | + |
2158 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2159 | +#. singlequote is an escape character. |
2160 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2161 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2162 | +msgid "'Yesterday', hh:mm" |
2163 | +msgstr "" |
2164 | + |
2165 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
2166 | msgid "Today" |
2167 | msgstr "Heute" |
2168 | @@ -253,7 +269,7 @@ |
2169 | |
2170 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37 |
2171 | msgid "Sorting settings..." |
2172 | -msgstr "Sortiereinstellungen …" |
2173 | +msgstr "" |
2174 | |
2175 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46 |
2176 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35 |
2177 | @@ -277,7 +293,7 @@ |
2178 | |
2179 | #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47 |
2180 | msgid "search in documents..." |
2181 | -msgstr "In Dokumenten suchen …" |
2182 | +msgstr "" |
2183 | |
2184 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52 |
2185 | msgid "Select None" |
2186 | @@ -289,34 +305,32 @@ |
2187 | |
2188 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:24 |
2189 | msgid "No matching document found" |
2190 | -msgstr "Kein passendes Dokument gefunden" |
2191 | +msgstr "" |
2192 | |
2193 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:26 |
2194 | msgid "" |
2195 | "Please ensure that your query is not misspelled and/or try a different query." |
2196 | msgstr "" |
2197 | -"Bitte sicherstellen, dass die Anfrage nicht falsch geschrieben ist und/oder " |
2198 | -"eine andere Anfrage versuchen." |
2199 | |
2200 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26 |
2201 | msgid "Sorting settings" |
2202 | -msgstr "Sortiereinstellungen" |
2203 | +msgstr "" |
2204 | |
2205 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:31 |
2206 | msgid "Sort by date (Latest first)" |
2207 | -msgstr "Sortiert nach Datum (Letztes zuerst)" |
2208 | +msgstr "" |
2209 | |
2210 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:32 |
2211 | msgid "Sort by name (A-Z)" |
2212 | -msgstr "Sortiert nach Name (A-Z)" |
2213 | +msgstr "" |
2214 | |
2215 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:33 |
2216 | msgid "Sort by size (Smaller first)" |
2217 | -msgstr "Sortiert nach Größe (Kleinstes zuerst)" |
2218 | +msgstr "" |
2219 | |
2220 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47 |
2221 | msgid "Reverse order" |
2222 | -msgstr "Umgekehrte Reihenfolge" |
2223 | +msgstr "" |
2224 | |
2225 | #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document. |
2226 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:32 |
2227 | @@ -376,6 +390,6 @@ |
2228 | msgid "Open" |
2229 | msgstr "Öffnen" |
2230 | |
2231 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2232 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2233 | msgid "documents;viewer;pdf;reader;" |
2234 | msgstr "Dokumente;Betrachter;PDF;Leser;Dokumentenbetrachter;PDF-Betrachter" |
2235 | |
2236 | === modified file 'po/el.po' |
2237 | --- po/el.po 2015-08-18 05:56:20 +0000 |
2238 | +++ po/el.po 2015-11-06 11:00:18 +0000 |
2239 | @@ -7,16 +7,21 @@ |
2240 | msgstr "" |
2241 | "Project-Id-Version: ubuntu-docviewer-app\n" |
2242 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2243 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
2244 | -"PO-Revision-Date: 2015-07-17 10:02+0000\n" |
2245 | -"Last-Translator: Simos Xenitellis <Unknown>\n" |
2246 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
2247 | +"PO-Revision-Date: 2015-03-08 18:24+0000\n" |
2248 | +"Last-Translator: Aggelos Arnaoutis <angelosarn@hotmail.com>\n" |
2249 | "Language-Team: Greek <el@li.org>\n" |
2250 | "MIME-Version: 1.0\n" |
2251 | "Content-Type: text/plain; charset=UTF-8\n" |
2252 | "Content-Transfer-Encoding: 8bit\n" |
2253 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2254 | +<<<<<<< TREE |
2255 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
2256 | "X-Generator: Launchpad (build 17690)\n" |
2257 | +======= |
2258 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
2259 | +"X-Generator: Launchpad (build 17578)\n" |
2260 | +>>>>>>> MERGE-SOURCE |
2261 | |
2262 | #. TRANSLATORS: This string is used for renaming a copied file, |
2263 | #. when a file with the same name already exists in user's |
2264 | @@ -30,12 +35,12 @@ |
2265 | #: ../src/app/content-communicator.cpp:105 |
2266 | #, qt-format |
2267 | msgid "copy %1" |
2268 | -msgstr "αντίγραφο %1" |
2269 | +msgstr "" |
2270 | |
2271 | #: ../src/app/docviewer-application.cpp:171 |
2272 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2273 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2274 | msgid "Document Viewer" |
2275 | -msgstr "Προβολή εγγράφων" |
2276 | +msgstr "Προβολέας εγγράφων" |
2277 | |
2278 | #: ../src/app/qml/common/DetailsPage.qml:27 |
2279 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97 |
2280 | @@ -83,27 +88,27 @@ |
2281 | |
2282 | #: ../src/app/qml/common/PickImportedDialog.qml:29 |
2283 | msgid "Multiple documents imported" |
2284 | -msgstr "Εισήχθησαν πολλαπλά έγγραφα" |
2285 | +msgstr "" |
2286 | |
2287 | #: ../src/app/qml/common/PickImportedDialog.qml:30 |
2288 | msgid "Choose which one to open:" |
2289 | -msgstr "Επιλέξτε ποιο να ανοίξετε:" |
2290 | +msgstr "" |
2291 | |
2292 | #: ../src/app/qml/common/RejectedImportDialog.qml:28 |
2293 | msgid "File not supported" |
2294 | msgid_plural "Files not supported" |
2295 | -msgstr[0] "Δεν υποστηρίζεται το αρχείο" |
2296 | -msgstr[1] "Δεν υποστηρίζονται τα αρχεία" |
2297 | +msgstr[0] "" |
2298 | +msgstr[1] "" |
2299 | |
2300 | #: ../src/app/qml/common/RejectedImportDialog.qml:29 |
2301 | msgid "Following document has not been imported:" |
2302 | msgid_plural "Following documents have not been imported:" |
2303 | -msgstr[0] "Το παρακάτω έγγραφο δεν εισήχθη:" |
2304 | -msgstr[1] "Τα παρακάτω έγγραφα δεν εισήχθησαν:" |
2305 | +msgstr[0] "" |
2306 | +msgstr[1] "" |
2307 | |
2308 | #: ../src/app/qml/common/ToastWithAction.qml:97 |
2309 | msgid "Dismiss" |
2310 | -msgstr "Κλείσιμο" |
2311 | +msgstr "" |
2312 | |
2313 | #: ../src/app/qml/common/UnknownTypeDialog.qml:26 |
2314 | msgid "Unknown file type" |
2315 | @@ -115,7 +120,7 @@ |
2316 | "as a plain text?" |
2317 | msgstr "" |
2318 | "Συγγνωμή αλλά δεν είναι δυνατό να βρεθεί τρόπος να εμφανιστεί αυτό το " |
2319 | -"αρχείο. Θέλετε να το ανοίξετα ως απλό κείμενο;" |
2320 | +"αρχείο. Θέλετε να το ανοίξετα σαν απλό κείμενο;" |
2321 | |
2322 | #: ../src/app/qml/common/UnknownTypeDialog.qml:29 |
2323 | msgid "Yes" |
2324 | @@ -147,80 +152,91 @@ |
2325 | #: ../src/app/qml/common/utils.js:33 |
2326 | #, qt-format |
2327 | msgid "%1 byte" |
2328 | -msgstr "%1 byte" |
2329 | +msgstr "" |
2330 | |
2331 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2332 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
2333 | msgid "Delete file" |
2334 | msgstr "Διαγραφή αρχείου" |
2335 | |
2336 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
2337 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
2338 | #, qt-format |
2339 | msgid "Delete %1 file" |
2340 | msgid_plural "Delete %1 files" |
2341 | msgstr[0] "ΔΙαγραφή %1 αρχείου" |
2342 | msgstr[1] "Διαγραφή %1 αρχείων" |
2343 | |
2344 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
2345 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
2346 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
2347 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
2348 | msgid "Are you sure you want to permanently delete this file?" |
2349 | msgid_plural "Are you sure you want to permanently delete these files?" |
2350 | -msgstr[0] "Θέλετε σίγουρα να διαγράψετε για πάντα αυτό το αρχείο;" |
2351 | -msgstr[1] "Θέλετε σίγουρα να διαγράψετε για πάντα αυτά τα αρχεία;" |
2352 | +msgstr[0] "Είστε σίγουρος πως θέλετε να διαγράψετε μόνιμα αυτό το αρχείο;" |
2353 | +msgstr[1] "Είστε σίγουρος πως θέλετε να διαγράψετε μόνιμα αυτά τα αρχεία;" |
2354 | |
2355 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
2356 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2357 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
2358 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
2359 | msgid "Cancel" |
2360 | -msgstr "Ακύρωση" |
2361 | +msgstr "" |
2362 | |
2363 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
2364 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
2365 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
2366 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
2367 | msgid "Delete" |
2368 | msgstr "Διαγραφή" |
2369 | |
2370 | #: ../src/app/qml/documentPage/DocumentEmptyState.qml:24 |
2371 | msgid "No document found" |
2372 | -msgstr "Δεν βρέθηκαν έγγραφα" |
2373 | +msgstr "Κανένα έγγραφο δεν βρέθηκε" |
2374 | |
2375 | #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28 |
2376 | msgid "" |
2377 | "Connect your device to any computer and simply drag files to the Documents " |
2378 | "folder." |
2379 | msgstr "" |
2380 | -"Συνδέστε τη συσκευή σας σε οποιονδήποτε υπολογιστή και απλά σύρτε αρχεία στο " |
2381 | -"φάκελο Έγγραφα." |
2382 | +"Συνεστε την συσκευή σας σε οποιονδήποτε υπολογιστή και απλά σύτερε αρχεία " |
2383 | +"στον φάκελο Έγγραφα." |
2384 | |
2385 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2386 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2387 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
2388 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
2389 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
2390 | #, qt-format |
2391 | msgid "Today, %1" |
2392 | msgstr "Σήμερα, %1" |
2393 | |
2394 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2395 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2396 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
2397 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2398 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
2399 | #, qt-format |
2400 | msgid "Yesterday, %1" |
2401 | -msgstr "Χθες, %1" |
2402 | +msgstr "Χθές, %1" |
2403 | |
2404 | #. TRANSLATORS: this is a datetime formatting string, |
2405 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2406 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
2407 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
2408 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
2409 | msgid "dddd, hh:mm" |
2410 | -msgstr "dddd, hh:mm" |
2411 | +msgstr "ηηηη, ωω:λλ" |
2412 | |
2413 | #. TRANSLATORS: this is a datetime formatting string, |
2414 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2415 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
2416 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
2417 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
2418 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
2419 | msgid "dd-MM-yyyy hh:mm" |
2420 | -msgstr "dd-MM-yyyy hh:mm" |
2421 | +msgstr "ηη-ΜΜ-εεε ωω:λλ" |
2422 | + |
2423 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2424 | +#. singlequote is an escape character. |
2425 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2426 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
2427 | +msgid "'Today', hh:mm" |
2428 | +msgstr "" |
2429 | + |
2430 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2431 | +#. singlequote is an escape character. |
2432 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2433 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2434 | +msgid "'Yesterday', hh:mm" |
2435 | +msgstr "" |
2436 | |
2437 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
2438 | msgid "Today" |
2439 | @@ -232,27 +248,27 @@ |
2440 | |
2441 | #: ../src/app/qml/documentPage/DocumentListView.qml:163 |
2442 | msgid "Earlier this week" |
2443 | -msgstr "Νωρίτερα αυτή την εβδομάδα" |
2444 | +msgstr "Νωρίτερα αυτήν την εβδομάδα" |
2445 | |
2446 | #: ../src/app/qml/documentPage/DocumentListView.qml:166 |
2447 | msgid "Earlier this month" |
2448 | -msgstr "Νωρίτερα αυτό τον μήνα" |
2449 | +msgstr "Νωρίτερα αυτόν τον μήνα" |
2450 | |
2451 | #: ../src/app/qml/documentPage/DocumentListView.qml:168 |
2452 | msgid "Even earlier..." |
2453 | -msgstr "Ακόμα νωρίτερα..." |
2454 | +msgstr "Ακόμα νωρίτερα" |
2455 | |
2456 | #: ../src/app/qml/documentPage/DocumentPage.qml:24 |
2457 | msgid "Documents" |
2458 | -msgstr "Έγγραφα" |
2459 | +msgstr "" |
2460 | |
2461 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29 |
2462 | msgid "Search..." |
2463 | -msgstr "Αναζήτηση..." |
2464 | +msgstr "" |
2465 | |
2466 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37 |
2467 | msgid "Sorting settings..." |
2468 | -msgstr "Ρυθμίσεις ταξινόμησης..." |
2469 | +msgstr "" |
2470 | |
2471 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46 |
2472 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35 |
2473 | @@ -276,7 +292,7 @@ |
2474 | |
2475 | #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47 |
2476 | msgid "search in documents..." |
2477 | -msgstr "αναζήτηση στα έγγραφα..." |
2478 | +msgstr "" |
2479 | |
2480 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52 |
2481 | msgid "Select None" |
2482 | @@ -288,34 +304,32 @@ |
2483 | |
2484 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:24 |
2485 | msgid "No matching document found" |
2486 | -msgstr "Δεν βρέθηκαν έγγραφα που ταιριάζουν" |
2487 | +msgstr "" |
2488 | |
2489 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:26 |
2490 | msgid "" |
2491 | "Please ensure that your query is not misspelled and/or try a different query." |
2492 | msgstr "" |
2493 | -"Παρακαλούμε επιβεβαιώστε ότι το λεκτικό αναζήτησης είναι σωστό και/ή " |
2494 | -"δοκιμάστε με άλλο λεκτικό." |
2495 | |
2496 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26 |
2497 | msgid "Sorting settings" |
2498 | -msgstr "Ρυθμίσεις ταξινόμησης" |
2499 | +msgstr "" |
2500 | |
2501 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:31 |
2502 | msgid "Sort by date (Latest first)" |
2503 | -msgstr "Ταξινόμηση ανά ημερομηνία (Πιο πρόσφατα πρώτα)" |
2504 | +msgstr "" |
2505 | |
2506 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:32 |
2507 | msgid "Sort by name (A-Z)" |
2508 | -msgstr "Ταξινόμηση ανά όνομα (Α-Ω)" |
2509 | +msgstr "" |
2510 | |
2511 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:33 |
2512 | msgid "Sort by size (Smaller first)" |
2513 | -msgstr "Ταξινόμηση ανά μέγεθος (Πιο μικρά πρώτα)" |
2514 | +msgstr "" |
2515 | |
2516 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47 |
2517 | msgid "Reverse order" |
2518 | -msgstr "Αντίστροφη σειρά" |
2519 | +msgstr "" |
2520 | |
2521 | #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document. |
2522 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:32 |
2523 | @@ -325,7 +339,7 @@ |
2524 | |
2525 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:38 |
2526 | msgid "Hide table of contents" |
2527 | -msgstr "Απόκρυψη του πίνακα περιεχομένων" |
2528 | +msgstr "" |
2529 | |
2530 | #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen, |
2531 | #. while the second one (%2) refers to the total pages count. |
2532 | @@ -336,17 +350,17 @@ |
2533 | |
2534 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85 |
2535 | msgid "Go to page..." |
2536 | -msgstr "Μετάβαση στη σελίδα..." |
2537 | +msgstr "Μετάβαση στην σελίδα..." |
2538 | |
2539 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91 |
2540 | #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77 |
2541 | msgid "Disable night mode" |
2542 | -msgstr "Απενεργοποίηση της ρύθμισης νύχτας" |
2543 | +msgstr "" |
2544 | |
2545 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91 |
2546 | #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77 |
2547 | msgid "Enable night mode" |
2548 | -msgstr "Ενεργοποίηση της ρύθμισης νύχτας" |
2549 | +msgstr "" |
2550 | |
2551 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25 |
2552 | msgid "Go to page" |
2553 | @@ -359,7 +373,7 @@ |
2554 | |
2555 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44 |
2556 | msgid "GO!" |
2557 | -msgstr "ΠΑΜΕ!" |
2558 | +msgstr "" |
2559 | |
2560 | #: ../src/app/qml/textView/TextView.qml:42 |
2561 | msgid "Loading..." |
2562 | @@ -368,13 +382,13 @@ |
2563 | #: ../src/app/qml/ubuntu-docviewer-app.qml:240 |
2564 | msgid "Document successfully imported!" |
2565 | msgid_plural "Documents successfully imported!" |
2566 | -msgstr[0] "Το έγγραφο εισήχθη επιτυχώς!" |
2567 | -msgstr[1] "Τα έγγραφα εισήχθησαν επιτυχώς!" |
2568 | +msgstr[0] "" |
2569 | +msgstr[1] "" |
2570 | |
2571 | #: ../src/app/qml/ubuntu-docviewer-app.qml:243 |
2572 | msgid "Open" |
2573 | -msgstr "Άνοιγμα" |
2574 | +msgstr "" |
2575 | |
2576 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2577 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2578 | msgid "documents;viewer;pdf;reader;" |
2579 | -msgstr "documents;viewer;pdf;reader;έγγραφα;προβολή;πδφ;αναγνώστης;διάβασμα;" |
2580 | +msgstr "" |
2581 | |
2582 | === modified file 'po/en_AU.po' |
2583 | --- po/en_AU.po 2015-08-18 05:56:20 +0000 |
2584 | +++ po/en_AU.po 2015-11-06 11:00:18 +0000 |
2585 | @@ -7,7 +7,7 @@ |
2586 | msgstr "" |
2587 | "Project-Id-Version: ubuntu-docviewer-app\n" |
2588 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2589 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
2590 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
2591 | "PO-Revision-Date: 2015-06-27 01:15+0000\n" |
2592 | "Last-Translator: Joel Addison <jaddi27@gmail.com>\n" |
2593 | "Language-Team: English (Australia) <en_AU@li.org>\n" |
2594 | @@ -15,8 +15,13 @@ |
2595 | "Content-Type: text/plain; charset=UTF-8\n" |
2596 | "Content-Transfer-Encoding: 8bit\n" |
2597 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2598 | +<<<<<<< TREE |
2599 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
2600 | "X-Generator: Launchpad (build 17690)\n" |
2601 | +======= |
2602 | +"X-Launchpad-Export-Date: 2015-06-28 05:35+0000\n" |
2603 | +"X-Generator: Launchpad (build 17578)\n" |
2604 | +>>>>>>> MERGE-SOURCE |
2605 | |
2606 | #. TRANSLATORS: This string is used for renaming a copied file, |
2607 | #. when a file with the same name already exists in user's |
2608 | @@ -33,7 +38,7 @@ |
2609 | msgstr "copy %1" |
2610 | |
2611 | #: ../src/app/docviewer-application.cpp:171 |
2612 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2613 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2614 | msgid "Document Viewer" |
2615 | msgstr "Document Viewer" |
2616 | |
2617 | @@ -149,32 +154,31 @@ |
2618 | msgid "%1 byte" |
2619 | msgstr "%1 byte" |
2620 | |
2621 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2622 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
2623 | msgid "Delete file" |
2624 | msgstr "Delete file" |
2625 | |
2626 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
2627 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
2628 | #, qt-format |
2629 | msgid "Delete %1 file" |
2630 | msgid_plural "Delete %1 files" |
2631 | msgstr[0] "Delete %1 file" |
2632 | msgstr[1] "Delete %1 files" |
2633 | |
2634 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
2635 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
2636 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
2637 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
2638 | msgid "Are you sure you want to permanently delete this file?" |
2639 | msgid_plural "Are you sure you want to permanently delete these files?" |
2640 | msgstr[0] "Are you sure you want to permanently delete this file?" |
2641 | msgstr[1] "Are you sure you want to permanently delete these files?" |
2642 | |
2643 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
2644 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2645 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
2646 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
2647 | msgid "Cancel" |
2648 | msgstr "Cancel" |
2649 | |
2650 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
2651 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
2652 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
2653 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
2654 | msgid "Delete" |
2655 | msgstr "Delete" |
2656 | @@ -193,35 +197,47 @@ |
2657 | |
2658 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2659 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2660 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
2661 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
2662 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
2663 | #, qt-format |
2664 | msgid "Today, %1" |
2665 | msgstr "Today, %1" |
2666 | |
2667 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2668 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2669 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
2670 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2671 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
2672 | #, qt-format |
2673 | msgid "Yesterday, %1" |
2674 | msgstr "Yesterday, %1" |
2675 | |
2676 | #. TRANSLATORS: this is a datetime formatting string, |
2677 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2678 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
2679 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
2680 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
2681 | msgid "dddd, hh:mm" |
2682 | msgstr "dddd, hh:mm" |
2683 | |
2684 | #. TRANSLATORS: this is a datetime formatting string, |
2685 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2686 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
2687 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
2688 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
2689 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
2690 | msgid "dd-MM-yyyy hh:mm" |
2691 | msgstr "dd-MM-yyyy hh:mm" |
2692 | |
2693 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2694 | +#. singlequote is an escape character. |
2695 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2696 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
2697 | +msgid "'Today', hh:mm" |
2698 | +msgstr "'Today', hh:mm" |
2699 | + |
2700 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2701 | +#. singlequote is an escape character. |
2702 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2703 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2704 | +msgid "'Yesterday', hh:mm" |
2705 | +msgstr "'Yesterday', hh:mm" |
2706 | + |
2707 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
2708 | msgid "Today" |
2709 | msgstr "Today" |
2710 | @@ -374,6 +390,6 @@ |
2711 | msgid "Open" |
2712 | msgstr "Open" |
2713 | |
2714 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2715 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2716 | msgid "documents;viewer;pdf;reader;" |
2717 | msgstr "documents;viewer;pdf;reader;" |
2718 | |
2719 | === modified file 'po/en_GB.po' |
2720 | --- po/en_GB.po 2015-08-18 05:56:20 +0000 |
2721 | +++ po/en_GB.po 2015-11-06 11:00:18 +0000 |
2722 | @@ -7,16 +7,21 @@ |
2723 | msgstr "" |
2724 | "Project-Id-Version: ubuntu-docviewer-app\n" |
2725 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2726 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
2727 | -"PO-Revision-Date: 2015-06-30 14:30+0000\n" |
2728 | -"Last-Translator: James Tait <Unknown>\n" |
2729 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
2730 | +"PO-Revision-Date: 2015-06-13 21:56+0000\n" |
2731 | +"Last-Translator: Andi Chandler <Unknown>\n" |
2732 | "Language-Team: English (United Kingdom) <en_GB@li.org>\n" |
2733 | "MIME-Version: 1.0\n" |
2734 | "Content-Type: text/plain; charset=UTF-8\n" |
2735 | "Content-Transfer-Encoding: 8bit\n" |
2736 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2737 | +<<<<<<< TREE |
2738 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
2739 | "X-Generator: Launchpad (build 17690)\n" |
2740 | +======= |
2741 | +"X-Launchpad-Export-Date: 2015-06-26 04:59+0000\n" |
2742 | +"X-Generator: Launchpad (build 17578)\n" |
2743 | +>>>>>>> MERGE-SOURCE |
2744 | |
2745 | #. TRANSLATORS: This string is used for renaming a copied file, |
2746 | #. when a file with the same name already exists in user's |
2747 | @@ -33,7 +38,7 @@ |
2748 | msgstr "copy %1" |
2749 | |
2750 | #: ../src/app/docviewer-application.cpp:171 |
2751 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2752 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2753 | msgid "Document Viewer" |
2754 | msgstr "Document Viewer" |
2755 | |
2756 | @@ -149,32 +154,31 @@ |
2757 | msgid "%1 byte" |
2758 | msgstr "%1 byte" |
2759 | |
2760 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2761 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
2762 | msgid "Delete file" |
2763 | msgstr "Delete file" |
2764 | |
2765 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
2766 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
2767 | #, qt-format |
2768 | msgid "Delete %1 file" |
2769 | msgid_plural "Delete %1 files" |
2770 | msgstr[0] "Delete %1 file" |
2771 | msgstr[1] "Delete %1 files" |
2772 | |
2773 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
2774 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
2775 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
2776 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
2777 | msgid "Are you sure you want to permanently delete this file?" |
2778 | msgid_plural "Are you sure you want to permanently delete these files?" |
2779 | msgstr[0] "Are you sure you want to permanently delete this file?" |
2780 | msgstr[1] "Are you sure you want to permanently delete these files?" |
2781 | |
2782 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
2783 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
2784 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
2785 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
2786 | msgid "Cancel" |
2787 | msgstr "Cancel" |
2788 | |
2789 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
2790 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
2791 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
2792 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
2793 | msgid "Delete" |
2794 | msgstr "Delete" |
2795 | @@ -193,35 +197,47 @@ |
2796 | |
2797 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2798 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2799 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
2800 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
2801 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
2802 | #, qt-format |
2803 | msgid "Today, %1" |
2804 | msgstr "Today, %1" |
2805 | |
2806 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
2807 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
2808 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
2809 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2810 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
2811 | #, qt-format |
2812 | msgid "Yesterday, %1" |
2813 | msgstr "Yesterday, %1" |
2814 | |
2815 | #. TRANSLATORS: this is a datetime formatting string, |
2816 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2817 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
2818 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
2819 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
2820 | msgid "dddd, hh:mm" |
2821 | msgstr "dddd, hh:mm" |
2822 | |
2823 | #. TRANSLATORS: this is a datetime formatting string, |
2824 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2825 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
2826 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
2827 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
2828 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
2829 | msgid "dd-MM-yyyy hh:mm" |
2830 | msgstr "dd-MM-yyyy hh:mm" |
2831 | |
2832 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2833 | +#. singlequote is an escape character. |
2834 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2835 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
2836 | +msgid "'Today', hh:mm" |
2837 | +msgstr "" |
2838 | + |
2839 | +#. TRANSLATORS: this is a datetime formatting string, and the |
2840 | +#. singlequote is an escape character. |
2841 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
2842 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
2843 | +msgid "'Yesterday', hh:mm" |
2844 | +msgstr "" |
2845 | + |
2846 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
2847 | msgid "Today" |
2848 | msgstr "Today" |
2849 | @@ -244,15 +260,15 @@ |
2850 | |
2851 | #: ../src/app/qml/documentPage/DocumentPage.qml:24 |
2852 | msgid "Documents" |
2853 | -msgstr "Documents" |
2854 | +msgstr "" |
2855 | |
2856 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29 |
2857 | msgid "Search..." |
2858 | -msgstr "Search..." |
2859 | +msgstr "" |
2860 | |
2861 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37 |
2862 | msgid "Sorting settings..." |
2863 | -msgstr "Sorting settings..." |
2864 | +msgstr "" |
2865 | |
2866 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46 |
2867 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35 |
2868 | @@ -276,7 +292,7 @@ |
2869 | |
2870 | #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47 |
2871 | msgid "search in documents..." |
2872 | -msgstr "search in documents..." |
2873 | +msgstr "" |
2874 | |
2875 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52 |
2876 | msgid "Select None" |
2877 | @@ -288,33 +304,32 @@ |
2878 | |
2879 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:24 |
2880 | msgid "No matching document found" |
2881 | -msgstr "No matching document found" |
2882 | +msgstr "" |
2883 | |
2884 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:26 |
2885 | msgid "" |
2886 | "Please ensure that your query is not misspelled and/or try a different query." |
2887 | msgstr "" |
2888 | -"Please ensure that your query is not misspelled and/or try a different query." |
2889 | |
2890 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26 |
2891 | msgid "Sorting settings" |
2892 | -msgstr "Sorting settings" |
2893 | +msgstr "" |
2894 | |
2895 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:31 |
2896 | msgid "Sort by date (Latest first)" |
2897 | -msgstr "Sort by date (Latest first)" |
2898 | +msgstr "" |
2899 | |
2900 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:32 |
2901 | msgid "Sort by name (A-Z)" |
2902 | -msgstr "Sort by name (A-Z)" |
2903 | +msgstr "" |
2904 | |
2905 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:33 |
2906 | msgid "Sort by size (Smaller first)" |
2907 | -msgstr "Sort by size (Smaller first)" |
2908 | +msgstr "" |
2909 | |
2910 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47 |
2911 | msgid "Reverse order" |
2912 | -msgstr "Reverse order" |
2913 | +msgstr "" |
2914 | |
2915 | #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document. |
2916 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:32 |
2917 | @@ -374,6 +389,6 @@ |
2918 | msgid "Open" |
2919 | msgstr "Open" |
2920 | |
2921 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2922 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
2923 | msgid "documents;viewer;pdf;reader;" |
2924 | msgstr "documents;viewer;pdf;reader;" |
2925 | |
2926 | === modified file 'po/eo.po' |
2927 | --- po/eo.po 2015-08-18 05:56:20 +0000 |
2928 | +++ po/eo.po 2015-11-06 11:00:18 +0000 |
2929 | @@ -7,16 +7,21 @@ |
2930 | msgstr "" |
2931 | "Project-Id-Version: ubuntu-docviewer-app\n" |
2932 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2933 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
2934 | -"PO-Revision-Date: 2015-07-17 05:33+0000\n" |
2935 | -"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n" |
2936 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
2937 | +"PO-Revision-Date: 2015-03-03 23:59+0000\n" |
2938 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
2939 | "Language-Team: Esperanto <eo@li.org>\n" |
2940 | "MIME-Version: 1.0\n" |
2941 | "Content-Type: text/plain; charset=UTF-8\n" |
2942 | "Content-Transfer-Encoding: 8bit\n" |
2943 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2944 | +<<<<<<< TREE |
2945 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
2946 | "X-Generator: Launchpad (build 17690)\n" |
2947 | +======= |
2948 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
2949 | +"X-Generator: Launchpad (build 17578)\n" |
2950 | +>>>>>>> MERGE-SOURCE |
2951 | |
2952 | #. TRANSLATORS: This string is used for renaming a copied file, |
2953 | #. when a file with the same name already exists in user's |
2954 | @@ -30,46 +35,46 @@ |
2955 | #: ../src/app/content-communicator.cpp:105 |
2956 | #, qt-format |
2957 | msgid "copy %1" |
2958 | -msgstr "%1-a kopio" |
2959 | +msgstr "" |
2960 | |
2961 | #: ../src/app/docviewer-application.cpp:171 |
2962 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2963 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
2964 | msgid "Document Viewer" |
2965 | -msgstr "Dokumentmontrilo" |
2966 | +msgstr "" |
2967 | |
2968 | #: ../src/app/qml/common/DetailsPage.qml:27 |
2969 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97 |
2970 | #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83 |
2971 | msgid "Details" |
2972 | -msgstr "Detaloj" |
2973 | +msgstr "" |
2974 | |
2975 | #: ../src/app/qml/common/DetailsPage.qml:33 |
2976 | msgid "Location" |
2977 | -msgstr "Loko" |
2978 | +msgstr "" |
2979 | |
2980 | #: ../src/app/qml/common/DetailsPage.qml:37 |
2981 | msgid "Size" |
2982 | -msgstr "Grandeco" |
2983 | +msgstr "" |
2984 | |
2985 | #: ../src/app/qml/common/DetailsPage.qml:42 |
2986 | msgid "Created" |
2987 | -msgstr "Kreita" |
2988 | +msgstr "" |
2989 | |
2990 | #: ../src/app/qml/common/DetailsPage.qml:47 |
2991 | msgid "Last modified" |
2992 | -msgstr "Laste ŝanĝita" |
2993 | +msgstr "" |
2994 | |
2995 | #: ../src/app/qml/common/DetailsPage.qml:54 |
2996 | msgid "MIME type" |
2997 | -msgstr "MIME-tipo" |
2998 | +msgstr "" |
2999 | |
3000 | #: ../src/app/qml/common/FileNotFoundDialog.qml:24 |
3001 | msgid "Error" |
3002 | -msgstr "Eraro" |
3003 | +msgstr "" |
3004 | |
3005 | #: ../src/app/qml/common/FileNotFoundDialog.qml:25 |
3006 | msgid "File does not exist" |
3007 | -msgstr "La dosiero ne ekzistas" |
3008 | +msgstr "" |
3009 | |
3010 | #: ../src/app/qml/common/FileNotFoundDialog.qml:28 |
3011 | #: ../src/app/qml/common/PickImportedDialog.qml:47 |
3012 | @@ -79,7 +84,7 @@ |
3013 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61 |
3014 | #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61 |
3015 | msgid "Close" |
3016 | -msgstr "Fermi" |
3017 | +msgstr "" |
3018 | |
3019 | #: ../src/app/qml/common/PickImportedDialog.qml:29 |
3020 | msgid "Multiple documents imported" |
3021 | @@ -107,7 +112,7 @@ |
3022 | |
3023 | #: ../src/app/qml/common/UnknownTypeDialog.qml:26 |
3024 | msgid "Unknown file type" |
3025 | -msgstr "Nekonata dosierspeco" |
3026 | +msgstr "" |
3027 | |
3028 | #: ../src/app/qml/common/UnknownTypeDialog.qml:27 |
3029 | msgid "" |
3030 | @@ -117,62 +122,61 @@ |
3031 | |
3032 | #: ../src/app/qml/common/UnknownTypeDialog.qml:29 |
3033 | msgid "Yes" |
3034 | -msgstr "Jes" |
3035 | +msgstr "" |
3036 | |
3037 | #: ../src/app/qml/common/UnknownTypeDialog.qml:38 |
3038 | msgid "No" |
3039 | -msgstr "Ne" |
3040 | +msgstr "" |
3041 | |
3042 | #. TRANSLATORS: %1 is the size of a file, expressed in GB |
3043 | #: ../src/app/qml/common/utils.js:22 |
3044 | #, qt-format |
3045 | msgid "%1 GB" |
3046 | -msgstr "%1 GB" |
3047 | +msgstr "" |
3048 | |
3049 | #. TRANSLATORS: %1 is the size of a file, expressed in MB |
3050 | #: ../src/app/qml/common/utils.js:26 |
3051 | #, qt-format |
3052 | msgid "%1 MB" |
3053 | -msgstr "%1 MB" |
3054 | +msgstr "" |
3055 | |
3056 | #. TRANSLATORS: %1 is the size of a file, expressed in kB |
3057 | #: ../src/app/qml/common/utils.js:30 |
3058 | #, qt-format |
3059 | msgid "%1 kB" |
3060 | -msgstr "%1 kB" |
3061 | +msgstr "" |
3062 | |
3063 | #. TRANSLATORS: %1 is the size of a file, expressed in byte |
3064 | #: ../src/app/qml/common/utils.js:33 |
3065 | #, qt-format |
3066 | msgid "%1 byte" |
3067 | -msgstr "%1 bitoko" |
3068 | +msgstr "" |
3069 | |
3070 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3071 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
3072 | msgid "Delete file" |
3073 | -msgstr "Forigi dosieron" |
3074 | +msgstr "" |
3075 | |
3076 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
3077 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
3078 | #, qt-format |
3079 | msgid "Delete %1 file" |
3080 | msgid_plural "Delete %1 files" |
3081 | msgstr[0] "" |
3082 | msgstr[1] "" |
3083 | |
3084 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
3085 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
3086 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
3087 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
3088 | msgid "Are you sure you want to permanently delete this file?" |
3089 | msgid_plural "Are you sure you want to permanently delete these files?" |
3090 | msgstr[0] "" |
3091 | msgstr[1] "" |
3092 | |
3093 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
3094 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3095 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
3096 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
3097 | msgid "Cancel" |
3098 | msgstr "" |
3099 | |
3100 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
3101 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
3102 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
3103 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
3104 | msgid "Delete" |
3105 | msgstr "" |
3106 | @@ -189,42 +193,54 @@ |
3107 | |
3108 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3109 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3110 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
3111 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
3112 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
3113 | #, qt-format |
3114 | msgid "Today, %1" |
3115 | msgstr "" |
3116 | |
3117 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3118 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3119 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
3120 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3121 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
3122 | #, qt-format |
3123 | msgid "Yesterday, %1" |
3124 | msgstr "" |
3125 | |
3126 | #. TRANSLATORS: this is a datetime formatting string, |
3127 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3128 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
3129 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
3130 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
3131 | msgid "dddd, hh:mm" |
3132 | msgstr "" |
3133 | |
3134 | #. TRANSLATORS: this is a datetime formatting string, |
3135 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3136 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
3137 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
3138 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
3139 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
3140 | msgid "dd-MM-yyyy hh:mm" |
3141 | msgstr "" |
3142 | |
3143 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3144 | +#. singlequote is an escape character. |
3145 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3146 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
3147 | +msgid "'Today', hh:mm" |
3148 | +msgstr "" |
3149 | + |
3150 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3151 | +#. singlequote is an escape character. |
3152 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3153 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3154 | +msgid "'Yesterday', hh:mm" |
3155 | +msgstr "" |
3156 | + |
3157 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
3158 | msgid "Today" |
3159 | -msgstr "Hodiaŭ" |
3160 | +msgstr "" |
3161 | |
3162 | #: ../src/app/qml/documentPage/DocumentListView.qml:160 |
3163 | msgid "Yesterday" |
3164 | -msgstr "Hieraŭ" |
3165 | +msgstr "" |
3166 | |
3167 | #: ../src/app/qml/documentPage/DocumentListView.qml:163 |
3168 | msgid "Earlier this week" |
3169 | @@ -326,7 +342,7 @@ |
3170 | #: ../src/app/qml/pdfView/PdfView.qml:34 |
3171 | #, qt-format |
3172 | msgid "Page %1 of %2" |
3173 | -msgstr "Paĝo %1 el %2" |
3174 | +msgstr "" |
3175 | |
3176 | #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85 |
3177 | msgid "Go to page..." |
3178 | @@ -369,6 +385,6 @@ |
3179 | msgid "Open" |
3180 | msgstr "" |
3181 | |
3182 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3183 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3184 | msgid "documents;viewer;pdf;reader;" |
3185 | msgstr "" |
3186 | |
3187 | === modified file 'po/es.po' |
3188 | --- po/es.po 2015-08-18 05:56:20 +0000 |
3189 | +++ po/es.po 2015-11-06 11:00:18 +0000 |
3190 | @@ -7,7 +7,7 @@ |
3191 | msgstr "" |
3192 | "Project-Id-Version: ubuntu-docviewer-app\n" |
3193 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3194 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
3195 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
3196 | "PO-Revision-Date: 2015-06-27 21:08+0000\n" |
3197 | "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n" |
3198 | "Language-Team: Spanish <es@li.org>\n" |
3199 | @@ -15,8 +15,13 @@ |
3200 | "Content-Type: text/plain; charset=UTF-8\n" |
3201 | "Content-Transfer-Encoding: 8bit\n" |
3202 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
3203 | +<<<<<<< TREE |
3204 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
3205 | "X-Generator: Launchpad (build 17690)\n" |
3206 | +======= |
3207 | +"X-Launchpad-Export-Date: 2015-06-28 05:35+0000\n" |
3208 | +"X-Generator: Launchpad (build 17578)\n" |
3209 | +>>>>>>> MERGE-SOURCE |
3210 | |
3211 | #. TRANSLATORS: This string is used for renaming a copied file, |
3212 | #. when a file with the same name already exists in user's |
3213 | @@ -33,7 +38,7 @@ |
3214 | msgstr "copia %1" |
3215 | |
3216 | #: ../src/app/docviewer-application.cpp:171 |
3217 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3218 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3219 | msgid "Document Viewer" |
3220 | msgstr "Visor de documentos" |
3221 | |
3222 | @@ -149,32 +154,31 @@ |
3223 | msgid "%1 byte" |
3224 | msgstr "%1 byte" |
3225 | |
3226 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3227 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
3228 | msgid "Delete file" |
3229 | msgstr "Eliminar archivo" |
3230 | |
3231 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
3232 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
3233 | #, qt-format |
3234 | msgid "Delete %1 file" |
3235 | msgid_plural "Delete %1 files" |
3236 | msgstr[0] "Eliminar %1 archivo" |
3237 | msgstr[1] "Eliminar %1 archivos" |
3238 | |
3239 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
3240 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
3241 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
3242 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
3243 | msgid "Are you sure you want to permanently delete this file?" |
3244 | msgid_plural "Are you sure you want to permanently delete these files?" |
3245 | msgstr[0] "¿Confirma la eliminación permanente de este archivo?" |
3246 | msgstr[1] "¿Confirma la eliminación permanente de estos archivos?" |
3247 | |
3248 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
3249 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3250 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
3251 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
3252 | msgid "Cancel" |
3253 | msgstr "Cancelar" |
3254 | |
3255 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
3256 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
3257 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
3258 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
3259 | msgid "Delete" |
3260 | msgstr "Eliminar" |
3261 | @@ -192,35 +196,47 @@ |
3262 | |
3263 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3264 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3265 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
3266 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
3267 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
3268 | #, qt-format |
3269 | msgid "Today, %1" |
3270 | msgstr "Hoy, %1" |
3271 | |
3272 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3273 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3274 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
3275 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3276 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
3277 | #, qt-format |
3278 | msgid "Yesterday, %1" |
3279 | msgstr "Ayer, %1" |
3280 | |
3281 | #. TRANSLATORS: this is a datetime formatting string, |
3282 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3283 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
3284 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
3285 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
3286 | msgid "dddd, hh:mm" |
3287 | msgstr "dddd, hh:mm" |
3288 | |
3289 | #. TRANSLATORS: this is a datetime formatting string, |
3290 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3291 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
3292 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
3293 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
3294 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
3295 | msgid "dd-MM-yyyy hh:mm" |
3296 | msgstr "dd/MM/yyyy hh:mm" |
3297 | |
3298 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3299 | +#. singlequote is an escape character. |
3300 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3301 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
3302 | +msgid "'Today', hh:mm" |
3303 | +msgstr "'Hoy', hh:mm" |
3304 | + |
3305 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3306 | +#. singlequote is an escape character. |
3307 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3308 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3309 | +msgid "'Yesterday', hh:mm" |
3310 | +msgstr "'Ayer', hh:mm" |
3311 | + |
3312 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
3313 | msgid "Today" |
3314 | msgstr "Hoy" |
3315 | @@ -373,6 +389,6 @@ |
3316 | msgid "Open" |
3317 | msgstr "Abrir" |
3318 | |
3319 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3320 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3321 | msgid "documents;viewer;pdf;reader;" |
3322 | msgstr "documentos;visor;pdf;lector;" |
3323 | |
3324 | === modified file 'po/eu.po' |
3325 | --- po/eu.po 2015-08-18 05:56:20 +0000 |
3326 | +++ po/eu.po 2015-11-06 11:00:18 +0000 |
3327 | @@ -7,7 +7,7 @@ |
3328 | msgstr "" |
3329 | "Project-Id-Version: ubuntu-docviewer-app\n" |
3330 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3331 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
3332 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
3333 | "PO-Revision-Date: 2015-03-23 21:50+0000\n" |
3334 | "Last-Translator: Asier Iturralde Sarasola <Unknown>\n" |
3335 | "Language-Team: Basque <eu@li.org>\n" |
3336 | @@ -15,8 +15,13 @@ |
3337 | "Content-Type: text/plain; charset=UTF-8\n" |
3338 | "Content-Transfer-Encoding: 8bit\n" |
3339 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
3340 | +<<<<<<< TREE |
3341 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
3342 | "X-Generator: Launchpad (build 17690)\n" |
3343 | +======= |
3344 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
3345 | +"X-Generator: Launchpad (build 17578)\n" |
3346 | +>>>>>>> MERGE-SOURCE |
3347 | |
3348 | #. TRANSLATORS: This string is used for renaming a copied file, |
3349 | #. when a file with the same name already exists in user's |
3350 | @@ -33,7 +38,7 @@ |
3351 | msgstr "" |
3352 | |
3353 | #: ../src/app/docviewer-application.cpp:171 |
3354 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3355 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3356 | msgid "Document Viewer" |
3357 | msgstr "Dokumentu-ikustailea" |
3358 | |
3359 | @@ -147,32 +152,31 @@ |
3360 | msgid "%1 byte" |
3361 | msgstr "%1 byte" |
3362 | |
3363 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3364 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
3365 | msgid "Delete file" |
3366 | msgstr "Ezabatu fitxategia" |
3367 | |
3368 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
3369 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
3370 | #, qt-format |
3371 | msgid "Delete %1 file" |
3372 | msgid_plural "Delete %1 files" |
3373 | msgstr[0] "Ezabatu fitxategi %1" |
3374 | msgstr[1] "Ezabatu %1 fitxategi" |
3375 | |
3376 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
3377 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
3378 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
3379 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
3380 | msgid "Are you sure you want to permanently delete this file?" |
3381 | msgid_plural "Are you sure you want to permanently delete these files?" |
3382 | msgstr[0] "Ziur zaude fitxategi hau behin-betiko ezabatu nahi duzula?" |
3383 | msgstr[1] "Ziur zaude fitxategi hauek behin-betiko ezabatu nahi dituzula?" |
3384 | |
3385 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
3386 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3387 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
3388 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
3389 | msgid "Cancel" |
3390 | msgstr "Utzi" |
3391 | |
3392 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
3393 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
3394 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
3395 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
3396 | msgid "Delete" |
3397 | msgstr "Ezabatu" |
3398 | @@ -189,35 +193,47 @@ |
3399 | |
3400 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3401 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3402 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
3403 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
3404 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
3405 | #, qt-format |
3406 | msgid "Today, %1" |
3407 | msgstr "Gaur, %1" |
3408 | |
3409 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3410 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3411 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
3412 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3413 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
3414 | #, qt-format |
3415 | msgid "Yesterday, %1" |
3416 | msgstr "Atzo, %1" |
3417 | |
3418 | #. TRANSLATORS: this is a datetime formatting string, |
3419 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3420 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
3421 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
3422 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
3423 | msgid "dddd, hh:mm" |
3424 | msgstr "dddd, hh:mm" |
3425 | |
3426 | #. TRANSLATORS: this is a datetime formatting string, |
3427 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3428 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
3429 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
3430 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
3431 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
3432 | msgid "dd-MM-yyyy hh:mm" |
3433 | msgstr "yyyy-MM-dd hh:mm" |
3434 | |
3435 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3436 | +#. singlequote is an escape character. |
3437 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3438 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
3439 | +msgid "'Today', hh:mm" |
3440 | +msgstr "" |
3441 | + |
3442 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3443 | +#. singlequote is an escape character. |
3444 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3445 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3446 | +msgid "'Yesterday', hh:mm" |
3447 | +msgstr "" |
3448 | + |
3449 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
3450 | msgid "Today" |
3451 | msgstr "Gaur" |
3452 | @@ -369,6 +385,6 @@ |
3453 | msgid "Open" |
3454 | msgstr "" |
3455 | |
3456 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3457 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3458 | msgid "documents;viewer;pdf;reader;" |
3459 | msgstr "dokumentu;ikustailea;pdf;irakurlea" |
3460 | |
3461 | === modified file 'po/fa.po' |
3462 | --- po/fa.po 2015-08-18 05:56:20 +0000 |
3463 | +++ po/fa.po 2015-11-06 11:00:18 +0000 |
3464 | @@ -7,16 +7,21 @@ |
3465 | msgstr "" |
3466 | "Project-Id-Version: ubuntu-docviewer-app\n" |
3467 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3468 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
3469 | -"PO-Revision-Date: 2015-07-17 10:09+0000\n" |
3470 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
3471 | +"PO-Revision-Date: 2015-05-30 22:19+0000\n" |
3472 | "Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n" |
3473 | "Language-Team: Persian <fa@li.org>\n" |
3474 | "MIME-Version: 1.0\n" |
3475 | "Content-Type: text/plain; charset=UTF-8\n" |
3476 | "Content-Transfer-Encoding: 8bit\n" |
3477 | "Plural-Forms: nplurals=1; plural=0;\n" |
3478 | +<<<<<<< TREE |
3479 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
3480 | "X-Generator: Launchpad (build 17690)\n" |
3481 | +======= |
3482 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
3483 | +"X-Generator: Launchpad (build 17578)\n" |
3484 | +>>>>>>> MERGE-SOURCE |
3485 | |
3486 | #. TRANSLATORS: This string is used for renaming a copied file, |
3487 | #. when a file with the same name already exists in user's |
3488 | @@ -33,7 +38,7 @@ |
3489 | msgstr "رونوشت %1" |
3490 | |
3491 | #: ../src/app/docviewer-application.cpp:171 |
3492 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3493 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3494 | msgid "Document Viewer" |
3495 | msgstr "نمایشگر سند" |
3496 | |
3497 | @@ -147,30 +152,29 @@ |
3498 | msgid "%1 byte" |
3499 | msgstr "%1 بایت" |
3500 | |
3501 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3502 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
3503 | msgid "Delete file" |
3504 | msgstr "حذف پرونده" |
3505 | |
3506 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
3507 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
3508 | #, qt-format |
3509 | msgid "Delete %1 file" |
3510 | msgid_plural "Delete %1 files" |
3511 | msgstr[0] "حذف %1 پرونده" |
3512 | |
3513 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
3514 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
3515 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
3516 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
3517 | msgid "Are you sure you want to permanently delete this file?" |
3518 | msgid_plural "Are you sure you want to permanently delete these files?" |
3519 | msgstr[0] "مطمئنید که میخواهید این پروندهها را برای همیشه حذف کنید؟" |
3520 | |
3521 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
3522 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3523 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
3524 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
3525 | msgid "Cancel" |
3526 | msgstr "لغو" |
3527 | |
3528 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
3529 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
3530 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
3531 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
3532 | msgid "Delete" |
3533 | msgstr "حذف" |
3534 | @@ -189,35 +193,47 @@ |
3535 | |
3536 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3537 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3538 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
3539 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
3540 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
3541 | #, qt-format |
3542 | msgid "Today, %1" |
3543 | msgstr "امروز، %1" |
3544 | |
3545 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3546 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3547 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
3548 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3549 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
3550 | #, qt-format |
3551 | msgid "Yesterday, %1" |
3552 | msgstr "دیروز، %1" |
3553 | |
3554 | #. TRANSLATORS: this is a datetime formatting string, |
3555 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3556 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
3557 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
3558 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
3559 | msgid "dddd, hh:mm" |
3560 | msgstr "dddd، hh:mm" |
3561 | |
3562 | #. TRANSLATORS: this is a datetime formatting string, |
3563 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3564 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
3565 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
3566 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
3567 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
3568 | msgid "dd-MM-yyyy hh:mm" |
3569 | msgstr "dd/MM/yyyy hh:mm" |
3570 | |
3571 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3572 | +#. singlequote is an escape character. |
3573 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3574 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
3575 | +msgid "'Today', hh:mm" |
3576 | +msgstr "" |
3577 | + |
3578 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3579 | +#. singlequote is an escape character. |
3580 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3581 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3582 | +msgid "'Yesterday', hh:mm" |
3583 | +msgstr "" |
3584 | + |
3585 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
3586 | msgid "Today" |
3587 | msgstr "امروز" |
3588 | @@ -240,15 +256,15 @@ |
3589 | |
3590 | #: ../src/app/qml/documentPage/DocumentPage.qml:24 |
3591 | msgid "Documents" |
3592 | -msgstr "مستندات" |
3593 | +msgstr "" |
3594 | |
3595 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29 |
3596 | msgid "Search..." |
3597 | -msgstr "جستوجو…" |
3598 | +msgstr "" |
3599 | |
3600 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37 |
3601 | msgid "Sorting settings..." |
3602 | -msgstr "تنظیمات چینش…" |
3603 | +msgstr "" |
3604 | |
3605 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46 |
3606 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35 |
3607 | @@ -272,7 +288,7 @@ |
3608 | |
3609 | #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47 |
3610 | msgid "search in documents..." |
3611 | -msgstr "جستوجو در مستندات…" |
3612 | +msgstr "" |
3613 | |
3614 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52 |
3615 | msgid "Select None" |
3616 | @@ -284,34 +300,32 @@ |
3617 | |
3618 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:24 |
3619 | msgid "No matching document found" |
3620 | -msgstr "هیچ سند مطابقی یافت نشد" |
3621 | +msgstr "" |
3622 | |
3623 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:26 |
3624 | msgid "" |
3625 | "Please ensure that your query is not misspelled and/or try a different query." |
3626 | msgstr "" |
3627 | -"لطفاُ مطمئن شوید که پرسوجویتان اشتباه نداشت و/یا پرسوجوی دیگری را امتحان " |
3628 | -"کنید." |
3629 | |
3630 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26 |
3631 | msgid "Sorting settings" |
3632 | -msgstr "تنظیمات چینش" |
3633 | +msgstr "" |
3634 | |
3635 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:31 |
3636 | msgid "Sort by date (Latest first)" |
3637 | -msgstr "چینش بر اساس تاریخ (ابتدا جدیدترینها)" |
3638 | +msgstr "" |
3639 | |
3640 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:32 |
3641 | msgid "Sort by name (A-Z)" |
3642 | -msgstr "چینش بر اساس نام (صعودی)" |
3643 | +msgstr "" |
3644 | |
3645 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:33 |
3646 | msgid "Sort by size (Smaller first)" |
3647 | -msgstr "چینش بر اساس اندازه (ابتدا کوچکترها)" |
3648 | +msgstr "" |
3649 | |
3650 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47 |
3651 | msgid "Reverse order" |
3652 | -msgstr "ترتیب معکوس" |
3653 | +msgstr "" |
3654 | |
3655 | #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document. |
3656 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:32 |
3657 | @@ -370,6 +384,6 @@ |
3658 | msgid "Open" |
3659 | msgstr "گشودن" |
3660 | |
3661 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3662 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3663 | msgid "documents;viewer;pdf;reader;" |
3664 | msgstr "documents;viewer;pdf;reader;" |
3665 | |
3666 | === modified file 'po/fi.po' |
3667 | --- po/fi.po 2015-08-18 05:56:20 +0000 |
3668 | +++ po/fi.po 2015-11-06 11:00:18 +0000 |
3669 | @@ -7,16 +7,21 @@ |
3670 | msgstr "" |
3671 | "Project-Id-Version: ubuntu-docviewer-app\n" |
3672 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3673 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
3674 | -"PO-Revision-Date: 2015-06-29 11:40+0000\n" |
3675 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
3676 | +"PO-Revision-Date: 2015-06-26 14:12+0000\n" |
3677 | "Last-Translator: Jiri Grönroos <Unknown>\n" |
3678 | "Language-Team: Finnish <fi@li.org>\n" |
3679 | "MIME-Version: 1.0\n" |
3680 | "Content-Type: text/plain; charset=UTF-8\n" |
3681 | "Content-Transfer-Encoding: 8bit\n" |
3682 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
3683 | +<<<<<<< TREE |
3684 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
3685 | "X-Generator: Launchpad (build 17690)\n" |
3686 | +======= |
3687 | +"X-Launchpad-Export-Date: 2015-06-27 05:35+0000\n" |
3688 | +"X-Generator: Launchpad (build 17578)\n" |
3689 | +>>>>>>> MERGE-SOURCE |
3690 | |
3691 | #. TRANSLATORS: This string is used for renaming a copied file, |
3692 | #. when a file with the same name already exists in user's |
3693 | @@ -33,7 +38,7 @@ |
3694 | msgstr "kopio %1" |
3695 | |
3696 | #: ../src/app/docviewer-application.cpp:171 |
3697 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3698 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3699 | msgid "Document Viewer" |
3700 | msgstr "Asiakirjakatselin" |
3701 | |
3702 | @@ -149,32 +154,31 @@ |
3703 | msgid "%1 byte" |
3704 | msgstr "%1 tavu" |
3705 | |
3706 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3707 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
3708 | msgid "Delete file" |
3709 | msgstr "Poista tiedosto" |
3710 | |
3711 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
3712 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
3713 | #, qt-format |
3714 | msgid "Delete %1 file" |
3715 | msgid_plural "Delete %1 files" |
3716 | msgstr[0] "Poista %1 tiedosto" |
3717 | msgstr[1] "Poista %1 tiedostoa" |
3718 | |
3719 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
3720 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
3721 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
3722 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
3723 | msgid "Are you sure you want to permanently delete this file?" |
3724 | msgid_plural "Are you sure you want to permanently delete these files?" |
3725 | msgstr[0] "Haluatko varmasti poistaa tämän tiedoston pysyvästi?" |
3726 | msgstr[1] "Haluatko varmasti poistaa nämä tiedostot pysyvästi?" |
3727 | |
3728 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
3729 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3730 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
3731 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
3732 | msgid "Cancel" |
3733 | msgstr "Peru" |
3734 | |
3735 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
3736 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
3737 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
3738 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
3739 | msgid "Delete" |
3740 | msgstr "Poista" |
3741 | @@ -193,35 +197,47 @@ |
3742 | |
3743 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3744 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3745 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
3746 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
3747 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
3748 | #, qt-format |
3749 | msgid "Today, %1" |
3750 | msgstr "Tänään, %1" |
3751 | |
3752 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3753 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3754 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
3755 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3756 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
3757 | #, qt-format |
3758 | msgid "Yesterday, %1" |
3759 | msgstr "Eilen, %1" |
3760 | |
3761 | #. TRANSLATORS: this is a datetime formatting string, |
3762 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3763 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
3764 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
3765 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
3766 | msgid "dddd, hh:mm" |
3767 | msgstr "dddd, hh.mm" |
3768 | |
3769 | #. TRANSLATORS: this is a datetime formatting string, |
3770 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3771 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
3772 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
3773 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
3774 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
3775 | msgid "dd-MM-yyyy hh:mm" |
3776 | msgstr "dd-MM-yyyy hh.mm" |
3777 | |
3778 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3779 | +#. singlequote is an escape character. |
3780 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3781 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
3782 | +msgid "'Today', hh:mm" |
3783 | +msgstr "" |
3784 | + |
3785 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3786 | +#. singlequote is an escape character. |
3787 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3788 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3789 | +msgid "'Yesterday', hh:mm" |
3790 | +msgstr "" |
3791 | + |
3792 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
3793 | msgid "Today" |
3794 | msgstr "Tänään" |
3795 | @@ -375,6 +391,6 @@ |
3796 | msgid "Open" |
3797 | msgstr "Avaa" |
3798 | |
3799 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3800 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
3801 | msgid "documents;viewer;pdf;reader;" |
3802 | msgstr "documents;viewer;pdf;reader;asiakirjat;dokumentit;katselin;lukija;" |
3803 | |
3804 | === modified file 'po/fr.po' |
3805 | --- po/fr.po 2015-08-18 05:56:20 +0000 |
3806 | +++ po/fr.po 2015-11-06 11:00:18 +0000 |
3807 | @@ -7,16 +7,21 @@ |
3808 | msgstr "" |
3809 | "Project-Id-Version: ubuntu-docviewer-app\n" |
3810 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3811 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
3812 | -"PO-Revision-Date: 2015-07-07 12:33+0000\n" |
3813 | -"Last-Translator: Anne <anneonyme017@gmail.com>\n" |
3814 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
3815 | +"PO-Revision-Date: 2015-05-10 13:11+0000\n" |
3816 | +"Last-Translator: Yuri <Unknown>\n" |
3817 | "Language-Team: French <fr@li.org>\n" |
3818 | "MIME-Version: 1.0\n" |
3819 | "Content-Type: text/plain; charset=UTF-8\n" |
3820 | "Content-Transfer-Encoding: 8bit\n" |
3821 | "Plural-Forms: nplurals=2; plural=n > 1;\n" |
3822 | +<<<<<<< TREE |
3823 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
3824 | "X-Generator: Launchpad (build 17690)\n" |
3825 | +======= |
3826 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
3827 | +"X-Generator: Launchpad (build 17578)\n" |
3828 | +>>>>>>> MERGE-SOURCE |
3829 | |
3830 | #. TRANSLATORS: This string is used for renaming a copied file, |
3831 | #. when a file with the same name already exists in user's |
3832 | @@ -33,7 +38,7 @@ |
3833 | msgstr "copie %1" |
3834 | |
3835 | #: ../src/app/docviewer-application.cpp:171 |
3836 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3837 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
3838 | msgid "Document Viewer" |
3839 | msgstr "Visionneuse de document" |
3840 | |
3841 | @@ -149,32 +154,31 @@ |
3842 | msgid "%1 byte" |
3843 | msgstr "%1 octet" |
3844 | |
3845 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3846 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
3847 | msgid "Delete file" |
3848 | msgstr "Supprimer le fichier" |
3849 | |
3850 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
3851 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
3852 | #, qt-format |
3853 | msgid "Delete %1 file" |
3854 | msgid_plural "Delete %1 files" |
3855 | msgstr[0] "Supprimer %1 fichier" |
3856 | msgstr[1] "Supprimer %1 fichiers" |
3857 | |
3858 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
3859 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
3860 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
3861 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
3862 | msgid "Are you sure you want to permanently delete this file?" |
3863 | msgid_plural "Are you sure you want to permanently delete these files?" |
3864 | msgstr[0] "Êtes-vous sûr de vouloir supprimer définitivement ce fichier ?" |
3865 | msgstr[1] "Êtes-vous sûr de vouloir supprimer définitivement ces fichiers ?" |
3866 | |
3867 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
3868 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
3869 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
3870 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
3871 | msgid "Cancel" |
3872 | msgstr "Annuler" |
3873 | |
3874 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
3875 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
3876 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
3877 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
3878 | msgid "Delete" |
3879 | msgstr "Supprimer" |
3880 | @@ -193,35 +197,47 @@ |
3881 | |
3882 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3883 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3884 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
3885 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
3886 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
3887 | #, qt-format |
3888 | msgid "Today, %1" |
3889 | msgstr "Aujourd'hui, %1" |
3890 | |
3891 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
3892 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
3893 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
3894 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3895 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
3896 | #, qt-format |
3897 | msgid "Yesterday, %1" |
3898 | msgstr "Hier, %1" |
3899 | |
3900 | #. TRANSLATORS: this is a datetime formatting string, |
3901 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3902 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
3903 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
3904 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
3905 | msgid "dddd, hh:mm" |
3906 | msgstr "dddd, hh:mm" |
3907 | |
3908 | #. TRANSLATORS: this is a datetime formatting string, |
3909 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3910 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
3911 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
3912 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
3913 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
3914 | msgid "dd-MM-yyyy hh:mm" |
3915 | msgstr "dd-MM-yyyy hh:mm" |
3916 | |
3917 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3918 | +#. singlequote is an escape character. |
3919 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3920 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
3921 | +msgid "'Today', hh:mm" |
3922 | +msgstr "" |
3923 | + |
3924 | +#. TRANSLATORS: this is a datetime formatting string, and the |
3925 | +#. singlequote is an escape character. |
3926 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
3927 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
3928 | +msgid "'Yesterday', hh:mm" |
3929 | +msgstr "" |
3930 | + |
3931 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
3932 | msgid "Today" |
3933 | msgstr "Aujourd'hui" |
3934 | @@ -244,15 +260,15 @@ |
3935 | |
3936 | #: ../src/app/qml/documentPage/DocumentPage.qml:24 |
3937 | msgid "Documents" |
3938 | -msgstr "Documents" |
3939 | +msgstr "" |
3940 | |
3941 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29 |
3942 | msgid "Search..." |
3943 | -msgstr "Rechercher..." |
3944 | +msgstr "" |
3945 | |
3946 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37 |
3947 | msgid "Sorting settings..." |
3948 | -msgstr "Paramètres de tri..." |
3949 | +msgstr "" |
3950 | |
3951 | #: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46 |
3952 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35 |
3953 | @@ -276,7 +292,7 @@ |
3954 | |
3955 | #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47 |
3956 | msgid "search in documents..." |
3957 | -msgstr "rechercher dans les documents..." |
3958 | +msgstr "" |
3959 | |
3960 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52 |
3961 | msgid "Select None" |
3962 | @@ -288,34 +304,32 @@ |
3963 | |
3964 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:24 |
3965 | msgid "No matching document found" |
3966 | -msgstr "Aucun document correspondant trouvé" |
3967 | +msgstr "" |
3968 | |
3969 | #: ../src/app/qml/documentPage/SearchEmptyState.qml:26 |
3970 | msgid "" |
3971 | "Please ensure that your query is not misspelled and/or try a different query." |
3972 | msgstr "" |
3973 | -"Veuillez vérifier que votre requête n'est pas mal orthographiée et/ou " |
3974 | -"essayez une requête différente." |
3975 | |
3976 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26 |
3977 | msgid "Sorting settings" |
3978 | -msgstr "Paramètres de tri" |
3979 | +msgstr "" |
3980 | |
3981 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:31 |
3982 | msgid "Sort by date (Latest first)" |
3983 | -msgstr "Tri par date (plus récente en premier)" |
3984 | +msgstr "" |
3985 | |
3986 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:32 |
3987 | msgid "Sort by name (A-Z)" |
3988 | -msgstr "Trier par nom (A-Z)" |
3989 | +msgstr "" |
3990 | |
3991 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:33 |
3992 | msgid "Sort by size (Smaller first)" |
3993 | -msgstr "Trier par taille (plus petite en premier)" |
3994 | +msgstr "" |
3995 | |
3996 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47 |
3997 | msgid "Reverse order" |
3998 | -msgstr "Ordre inversé" |
3999 | +msgstr "" |
4000 | |
4001 | #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document. |
4002 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:32 |
4003 | @@ -375,6 +389,6 @@ |
4004 | msgid "Open" |
4005 | msgstr "Ouvrir" |
4006 | |
4007 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4008 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4009 | msgid "documents;viewer;pdf;reader;" |
4010 | msgstr "documents;visionneuse;pdf;lecteur;" |
4011 | |
4012 | === modified file 'po/gd.po' |
4013 | --- po/gd.po 2015-08-18 05:56:20 +0000 |
4014 | +++ po/gd.po 2015-11-06 11:00:18 +0000 |
4015 | @@ -7,7 +7,7 @@ |
4016 | msgstr "" |
4017 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4018 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4019 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4020 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
4021 | "PO-Revision-Date: 2015-06-27 15:42+0000\n" |
4022 | "Last-Translator: GunChleoc <Unknown>\n" |
4023 | "Language-Team: Fòram na Gàidhlig\n" |
4024 | @@ -16,8 +16,13 @@ |
4025 | "Content-Transfer-Encoding: 8bit\n" |
4026 | "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " |
4027 | "(n > 2 && n < 20) ? 2 : 3;\n" |
4028 | +<<<<<<< TREE |
4029 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
4030 | "X-Generator: Launchpad (build 17690)\n" |
4031 | +======= |
4032 | +"X-Launchpad-Export-Date: 2015-06-28 05:35+0000\n" |
4033 | +"X-Generator: Launchpad (build 17578)\n" |
4034 | +>>>>>>> MERGE-SOURCE |
4035 | "Language: gd\n" |
4036 | |
4037 | #. TRANSLATORS: This string is used for renaming a copied file, |
4038 | @@ -35,7 +40,7 @@ |
4039 | msgstr "lethbhreac %1" |
4040 | |
4041 | #: ../src/app/docviewer-application.cpp:171 |
4042 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4043 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4044 | msgid "Document Viewer" |
4045 | msgstr "Sealladair sgrìobhainnean" |
4046 | |
4047 | @@ -155,11 +160,11 @@ |
4048 | msgid "%1 byte" |
4049 | msgstr "%1 baidht" |
4050 | |
4051 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4052 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
4053 | msgid "Delete file" |
4054 | msgstr "Sguab às am faidhle" |
4055 | |
4056 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
4057 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
4058 | #, qt-format |
4059 | msgid "Delete %1 file" |
4060 | msgid_plural "Delete %1 files" |
4061 | @@ -168,8 +173,8 @@ |
4062 | msgstr[2] "Sguab às %1 faidhlichean" |
4063 | msgstr[3] "Sguab às %1 faidhle" |
4064 | |
4065 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
4066 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
4067 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
4068 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
4069 | msgid "Are you sure you want to permanently delete this file?" |
4070 | msgid_plural "Are you sure you want to permanently delete these files?" |
4071 | msgstr[0] "" |
4072 | @@ -185,14 +190,13 @@ |
4073 | "A bheil thu cinnteach gu bheil thu airson na faidhlichean seo a sguabadh às " |
4074 | "gu buan?" |
4075 | |
4076 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
4077 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4078 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
4079 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
4080 | msgid "Cancel" |
4081 | msgstr "Sguir dheth" |
4082 | |
4083 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
4084 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
4085 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
4086 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
4087 | msgid "Delete" |
4088 | msgstr "Sguab às" |
4089 | @@ -211,35 +215,47 @@ |
4090 | |
4091 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4092 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4093 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
4094 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
4095 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
4096 | #, qt-format |
4097 | msgid "Today, %1" |
4098 | msgstr "An-diugh %1" |
4099 | |
4100 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4101 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4102 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
4103 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4104 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
4105 | #, qt-format |
4106 | msgid "Yesterday, %1" |
4107 | msgstr "An-dè %1" |
4108 | |
4109 | #. TRANSLATORS: this is a datetime formatting string, |
4110 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4111 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
4112 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
4113 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
4114 | msgid "dddd, hh:mm" |
4115 | msgstr "dddd hh:mm" |
4116 | |
4117 | #. TRANSLATORS: this is a datetime formatting string, |
4118 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4119 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
4120 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
4121 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
4122 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
4123 | msgid "dd-MM-yyyy hh:mm" |
4124 | msgstr "dd.MM.yyyy hh:mm" |
4125 | |
4126 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4127 | +#. singlequote is an escape character. |
4128 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4129 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
4130 | +msgid "'Today', hh:mm" |
4131 | +msgstr "'An-diugh' aig hh:mm" |
4132 | + |
4133 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4134 | +#. singlequote is an escape character. |
4135 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4136 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4137 | +msgid "'Yesterday', hh:mm" |
4138 | +msgstr "'An-dè' aig hh:mm" |
4139 | + |
4140 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
4141 | msgid "Today" |
4142 | msgstr "An-diugh" |
4143 | @@ -395,7 +411,7 @@ |
4144 | msgid "Open" |
4145 | msgstr "Fosgail" |
4146 | |
4147 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4148 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4149 | msgid "documents;viewer;pdf;reader;" |
4150 | msgstr "" |
4151 | "documents;viewer;pdf;reader;sgrìobhainnean;sealladair;leughadair;inneal-" |
4152 | |
4153 | === modified file 'po/gl.po' |
4154 | --- po/gl.po 2015-09-19 05:34:40 +0000 |
4155 | +++ po/gl.po 2015-11-06 11:00:18 +0000 |
4156 | @@ -7,16 +7,26 @@ |
4157 | msgstr "" |
4158 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4159 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4160 | +<<<<<<< TREE |
4161 | "POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4162 | "PO-Revision-Date: 2015-09-18 16:42+0000\n" |
4163 | +======= |
4164 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
4165 | +"PO-Revision-Date: 2015-06-23 17:13+0000\n" |
4166 | +>>>>>>> MERGE-SOURCE |
4167 | "Last-Translator: Marcos Lans <Unknown>\n" |
4168 | "Language-Team: Galician <gl@li.org>\n" |
4169 | "MIME-Version: 1.0\n" |
4170 | "Content-Type: text/plain; charset=UTF-8\n" |
4171 | "Content-Transfer-Encoding: 8bit\n" |
4172 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4173 | +<<<<<<< TREE |
4174 | "X-Launchpad-Export-Date: 2015-09-19 05:34+0000\n" |
4175 | "X-Generator: Launchpad (build 17746)\n" |
4176 | +======= |
4177 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
4178 | +"X-Generator: Launchpad (build 17578)\n" |
4179 | +>>>>>>> MERGE-SOURCE |
4180 | |
4181 | #. TRANSLATORS: This string is used for renaming a copied file, |
4182 | #. when a file with the same name already exists in user's |
4183 | @@ -33,7 +43,7 @@ |
4184 | msgstr "copia %1" |
4185 | |
4186 | #: ../src/app/docviewer-application.cpp:171 |
4187 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4188 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4189 | msgid "Document Viewer" |
4190 | msgstr "Visor de documentos" |
4191 | |
4192 | @@ -149,32 +159,31 @@ |
4193 | msgid "%1 byte" |
4194 | msgstr "%1 byte" |
4195 | |
4196 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4197 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
4198 | msgid "Delete file" |
4199 | msgstr "Eliminar ficheiro" |
4200 | |
4201 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
4202 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
4203 | #, qt-format |
4204 | msgid "Delete %1 file" |
4205 | msgid_plural "Delete %1 files" |
4206 | msgstr[0] "Eliminar %1 ficheiro" |
4207 | msgstr[1] "Eliminar %1 ficheiros" |
4208 | |
4209 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
4210 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
4211 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
4212 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
4213 | msgid "Are you sure you want to permanently delete this file?" |
4214 | msgid_plural "Are you sure you want to permanently delete these files?" |
4215 | msgstr[0] "Confirma a eliminación permanente deste ficheiro?" |
4216 | msgstr[1] "Confirma a eliminación permanente destes ficheiros?" |
4217 | |
4218 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
4219 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4220 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
4221 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
4222 | msgid "Cancel" |
4223 | msgstr "Cancelar" |
4224 | |
4225 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
4226 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
4227 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
4228 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
4229 | msgid "Delete" |
4230 | msgstr "Eliminar" |
4231 | @@ -193,35 +202,47 @@ |
4232 | |
4233 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4234 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4235 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
4236 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
4237 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
4238 | #, qt-format |
4239 | msgid "Today, %1" |
4240 | msgstr "Hoxe, %1" |
4241 | |
4242 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4243 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4244 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
4245 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4246 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
4247 | #, qt-format |
4248 | msgid "Yesterday, %1" |
4249 | msgstr "Onte, %1" |
4250 | |
4251 | #. TRANSLATORS: this is a datetime formatting string, |
4252 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4253 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
4254 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
4255 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
4256 | msgid "dddd, hh:mm" |
4257 | msgstr "dddd, hh:mm" |
4258 | |
4259 | #. TRANSLATORS: this is a datetime formatting string, |
4260 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4261 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
4262 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
4263 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
4264 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
4265 | msgid "dd-MM-yyyy hh:mm" |
4266 | msgstr "dd-MM-yyyy hh:mm" |
4267 | |
4268 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4269 | +#. singlequote is an escape character. |
4270 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4271 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
4272 | +msgid "'Today', hh:mm" |
4273 | +msgstr "«Hoxe», hh:mm" |
4274 | + |
4275 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4276 | +#. singlequote is an escape character. |
4277 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4278 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4279 | +msgid "'Yesterday', hh:mm" |
4280 | +msgstr "«Onte», hh:mm" |
4281 | + |
4282 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
4283 | msgid "Today" |
4284 | msgstr "Hoxe" |
4285 | @@ -276,7 +297,7 @@ |
4286 | |
4287 | #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47 |
4288 | msgid "search in documents..." |
4289 | -msgstr "buscar documentos..." |
4290 | +msgstr "buscar nos documentos..." |
4291 | |
4292 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52 |
4293 | msgid "Select None" |
4294 | @@ -375,6 +396,6 @@ |
4295 | msgid "Open" |
4296 | msgstr "Abrir" |
4297 | |
4298 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4299 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4300 | msgid "documents;viewer;pdf;reader;" |
4301 | msgstr "documentos;visor;pdf;lector;" |
4302 | |
4303 | === modified file 'po/hu.po' |
4304 | --- po/hu.po 2015-08-18 05:56:20 +0000 |
4305 | +++ po/hu.po 2015-11-06 11:00:18 +0000 |
4306 | @@ -7,7 +7,7 @@ |
4307 | msgstr "" |
4308 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4309 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4310 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4311 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
4312 | "PO-Revision-Date: 2015-06-24 17:52+0000\n" |
4313 | "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n" |
4314 | "Language-Team: Hungarian <hu@li.org>\n" |
4315 | @@ -15,8 +15,13 @@ |
4316 | "Content-Type: text/plain; charset=UTF-8\n" |
4317 | "Content-Transfer-Encoding: 8bit\n" |
4318 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4319 | +<<<<<<< TREE |
4320 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
4321 | "X-Generator: Launchpad (build 17690)\n" |
4322 | +======= |
4323 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
4324 | +"X-Generator: Launchpad (build 17578)\n" |
4325 | +>>>>>>> MERGE-SOURCE |
4326 | |
4327 | #. TRANSLATORS: This string is used for renaming a copied file, |
4328 | #. when a file with the same name already exists in user's |
4329 | @@ -33,7 +38,7 @@ |
4330 | msgstr "másolat %1" |
4331 | |
4332 | #: ../src/app/docviewer-application.cpp:171 |
4333 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4334 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4335 | msgid "Document Viewer" |
4336 | msgstr "Dokumentummegjelenítő" |
4337 | |
4338 | @@ -149,32 +154,31 @@ |
4339 | msgid "%1 byte" |
4340 | msgstr "%1 bájt" |
4341 | |
4342 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4343 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
4344 | msgid "Delete file" |
4345 | msgstr "Fájl törlése" |
4346 | |
4347 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
4348 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
4349 | #, qt-format |
4350 | msgid "Delete %1 file" |
4351 | msgid_plural "Delete %1 files" |
4352 | msgstr[0] "%1 fájl törlése" |
4353 | msgstr[1] "%1 fájl törlése" |
4354 | |
4355 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
4356 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
4357 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
4358 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
4359 | msgid "Are you sure you want to permanently delete this file?" |
4360 | msgid_plural "Are you sure you want to permanently delete these files?" |
4361 | msgstr[0] "Biztos, hogy véglegesen törölni szeretné ezt a fájlt?" |
4362 | msgstr[1] "Biztos, hogy véglegesen törölni szeretné ezeket a fájlokat?" |
4363 | |
4364 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
4365 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4366 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
4367 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
4368 | msgid "Cancel" |
4369 | msgstr "Mégse" |
4370 | |
4371 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
4372 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
4373 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
4374 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
4375 | msgid "Delete" |
4376 | msgstr "Törlés" |
4377 | @@ -193,35 +197,47 @@ |
4378 | |
4379 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4380 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4381 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
4382 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
4383 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
4384 | #, qt-format |
4385 | msgid "Today, %1" |
4386 | msgstr "Ma, %1" |
4387 | |
4388 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4389 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4390 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
4391 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4392 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
4393 | #, qt-format |
4394 | msgid "Yesterday, %1" |
4395 | msgstr "Tegnap, %1" |
4396 | |
4397 | #. TRANSLATORS: this is a datetime formatting string, |
4398 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4399 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
4400 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
4401 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
4402 | msgid "dddd, hh:mm" |
4403 | msgstr "dddd, hh.mm" |
4404 | |
4405 | #. TRANSLATORS: this is a datetime formatting string, |
4406 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4407 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
4408 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
4409 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
4410 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
4411 | msgid "dd-MM-yyyy hh:mm" |
4412 | msgstr "yyyy.MM.dd. hh.mm" |
4413 | |
4414 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4415 | +#. singlequote is an escape character. |
4416 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4417 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
4418 | +msgid "'Today', hh:mm" |
4419 | +msgstr "'Ma', hh.mm" |
4420 | + |
4421 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4422 | +#. singlequote is an escape character. |
4423 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4424 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4425 | +msgid "'Yesterday', hh:mm" |
4426 | +msgstr "'Tegnap', hh.mm" |
4427 | + |
4428 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
4429 | msgid "Today" |
4430 | msgstr "Ma" |
4431 | @@ -375,6 +391,6 @@ |
4432 | msgid "Open" |
4433 | msgstr "Megnyitás" |
4434 | |
4435 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4436 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4437 | msgid "documents;viewer;pdf;reader;" |
4438 | msgstr "dokumentumok;megtekintő;pdf;olvasó;" |
4439 | |
4440 | === modified file 'po/id.po' |
4441 | --- po/id.po 2015-08-18 05:56:20 +0000 |
4442 | +++ po/id.po 2015-11-06 11:00:18 +0000 |
4443 | @@ -7,7 +7,7 @@ |
4444 | msgstr "" |
4445 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4446 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4447 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4448 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
4449 | "PO-Revision-Date: 2015-05-30 07:55+0000\n" |
4450 | "Last-Translator: Dirgita <Unknown>\n" |
4451 | "Language-Team: Indonesian <id@li.org>\n" |
4452 | @@ -15,8 +15,13 @@ |
4453 | "Content-Type: text/plain; charset=UTF-8\n" |
4454 | "Content-Transfer-Encoding: 8bit\n" |
4455 | "Plural-Forms: nplurals=1; plural=0;\n" |
4456 | +<<<<<<< TREE |
4457 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
4458 | "X-Generator: Launchpad (build 17690)\n" |
4459 | +======= |
4460 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
4461 | +"X-Generator: Launchpad (build 17578)\n" |
4462 | +>>>>>>> MERGE-SOURCE |
4463 | |
4464 | #. TRANSLATORS: This string is used for renaming a copied file, |
4465 | #. when a file with the same name already exists in user's |
4466 | @@ -33,7 +38,7 @@ |
4467 | msgstr "kopi %1" |
4468 | |
4469 | #: ../src/app/docviewer-application.cpp:171 |
4470 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4471 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4472 | msgid "Document Viewer" |
4473 | msgstr "Penampil Dokumen" |
4474 | |
4475 | @@ -147,30 +152,29 @@ |
4476 | msgid "%1 byte" |
4477 | msgstr "%1 bita" |
4478 | |
4479 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4480 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
4481 | msgid "Delete file" |
4482 | msgstr "Menghapus berkas" |
4483 | |
4484 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
4485 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
4486 | #, qt-format |
4487 | msgid "Delete %1 file" |
4488 | msgid_plural "Delete %1 files" |
4489 | msgstr[0] "Menghapus %1 berkas" |
4490 | |
4491 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
4492 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
4493 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
4494 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
4495 | msgid "Are you sure you want to permanently delete this file?" |
4496 | msgid_plural "Are you sure you want to permanently delete these files?" |
4497 | msgstr[0] "Yakin menghapus berkas ini?" |
4498 | |
4499 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
4500 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4501 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
4502 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
4503 | msgid "Cancel" |
4504 | msgstr "Batal" |
4505 | |
4506 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
4507 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
4508 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
4509 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
4510 | msgid "Delete" |
4511 | msgstr "Hapus" |
4512 | @@ -189,35 +193,47 @@ |
4513 | |
4514 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4515 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4516 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
4517 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
4518 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
4519 | #, qt-format |
4520 | msgid "Today, %1" |
4521 | msgstr "Hari ini, %1" |
4522 | |
4523 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4524 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4525 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
4526 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4527 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
4528 | #, qt-format |
4529 | msgid "Yesterday, %1" |
4530 | msgstr "Kemarin, %1" |
4531 | |
4532 | #. TRANSLATORS: this is a datetime formatting string, |
4533 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4534 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
4535 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
4536 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
4537 | msgid "dddd, hh:mm" |
4538 | msgstr "dddd, HH:mm" |
4539 | |
4540 | #. TRANSLATORS: this is a datetime formatting string, |
4541 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4542 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
4543 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
4544 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
4545 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
4546 | msgid "dd-MM-yyyy hh:mm" |
4547 | msgstr "dd-MM-yyyy HH:mm" |
4548 | |
4549 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4550 | +#. singlequote is an escape character. |
4551 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4552 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
4553 | +msgid "'Today', hh:mm" |
4554 | +msgstr "" |
4555 | + |
4556 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4557 | +#. singlequote is an escape character. |
4558 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4559 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4560 | +msgid "'Yesterday', hh:mm" |
4561 | +msgstr "" |
4562 | + |
4563 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
4564 | msgid "Today" |
4565 | msgstr "Hari ini" |
4566 | @@ -368,6 +384,6 @@ |
4567 | msgid "Open" |
4568 | msgstr "Buka" |
4569 | |
4570 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4571 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4572 | msgid "documents;viewer;pdf;reader;" |
4573 | msgstr "documents;viewer;pdf;reader;dokumen;penampil;pembaca" |
4574 | |
4575 | === modified file 'po/it.po' |
4576 | --- po/it.po 2015-08-18 05:56:20 +0000 |
4577 | +++ po/it.po 2015-11-06 11:00:18 +0000 |
4578 | @@ -7,16 +7,21 @@ |
4579 | msgstr "" |
4580 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4581 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4582 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4583 | -"PO-Revision-Date: 2015-06-30 06:59+0000\n" |
4584 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
4585 | +"PO-Revision-Date: 2015-06-26 13:58+0000\n" |
4586 | "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n" |
4587 | "Language-Team: Italian <it@li.org>\n" |
4588 | "MIME-Version: 1.0\n" |
4589 | "Content-Type: text/plain; charset=UTF-8\n" |
4590 | "Content-Transfer-Encoding: 8bit\n" |
4591 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4592 | +<<<<<<< TREE |
4593 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
4594 | "X-Generator: Launchpad (build 17690)\n" |
4595 | +======= |
4596 | +"X-Launchpad-Export-Date: 2015-06-27 05:35+0000\n" |
4597 | +"X-Generator: Launchpad (build 17578)\n" |
4598 | +>>>>>>> MERGE-SOURCE |
4599 | |
4600 | #. TRANSLATORS: This string is used for renaming a copied file, |
4601 | #. when a file with the same name already exists in user's |
4602 | @@ -33,7 +38,7 @@ |
4603 | msgstr "copia %1" |
4604 | |
4605 | #: ../src/app/docviewer-application.cpp:171 |
4606 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4607 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4608 | msgid "Document Viewer" |
4609 | msgstr "Visualizzatore di documenti" |
4610 | |
4611 | @@ -149,32 +154,31 @@ |
4612 | msgid "%1 byte" |
4613 | msgstr "%1 byte" |
4614 | |
4615 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4616 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
4617 | msgid "Delete file" |
4618 | msgstr "Elimina file" |
4619 | |
4620 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
4621 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
4622 | #, qt-format |
4623 | msgid "Delete %1 file" |
4624 | msgid_plural "Delete %1 files" |
4625 | msgstr[0] "Elimina %1 file" |
4626 | msgstr[1] "Elimina %1 file" |
4627 | |
4628 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
4629 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
4630 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
4631 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
4632 | msgid "Are you sure you want to permanently delete this file?" |
4633 | msgid_plural "Are you sure you want to permanently delete these files?" |
4634 | msgstr[0] "Eliminare veramente in modo permanente questo file?" |
4635 | msgstr[1] "Eliminare veramente in modo permanente questi file?" |
4636 | |
4637 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
4638 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4639 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
4640 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
4641 | msgid "Cancel" |
4642 | msgstr "Annulla" |
4643 | |
4644 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
4645 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
4646 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
4647 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
4648 | msgid "Delete" |
4649 | msgstr "Elimina" |
4650 | @@ -193,35 +197,47 @@ |
4651 | |
4652 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4653 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4654 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
4655 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
4656 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
4657 | #, qt-format |
4658 | msgid "Today, %1" |
4659 | msgstr "Oggi, %1" |
4660 | |
4661 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4662 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4663 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
4664 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4665 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
4666 | #, qt-format |
4667 | msgid "Yesterday, %1" |
4668 | msgstr "Ieri, %1" |
4669 | |
4670 | #. TRANSLATORS: this is a datetime formatting string, |
4671 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4672 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
4673 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
4674 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
4675 | msgid "dddd, hh:mm" |
4676 | msgstr "dddd, hh:mm" |
4677 | |
4678 | #. TRANSLATORS: this is a datetime formatting string, |
4679 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4680 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
4681 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
4682 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
4683 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
4684 | msgid "dd-MM-yyyy hh:mm" |
4685 | msgstr "dd/MM/yyyy hh:mm" |
4686 | |
4687 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4688 | +#. singlequote is an escape character. |
4689 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4690 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
4691 | +msgid "'Today', hh:mm" |
4692 | +msgstr "«Oggi», hh:mm" |
4693 | + |
4694 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4695 | +#. singlequote is an escape character. |
4696 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4697 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4698 | +msgid "'Yesterday', hh:mm" |
4699 | +msgstr "«Ieri», hh:mm" |
4700 | + |
4701 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
4702 | msgid "Today" |
4703 | msgstr "Oggi" |
4704 | @@ -375,6 +391,6 @@ |
4705 | msgid "Open" |
4706 | msgstr "Apri" |
4707 | |
4708 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4709 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4710 | msgid "documents;viewer;pdf;reader;" |
4711 | msgstr "documenti;visualizzatore;pdf;lettore;viewer;reader;" |
4712 | |
4713 | === modified file 'po/lo.po' |
4714 | --- po/lo.po 2015-08-18 05:56:20 +0000 |
4715 | +++ po/lo.po 2015-11-06 11:00:18 +0000 |
4716 | @@ -7,7 +7,7 @@ |
4717 | msgstr "" |
4718 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4719 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4720 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4721 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
4722 | "PO-Revision-Date: 2015-03-04 07:27+0000\n" |
4723 | "Last-Translator: Anousak <anousak@gmail.com>\n" |
4724 | "Language-Team: Lao <lo@li.org>\n" |
4725 | @@ -15,8 +15,13 @@ |
4726 | "Content-Type: text/plain; charset=UTF-8\n" |
4727 | "Content-Transfer-Encoding: 8bit\n" |
4728 | "Plural-Forms: nplurals=1; plural=0;\n" |
4729 | +<<<<<<< TREE |
4730 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
4731 | "X-Generator: Launchpad (build 17690)\n" |
4732 | +======= |
4733 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
4734 | +"X-Generator: Launchpad (build 17578)\n" |
4735 | +>>>>>>> MERGE-SOURCE |
4736 | |
4737 | #. TRANSLATORS: This string is used for renaming a copied file, |
4738 | #. when a file with the same name already exists in user's |
4739 | @@ -33,7 +38,7 @@ |
4740 | msgstr "" |
4741 | |
4742 | #: ../src/app/docviewer-application.cpp:171 |
4743 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4744 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4745 | msgid "Document Viewer" |
4746 | msgstr "ຕົວເບີ່ງເອກະສານ" |
4747 | |
4748 | @@ -147,32 +152,31 @@ |
4749 | msgid "%1 byte" |
4750 | msgstr "" |
4751 | |
4752 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4753 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
4754 | msgid "Delete file" |
4755 | msgstr "ລຶບຟາຍ" |
4756 | |
4757 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
4758 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
4759 | #, qt-format |
4760 | msgid "Delete %1 file" |
4761 | msgid_plural "Delete %1 files" |
4762 | msgstr[0] "" |
4763 | msgstr[1] "" |
4764 | |
4765 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
4766 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
4767 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
4768 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
4769 | msgid "Are you sure you want to permanently delete this file?" |
4770 | msgid_plural "Are you sure you want to permanently delete these files?" |
4771 | msgstr[0] "" |
4772 | msgstr[1] "" |
4773 | |
4774 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
4775 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4776 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
4777 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
4778 | msgid "Cancel" |
4779 | msgstr "ຍົກເລີອກ" |
4780 | |
4781 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
4782 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
4783 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
4784 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
4785 | msgid "Delete" |
4786 | msgstr "ລຶບ" |
4787 | @@ -189,35 +193,47 @@ |
4788 | |
4789 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4790 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4791 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
4792 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
4793 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
4794 | #, qt-format |
4795 | msgid "Today, %1" |
4796 | msgstr "" |
4797 | |
4798 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4799 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4800 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
4801 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4802 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
4803 | #, qt-format |
4804 | msgid "Yesterday, %1" |
4805 | msgstr "" |
4806 | |
4807 | #. TRANSLATORS: this is a datetime formatting string, |
4808 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4809 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
4810 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
4811 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
4812 | msgid "dddd, hh:mm" |
4813 | msgstr "dddd, hh:mm" |
4814 | |
4815 | #. TRANSLATORS: this is a datetime formatting string, |
4816 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4817 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
4818 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
4819 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
4820 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
4821 | msgid "dd-MM-yyyy hh:mm" |
4822 | msgstr "dd-MM-yyyy hh:mm" |
4823 | |
4824 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4825 | +#. singlequote is an escape character. |
4826 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4827 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
4828 | +msgid "'Today', hh:mm" |
4829 | +msgstr "" |
4830 | + |
4831 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4832 | +#. singlequote is an escape character. |
4833 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4834 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4835 | +msgid "'Yesterday', hh:mm" |
4836 | +msgstr "" |
4837 | + |
4838 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
4839 | msgid "Today" |
4840 | msgstr "ມື້ນີ້" |
4841 | @@ -369,6 +385,6 @@ |
4842 | msgid "Open" |
4843 | msgstr "" |
4844 | |
4845 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4846 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4847 | msgid "documents;viewer;pdf;reader;" |
4848 | msgstr "ເກະສານ;ຕົວເບີ່ງ;ພີດີເເຟບ;ຕົວອ່ານ;" |
4849 | |
4850 | === modified file 'po/lv.po' |
4851 | --- po/lv.po 2015-08-18 05:56:20 +0000 |
4852 | +++ po/lv.po 2015-11-06 11:00:18 +0000 |
4853 | @@ -7,7 +7,7 @@ |
4854 | msgstr "" |
4855 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4856 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4857 | -"POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4858 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
4859 | "PO-Revision-Date: 2015-02-28 13:37+0000\n" |
4860 | "Last-Translator: Rūdolfs Mazurs <Unknown>\n" |
4861 | "Language-Team: Latvian <lv@li.org>\n" |
4862 | @@ -15,8 +15,13 @@ |
4863 | "Content-Type: text/plain; charset=UTF-8\n" |
4864 | "Content-Transfer-Encoding: 8bit\n" |
4865 | "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n" |
4866 | +<<<<<<< TREE |
4867 | "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n" |
4868 | "X-Generator: Launchpad (build 17690)\n" |
4869 | +======= |
4870 | +"X-Launchpad-Export-Date: 2015-06-26 04:58+0000\n" |
4871 | +"X-Generator: Launchpad (build 17578)\n" |
4872 | +>>>>>>> MERGE-SOURCE |
4873 | |
4874 | #. TRANSLATORS: This string is used for renaming a copied file, |
4875 | #. when a file with the same name already exists in user's |
4876 | @@ -33,7 +38,7 @@ |
4877 | msgstr "" |
4878 | |
4879 | #: ../src/app/docviewer-application.cpp:171 |
4880 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4881 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
4882 | msgid "Document Viewer" |
4883 | msgstr "Dokumentu skatītājs" |
4884 | |
4885 | @@ -149,32 +154,31 @@ |
4886 | msgid "%1 byte" |
4887 | msgstr "" |
4888 | |
4889 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4890 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 |
4891 | msgid "Delete file" |
4892 | msgstr "" |
4893 | |
4894 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 |
4895 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 |
4896 | #, qt-format |
4897 | msgid "Delete %1 file" |
4898 | msgid_plural "Delete %1 files" |
4899 | msgstr[0] "" |
4900 | msgstr[1] "" |
4901 | |
4902 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 |
4903 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 |
4904 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 |
4905 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 |
4906 | msgid "Are you sure you want to permanently delete this file?" |
4907 | msgid_plural "Are you sure you want to permanently delete these files?" |
4908 | msgstr[0] "" |
4909 | msgstr[1] "" |
4910 | |
4911 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 |
4912 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 |
4913 | #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 |
4914 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 |
4915 | msgid "Cancel" |
4916 | msgstr "Atcelt" |
4917 | |
4918 | -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 |
4919 | -#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
4920 | +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 |
4921 | #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 |
4922 | msgid "Delete" |
4923 | msgstr "" |
4924 | @@ -191,35 +195,47 @@ |
4925 | |
4926 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4927 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4928 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 |
4929 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 |
4930 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 |
4931 | #, qt-format |
4932 | msgid "Today, %1" |
4933 | msgstr "" |
4934 | |
4935 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
4936 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
4937 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 |
4938 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4939 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 |
4940 | #, qt-format |
4941 | msgid "Yesterday, %1" |
4942 | msgstr "" |
4943 | |
4944 | #. TRANSLATORS: this is a datetime formatting string, |
4945 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4946 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 |
4947 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 |
4948 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 |
4949 | msgid "dddd, hh:mm" |
4950 | msgstr "" |
4951 | |
4952 | #. TRANSLATORS: this is a datetime formatting string, |
4953 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4954 | -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 |
4955 | +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 |
4956 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 |
4957 | #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 |
4958 | msgid "dd-MM-yyyy hh:mm" |
4959 | msgstr "" |
4960 | |
4961 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4962 | +#. singlequote is an escape character. |
4963 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4964 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 |
4965 | +msgid "'Today', hh:mm" |
4966 | +msgstr "" |
4967 | + |
4968 | +#. TRANSLATORS: this is a datetime formatting string, and the |
4969 | +#. singlequote is an escape character. |
4970 | +#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
4971 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 |
4972 | +msgid "'Yesterday', hh:mm" |
4973 | +msgstr "" |
4974 | + |
4975 | #: ../src/app/qml/documentPage/DocumentListView.qml:157 |
4976 | msgid "Today" |
4977 | msgstr "" |
4978 | @@ -371,6 +387,6 @@ |
4979 | msgid "Open" |
4980 | msgstr "" |
4981 | |
4982 | -#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4983 | +#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
4984 | msgid "documents;viewer;pdf;reader;" |
4985 | msgstr "dokumenti;skatītājs;pdf;lasītājs;" |
4986 | |
4987 | === modified file 'po/nb.po' |
4988 | --- po/nb.po 2015-10-04 06:08:56 +0000 |
4989 | +++ po/nb.po 2015-11-06 11:00:18 +0000 |
4990 | @@ -7,16 +7,27 @@ |
4991 | msgstr "" |
4992 | "Project-Id-Version: ubuntu-docviewer-app\n" |
4993 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4994 | +<<<<<<< TREE |
4995 | "POT-Creation-Date: 2015-07-24 11:10+0200\n" |
4996 | "PO-Revision-Date: 2015-10-03 02:19+0000\n" |
4997 | "Last-Translator: Marius Gripsgard <me@mariogrip.com>\n" |
4998 | +======= |
4999 | +"POT-Creation-Date: 2015-06-24 22:48+0200\n" |
5000 | +"PO-Revision-Date: 2015-06-28 13:54+0000\n" |
FAILED: Continuous integration, rev:193 /core-apps- jenkins. ubuntu. com/job/ docviewer- app-ci/ 9/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/113/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ docviewer- app-ci/ 9/rebuild
https:/