Merge lp:ubuntu-docviewer-app into lp:ubuntu-docviewer-app/trunk

Proposed by David Planella on 2015-06-23
Status: Work in progress
Proposed branch: lp:ubuntu-docviewer-app
Merge into: lp:ubuntu-docviewer-app/trunk
Diff against target: 46430 lines (+26078/-11743) (has conflicts)
224 files modified
.bzrignore (+1/-1)
CMakeLists.txt (+31/-100)
README (+0/-20)
README-Autopilot.md (+81/-0)
README-Developers.md (+43/-0)
README-Mergeproposal.md (+36/-0)
README-Translations.md (+37/-0)
README.md (+30/-0)
README.translations (+0/-36)
click/CMakeLists.txt (+18/-0)
click/com.ubuntu.docviewer.url-dispatcher (+5/-0)
click/disable-file-locking.xcd (+11/-0)
click/disable-lo-features.sh (+14/-0)
click/disable-spell-check.xcd (+23/-0)
click/docviewer-content.json (+8/-0)
click/docviewer-libs.json (+94/-0)
click/docviewer.apparmor (+18/-0)
click/manifest.json.in (+25/-0)
cmake/modules/Click.cmake (+80/-0)
com.ubuntu.docviewer.url-dispatcher (+0/-5)
data/CMakeLists.txt (+27/-0)
data/com.ubuntu.docviewer.desktop.in.in (+1/-1)
debian/changelog (+53/-0)
debian/control (+42/-6)
debian/qtdeclarative5-documentviewer-common.install (+2/-0)
debian/qtdeclarative5-documentviewer-libreoffice.install (+1/-0)
debian/qtdeclarative5-documentviewer-pdf.install (+1/-0)
debian/rules (+1/-1)
debian/ubuntu-docviewer-app.install (+0/-1)
docviewer-content.json (+0/-8)
docviewer.apparmor (+0/-16)
manifest.json.in (+0/-25)
po/CMakeLists.txt (+11/-2)
po/am.po (+304/-93)
po/ar.po (+507/-0)
po/ast.po (+284/-136)
po/br.po (+289/-134)
po/bs.po (+499/-0)
po/ca.po (+282/-134)
po/com.ubuntu.docviewer.pot (+251/-152)
po/cs.po (+263/-130)
po/cy.po (+493/-0)
po/da.po (+316/-184)
po/de.po (+278/-136)
po/el.po (+278/-136)
po/en_AU.po (+267/-135)
po/en_GB.po (+275/-135)
po/eo.po (+272/-142)
po/es.po (+284/-142)
po/eu.po (+263/-130)
po/fa.po (+276/-134)
po/fi.po (+273/-135)
po/fo.po (+484/-0)
po/fr.po (+279/-136)
po/fr_CA.po (+488/-0)
po/gd.po (+278/-159)
po/gl.po (+285/-102)
po/hr.po (+474/-0)
po/hu.po (+278/-134)
po/id.po (+287/-142)
po/it.po (+280/-134)
po/ja.po (+473/-0)
po/lo.po (+263/-130)
po/lv.po (+316/-174)
po/nb.po (+276/-114)
po/nl.po (+275/-137)
po/ny.po (+264/-135)
po/pa.po (+267/-135)
po/pl.po (+303/-100)
po/pt.po (+278/-137)
po/pt_BR.po (+264/-135)
po/ro.po (+474/-0)
po/ru.po (+270/-136)
po/shn.po (+473/-0)
po/sk.po (+486/-0)
po/sl.po (+275/-137)
po/sr.po (+497/-0)
po/sv.po (+482/-0)
po/tr.po (+264/-135)
po/ug.po (+479/-0)
po/uk.po (+267/-136)
po/uz.po (+488/-0)
po/zh_CN.po (+261/-131)
po/zh_TW.po (+277/-149)
setup/gui/ubuntu-docviewer-app.desktop (+135/-0)
snapcraft.yaml (+76/-0)
src/CMakeLists.txt (+0/-4)
src/app/CMakeLists.txt (+17/-19)
src/app/command-line-parser.cpp (+0/-134)
src/app/command-line-parser.h (+0/-60)
src/app/config.h.in (+49/-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 (+150/-0)
src/app/qml/common/DetailsPage.qml (+50/-33)
src/app/qml/common/EmptyState.qml (+33/-21)
src/app/qml/common/ErrorDialog.qml (+3/-5)
src/app/qml/common/HorizontalDivider.qml (+28/-0)
src/app/qml/common/NightModeShader.qml (+6/-6)
src/app/qml/common/PickImportedDialog.qml (+16/-9)
src/app/qml/common/RejectedImportDialog.qml (+7/-7)
src/app/qml/common/ResizeableSidebar.qml (+96/-0)
src/app/qml/common/ScalingMouseArea.qml (+104/-0)
src/app/qml/common/ScalingPinchArea.qml (+59/-0)
src/app/qml/common/SubtitledListItem.qml (+37/-0)
src/app/qml/common/TextFieldButtonPopover.qml (+58/-0)
src/app/qml/common/TextFieldWithButton.qml (+84/-0)
src/app/qml/common/TextualButtonStyle.qml (+58/-0)
src/app/qml/common/Toast.qml (+0/-82)
src/app/qml/common/ToastWithAction.qml (+0/-117)
src/app/qml/common/UnknownTypeDialog.qml (+29/-17)
src/app/qml/common/VerticalDivider.qml (+35/-0)
src/app/qml/common/ViewerPage.qml (+82/-0)
src/app/qml/common/loadComponent.js (+10/-0)
src/app/qml/common/utils.js (+26/-2)
src/app/qml/documentPage/DeleteFileDialog.qml (+53/-40)
src/app/qml/documentPage/DocumentDelegateActions.qml (+14/-5)
src/app/qml/documentPage/DocumentEmptyState.qml (+45/-11)
src/app/qml/documentPage/DocumentGridDelegate.qml (+0/-113)
src/app/qml/documentPage/DocumentGridView.qml (+0/-84)
src/app/qml/documentPage/DocumentListDelegate.qml (+103/-112)
src/app/qml/documentPage/DocumentListView.qml (+76/-164)
src/app/qml/documentPage/DocumentPage.qml (+53/-49)
src/app/qml/documentPage/DocumentPageDefaultHeader.qml (+20/-25)
src/app/qml/documentPage/DocumentPagePickModeHeader.qml (+63/-39)
src/app/qml/documentPage/DocumentPageSearchHeader.qml (+30/-21)
src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml (+35/-65)
src/app/qml/documentPage/SearchEmptyState.qml (+2/-3)
src/app/qml/documentPage/SectionHeader.qml (+55/-0)
src/app/qml/documentPage/SharePage.qml (+60/-0)
src/app/qml/documentPage/SortSettingsDialog.qml (+4/-3)
src/app/qml/documentPage/TileBase.qml (+0/-369)
src/app/qml/loView/KeybHelper.js (+120/-0)
src/app/qml/loView/LOViewDefaultHeader.qml (+99/-0)
src/app/qml/loView/LOViewGotoDialog.qml (+77/-0)
src/app/qml/loView/LOViewPage.qml (+288/-0)
src/app/qml/loView/PartsView.qml (+215/-0)
src/app/qml/loView/Splashscreen.qml (+48/-0)
src/app/qml/loView/SpreadsheetSelector.qml (+85/-0)
src/app/qml/loView/ZoomSelector.qml (+196/-0)
src/app/qml/loView/graphics/dropshadow@27.sci (+5/-0)
src/app/qml/pdfView/PdfContentsPage.qml (+69/-84)
src/app/qml/pdfView/PdfPresentation.qml (+120/-0)
src/app/qml/pdfView/PdfView.qml (+194/-79)
src/app/qml/pdfView/PdfViewDefaultHeader.qml (+0/-102)
src/app/qml/pdfView/PdfViewDelegate.qml (+9/-3)
src/app/qml/pdfView/PdfViewGotoDialog.qml (+28/-17)
src/app/qml/textView/TextView.qml (+15/-18)
src/app/qml/textView/TextViewDefaultHeader.qml (+25/-53)
src/app/qml/ubuntu-docviewer-app.qml (+97/-166)
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 (+0/-407)
src/app/renderengine.cpp (+97/-0)
src/app/renderengine.h (+60/-0)
src/app/rendertask.cpp (+1/-0)
src/app/rendertask.h (+42/-0)
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 (+9/-6)
src/plugin/file-qml-plugin/backend.cpp (+12/-0)
src/plugin/file-qml-plugin/documentmodel.cpp (+4/-6)
src/plugin/file-qml-plugin/docviewerutils.cpp (+184/-0)
src/plugin/file-qml-plugin/docviewerutils.h (+45/-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 (+62/-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 (+97/-0)
src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp (+251/-0)
src/plugin/libreofficetoolkit-qml-plugin/lodocument.h (+88/-0)
src/plugin/libreofficetoolkit-qml-plugin/loerror.h (+37/-0)
src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.cpp (+56/-0)
src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.h (+41/-0)
src/plugin/libreofficetoolkit-qml-plugin/lopartsimageresponse.cpp (+54/-0)
src/plugin/libreofficetoolkit-qml-plugin/lopartsimageresponse.h (+41/-0)
src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.cpp (+106/-0)
src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.h (+73/-0)
src/plugin/libreofficetoolkit-qml-plugin/lorendertask.cpp (+25/-0)
src/plugin/libreofficetoolkit-qml-plugin/lorendertask.h (+57/-0)
src/plugin/libreofficetoolkit-qml-plugin/loview.cpp (+431/-0)
src/plugin/libreofficetoolkit-qml-plugin/loview.h (+120/-0)
src/plugin/libreofficetoolkit-qml-plugin/lozoom.cpp (+254/-0)
src/plugin/libreofficetoolkit-qml-plugin/lozoom.h (+103/-0)
src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp (+43/-0)
src/plugin/libreofficetoolkit-qml-plugin/plugin.h (+33/-0)
src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml (+149/-0)
src/plugin/libreofficetoolkit-qml-plugin/qmldir (+4/-0)
src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp (+82/-0)
src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h (+46/-0)
src/plugin/libreofficetoolkit-qml-plugin/twips.h (+86/-0)
src/plugin/libreofficetoolkit-qml-plugin/ucunits.cpp (+241/-0)
src/plugin/libreofficetoolkit-qml-plugin/ucunits.h (+60/-0)
src/plugin/poppler-qml-plugin/CMakeLists.txt (+8/-0)
tests/CMakeLists.txt (+0/-1)
tests/autopilot/CMakeLists.txt (+0/-10)
tests/autopilot/ubuntu_docviewer_app/CMakeLists.txt (+0/-9)
tests/autopilot/ubuntu_docviewer_app/CMakePluginParser.py (+0/-120)
tests/autopilot/ubuntu_docviewer_app/__init__.py (+0/-183)
tests/autopilot/ubuntu_docviewer_app/tests/CMakeLists.txt (+0/-6)
tests/autopilot/ubuntu_docviewer_app/tests/__init__.py (+0/-167)
tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py (+0/-69)
tests/autopilot/ubuntu_docviewer_app/tests/test_toc.py (+0/-47)
tools/get-click-deps (+451/-0)
tools/run-pep8 (+1/-1)
Text conflict in po/am.po
Conflict adding file po/ar.po.  Moved existing file to po/ar.po.moved.
Text conflict in po/ast.po
Text conflict in po/br.po
Conflict adding file po/bs.po.  Moved existing file to po/bs.po.moved.
Text conflict in po/ca.po
Text conflict in po/cs.po
Conflict adding file po/cy.po.  Moved existing file to po/cy.po.moved.
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
Conflict adding file po/fo.po.  Moved existing file to po/fo.po.moved.
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
Conflict adding file po/ja.po.  Moved existing file to po/ja.po.moved.
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
Conflict adding file po/ro.po.  Moved existing file to po/ro.po.moved.
Text conflict in po/ru.po
Conflict adding file po/shn.po.  Moved existing file to po/shn.po.moved.
Text conflict in po/sl.po
Conflict adding file po/sr.po.  Moved existing file to po/sr.po.moved.
Conflict adding file po/sv.po.  Moved existing file to po/sv.po.moved.
Text conflict in po/tr.po
Conflict adding file po/ug.po.  Moved existing file to po/ug.po.moved.
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:ubuntu-docviewer-app
Reviewer Review Type Date Requested Status
Ubuntu Document Viewer Developers 2015-06-23 Pending
Review via email: mp+262686@code.launchpad.net

Description of the Change

Added sample code as the first step to the LibreOffice viewer feature of docviewer. The code was provided by Bjoern Michaelsen, the Ubuntu LO maintaner, as a way to use the LO Toolkit API.

Right now the sample code uses the LO Toolkit API to read a given document into a buffer and then it writes a .png file using libpng.

For docviewer, we can probably convert the C++ code to Qt and assess whether it's needed to do the .png writing (I guess docviewer can use the buffer directly?), and create a QML plugin.

The requirement for this to work is to have LibreOffice 5.0 installed (easily available from a PPA as described in the .cxx's file comments).

I believe the easiest way to start experimenting is to develop on the desktop, prove that it works for Qt/QML and then we can worry about converting it to a .click once we've done that step.

## Build requirements

Please install prerequisites if you havent done so:

    sudo apt install libreofficekit-dev libreoffice libpng12-dev

Note that you need LibreOffice 5.0 -- a prerelease is currently available at the prereleases ppa:

    sudo add-apt-repository ppa:libreoffice/libreoffice-prereleases

## Additional documentation

- Readme at:
https://github.com/LibreOffice/core/tree/master/libreofficekit

- An example of a reader with more features:
https://github.com/LibreOffice/core/blob/master/libreofficekit/source/gtk/lokdocview.cxx

To post a comment you must log in.
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

I had a play with this on my amd64 wily laptop.
The ultimate goal being to have a fully-enclosed click package containing the necessary libreoffice binaries, rather than debian packages. So rather than install the debs from the ppa as Bjoern suggested, I grabbed the tarball directly from libreoffice.org

Followed these instructions:- https://wiki.documentfoundation.org/Installing_in_parallel/Linux
Steps 1-3 and 7 only, omitting the optional parts. I ended up with an unpackaged install of Libreoffice 5.x in ~/libreoffice/building/LibreOffice_5.0.0.1_Linux_x86-64_deb/DEBS/install so I edited line 71 in the attached code:-

std::unique_ptr<lok::Office> pOffice(lok::lok_cpp_init("/usr/lib/libreoffice/program/"));

To be:-

std::unique_ptr<lok::Office> pOffice(lok::lok_cpp_init("/home/alan/libreoffice/building/LibreOffice_5.0.0.1_Linux_x86-64_deb/DEBS/install/opt/libreoffice5.0/program/"));

Just to prove that this works with a libreoffice install which isn't installed in the usual places expected with a debian install.

This also means you don't need to replace the 4.x libreoffice shipped in ubuntu with the pre-release from a ppa, just for testing this.

Thank you all for this gem! \o/

A QImage class, provided by Qt libraries and generally used through a QQuickImageProvider in order to expose images to QML, can be constructed from an existent buffer.

I had a play too, and I integrated the sample code into a clone of the poppler-qml-plugin we use.
Still unstable and I get a few too many crashed, but it's nice to see it working: https://imgur.com/jnLBJQX,na4DPJC

I will upload the code tomorrow, I have to clean the code a bit, first.

I've pushed the result of my play in a separate branch:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/lo-plugin-prototype

To be fair it doesn't fit with the structure of the poppler-qml-plugin, since LibreOffice seems to have no concept of pages and returns the whole document in a single image.
Would be nice to do some extra work to get a list of pages (and their size) out from LibreOffice Writer documents, at least, so that we would be able to add some features like a "Go to page...".

Just some further note:
* When you try to open a second document from the DocViewer, it shows the rendering of the document previously opened.
* If you are using a parallel installation of LibreOffice, update the "#define LO_PATH" line in /src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp

lp:ubuntu-docviewer-app updated on 2017-04-05
153. By David Planella on 2015-06-26

Merged Stefano Verzegnassi's LO viewer prototype

154. By David Planella on 2015-06-29

Merged from trunk

155. By David Planella on 2015-06-29

Added information on how to compile the LO viewer support

156. By Stefano Verzegnassi on 2015-07-04

First work on tiled rendering for LibreOfficeKit QML plugin

157. By Stefano Verzegnassi on 2015-07-04

Dropped deprecated dependencies on Qt5 private imports

158. By Stefano Verzegnassi on 2015-07-04

Update visibleArea size when the width/height of the parentFlickable change

159. By Stefano Verzegnassi on 2015-07-05

rows and columns in the tile logic were swapped. use the less ambiguous 'x' and 'y'

160. By Stefano Verzegnassi on 2015-07-07

Fixed CMakeLists file in LOK-QML plugin

161. By Roman Shchekin on 2015-07-11

Seems that LoDocument uses BGR rather than RGB. Fixed.

162. By Roman Shchekin on 2015-07-13

* Format_RGB32 used instead of Format_ARGB32 (renders ~3 times faster). I have string feeling that LO toolkit won't provide tiles with alpha.
 * Memory leak fixed.
 * Member m_office now become static s_office.

163. By Stefano Verzegnassi on 2015-07-16

* Improved code consistency for TileItem class.
* Removed the unnecessary painter->eraseRect() from the paint function of LOView

164. By Roman Shchekin on 2015-07-20

Inlining can make code more efficient in such cases.

165. By Stefano Verzegnassi on 2015-07-22

Added support for all (OpenDocument/OpenXMLFormat/MS) (text/spreadsheet/presentation) documents in DocViewer's documentModel and plugin loader.

166. By Stefano Verzegnassi on 2015-07-23

Improvements in debug output management

167. By Stefano Verzegnassi on 2015-07-23

[lo-plugin] Added saveAs function

168. By Stefano Verzegnassi on 2015-07-23

[LOK-plugin] Use a QTimer to avoid multiple updates when contentX/contentY change

169. By Stefano Verzegnassi on 2015-07-30

Implemented cache buffer

170. By Stefano Verzegnassi on 2015-08-26

Added LibreOfficeKit headers.

Approved by Roman Shchekin, Ubuntu Phone Apps Jenkins Bot.

171. By Stefano Verzegnassi on 2015-08-30

Merged trunk (rev. 181) into "reboot" branch.

Approved by Ubuntu Phone Apps Jenkins Bot, Roman Shchekin.

172. By Roman Shchekin on 2015-09-11

QtQuick SceneGraph rendering, with multithreading support.
Includes changes from: lp:~mrqtros/ubuntu-docviewer-app/docviewer-sg-rendering.

Approved by Ubuntu Phone Apps Jenkins Bot, Roman Shchekin.

173. By Stefano Verzegnassi on 2015-09-16

Updated empty state strings in DocumentsPage.

Approved by Ubuntu Phone Apps Jenkins Bot.

174. By Stefano Verzegnassi on 2015-09-16

Use SD card icon from official Suru theme. Fixes: https://bugs.launchpad.net/bugs/1476659.

Approved by Ubuntu Phone Apps Jenkins Bot.

175. By Stefano Verzegnassi on 2015-09-16

Added share option in documentsPage. Fixes: https://bugs.launchpad.net/bugs/1494818.

Approved by Roman Shchekin, Ubuntu Phone Apps Jenkins Bot.

176. By Stefano Verzegnassi on 2015-09-16

Removed QStorageInfo sources. Build depends on Qt 5.4.

Approved by Roman Shchekin, Ubuntu Phone Apps Jenkins Bot.

177. By Roman Shchekin on 2015-09-19

New method of multithreaded rendering.

Approved by Stefano Verzegnassi, Ubuntu Phone Apps Jenkins Bot.

178. By Roman Shchekin on 2015-09-19

[LibreOffice-plugin] Get screen DPIs at runtime.

Approved by Ubuntu Phone Apps Jenkins Bot.

179. By Roman Shchekin on 2015-09-19

Async lok loading . Fixes: https://bugs.launchpad.net/bugs/1495069.

Approved by Stefano Verzegnassi, Ubuntu Phone Apps Jenkins Bot.

180. By Stefano Verzegnassi on 2015-09-21

* Use QML APIs for Content Hub
* Remove toast notifications for imported documents (open documents automatically). Fixes: https://bugs.launchpad.net/bugs/1469422.

Approved by Roman Shchekin, Ubuntu Phone Apps Jenkins Bot.

181. By Stefano Verzegnassi on 2015-09-21

Updated translation template.

Approved by Ubuntu Phone Apps Jenkins Bot.

182. By Stefano Verzegnassi on 2015-09-21

[ContentHub] Check if a file has been already imported in the past, and don't import it if that's the case. Fixes: https://bugs.launchpad.net/bugs/1432394.

Approved by Ubuntu Phone Apps Jenkins Bot.

183. By Stefano Verzegnassi on 2015-10-01

* [loviewer] Use percentage for 'go to' dialog.
* [loviewer] Enable 'go to' dialog only for LibreOffice.TextDocument type.

Approved by Ubuntu Phone Apps Jenkins Bot, Stefano Verzegnassi.

184. By Stefano Verzegnassi on 2015-10-10

[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.

185. By Stefano Verzegnassi on 2015-10-10

* [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.

186. By Roman Shchekin on 2015-10-11

RenderEngine - impress support.

Approved by Ubuntu Phone Apps Jenkins Bot, Stefano Verzegnassi.

187. By Stefano Verzegnassi on 2015-10-12

[loview] Fixed leak and tiles that stay visible even after their removal.

Approved by Roman Shchekin, Ubuntu Phone Apps Jenkins Bot.

188. By Stefano Verzegnassi on 2015-10-13

[loviewer] Fixed 'singleShot' property not set for m_updateTimer.

Approved by Ubuntu Phone Apps Jenkins Bot.

189. By Roman Shchekin on 2015-10-19

More OOP in RenderEngine (preparations for migration of PDF plugin to tile rendering).

Approved by Ubuntu Phone Apps Jenkins Bot, Stefano Verzegnassi.

190. By Stefano Verzegnassi on 2015-10-20

* Refactored cpp init
* Moved command line parser to QML.

Approved by Ubuntu Phone Apps Jenkins Bot, Stefano Verzegnassi, Roman Shchekin.

191. By Stefano Verzegnassi on 2015-10-20

* 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.

192. By Stefano Verzegnassi on 2015-11-06

Automatically fetch dependencies for LibreOffice viewer and put them inside the .click package.

Approved by Alan Pope , Ubuntu Phone Apps Jenkins Bot.

193. By Alan Pope 🍺🐧🐱 🦄 on 2015-11-06

Remove unconfined from apparmor profile. Tested on device, and we're still able to open pdfs and office docs just fine.

Approved by Stefano Verzegnassi, Ubuntu Phone Apps Jenkins Bot.

194. By Roman Shchekin on 2015-11-06

Code of RenderEngine become more SOLID (still a lot of work to do).

Approved by Stefano Verzegnassi, Ubuntu Phone Apps Jenkins Bot.

195. By Nicholas Skaggs on 2015-11-19

Fix internet check for jenkins.

Approved by Stefano Verzegnassi, Jenkins Bot.

196. By Stefano Verzegnassi on 2015-11-19

Disable file locking in LibreOffice. Fixes: https://bugs.launchpad.net/bugs/1517074.

Approved by Jenkins Bot, Alan Pope .

197. By Stefano Verzegnassi on 2015-11-19

* [loviewer] Adding error detection
* [loviewer] Removed updateZoomIfAutomatic() function in LOView, its code was a bit cryptic
* Added a debug option in CMakeLists
* added '*.user.*' filter in .bzrignore file. Fixes: https://bugs.launchpad.net/bugs/1514458.

Approved by Jenkins Bot, Roman Shchekin.

198. By Stefano Verzegnassi on 2015-11-19

[lok-qml] Fixed broken SHOW_TILE_BORDER mode. Fixes: https://bugs.launchpad.net/bugs/1515037.

Approved by Stefano Verzegnassi, Jenkins Bot.

199. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-20

Launchpad automatic translations update.

200. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-21

Launchpad automatic translations update.

201. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-22

Launchpad automatic translations update.

202. By Stefano Verzegnassi on 2015-11-22

LibreofficeKit-qml-plugin:
  * Fix wrong size for last tile in a row/column
  * Don't create tiles outside the visible/buffer grid (i.e. wrong size for m_visibleArea and m_gridArea). Fixes: https://bugs.launchpad.net/bugs/1516239, https://bugs.launchpad.net/bugs/1516241.

Approved by Alan Pope , Jenkins Bot.

203. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-23

Launchpad automatic translations update.

204. By Roman Shchekin on 2015-11-23

Zoom in LO.

Approved by Alan Pope , Stefano Verzegnassi, Jenkins Bot.

205. By Stefano Verzegnassi on 2015-11-23

Error detection branch has been merged without a 'fix' as per diff inline comments. Not relevant stuff, just code styling.

Approved by Alan Pope , Jenkins Bot.

206. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-24

Launchpad automatic translations update.

207. By Stefano Verzegnassi on 2015-11-24

* Changes to the project structure
* Provide DocViewer plugins as separate .deb packages
* Added exception for '*.user.*' in .bzrignore file.

Approved by Jenkins Bot, Ubuntu Phone Apps Jenkins Bot.

208. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-25

Launchpad automatic translations update.

209. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-26

Launchpad automatic translations update.

210. By Stefano Verzegnassi on 2015-11-27

* Switch to Ubuntu Toolkit 1.3
* UI updated
* Improved support for zoom on desktop
* Updated framework to 14.04.1
* Moved components in the 'upstreamComponents' folder into 'common'
* Use the new BottomEdgeHint component in order to provide mouse/keyb controls for the bottom edge.
* Changed Header behaviour to default in the PDF viewer
* Use an horizontal PartsView for switching slides in portrait, small-width mode, instead of using the SlideControllerPanel component + BottomEdge.
* Removed some obsolete code. Fixes: https://bugs.launchpad.net/bugs/1453403, https://bugs.launchpad.net/bugs/1508363, https://bugs.launchpad.net/bugs/1513843.

Approved by Roman Shchekin, Jenkins Bot.

211. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-28

Launchpad automatic translations update.

212. By Stefano Verzegnassi on 2015-11-28

Use UITK 1.3 ListItemLayout.

Approved by Jenkins Bot.

213. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-29

Launchpad automatic translations update.

214. By Roman Shchekin on 2015-11-29

Code cleanup - phase 2.

Approved by Jenkins Bot, Stefano Verzegnassi.

215. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-11-30

Launchpad automatic translations update.

216. By Stefano Verzegnassi on 2015-11-30

Updated app icon.

Approved by Alan Pope , Jenkins Bot.

217. By Stefano Verzegnassi on 2015-11-30

* Added splashscreen for loViewer
* Moved the async logic that loads loViewer in another component
* Removed 'PanelButton' component - no longer used
* Changed the behaviour of the header in the loViewer: if (textDocument) hideableHeader = true
* Don't use a global 'graphics' folder. Assets are now placed in the module which uses them. Fixes: https://bugs.launchpad.net/bugs/1495079.

Approved by Roman Shchekin, Alan Pope , Jenkins Bot.

218. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-01

Launchpad automatic translations update.

219. By Stefano Verzegnassi on 2015-12-01

Fixed translatable strings.

Approved by Roman Shchekin, Jenkins Bot.

220. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-02

Launchpad automatic translations update.

221. By Stefano Verzegnassi on 2015-12-02

* Bump app version to 2.0
* Updated changelog.

Approved by Alan Pope , Jenkins Bot, Stefano Verzegnassi, Ubuntu Phone Apps Jenkins Bot.

222. By Stefano Verzegnassi on 2015-12-02

* Backported fix for stage mode being forced on Nexus 10
* Fixed wrong string shown in the splash screen. Fixes: https://bugs.launchpad.net/bugs/1479483.

Approved by Jenkins Bot.

223. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-03

Launchpad automatic translations update.

224. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-04

Launchpad automatic translations update.

225. By Stefano Verzegnassi on 2015-12-04

Fixed url-dispatcher missing in the click package.

Approved by Jenkins Bot, Alan Pope .

226. By Stefano Verzegnassi on 2015-12-04

Re-bump framework and AppArmor policy version.

Approved by Alan Pope , Jenkins Bot.

227. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-05

Launchpad automatic translations update.

228. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-06

Launchpad automatic translations update.

229. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-07

Launchpad automatic translations update.

230. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-08

Launchpad automatic translations update.

231. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-09

Launchpad automatic translations update.

232. By Stefano Verzegnassi on 2015-12-10

Align 'no document found' empty state design to music-app. Fixes: https://bugs.launchpad.net/bugs/1523122.

Approved by Jenkins Bot, Alan Pope .

233. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-11

Launchpad automatic translations update.

234. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-17

Launchpad automatic translations update.

235. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-18

Launchpad automatic translations update.

236. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-20

Launchpad automatic translations update.

237. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-21

Launchpad automatic translations update.

238. By Girish on 2015-12-21

Updated and expanded READMEs.

Approved by Jenkins Bot, Stefano Verzegnassi.

239. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-23

Launchpad automatic translations update.

240. By Roman Shchekin on 2015-12-23

RenderEngine now become application-wide tool .

Approved by Stefano Verzegnassi, Jenkins Bot.

241. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-24

Launchpad automatic translations update.

242. By Stefano Verzegnassi on 2015-12-27

Updated AppArmor template. It fixes the deletion of a document stored on a SD card. Fixes: https://bugs.launchpad.net/bugs/1524293.

Approved by Roman Shchekin, Jenkins Bot.

243. By Stefano Verzegnassi on 2015-12-27

[lok-qml] Fixed warning about document not loaded. Now it properly informs that the document may be protected by a password. Fixes: https://bugs.launchpad.net/bugs/1524712.

Approved by Roman Shchekin, Jenkins Bot.

244. By Stefano Verzegnassi on 2015-12-27

Don't show file extension in the viewer's header. Fixes: https://bugs.launchpad.net/bugs/1523886.

Approved by Roman Shchekin, Jenkins Bot.

245. By Stefano Verzegnassi on 2015-12-27

Added Flickable in DetailsPage. Content can be scrolled when bigger than the page. Fixes: https://bugs.launchpad.net/bugs/1523112.

Approved by Roman Shchekin, Jenkins Bot.

246. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-28

Launchpad automatic translations update.

247. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-29

Launchpad automatic translations update.

248. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-30

Launchpad automatic translations update.

249. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2015-12-31

Launchpad automatic translations update.

250. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-02

Launchpad automatic translations update.

251. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-03

Launchpad automatic translations update.

252. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-04

Launchpad automatic translations update.

253. By Stefano Verzegnassi on 2016-01-04

[DetailsPage] Split file name and file path into two separate fields. Allow multiline subtext. Fixes: https://bugs.launchpad.net/bugs/1523106.

Approved by Alan Pope , Jenkins Bot.

254. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-05

Launchpad automatic translations update.

255. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-06

Launchpad automatic translations update.

256. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-07

Launchpad automatic translations update.

257. By Stefano Verzegnassi on 2016-01-07

[loviewer] PartsView: Ensure that items next to the current item are always visible. Fixes: https://bugs.launchpad.net/bugs/1521386.

Approved by Roman Shchekin, Jenkins Bot.

258. By Stefano Verzegnassi on 2016-01-07

DocumentListDelegate: wrap title text anywhere. Fix bug #1523113. Fixes: https://bugs.launchpad.net/bugs/1523113.

Approved by Alan Pope , Jenkins Bot.

259. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-08

Launchpad automatic translations update.

260. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-12

Launchpad automatic translations update.

261. By Stefano Verzegnassi on 2016-01-15

Disabled current Autopilot tests. Added a dummy test instead.

Approved by Stefano Verzegnassi, Jenkins Bot.

262. By Michael Hall on 2016-01-15

Add a basic presentation mode to PDF docments. Fixes: https://bugs.launchpad.net/bugs/1534761.

Approved by Jenkins Bot, Stefano Verzegnassi.

263. By Stefano Verzegnassi on 2016-01-15

Night shader updated.

Approved by Jenkins Bot, Alan Pope .

264. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-16

Launchpad automatic translations update.

265. By Stefano Verzegnassi on 2016-01-16

[lok-qml] Moved 'currentPart' property from LODocument to LOView.

Approved by Jenkins Bot, Roman Shchekin.

266. By Roman Shchekin on 2016-01-16

Upstream libs caching. Fixes: https://bugs.launchpad.net/bugs/1534933.

Approved by Stefano Verzegnassi, Jenkins Bot.

267. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-17

Launchpad automatic translations update.

268. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-18

Launchpad automatic translations update.

269. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-19

Launchpad automatic translations update.

270. By Stefano Verzegnassi on 2016-01-20

[loview] Added drop shadow effect to partsview thumbnails.

Approved by Alan Pope , Jenkins Bot.

271. By Stefano Verzegnassi on 2016-01-20

added python3-lxml package as dependency.

Approved by Jenkins Bot, Alan Pope .

272. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-21

Launchpad automatic translations update.

273. By Roman Shchekin on 2016-01-21

RenderEngine: thread safety.

Approved by Roman Shchekin, Jenkins Bot, Stefano Verzegnassi.

274. By Stefano Verzegnassi on 2016-01-21

LibreOffice Viewer - LibreOfficeKit QML plugin:
- Open spreadsheet with manual zoom (1.0x factor)
- Added "Fit to height" and "Automatic" zoom behaviours
- Added a "zoomModesAvailable" which returns the zoom modes available for a given document.
- Use UCUnits when converting TWIPs in pixels (and vice versa)
- Minor changes. Fixes: https://bugs.launchpad.net/bugs/1513960, https://bugs.launchpad.net/bugs/1515649, https://bugs.launchpad.net/bugs/1535264.

Approved by Jenkins Bot.

275. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-22

Launchpad automatic translations update.

276. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-23

Launchpad automatic translations update.

277. By Stefano Verzegnassi on 2016-01-23

Disable spell checking in LibreOffice:

* We don't need it since we don't provide any editing feature
* Our minimal build of LibreOffice doesn't have a full languages support
* In future we'll add a full-screen mode for .pptx/.ppt/.odp documents. Those red lines below the text are just terrible. Fixes: https://bugs.launchpad.net/bugs/1536599.

Approved by Alan Pope , Jenkins Bot.

278. By Stefano Verzegnassi on 2016-01-26

LibreOffice QML plugin:
* Provide zoom settings as grouped properties
* Added a minimum and a maximum value for the zoom factor
* Removed any reference to zoomFactor from SGTileItem
* Expose to QML the values for 'fitToWidth', 'fitToHeight' and 'Automatic' zoom.

Approved by Jenkins Bot, Roman Shchekin.

279. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-27

Launchpad automatic translations update.

280. By Stefano Verzegnassi on 2016-01-29

[PdfPresentation] Hide mouse cursor when there's no on-going mouse event.

Approved by Roman Shchekin, Jenkins Bot.

281. By Stefano Verzegnassi on 2016-01-29

* Use UITK 1.3 BottomEdge instead of old PageWithBottomEdge component.
* Updated framework version to 15.04.3. Fixes: https://bugs.launchpad.net/bugs/1535320.

Approved by Jenkins Bot, Alan Pope .

282. By Stefano Verzegnassi on 2016-01-29

SGTileItem: keep QImage data so that QSG don't fail on repainting.

Approved by Roman Shchekin, Jenkins Bot.

283. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-30

Launchpad automatic translations update.

284. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-01-31

Launchpad automatic translations update.

285. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-02

Launchpad automatic translations update.

286. By Stefano Verzegnassi on 2016-02-02

Apply new style for empty state everywhere.

Approved by Jenkins Bot, Roman Shchekin.

287. By Stefano Verzegnassi on 2016-02-03

LibreOffice viewer:
* Added a sheet selector
* Show an empty state when the current sheet has no content
* Fixed "currentPart" usage, partially broken after a recent commit in trunk. Fixes: https://bugs.launchpad.net/bugs/1537755, https://bugs.launchpad.net/bugs/1537756.

Approved by Jenkins Bot, Alan Pope .

288. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-03

Launchpad automatic translations update.

289. By Stefano Verzegnassi on 2016-02-03

Restored "Start presentation" action in the PDF viewer.
After the merging of the branch with the new bottom-edge component, PdfViewDefaultHeader.qml document has been removed and the action hasn't been added to the header replacement.

Approved by Stefano Verzegnassi, Jenkins Bot.

290. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-04

Launchpad automatic translations update.

291. By Stefano Verzegnassi on 2016-02-04

LibreOffice viewer:
* Show the viewer content at the center of the canvas (excluded spreadsheets)
* Fixed some bug in ScalingPinchArea
* Added a ScalingMouseArea component, for handling the double-tap-to-zoom gesture
* Set the zoom behaviour according to the parameters returned by LOZoom class
* Changed background color for the viewer
* Fixed 'rebound' behaviour for the LOK Viewer
* Added missing signal emissions in LOZoom. Fixes: https://bugs.launchpad.net/bugs/1501424, https://bugs.launchpad.net/bugs/1515655, https://bugs.launchpad.net/bugs/1541582.

Approved by Alan Pope , Jenkins Bot.

292. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-05

Launchpad automatic translations update.

293. By Stefano Verzegnassi on 2016-02-05

[PdfPresentation] Go automatically full-screen.

Approved by Roman Shchekin, Jenkins Bot.

294. By Stefano Verzegnassi on 2016-02-05

Use QQuickAsyncImageProvider in LOPartsImageProvider class.
This is backported on Ubuntu/Ubuntu Touch since Qt 5.4.1-1ubuntu7.
On any other distro/OS it works only with Qt 5.6 (or later).

Approved by Jenkins Bot, Roman Shchekin.

295. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-06

Launchpad automatic translations update.

296. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-10

Launchpad automatic translations update.

297. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-11

Launchpad automatic translations update.

298. By Stefano Verzegnassi on 2016-02-11

[PdfPresentation] Disable screen saver during a presentation.

Approved by Alan Pope , Jenkins Bot.

299. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-12

Launchpad automatic translations update.

300. By Stefano Verzegnassi on 2016-02-12

Fixed ContentTransferHint being visible during an export. Fixes: https://bugs.launchpad.net/bugs/1544149.

Approved by Alan Pope , Jenkins Bot.

301. By Stefano Verzegnassi on 2016-02-12

* Release Ubuntu DocViewer 2.1
* Updated changelog.

Approved by Alan Pope , Jenkins Bot.

302. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-13

Launchpad automatic translations update.

303. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-18

Launchpad automatic translations update.

304. By Stefano Verzegnassi on 2016-02-19

[PdfView] Disable bottom edge gesture if the current document does not provide any ToC. Fixes: https://bugs.launchpad.net/bugs/1546164.

Approved by Alan Pope , Jenkins Bot.

305. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-02-22

Launchpad automatic translations update.

306. By Stefano Verzegnassi on 2016-02-26

Allow to disable .click dependencies caching through a CMake option. Fixes: https://bugs.launchpad.net/bugs/1547059.

Approved by Alan Pope , Jenkins Bot.

307. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-01

Launchpad automatic translations update.

308. By Stefano Verzegnassi on 2016-03-01

[lok-viewer] Fixed ZoomSelector visibility on frieza (BQ M10). Fixes: https://bugs.launchpad.net/bugs/1551254.

Approved by Roman Shchekin, Jenkins Bot.

309. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-02

Launchpad automatic translations update.

310. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-03

Launchpad automatic translations update.

311. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-04

Launchpad automatic translations update.

312. By Nicholas Skaggs on 2016-03-04

add jenkins info and mp readme.

Approved by Andrew Hayzen, Jenkins Bot.

313. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-06

Launchpad automatic translations update.

314. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-09

Launchpad automatic translations update.

315. By Stefano Verzegnassi on 2016-03-11

Minor code style changes.

Approved by Jenkins Bot, Roman Shchekin.

316. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-11

Launchpad automatic translations update.

317. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-12

Launchpad automatic translations update.

318. By Nicholas Skaggs on 2016-03-16

Restore AP test shell.

Approved by Stefano Verzegnassi, Jenkins Bot.

319. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-20

Launchpad automatic translations update.

320. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-21

Launchpad automatic translations update.

321. By Nicholas Skaggs on 2016-03-23

Create cache folder during cmake copy.

Approved by Jenkins Bot, Stefano Verzegnassi.

322. By Stefano Verzegnassi on 2016-03-23

emit DocumentModel::dataChanged()
Sometimes the UI was not notified about changes in model entries (e.g. file size still equals to zero after file has been successfully copied). Fixes: https://bugs.launchpad.net/bugs/1483218.

Approved by Roman Shchekin, Jenkins Bot.

323. By Stefano Verzegnassi on 2016-03-23

Use PageHeader and ScrollView in details page.

Approved by Roman Shchekin, Jenkins Bot.

324. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-03-30

Launchpad automatic translations update.

325. By Stefano Verzegnassi on 2016-03-30

[TextView] Switch to UITK 1.3 PageHeader component.

Approved by Roman Shchekin, Jenkins Bot.

326. By Stefano Verzegnassi on 2016-03-31

* WORKAROUND: make the lok-viewer header static (avoid unpredictable binding)
* Use new PageHeader and ScrollView components
* UI: Show an empty header when loading LibreOffice.

Approved by Jenkins Bot.

327. By Stefano Verzegnassi on 2016-03-31

* Updated copyright
* Removed usage of deprecated colors (e.g. UbuntuColors.midAubergine)
* Align to the latest clock-app specs (i.e. don't use purple as accent color)
* Use the section divider from the latest calendar-app specs
* Don't use DemiBold in PDF ToC
* Fixed font color broken after UITK theming changes in Silo 50 (OTA 10)
* ResizeableSidebar: fixed vertical divider margins. Fixes: https://bugs.launchpad.net/bugs/1551259.

Approved by Jenkins Bot.

328. By Stefano Verzegnassi on 2016-03-31

Pdf viewer:
* Removed 'search' action (unused)
* Fixed keyboard hooks in the 'GoTo' dialog
* Fixed presentation mode color palette
* Use ScrollView component
.

Approved by Roman Shchekin, Jenkins Bot.

329. By Stefano Verzegnassi on 2016-03-31

* Use PageHeader and ScrollView in documents page

* Removed width limitation of units.gu(80) from documents page

* Code refactoring

* Use a 'Label' instead of the SD card icon.
Sure, it's a bit ugly but it has no alignment issue. In any case, we should replace the current documents view soon.

* Fixed a few typos in the pickMode header (i.e. we were pushing the wrong file through content-hub)

* UI changes to headers:
--- Search header: use search header style recently introduced in unity8-dash
--- Pick mode header: use textual buttons
. Fixes: https://bugs.launchpad.net/bugs/1523114.

Approved by Roman Shchekin, Jenkins Bot.

330. By Stefano Verzegnassi on 2016-04-05

* Bumped framework to 15.04.4
* Fixed broken night mode (i.e. app background is still white when the mode is enabled)
* Updated changelog.

Approved by Roman Shchekin, Jenkins Bot.

331. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-07

Launchpad automatic translations update.

332. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-10

Launchpad automatic translations update.

333. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-11

Launchpad automatic translations update.

334. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-17

Launchpad automatic translations update.

335. By Stefano Verzegnassi on 2016-04-17

Fixed wrong alignment of the peer picker in SharePage. Fixes: https://bugs.launchpad.net/bugs/1566903.

Approved by Jenkins Bot, Nekhelesh Ramananthan.

336. By Stefano Verzegnassi on 2016-04-20

Fixed the keyboard input issues in DocumentsPage, caused by the migration to the new PageHeader component. In particular:
* OSK visible on app start-up
* It was possible to type chars into the searchField (and then filter the document entries out) even if the searchFiled was not visible
* OSK still visible after the search header was closed (through the 'Cancel' button). Fixes: https://bugs.launchpad.net/bugs/1566899, https://bugs.launchpad.net/bugs/1566902.

Approved by Nekhelesh Ramananthan, Jenkins Bot.

337. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-25

Launchpad automatic translations update.

338. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-26

Launchpad automatic translations update.

339. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-27

Launchpad automatic translations update.

340. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-04-28

Launchpad automatic translations update.

341. By Stefano Verzegnassi on 2016-05-07

PdfViewer - Presentation mode: use a single-tap gesture (instead of double tap) to show/hide header. Fixes: https://bugs.launchpad.net/bugs/1545142.

Approved by Alan Pope , Jenkins Bot.

342. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-05-15

Launchpad automatic translations update.

343. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-05-17

Launchpad automatic translations update.

344. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-05-18

Launchpad automatic translations update.

345. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-06-07

Launchpad automatic translations update.

346. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-06-08

Launchpad automatic translations update.

347. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-06-29

Launchpad automatic translations update.

348. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-08-29

Launchpad automatic translations update.

349. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-08-31

Launchpad automatic translations update.

350. By Tim Peeters on 2016-09-07

Workaround for bug 1577277. Fixes: https://bugs.launchpad.net/bugs/1577277.

Approved by Jenkins Bot, Alan Pope .

351. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-09-12

Launchpad automatic translations update.

352. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-09-13

Launchpad automatic translations update.

353. By Stefano Verzegnassi on 2016-09-21

Do not initialize content-hub asynchronously, otherwise a transfer can not be finalized if the app is not already launched.
This bug likely exists since months, but after the recent changes in content-hub it seems easier to trigger. Fixes: https://bugs.launchpad.net/bugs/1588485.

Approved by Alan Pope 🍺🐧🐱, Jenkins Bot.

354. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-09-29

Launchpad automatic translations update.

355. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-11-30

Launchpad automatic translations update.

356. By Renato Araujo Oliveira Filho on 2016-12-09

Create snapcract package.

Approved by Jenkins Bot, Pat McGowan.

357. By Renato Araujo Oliveira Filho on 2016-12-12

Added snap metadata.

Approved by Jenkins Bot, Andrew Hayzen, Gustavo Pichorim Boiko.

358. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-12-16

Launchpad automatic translations update.

359. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-12-17

Launchpad automatic translations update.

360. By Renato Araujo Oliveira Filho on 2017-02-15

[snap] Added "mir" interface on plug list

Remove desktop_file_hint flag.

Approved by Jenkins Bot.

361. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2017-02-23

Launchpad automatic translations update.

362. By Renato Araujo Oliveira Filho on 2017-03-23

[snap] Connect with mir-libs content share.

Approved by Pat McGowan, Jenkins Bot.

363. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2017-04-05

Launchpad automatic translations update.

Unmerged revisions

363. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2017-04-05

Launchpad automatic translations update.

362. By Renato Araujo Oliveira Filho on 2017-03-23

[snap] Connect with mir-libs content share.

Approved by Pat McGowan, Jenkins Bot.

361. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2017-02-23

Launchpad automatic translations update.

360. By Renato Araujo Oliveira Filho on 2017-02-15

[snap] Added "mir" interface on plug list

Remove desktop_file_hint flag.

Approved by Jenkins Bot.

359. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-12-17

Launchpad automatic translations update.

358. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-12-16

Launchpad automatic translations update.

357. By Renato Araujo Oliveira Filho on 2016-12-12

Added snap metadata.

Approved by Jenkins Bot, Andrew Hayzen, Gustavo Pichorim Boiko.

356. By Renato Araujo Oliveira Filho on 2016-12-09

Create snapcract package.

Approved by Jenkins Bot, Pat McGowan.

355. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-11-30

Launchpad automatic translations update.

354. By Launchpad Translations on behalf of ubuntu-docviewer-dev on 2016-09-29

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-10-28 22:10:16 +0000
3+++ .bzrignore 2017-04-05 07:49:18 +0000
4@@ -1,11 +1,11 @@
5 Makefile
6 ubuntu-docviewer-app
7 *.user
8+*.user.*
9 moc_file.cpp
10 launcher/build-docviewer-launcher-Desktop-Debug/
11 launcher/build-docviewer-launcher-Desktop-Release/
12 launcher/src/docviewer-launcher.pro.user
13-*.cmake
14 CMakeFiles
15 *_automoc.cpp
16 moc_*
17
18=== modified file 'CMakeLists.txt'
19--- CMakeLists.txt 2015-06-24 20:50:40 +0000
20+++ CMakeLists.txt 2017-04-05 07:49:18 +0000
21@@ -1,34 +1,26 @@
22 project(com.ubuntu.docviewer C CXX)
23 cmake_minimum_required(VERSION 2.8.9)
24
25-find_program(INTLTOOL_MERGE intltool-merge)
26-if(NOT INTLTOOL_MERGE)
27- message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
28-endif(NOT INTLTOOL_MERGE)
29-
30-find_program(INTLTOOL_EXTRACT intltool-extract)
31-if(NOT INTLTOOL_EXTRACT)
32- message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
33-endif(NOT INTLTOOL_EXTRACT)
34-
35+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
36+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
37 set(CMAKE_AUTOMOC ON)
38 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
39
40+# Debugging purpose. Keep commented unless you need it.
41+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
42+
43 include(FindPkgConfig)
44-# Standard install paths
45 include(GNUInstallDirs)
46
47-option(INSTALL_TESTS "Install the tests on make install" on)
48-option(CLICK_MODE "Installs to a contained location" on)
49+option(INSTALL_TESTS "Install the tests on make install" on)
50+option(CLICK_MODE "Installs to a contained location" on)
51+option(NO_CACHE "Disable caching of click dependencies (CLICK_MODE only)" off)
52
53-set(APP_NAME ubuntu-docviewer-app)
54-set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
55-set(URLS_FILE "${PROJECT_NAME}.url-dispatcher")
56-set(LP_PROJECT ubuntu-docviewer-app)
57-set(ICON_FILE docviewer@30.png)
58-set(AUTOPILOT_DIR ubuntu_docviewer_app)
59-set(EXEC "${APP_NAME}")
60-set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
61+set(APP_NAME ubuntu-docviewer-app)
62+set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
63+set(LP_PROJECT ubuntu-docviewer-app)
64+set(ICON_FILE docviewer-app.png)
65+set(AUTOPILOT_DIR ubuntu_docviewer_app)
66
67 # Sets BZR_REVNO
68 execute_process(
69@@ -37,87 +29,26 @@
70 OUTPUT_STRIP_TRAILING_WHITESPACE
71 )
72
73-if(CLICK_MODE)
74- if(NOT DEFINED BZR_SOURCE)
75- set(BZR_SOURCE "lp:${LP_PROJECT}")
76- message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
77- endif(NOT DEFINED BZR_SOURCE)
78-
79- if(NOT BZR_REVNO)
80- set(BZR_REVNO "latest")
81- endif(NOT BZR_REVNO)
82-
83- # Find out the architecture for package building
84- # to determine the plugin's installation path
85- execute_process(
86- COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
87- OUTPUT_VARIABLE ARCH_TRIPLET
88- OUTPUT_STRIP_TRAILING_WHITESPACE
89- )
90- execute_process(
91- COMMAND dpkg-architecture -qDEB_HOST_ARCH
92- OUTPUT_VARIABLE CLICK_ARCH
93- OUTPUT_STRIP_TRAILING_WHITESPACE
94- )
95- set(CMAKE_INSTALL_PREFIX /)
96- set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
97- set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
98- set(DATA_DIR /)
99- set(ICON ${ICON_FILE})
100- set(DESKTOP_DIR ${DATA_DIR})
101- set(URLS_DIR ${DATA_DIR})
102- configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
103- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor docviewer-content.json ${URLS_FILE}
104- DESTINATION ${CMAKE_INSTALL_PREFIX})
105- # Make the click files visible in Qt Creator
106- file(GLOB CLICK_FILES
107- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
108- *.json *.json.in *.apparmor)
109-
110- add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})
111-else(CLICK_MODE)
112- # components PATH
113- execute_process(
114- COMMAND qmake -query QT_INSTALL_QML
115- OUTPUT_VARIABLE QT_IMPORTS_DIR
116- OUTPUT_STRIP_TRAILING_WHITESPACE
117- )
118- set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
119- set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
120- set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
121- set(APPLICATION_DIR ${CMAKE_INSTALL_DATADIR}/accounts/applications)
122-endif(CLICK_MODE)
123-
124-file(GLOB_RECURSE I18N_SRC_FILES
125- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
126- *.qml *.js *.cpp)
127-list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/po/${DESKTOP_FILE}.in.in.h)
128-list(SORT I18N_SRC_FILES)
129-message("Found ${I18N_SRC_FILES}")
130-
131-file(GLOB SRC_FILES
132- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
133- *.qml *.js)
134-add_custom_target(ubuntu-docviewer-app_QMlFiles ALL SOURCES ${SRC_FILES})
135-
136-file(GLOB RESOURCE_FILES
137- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
138- *.png *.svg)
139-install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
140-
141-configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
142-
143-add_custom_target(${DESKTOP_FILE} ALL
144- COMMENT "Merging translations into ${DESKTOP_FILE}"
145- COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
146-)
147-
148-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
149- DESTINATION ${DESKTOP_DIR})
150-
151+# Find out the architecture for package building
152+# to determine the plugin's installation path
153+execute_process(
154+ COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
155+ OUTPUT_VARIABLE ARCH_TRIPLET
156+ OUTPUT_STRIP_TRAILING_WHITESPACE
157+)
158+execute_process(
159+ COMMAND dpkg-architecture -qDEB_HOST_ARCH
160+ OUTPUT_VARIABLE CLICK_ARCH
161+ OUTPUT_STRIP_TRAILING_WHITESPACE
162+)
163+
164+include(Click)
165+
166 # Tests
167 enable_testing()
168
169+add_subdirectory(po)
170+add_subdirectory(click)
171+add_subdirectory(data)
172 add_subdirectory(src)
173 add_subdirectory(tests)
174-add_subdirectory(po)
175
176=== removed file 'README'
177--- README 2015-01-30 19:20:39 +0000
178+++ README 1970-01-01 00:00:00 +0000
179@@ -1,20 +0,0 @@
180-Usage
181-=====
182-ubuntu-docviewer-app [filename]
183-
184-filename : The path where the file you want to open is located.
185-
186-Compiling
187-=========
188-
189-Install poppler's development files:
190-sudo apt-get install libpoppler-qt5-dev
191-
192-Install Qt5 private development files:
193-sudo apt-get install qtdeclarative5-private-dev qtbase5-private-dev
194-
195-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:
196-
197-apt-get install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf
198-
199-
200
201=== added file 'README-Autopilot.md'
202--- README-Autopilot.md 1970-01-01 00:00:00 +0000
203+++ README-Autopilot.md 2017-04-05 07:49:18 +0000
204@@ -0,0 +1,81 @@
205+Running Autopilot tests
206+=======================
207+
208+As of wily 15.10, some autopilot tests are broken in trunk. As such autopilot failures
209+can be excused until they are fixed in trunk.
210+
211+The Doc Viewer app follows a test driven development where autopilot tests are run before every merge into trunk. If you are submitting your bugfix/patch to the Doc Viewer app, please follow the following steps below to ensure that all tests pass before proposing a merge request.
212+
213+If you are looking for more info about Autopilot or writing AP tests for the doc viewer app, here are some useful links to help you:
214+
215+- [Ubuntu - Quality](http://developer.ubuntu.com/start/quality)
216+- [Autopilot - Python](https://developer.ubuntu.com/api/autopilot/python/1.5.0/)
217+
218+For help and options on running tests, see:
219+
220+- [Autopilot tests](https://developer.ubuntu.com/en/start/platform/guides/running-autopilot-tests/)
221+
222+Prerequisites
223+=============
224+
225+Install the following autopilot packages required to run the tests,
226+
227+ $ sudo apt-get install python3-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot python3-autopilot-vis
228+
229+Running tests on the desktop
230+============================
231+
232+Using terminal:
233+
234+* Branch the Doc Viewer app code, for example,
235+
236+ $ bzr branch lp:ubuntu-docviewer-app
237+
238+* Navigate to the tests/autopilot directory.
239+
240+ $ cd ubuntu-docviewer-app/tests/autopilot
241+
242+* run all tests.
243+
244+ $ autopilot3 run -vv ubuntu_docviewer_app
245+
246+* to list all tests:
247+
248+ $ autopilot3 list ubuntu_docviewer_app
249+
250+ To run only one test (for instance: ubuntu_docviewer_app.tests.test_docviewer.TestMainWindow.test_open_pdf_file)
251+
252+
253+ $ autopilot3 run -vv ubuntu_docviewer_app.tests.test_docviewer.TestMainWindow.test_open_pdf_file
254+
255+* Debugging tests using autopilot vis
256+
257+ $ autopilot3 launch -i Qt qmlscene app/ubuntu-docviewer-app.qml
258+
259+ $ autopilot3 vis
260+
261+Running tests using Ubuntu SDK
262+==============================
263+
264+Refer this [tutorial](https://developer.ubuntu.com/en/start/platform/guides/running-autopilot-tests/) to run tests on Ubuntu SDK:
265+
266+Running tests on device or emulator:
267+====================================
268+
269+Using autopkg:
270+
271+* Branch the Doc Viewer app code, for example,
272+
273+ $ bzr branch lp:ubuntu-docviewer-app
274+
275+* Navigate to the source directory.
276+
277+ $ cd ubuntu-docviewer-app
278+
279+* Build a click package
280+
281+ $ click-buddy .
282+
283+* Run the tests on device (assumes only one click package in the directory)
284+
285+ $ adt-run . *.click --- ssh -s adb -- -p <PASSWORD>
286
287=== added file 'README-Developers.md'
288--- README-Developers.md 1970-01-01 00:00:00 +0000
289+++ README-Developers.md 2017-04-05 07:49:18 +0000
290@@ -0,0 +1,43 @@
291+Dependencies
292+============
293+**DEPENDENCIES ARE NEEDED TO BE INSTALLED TO BUILD AND RUN THE APP**
294+
295+A complete list of dependencies for the project can be found in ubuntu-docviewer-app/debian/control
296+
297+The following essential packages are also required to develop this app:
298+* [ubuntu-sdk](http://developer.ubuntu.com/start)
299+* intltool - run `sudo apt-get install intltool`
300+
301+Compiling
302+=========
303+
304+**A working internet connection is required in order to build the project. A number of Debian packages are downloaded when the project is loaded the first times**
305+
306+* Install poppler's development files:
307+ sudo apt install libpoppler-qt5-dev
308+
309+* Install Qt5 private development files:
310+ sudo apt install qtdeclarative5-private-dev qtbase5-private-dev
311+
312+* If you want to compile an arm click package, you need to install that package
313+ to the arm compilation environment. For example when using QtCreator for
314+ Ubuntu Touch, open Options -> Ubuntu -> Maintain, and then enter:
315+
316+ apt install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf
317+
318+LibreOffice viewer support
319+==========================
320+
321+* If you want to enable the LibreOffice viewer feature, you'll need to have a
322+ LibreOffice 5.0 installation on your development environment.
323+ To do so, type the following commands on a terminal:
324+
325+ sudo apt-get purge libreoffice-core
326+ sudo add-apt-repository ppa:libreoffice/libreoffice-5-0
327+ sudo apt-get update
328+ sudo apt-get install libreoffice
329+
330+* Then to compile the LibreOffice viewer plugin you'll simply need to install
331+ the LibreOffice Kit development files:
332+
333+ sudo apt install libreofficekit-dev
334
335=== added file 'README-Mergeproposal.md'
336--- README-Mergeproposal.md 1970-01-01 00:00:00 +0000
337+++ README-Mergeproposal.md 2017-04-05 07:49:18 +0000
338@@ -0,0 +1,36 @@
339+Prerequisites to approving a Merge Proposal (MP)
340+================================================
341+
342+Over time, it has been found that insufficient testing by reviewers sometimes leads to doc viewer app trunk not buildable in Qtcreator due to manifest errors, or translation pot file not updated. As such, please follow the checklist below before top-approving a MP.
343+
344+Checklist
345+=========
346+
347+* Does the MP add/remove user visible strings? If Yes, has the pot file been
348+ updated?
349+
350+* Does the MP change the UI? If Yes, has it been approved by design, or
351+ discussed with some of the DocViewer developers?
352+
353+* Did you perform an exploratory manual test run of your code change and any
354+ related functionality?
355+
356+* If the MP fixes a bug or implements a feature, are there accompanying unit
357+ and autopilot tests?
358+
359+* Is the doc viewer app trunk buildable and runnable using Qtcreator?
360+
361+* Was the debian changelog updated?
362+
363+* Was the copyright years updated if necessary?
364+
365+The above checklist is more of a guideline to help doc viewer app trunk stay buildable,
366+stable and up to date.
367+
368+Note: As of wily 15.10, some autopilot tests are broken in trunk. As such autopilot failures
369+can be excused until they are fixed in trunk.
370+
371+Jenkins
372+=======
373+In addition to manual reviews, merge proposals are subject to being run in jenkins to ensure the application builds and any unit tests are successful. For more information on jenkins and how it works, see the [Core Apps Jenkins Wiki](https://wiki.ubuntu.com/Touch/CoreApps/Jenkins)
374+
375
376=== added file 'README-Translations.md'
377--- README-Translations.md 1970-01-01 00:00:00 +0000
378+++ README-Translations.md 2017-04-05 07:49:18 +0000
379@@ -0,0 +1,37 @@
380+Updating translations
381+=====================
382+
383+Translations for the Document Viewer app happen in [Launchpad Translations](https://translations.launchpad.net/ubuntu-docviewer-app) and are automatically committed daily on the trunk branch in the po/ folder.
384+
385+They are then built and installed as part of the package build, so that
386+developers don't really need to worry about them.
387+
388+However, there is one task that needs to be taken care of: exposing new
389+translatable messages to translators. So whenever you add new translatable
390+messages in the code, make sure to follow these steps:
391+
392+ 1. Run click-buddy retaining the build directory:
393+ `click-buddy --dir . --no-clean`
394+ 2. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
395+ 3. Push the branch and send a merge proposal as usual
396+
397+And that's it, once the branch lands Launchpad should take care of all the rest!
398+
399+Behind the scenes
400+=================
401+
402+Behind the scenes, whenever the po/*.pot file (also known as translations template)
403+is committed to trunk Launchpad reads it and updates the translatable strings
404+exposed in the web UI. This will enable translators to work on the new strings.
405+The translations template contains all translatable strings that have been
406+extracted from the source code files.
407+
408+Launchpad will then store translations in its database and will commit them daily
409+in the form of textual po/*.po files to trunk. The PO files are also usually
410+referred to as the translations files. You'll find a translation file for each
411+language the app has got at least a translated message available for.
412+
413+Translations for core apps follow the standard [gettext format](https://www.gnu.org/software/gettext/).
414+
415+ [Launchpad Translations](https://translations.launchpad.net/ubuntu-docviewer-app)
416+ [gettext format](https://www.gnu.org/software/gettext/)
417
418=== added file 'README.md'
419--- README.md 1970-01-01 00:00:00 +0000
420+++ README.md 2017-04-05 07:49:18 +0000
421@@ -0,0 +1,30 @@
422+ReadMe - Ubuntu Doc Viewer App
423+==============================
424+Ubuntu Doc Viewer App is the official document viewer app for Ubuntu Touch. We follow an open
425+source model where the code is available to anyone to branch and hack on. The
426+ubuntu doc viewer app follows a test driven development (TDD) where tests are
427+written in parallel to feature implementation to help spot regressions easier.
428+
429+Usage
430+=====
431+ubuntu-docviewer-app [filename]
432+
433+filename : The path where the file you want to open is located.
434+
435+Dependencies
436+============
437+**DEPENDENCIES ARE NEEDED TO BE INSTALLED TO BUILD AND RUN THE APP**.
438+
439+A complete list of dependencies for the project can be found in ubuntu-docviewer-app/debian/control
440+
441+The following essential packages are also required to develop this app:
442+* [ubuntu-sdk](http://developer.ubuntu.com/start)
443+* intltool - run `sudo apt-get install intltool`
444+
445+Useful Links
446+============
447+Here are some useful links with regards to the Doc Viewer App development.
448+
449+* [Home Page](https://developer.ubuntu.com/en/community/core-apps/docviewer/)
450+* [Doc Viewer App Wiki](https://wiki.ubuntu.com/Touch/CoreApps/DocViewer)
451+* [Project page](https://launchpad.net/ubuntu-docviewer-app)
452
453=== removed file 'README.translations'
454--- README.translations 2015-01-24 00:03:13 +0000
455+++ README.translations 1970-01-01 00:00:00 +0000
456@@ -1,36 +0,0 @@
457-# Updating translations
458-
459-Translations for the Document Viewer app happen in [Launchpad Translations] and
460-are automatically committed daily on the trunk branch in the po/ folder.
461-
462-They are then built and installed as part of the package build, so that
463-developers don't really need to worry about them.
464-
465-However, there is one task that needs to be taken care of: exposing new
466-translatable messages to translators. So whenever you add new translatable
467-messages in the code, make sure to follow these steps:
468-
469- 1. Run click-buddy retaining the build directory:
470- `click-buddy --dir . --no-clean`
471- 2. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
472- 3. Push the branch and send a merge proposal as usual
473-
474-And that's it, once the branch lands Launchpad should take care of all the rest!
475-
476-# Behind the scenes
477-
478-Behind the scenes, whenever the po/*.pot file (also known as translations template)
479-is committed to trunk Launchpad reads it and updates the translatable strings
480-exposed in the web UI. This will enable translators to work on the new strings.
481-The translations template contains all translatable strings that have been
482-extracted from the source code files.
483-
484-Launchpad will then store translations in its database and will commit them daily
485-in the form of textual po/*.po files to trunk. The PO files are also usually
486-referred to as the translations files. You'll find a translation file for each
487-language the app has got at least a translated message available for.
488-
489-Translations for core apps follow the standard [gettext format].
490-
491- [Launchpad Translations]: https://translations.launchpad.net/ubuntu-docviewer-app
492- [gettext format]: https://www.gnu.org/software/gettext/
493
494=== added directory 'click'
495=== added file 'click/CMakeLists.txt'
496--- click/CMakeLists.txt 1970-01-01 00:00:00 +0000
497+++ click/CMakeLists.txt 2017-04-05 07:49:18 +0000
498@@ -0,0 +1,18 @@
499+if(CLICK_MODE)
500+ if(NOT BZR_REVNO)
501+ set(BZR_REVNO "latest")
502+ endif(NOT BZR_REVNO)
503+
504+ configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
505+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
506+ install(FILES docviewer.apparmor docviewer-content.json com.ubuntu.docviewer.url-dispatcher DESTINATION ${CMAKE_INSTALL_PREFIX})
507+endif(CLICK_MODE)
508+
509+
510+# Make the click files visible in Qt Creator
511+file(GLOB CLICK_FILES
512+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
513+ *.json *.json.in *.apparmor
514+)
515+
516+add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})
517
518=== added file 'click/com.ubuntu.docviewer.url-dispatcher'
519--- click/com.ubuntu.docviewer.url-dispatcher 1970-01-01 00:00:00 +0000
520+++ click/com.ubuntu.docviewer.url-dispatcher 2017-04-05 07:49:18 +0000
521@@ -0,0 +1,5 @@
522+[
523+ {
524+ "protocol": "document"
525+ }
526+]
527
528=== added file 'click/disable-file-locking.xcd'
529--- click/disable-file-locking.xcd 1970-01-01 00:00:00 +0000
530+++ click/disable-file-locking.xcd 2017-04-05 07:49:18 +0000
531@@ -0,0 +1,11 @@
532+<?xml version="1.0" encoding="UTF-8"?>
533+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
534+ <dependency file="main"/>
535+ <oor:component-data oor:package="org.openoffice.Office" oor:name="Common">
536+ <node oor:name="Misc">
537+ <prop oor:name="UseLocking">
538+ <value>false</value>
539+ </prop>
540+ </node>
541+ </oor:component-data>
542+</oor:data>
543
544=== added file 'click/disable-lo-features.sh'
545--- click/disable-lo-features.sh 1970-01-01 00:00:00 +0000
546+++ click/disable-lo-features.sh 2017-04-05 07:49:18 +0000
547@@ -0,0 +1,14 @@
548+#!/bin/bash
549+
550+# $1 is the temp folder where the packages have been extracted
551+TEMP_PATH=$1
552+LO_PATH=$TEMP_PATH/opt/libreoffice/lib/libreoffice
553+LO_REGISTRY=$LO_PATH/share/registry
554+
555+THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
556+
557+echo "Disable file locking in LibreOffice"
558+cp $THIS_DIR/disable-file-locking.xcd $LO_REGISTRY
559+
560+echo "Disable spell checking in LibreOffice"
561+cp $THIS_DIR/disable-spell-check.xcd $LO_REGISTRY
562
563=== added file 'click/disable-spell-check.xcd'
564--- click/disable-spell-check.xcd 1970-01-01 00:00:00 +0000
565+++ click/disable-spell-check.xcd 2017-04-05 07:49:18 +0000
566@@ -0,0 +1,23 @@
567+<?xml version="1.0" encoding="UTF-8"?>
568+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
569+ <dependency file="main"/>
570+ <oor:component-data oor:package="org.openoffice.Office" oor:name="Linguistic">
571+ <node oor:name="General">
572+ <node oor:name="DictionaryList">
573+ <prop oor:name="ActiveDictionaries">
574+ <value>IgnoreAllList</value>
575+ </prop>
576+ </node>
577+ </node>
578+ <node oor:name="GrammarChecking">
579+ <prop oor:name="IsAutoCheck">
580+ <value>false</value>
581+ </prop>
582+ </node>
583+ <node oor:name="SpellChecking">
584+ <prop oor:name="IsSpellAuto">
585+ <value>false</value>
586+ </prop>
587+ </node>
588+ </oor:component-data>
589+</oor:data>
590
591=== added file 'click/docviewer-content.json'
592--- click/docviewer-content.json 1970-01-01 00:00:00 +0000
593+++ click/docviewer-content.json 2017-04-05 07:49:18 +0000
594@@ -0,0 +1,8 @@
595+{
596+ "destination": [
597+ "documents"
598+ ],
599+ "source": [
600+ "documents"
601+ ]
602+}
603
604=== added file 'click/docviewer-libs.json'
605--- click/docviewer-libs.json 1970-01-01 00:00:00 +0000
606+++ click/docviewer-libs.json 2017-04-05 07:49:18 +0000
607@@ -0,0 +1,94 @@
608+{
609+ "armhf": [
610+ {
611+ "url": "http://ports.ubuntu.com/ubuntu-ports",
612+ "dist": "vivid",
613+ "component": "main",
614+ "packages": [
615+ "libboost-date-time1.55.0",
616+ "libgl1-mesa-glx",
617+ "libxcb-dri3-0",
618+ "libxcb-glx0",
619+ "libxcb-present0",
620+ "libxshmfence1",
621+ "libxslt1.1",
622+ "libxt6",
623+ "libxxf86vm1",
624+ "gconf-service",
625+ "gconf-service-backend",
626+ "gconf2-common",
627+ "libgconf-2-4"
628+ ]
629+ },
630+ {
631+ "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
632+ "dist": "vivid",
633+ "component": "main",
634+ "packages": [
635+ "libreoffice-vanilla"
636+ ]
637+ }
638+ ],
639+
640+ "i386": [
641+ {
642+ "url": "http://archive.ubuntu.com/ubuntu",
643+ "dist": "vivid",
644+ "component": "main",
645+ "packages": [
646+ "libboost-date-time1.55.0",
647+ "libgl1-mesa-glx",
648+ "libxcb-dri3-0",
649+ "libxcb-glx0",
650+ "libxcb-present0",
651+ "libxshmfence1",
652+ "libxslt1.1",
653+ "libxt6",
654+ "libxxf86vm1",
655+ "gconf-service",
656+ "gconf-service-backend",
657+ "gconf2-common",
658+ "libgconf-2-4"
659+ ]
660+ },
661+ {
662+ "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
663+ "dist": "vivid",
664+ "component": "main",
665+ "packages": [
666+ "libreoffice-vanilla"
667+ ]
668+ }
669+ ],
670+
671+ "amd64": [
672+ {
673+ "url": "http://archive.ubuntu.com/ubuntu",
674+ "dist": "vivid",
675+ "component": "main",
676+ "packages": [
677+ "libboost-date-time1.55.0",
678+ "libgl1-mesa-glx",
679+ "libxcb-dri3-0",
680+ "libxcb-glx0",
681+ "libxcb-present0",
682+ "libxshmfence1",
683+ "libxslt1.1",
684+ "libxt6",
685+ "libxxf86vm1",
686+ "gconf-service",
687+ "gconf-service-backend",
688+ "gconf2-common",
689+ "libgconf-2-4"
690+ ]
691+ },
692+ {
693+ "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
694+ "dist": "vivid",
695+ "component": "main",
696+ "packages": [
697+ "libreoffice-vanilla"
698+ ]
699+ }
700+ ]
701+}
702
703=== added file 'click/docviewer.apparmor'
704--- click/docviewer.apparmor 1970-01-01 00:00:00 +0000
705+++ click/docviewer.apparmor 2017-04-05 07:49:18 +0000
706@@ -0,0 +1,18 @@
707+{
708+ "policy_groups": [
709+ "content_exchange_source",
710+ "content_exchange",
711+ "keep-display-on"
712+ ],
713+ "read_path": [
714+ "@{HOME}/Documents/",
715+ "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
716+ "@{PROC}/*/mounts",
717+ "/dev/disk/by-label/"
718+ ],
719+ "write_path": [
720+ "@{HOME}/Documents/",
721+ "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/"
722+ ],
723+ "policy_version": 1.3
724+}
725\ No newline at end of file
726
727=== added file 'click/manifest.json.in'
728--- click/manifest.json.in 1970-01-01 00:00:00 +0000
729+++ click/manifest.json.in 2017-04-05 07:49:18 +0000
730@@ -0,0 +1,25 @@
731+{
732+ "name": "com.ubuntu.docviewer",
733+ "title": "Document Viewer",
734+ "description": "Document Viewer application for Ubuntu devices",
735+ "framework": "ubuntu-sdk-15.04.4",
736+ "architecture": "@CLICK_ARCH@",
737+ "icon": "@ICON@",
738+ "hooks": {
739+ "docviewer": {
740+ "apparmor": "docviewer.apparmor",
741+ "desktop": "com.ubuntu.docviewer.desktop",
742+ "content-hub": "docviewer-content.json",
743+ "urls": "com.ubuntu.docviewer.url-dispatcher"
744+ }
745+ },
746+ "version": "2.1.@BZR_REVNO@",
747+ "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
748+ "x-source": {
749+ "vcs-bzr": "@BZR_SOURCE@",
750+ "vcs-bzr-revno": "@BZR_REVNO@"
751+ },
752+ "x-test": {
753+ "autopilot": "@AUTOPILOT_DIR@"
754+ }
755+}
756
757=== added directory 'cmake'
758=== added directory 'cmake/modules'
759=== added file 'cmake/modules/Click.cmake'
760--- cmake/modules/Click.cmake 1970-01-01 00:00:00 +0000
761+++ cmake/modules/Click.cmake 2017-04-05 07:49:18 +0000
762@@ -0,0 +1,80 @@
763+if(CLICK_MODE)
764+ if(NOT DEFINED BZR_SOURCE)
765+ set(BZR_SOURCE "lp:${LP_PROJECT}")
766+ message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
767+ endif(NOT DEFINED BZR_SOURCE)
768+
769+ set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
770+ set(CMAKE_INSTALL_PREFIX /)
771+ set(DATA_DIR /)
772+
773+ # Path for ubuntu-docviewer-app executable
774+ set(BIN_DIR ${DATA_DIR}lib/${ARCH_TRIPLET}/bin)
775+
776+ # If running in CLICK_MODE, include binary dependencies of docviewer
777+ set(GET_CLICK_DEPS_TOOL ${CMAKE_SOURCE_DIR}/tools/get-click-deps)
778+ set(DEPS_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/click/docviewer-libs.json)
779+ set(CUSTOM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-lo-features.sh)
780+ set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
781+
782+ MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
783+
784+ if(NO_CACHE)
785+ # It has been specified not to cache .click dependencies on the machine.
786+ # This is meant to be used for automatic builds (e.g. Jenkins Bot).
787+ execute_process(
788+ COMMAND mkdir ${UPSTREAM_LIBS_DIR}
789+ COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
790+ )
791+ else(NO_CACHE)
792+ # Cache the .click dependencies for next usage. (Default)
793+ # Useful on developer machine.
794+ get_filename_component(BLD_CONFIGURATION_NAME ${CMAKE_BINARY_DIR} NAME)
795+ set(UPSTREAM_CACHE $ENV{HOME}/dev/upstream-libs-docviewer/${BLD_CONFIGURATION_NAME})
796+ MESSAGE("Upstream libs cache path: ${UPSTREAM_CACHE}")
797+
798+ if(EXISTS "${UPSTREAM_CACHE}")
799+ MESSAGE("Upstream libs cache exists.")
800+ file(COPY ${UPSTREAM_CACHE}/upstream-libs/ DESTINATION ${UPSTREAM_LIBS_DIR} PATTERN * )
801+ else()
802+ MESSAGE("Cache miss, downloading from network.")
803+ file(MAKE_DIRECTORY ${UPSTREAM_LIBS_DIR})
804+ file(MAKE_DIRECTORY ${UPSTREAM_CACHE})
805+ execute_process(
806+ COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
807+ )
808+ # Cache for next usage.
809+ file(COPY ${UPSTREAM_LIBS_DIR} DESTINATION ${UPSTREAM_CACHE} )
810+ endif() #EXISTS "${UPSTREAM_CACHE}"
811+ endif() #NO_CACHE
812+
813+ MESSAGE("Installing upstream libs from ${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
814+ file(GLOB_RECURSE UPSTREAM_LIBS "${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/*")
815+ foreach(ITEM ${UPSTREAM_LIBS})
816+ IF( IS_DIRECTORY "${ITEM}" )
817+ LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
818+ ELSE()
819+ LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
820+ ENDIF()
821+ endforeach()
822+ MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
823+ INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
824+
825+ MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
826+ INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
827+else(CLICK_MODE)
828+ execute_process(
829+ COMMAND qmake -query QT_INSTALL_QML
830+ OUTPUT_VARIABLE QT_IMPORTS_DIR
831+ OUTPUT_STRIP_TRAILING_WHITESPACE
832+ )
833+
834+ if (QT_IMPORTS_DIR STREQUAL "")
835+ set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml")
836+ message(STATUS "QT_IMPORTS_DIR is empty using default one: ${QT_IMPORTS_DIR}")
837+ else()
838+ message(STATUS "QT_IMPORTS_DIR set to ${QT_IMPORTS_DIR}")
839+ endif()
840+
841+ set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
842+endif(CLICK_MODE)
843
844=== removed file 'com.ubuntu.docviewer.url-dispatcher'
845--- com.ubuntu.docviewer.url-dispatcher 2015-02-13 15:30:01 +0000
846+++ com.ubuntu.docviewer.url-dispatcher 1970-01-01 00:00:00 +0000
847@@ -1,5 +0,0 @@
848-[
849- {
850- "protocol": "document"
851- }
852-]
853
854=== added directory 'data'
855=== added file 'data/CMakeLists.txt'
856--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
857+++ data/CMakeLists.txt 2017-04-05 07:49:18 +0000
858@@ -0,0 +1,27 @@
859+if(CLICK_MODE)
860+ set(ICON ${ICON_FILE})
861+ set(DESKTOP_DIR ${DATA_DIR})
862+
863+ install(FILES ${ICON_FILE} DESTINATION ${DATA_DIR})
864+else(CLICK_MODE)
865+ set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
866+ set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
867+
868+ install(DIRECTORY icons/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
869+ FILES_MATCHING PATTERN *.png
870+ )
871+endif(CLICK_MODE)
872+
873+set(EXEC "${APP_NAME}")
874+
875+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
876+
877+add_custom_target(${DESKTOP_FILE} ALL
878+ COMMENT "Merging translations into ${DESKTOP_FILE}"
879+ COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
880+ ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE}
881+)
882+
883+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
884+ DESTINATION ${DESKTOP_DIR}
885+)
886
887=== renamed file 'com.ubuntu.docviewer.desktop.in.in' => 'data/com.ubuntu.docviewer.desktop.in.in'
888--- com.ubuntu.docviewer.desktop.in.in 2015-07-30 11:14:35 +0000
889+++ data/com.ubuntu.docviewer.desktop.in.in 2017-04-05 07:49:18 +0000
890@@ -9,4 +9,4 @@
891 MimeType=text/plain;application/pdf
892 X-Ubuntu-Touch=true
893 X-Ubuntu-Splash-Show-Header=true
894-_X-Ubuntu-Splash-Title=Document Viewer
895+_X-Ubuntu-Splash-Title=Documents
896
897=== added file 'data/docviewer-app.png'
898Binary files data/docviewer-app.png 1970-01-01 00:00:00 +0000 and data/docviewer-app.png 2017-04-05 07:49:18 +0000 differ
899=== modified file 'debian/changelog'
900--- debian/changelog 2015-06-24 20:50:40 +0000
901+++ debian/changelog 2017-04-05 07:49:18 +0000
902@@ -1,3 +1,56 @@
903+ubuntu-docviewer-app (2.1) vivid; urgency=medium
904+
905+ * Fixed an issue with the documents list not updating the model entries (LP: #1483218)
906+ * New theming/UI components in OTA-10 fully supported (LP: #1551259)
907+ * LibreOffice viewer: added support for spreadsheet documents with multiple sheets (LP: #1537755)
908+ * LibreOffice viewer: limited zoom value to a minimum/maximum value (LP: #1501424)
909+ * LibreOffice viewer: added a double-tap-to-zoom gesture (LP: #1541582)
910+ * LibreOffice viewer: use QQuickAsyncImageProvider for thumbnails
911+ * LibreOffice viewer: show content at the center of the window (LP: #1515655)
912+ * LibreOffice viewer: better support for HiDPI screens (LP: #1535264)
913+ * More zoom options for LibreOffice presentations (LP: #1515649)
914+ * A manual zoom (1.0x) is now default for Libreoffice spreadsheets (LP: #1513960)
915+ * Resolved a content-hub issue that prevents users to export a document to another app (LP: #1544149)
916+ * Resolved an issue occurring when the user tries to delete a document stored in a external media (LP: #1524293)
917+ * Full-screen presentation mode for PDF documents (LP: #1534761)
918+ * Updated night mode shader
919+ * Updated and expanded READMEs
920+ * UI improvements
921+
922+ -- Stefano Verzegnassi <verzegnassi.stefano@gmail.com> Thu, 11 Feb 2016 18:36:48 +0100
923+
924+ubuntu-docviewer-app (2.0) vivid; urgency=medium
925+
926+ * Updated application icon (LP: #1476659 and LP: #1432392)
927+ * Updated translations
928+ * Added support to Office documents through libreofficekit
929+ * General performance improvements
930+ * UX more consistent with the design guidelines
931+ * Updated to ubuntu-sdk-14.04.1 (QtQuick 2.4 and Ubuntu.Components 1.3) (LP: #1508363)
932+ * A more intuitive UI when importing a new document
933+ * Added a 'share' action for exporting a document to another app/web service (LP: #1494818)
934+ * Removed GridView from documents page (will be reintroduced in future)
935+ * Refactored app initialization
936+ * Better zoom support on desktop
937+ * Switched to QML Ubuntu.ContentHub APIs (LP: #1469422)
938+ * Switched to QML Ubuntu.Components.Arguments APIs
939+ * Changed header behaviour in the PDF viewer (LP: #1453403)
940+ * Fix for stage mode being forced on Nexus 10 (LP: #1479483)
941+
942+ -- Stefano Verzegnassi <verzegnassi.stefano@gmail.com> Wed, 02 Dec 2015 16:08:55 +0100
943+
944+ubuntu-docviewer-app (0.3.181) vivid; urgency=medium
945+
946+ [ Roman Shchekin ]
947+ * Improved multithreading in the PDF viewer
948+
949+ [ Stefano Verzegnassi ]
950+ * Don't show duplicated entries from VFAT file systems (LP: #1477713)
951+ * Fixed bad strings in the translation template (LP: #1477502)
952+ * Restored contextual actions in the documents page (LP: #1447995)
953+
954+ -- Stefano Verzegnassi <verzegnassi.stefano@gmail.com> Sat, 01 Aug 2015 07:43:03 +0200
955+
956 ubuntu-docviewer-app (0.3.154) vivid; urgency=medium
957
958 * Fix missing icon for desktop: #1468418
959
960=== modified file 'debian/control'
961--- debian/control 2015-02-23 12:49:52 +0000
962+++ debian/control 2017-04-05 07:49:18 +0000
963@@ -4,14 +4,13 @@
964 Build-Depends: cmake,
965 debhelper (>= 9),
966 intltool,
967- libcontent-hub-dev (>= 0.0+13.10.20130930.1),
968 libpoppler-qt5-dev,
969 pep8,
970 pkg-config,
971 pkg-kde-tools,
972 python3-all,
973 qt5-default,
974- qtbase5-dev,
975+ qtbase5-dev (>= 5.4.0),
976 qtchooser,
977 qtdeclarative5-dev,
978 qtdeclarative5-dev-tools,
979@@ -22,20 +21,57 @@
980 Standards-Version: 3.9.6
981 Section: misc
982 Homepage: https://launchpad.net/ubuntu-docviewer-app
983-Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/trunk
984+Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot
985
986 Package: ubuntu-docviewer-app
987 Architecture: any
988-Depends: qtdeclarative5-qtquick2-plugin,
989- qtdeclarative5-ubuntu-ui-toolkit-plugin,
990- ${misc:Depends}
991+Depends: ${misc:Depends},
992+ qtdeclarative5-documentviewer-common (= ${source:Version}),
993+ qtdeclarative5-documentviewer-libreoffice (= ${source:Version}),
994+ qtdeclarative5-documentviewer-pdf (= ${source:Version}),
995+ suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
996+ qtdeclarative5-qtquick2-plugin,
997+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
998+ qtdeclarative5-ubuntu-content1,
999+ qtdeclarative5-quicklayouts-plugin,
1000+ qtdeclarative5-window-plugin
1001 Description: Document Viewer application
1002 Core Document Viewer application
1003
1004+Package: qtdeclarative5-documentviewer-common
1005+Architecture: any
1006+Depends: ${misc:Depends},
1007+ ${shlibs:Depends},
1008+ ${misc:Pre-Depends},
1009+Description: Document Viewer QML plugin
1010+ This package contains a plugin with some helper functions for the Ubuntu
1011+ Document Viewer.
1012+
1013+Package: qtdeclarative5-documentviewer-libreoffice
1014+Architecture: any
1015+Depends: ${misc:Depends},
1016+ ${shlibs:Depends},
1017+ ${misc:Pre-Depends},
1018+ libreoffice-vanilla (>= 5.0.0) | libreoffice (>= 5.0.0)
1019+Description: LibreOffice QML plugin
1020+ This package contains a plugin that enables QML apps to read
1021+ and display any LibreOffice document.
1022+
1023+Package: qtdeclarative5-documentviewer-pdf
1024+Architecture: any
1025+Depends: ${misc:Depends},
1026+ ${shlibs:Depends},
1027+ ${misc:Pre-Depends},
1028+ libpoppler-qt5-1
1029+Description: Poppler PDF QML plugin
1030+ This package contains a plugin that enables QML apps to read
1031+ and display any PDF document, via the Poppler Qt5 bindings.
1032+
1033 Package: ubuntu-docviewer-app-autopilot
1034 Architecture: all
1035 Depends: libautopilot-qt,
1036 libqt5test5,
1037+ python3-lxml,
1038 ubuntu-docviewer-app (>= ${source:Version}),
1039 ubuntu-ui-toolkit-autopilot,
1040 ${misc:Depends}
1041
1042=== added file 'debian/qtdeclarative5-documentviewer-common.install'
1043--- debian/qtdeclarative5-documentviewer-common.install 1970-01-01 00:00:00 +0000
1044+++ debian/qtdeclarative5-documentviewer-common.install 2017-04-05 07:49:18 +0000
1045@@ -0,0 +1,2 @@
1046+usr/lib/*/qt5/qml/DocumentViewer/qmldir
1047+usr/lib/*/qt5/qml/DocumentViewer/libfileqmlplugin.so
1048
1049=== added file 'debian/qtdeclarative5-documentviewer-libreoffice.install'
1050--- debian/qtdeclarative5-documentviewer-libreoffice.install 1970-01-01 00:00:00 +0000
1051+++ debian/qtdeclarative5-documentviewer-libreoffice.install 2017-04-05 07:49:18 +0000
1052@@ -0,0 +1,1 @@
1053+usr/lib/*/qt5/qml/DocumentViewer/LibreOffice
1054
1055=== added file 'debian/qtdeclarative5-documentviewer-pdf.install'
1056--- debian/qtdeclarative5-documentviewer-pdf.install 1970-01-01 00:00:00 +0000
1057+++ debian/qtdeclarative5-documentviewer-pdf.install 2017-04-05 07:49:18 +0000
1058@@ -0,0 +1,1 @@
1059+usr/lib/*/qt5/qml/DocumentViewer/PDF
1060
1061=== modified file 'debian/rules'
1062--- debian/rules 2015-04-27 16:29:17 +0000
1063+++ debian/rules 2017-04-05 07:49:18 +0000
1064@@ -12,7 +12,7 @@
1065
1066 override_dh_auto_test:
1067 dh_auto_test
1068- ./run-pep8
1069+ ./tools/run-pep8
1070
1071 override_dh_install:
1072 dh_install --fail-missing
1073
1074=== modified file 'debian/ubuntu-docviewer-app.install'
1075--- debian/ubuntu-docviewer-app.install 2015-01-29 19:23:09 +0000
1076+++ debian/ubuntu-docviewer-app.install 2017-04-05 07:49:18 +0000
1077@@ -1,5 +1,4 @@
1078 usr/bin/ubuntu-docviewer-app
1079-usr/lib/*/qt5
1080 usr/share/applications
1081 usr/share/locale
1082 usr/share/ubuntu-docviewer-app
1083
1084=== removed file 'docviewer-content.json'
1085--- docviewer-content.json 2015-02-13 15:30:01 +0000
1086+++ docviewer-content.json 1970-01-01 00:00:00 +0000
1087@@ -1,8 +0,0 @@
1088-{
1089- "destination": [
1090- "documents"
1091- ],
1092- "source": [
1093- "documents"
1094- ]
1095-}
1096
1097=== removed file 'docviewer.apparmor'
1098--- docviewer.apparmor 2015-05-13 14:22:36 +0000
1099+++ docviewer.apparmor 1970-01-01 00:00:00 +0000
1100@@ -1,16 +0,0 @@
1101-{
1102- "policy_groups": [
1103- "content_exchange_source",
1104- "content_exchange"
1105- ],
1106- "read_path": [
1107- "@{HOME}/Documents/",
1108- "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
1109- "@{PROC}/*/mounts",
1110- "/dev/disk/by-label/"
1111- ],
1112- "write_path": [
1113- "@{HOME}/Documents/"
1114- ],
1115- "policy_version": 1.2
1116-}
1117
1118=== removed file 'docviewer@30.png'
1119Binary files docviewer@30.png 2014-09-12 21:56:55 +0000 and docviewer@30.png 1970-01-01 00:00:00 +0000 differ
1120=== removed file 'manifest.json.in'
1121--- manifest.json.in 2015-02-13 15:30:01 +0000
1122+++ manifest.json.in 1970-01-01 00:00:00 +0000
1123@@ -1,25 +0,0 @@
1124-{
1125- "name": "com.ubuntu.docviewer",
1126- "title": "Document Viewer",
1127- "description": "Document Viewer application for Ubuntu devices",
1128- "framework": "ubuntu-sdk-14.10",
1129- "architecture": "@CLICK_ARCH@",
1130- "icon": "@ICON@",
1131- "hooks": {
1132- "docviewer": {
1133- "apparmor": "docviewer.apparmor",
1134- "desktop": "com.ubuntu.docviewer.desktop",
1135- "content-hub": "docviewer-content.json",
1136- "urls": "@URLS_FILE@"
1137- }
1138- },
1139- "version": "0.3.@BZR_REVNO@",
1140- "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
1141- "x-source": {
1142- "vcs-bzr": "@BZR_SOURCE@",
1143- "vcs-bzr-revno": "@BZR_REVNO@"
1144- },
1145- "x-test": {
1146- "autopilot": "@AUTOPILOT_DIR@"
1147- }
1148-}
1149
1150=== modified file 'po/CMakeLists.txt'
1151--- po/CMakeLists.txt 2015-04-29 16:09:12 +0000
1152+++ po/CMakeLists.txt 2017-04-05 07:49:18 +0000
1153@@ -17,12 +17,22 @@
1154 set(POT_FILE ${DOMAIN}.pot)
1155 file(GLOB PO_FILES *.po)
1156
1157+file(GLOB_RECURSE I18N_SRC_FILES
1158+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
1159+ ${CMAKE_SOURCE_DIR}/*.qml
1160+ ${CMAKE_SOURCE_DIR}/*.js
1161+ ${CMAKE_SOURCE_DIR}/*.cpp)
1162+list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in.in.h)
1163+list(SORT I18N_SRC_FILES)
1164+
1165+message("Found ${I18N_SRC_FILES}")
1166+
1167 # Creates the .pot file containing the translations template
1168 add_custom_target(${POT_FILE} ALL
1169 COMMENT "Generating translation template"
1170 # Extract the translatable messages from the desktop file
1171 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
1172- --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
1173+ --srcdir=${CMAKE_SOURCE_DIR}/data ${DESKTOP_FILE}.in.in
1174 # Update the translation file
1175 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
1176 --from-code=UTF-8
1177@@ -47,7 +57,6 @@
1178 RENAME ${DOMAIN}.mo)
1179 endforeach(PO_FILE)
1180
1181-
1182 # make the translation files visible on qtcreator
1183 file(GLOB TRANSLATION_FILES
1184 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
1185
1186=== modified file 'po/am.po'
1187--- po/am.po 2015-09-23 06:28:55 +0000
1188+++ po/am.po 2017-04-05 07:49:18 +0000
1189@@ -7,14 +7,20 @@
1190 msgstr ""
1191 "Project-Id-Version: ubuntu-docviewer-app\n"
1192 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1193+<<<<<<< TREE
1194 "POT-Creation-Date: 2015-07-24 11:10+0200\n"
1195 "PO-Revision-Date: 2015-09-22 22:55+0000\n"
1196+=======
1197+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
1198+"PO-Revision-Date: 2016-03-10 20:13+0000\n"
1199+>>>>>>> MERGE-SOURCE
1200 "Last-Translator: samson <Unknown>\n"
1201 "Language-Team: Amharic <am@li.org>\n"
1202 "MIME-Version: 1.0\n"
1203 "Content-Type: text/plain; charset=UTF-8\n"
1204 "Content-Transfer-Encoding: 8bit\n"
1205 "Plural-Forms: nplurals=2; plural=n > 1;\n"
1206+<<<<<<< TREE
1207 "X-Launchpad-Export-Date: 2015-09-23 06:28+0000\n"
1208 "X-Generator: Launchpad (build 17749)\n"
1209
1210@@ -40,44 +46,75 @@
1211 #: ../src/app/qml/common/DetailsPage.qml:27
1212 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
1213 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
1214+=======
1215+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
1216+"X-Generator: Launchpad (build 18335)\n"
1217+
1218+#: ../src/app/qml/common/CommandLineProxy.qml:49
1219+msgid "Some of the provided arguments are not valid."
1220+msgstr "አንዳንድ የ ቀረቡት ክርክሮች ዋጋ የላቸውም"
1221+
1222+#: ../src/app/qml/common/CommandLineProxy.qml:58
1223+msgid "Open ubuntu-docviewer-app displaying the selected file"
1224+msgstr "የ ኡቡንቱ-ሰነድ መመልከቻ-መተግበሪያ የተመረጠውን ፋይል ማሳያ"
1225+
1226+#: ../src/app/qml/common/CommandLineProxy.qml:65
1227+msgid "Run fullscreen"
1228+msgstr "በ ሙሉ መመልከቻ ዘዴ ማስኬጃ"
1229+
1230+#: ../src/app/qml/common/CommandLineProxy.qml:71
1231+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
1232+msgstr "የ ኡቡንቱ-ሰነድ መመልከቻ-መተግበሪያ በ ስእል ዘዴ: ለሙከራ ብቻ"
1233+
1234+#: ../src/app/qml/common/CommandLineProxy.qml:77
1235+msgid ""
1236+"Show documents from the given folder, instead of ~/Documents.\n"
1237+"The path must exist prior to running ubuntu-docviewer-app"
1238+msgstr ""
1239+"ሰነዶችን ማሳያ ከ ተሰጠው ፎልደር ውስጥ: instead of ~/Documents.\n"
1240+"መንገዱ ቀደም ብሎ መኖር አለበት የ ubuntu-docviewer-app ከማስኬዶት በፊት"
1241+
1242+#: ../src/app/qml/common/DetailsPage.qml:26
1243+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
1244+#: ../src/app/qml/pdfView/PdfView.qml:235
1245+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
1246+>>>>>>> MERGE-SOURCE
1247 msgid "Details"
1248 msgstr "ዝርዝሮች"
1249
1250-#: ../src/app/qml/common/DetailsPage.qml:33
1251+#: ../src/app/qml/common/DetailsPage.qml:42
1252+msgid "File"
1253+msgstr "ፋይል"
1254+
1255+#: ../src/app/qml/common/DetailsPage.qml:47
1256 msgid "Location"
1257 msgstr "አካባቢ"
1258
1259-#: ../src/app/qml/common/DetailsPage.qml:37
1260+#: ../src/app/qml/common/DetailsPage.qml:52
1261 msgid "Size"
1262 msgstr "መጠን"
1263
1264-#: ../src/app/qml/common/DetailsPage.qml:42
1265+#: ../src/app/qml/common/DetailsPage.qml:57
1266 msgid "Created"
1267 msgstr "የተፈጠረው"
1268
1269-#: ../src/app/qml/common/DetailsPage.qml:47
1270+#: ../src/app/qml/common/DetailsPage.qml:62
1271 msgid "Last modified"
1272 msgstr "መጨረሻ የተሻሻለው"
1273
1274-#: ../src/app/qml/common/DetailsPage.qml:54
1275+#: ../src/app/qml/common/DetailsPage.qml:69
1276 msgid "MIME type"
1277 msgstr "MIME አይነት"
1278
1279-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
1280+#: ../src/app/qml/common/ErrorDialog.qml:23
1281 msgid "Error"
1282 msgstr "ስህተት"
1283
1284-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
1285-msgid "File does not exist"
1286-msgstr "ፋይሉ አልተገኘም"
1287-
1288-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
1289-#: ../src/app/qml/common/PickImportedDialog.qml:47
1290+#: ../src/app/qml/common/ErrorDialog.qml:26
1291+#: ../src/app/qml/common/PickImportedDialog.qml:54
1292 #: ../src/app/qml/common/RejectedImportDialog.qml:38
1293-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
1294+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
1295 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
1296-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
1297-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
1298 msgid "Close"
1299 msgstr "መዝጊያ"
1300
1301@@ -98,6 +135,7 @@
1302 #: ../src/app/qml/common/RejectedImportDialog.qml:29
1303 msgid "Following document has not been imported:"
1304 msgid_plural "Following documents have not been imported:"
1305+<<<<<<< TREE
1306 msgstr[0] "የሚቀጥለው ሰነድ አልመጣም:"
1307 msgstr[1] "የሚቀጥሉት ሰነዶች አልመጡም:"
1308
1309@@ -106,23 +144,36 @@
1310 msgstr "መደምሰሻ"
1311
1312 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
1313+=======
1314+msgstr[0] "የሚቀጥለው ሰነድ አልመጣም:"
1315+msgstr[1] "የሚቀጥሉት ሰነዶች አልመጡም:"
1316+
1317+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
1318+>>>>>>> MERGE-SOURCE
1319 msgid "Unknown file type"
1320 msgstr "ያልታወቀ የፋይል አይነት"
1321
1322-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
1323+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
1324 msgid ""
1325-"Sorry but we can't find a way to display this file. Do you want to open it "
1326-"as a plain text?"
1327-msgstr "አዝናለሁ ይህን ፋይል ለማሳየት አልተቻለም: እንደ መደበኛ ጽሁፍ መክፈት ይፈልጋሉ?"
1328-
1329-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
1330+"This file is not supported.\n"
1331+"Do you want to open it as a plain text?"
1332+msgstr ""
1333+"ይህ ፋይል የተደገፈ አይደለም\n"
1334+"እንደ መደበኛ ጽሁፍ መክፈት ይፈልጋሉ?"
1335+
1336+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
1337+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
1338+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
1339+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
1340+#: ../src/app/qml/pdfView/PdfView.qml:180
1341+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
1342+msgid "Cancel"
1343+msgstr "መሰረዣ"
1344+
1345+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
1346 msgid "Yes"
1347 msgstr "አዎ"
1348
1349-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
1350-msgid "No"
1351-msgstr "አይ"
1352-
1353 #. TRANSLATORS: %1 is the size of a file, expressed in GB
1354 #: ../src/app/qml/common/utils.js:22
1355 #, qt-format
1356@@ -147,98 +198,75 @@
1357 msgid "%1 byte"
1358 msgstr "%1 ባይት"
1359
1360-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
1361+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
1362 msgid "Delete file"
1363 msgstr "ፋይል ማጥፊያ"
1364
1365-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
1366+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
1367 #, qt-format
1368 msgid "Delete %1 file"
1369 msgid_plural "Delete %1 files"
1370 msgstr[0] "ማጥፊያ %1 ፋይል"
1371 msgstr[1] "ማጥፊያ %1 ፋይሎች"
1372
1373-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
1374-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
1375+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
1376+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
1377 msgid "Are you sure you want to permanently delete this file?"
1378 msgid_plural "Are you sure you want to permanently delete these files?"
1379 msgstr[0] "ይህን ፋይል በ እርግጥ በቋሚነት ማጥፋት ይፈልጋሉ?"
1380 msgstr[1] "እነዚህን ፋይሎች በ እርግጥ በቋሚነት ማጥፋት ይፈልጋሉ?"
1381
1382-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
1383-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
1384-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
1385-msgid "Cancel"
1386-msgstr "መሰረዣ"
1387-
1388-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
1389+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
1390 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
1391-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
1392+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
1393 msgid "Delete"
1394 msgstr "ማጥፊያ"
1395
1396-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
1397-msgid "No document found"
1398+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
1399+msgid "Share"
1400+msgstr "ማካፈያ"
1401+
1402+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
1403+msgid "No documents found"
1404 msgstr "ምንም ሰነድ አልተገኘም"
1405
1406 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
1407 msgid ""
1408 "Connect your device to any computer and simply drag files to the Documents "
1409-"folder."
1410-msgstr "የ እርስዎን አካል ከ ማንኛውም ኮምፒዩተር ጋር ያገናኙ እና ፋይሎችን ይጎትቱ ወደ ሰነዶች ፎልደር"
1411+"folder or insert removable media containing documents."
1412+msgstr ""
1413+"የ እርስዎን አካል ከ ኮምፒዩተር ጋር ያገናኙ እና ፋይሎች ይጎትቱ ወደ ሰነዶች ፎልደር ወይንም ያስገቡ የሚወልቅ አካል "
1414+"ሰነዱን የያዘውን"
1415
1416 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
1417 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
1418-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
1419-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
1420+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
1421 #, qt-format
1422 msgid "Today, %1"
1423 msgstr "ዛሬ, %1"
1424
1425 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
1426 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
1427-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
1428-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
1429+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
1430 #, qt-format
1431 msgid "Yesterday, %1"
1432 msgstr "ትናንትና, %1"
1433
1434 #. TRANSLATORS: this is a datetime formatting string,
1435 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
1436-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
1437-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
1438+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
1439+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
1440+msgid "yyyy/MM/dd hh:mm"
1441+msgstr "yyyy/MM/dd hh:mm"
1442+
1443+#. TRANSLATORS: this is a datetime formatting string,
1444+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
1445+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
1446 msgid "dddd, hh:mm"
1447 msgstr "dddd, hh:mm"
1448
1449-#. TRANSLATORS: this is a datetime formatting string,
1450-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
1451-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
1452-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
1453-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
1454-msgid "dd-MM-yyyy hh:mm"
1455-msgstr "dd-MM-yyyy hh:mm"
1456-
1457-#: ../src/app/qml/documentPage/DocumentListView.qml:157
1458-msgid "Today"
1459-msgstr "ዛሬ"
1460-
1461-#: ../src/app/qml/documentPage/DocumentListView.qml:160
1462-msgid "Yesterday"
1463-msgstr "ትናንትና"
1464-
1465-#: ../src/app/qml/documentPage/DocumentListView.qml:163
1466-msgid "Earlier this week"
1467-msgstr "በዚህ ሳምንት መጀመሪያ"
1468-
1469-#: ../src/app/qml/documentPage/DocumentListView.qml:166
1470-msgid "Earlier this month"
1471-msgstr "በዚህ ወር መጀመሪያ"
1472-
1473-#: ../src/app/qml/documentPage/DocumentListView.qml:168
1474-msgid "Even earlier..."
1475-msgstr "ከዚያ ቀደም ብሎ..."
1476-
1477-#: ../src/app/qml/documentPage/DocumentPage.qml:24
1478+#: ../src/app/qml/documentPage/DocumentPage.qml:23
1479+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
1480 msgid "Documents"
1481 msgstr "ሰነዶች"
1482
1483@@ -246,27 +274,23 @@
1484 msgid "Search..."
1485 msgstr "መፈለጊያ..."
1486
1487-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
1488+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
1489 msgid "Sorting settings..."
1490 msgstr "መለያ ማሰናጃዎች..."
1491
1492-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
1493-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
1494+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
1495 msgid "Switch to single column list"
1496 msgstr "ወደ አንድ አምድ ዝርዝር መቀየሪያ"
1497
1498-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
1499-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
1500+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
1501 msgid "Switch to grid"
1502 msgstr "ወደ ስኴር መቀየሪያ"
1503
1504-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
1505+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
1506 msgid "Pick"
1507 msgstr "መምረጫ"
1508
1509 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
1510-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
1511-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
1512 msgid "Back"
1513 msgstr "ወደ ኋላ"
1514
1515@@ -274,11 +298,11 @@
1516 msgid "search in documents..."
1517 msgstr "በ ሰነድ ውስጥ መፈለጊያ..."
1518
1519-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
1520+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
1521 msgid "Select None"
1522 msgstr "ምንም አይምረጡ"
1523
1524-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
1525+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
1526 msgid "Select All"
1527 msgstr "ሁሉንም መምረጫ"
1528
1529@@ -289,7 +313,35 @@
1530 #: ../src/app/qml/documentPage/SearchEmptyState.qml:26
1531 msgid ""
1532 "Please ensure that your query is not misspelled and/or try a different query."
1533-msgstr "እባክዎን ጥያቄዎ በ ትክክል መጻፉን ያረጋግጡ እና/ወይንም ሌላ ጥያቄ ይሞክሩ"
1534+<<<<<<< TREE
1535+msgstr "እባክዎን ጥያቄዎ በ ትክክል መጻፉን ያረጋግጡ እና/ወይንም ሌላ ጥያቄ ይሞክሩ"
1536+=======
1537+msgstr "እባክዎን ጥያቄዎ በ ትክክል መጻፉን ያረጋግጡ እና/ወይንም ሌላ ጥያቄ ይሞክሩ"
1538+
1539+#: ../src/app/qml/documentPage/SectionHeader.qml:13
1540+msgid "Today"
1541+msgstr "ዛሬ"
1542+
1543+#: ../src/app/qml/documentPage/SectionHeader.qml:16
1544+msgid "Yesterday"
1545+msgstr "ትናንትና"
1546+
1547+#: ../src/app/qml/documentPage/SectionHeader.qml:19
1548+msgid "Earlier this week"
1549+msgstr "በዚህ ሳምንት መጀመሪያ"
1550+
1551+#: ../src/app/qml/documentPage/SectionHeader.qml:22
1552+msgid "Earlier this month"
1553+msgstr "በዚህ ወር መጀመሪያ"
1554+
1555+#: ../src/app/qml/documentPage/SectionHeader.qml:24
1556+msgid "Even earlier..."
1557+msgstr "ከዚያ ቀደም ብሎ..."
1558+
1559+#: ../src/app/qml/documentPage/SharePage.qml:23
1560+msgid "Share to"
1561+msgstr "ማካፈያ ለ"
1562+>>>>>>> MERGE-SOURCE
1563
1564 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
1565 msgid "Sorting settings"
1566@@ -309,29 +361,146 @@
1567
1568 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
1569 msgid "Reverse order"
1570-msgstr "በ ተቃራኒ ደንብ"
1571+<<<<<<< TREE
1572+msgstr "በ ተቃራኒ ደንብ"
1573+=======
1574+msgstr "በ ተቃራኒ ደንብ"
1575+
1576+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
1577+#: ../src/app/qml/textView/TextView.qml:43
1578+msgid "Loading..."
1579+msgstr "በመጫን ላይ..."
1580+
1581+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
1582+msgid "LibreOffice text document"
1583+msgstr "ሊብሬ ቢሮ የ ጽሁፍ ሰነድ"
1584+
1585+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
1586+msgid "LibreOffice spread sheet"
1587+msgstr "ሊብሬ ቢሮ ሰንጠረዥ"
1588+
1589+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
1590+msgid "LibreOffice presentation"
1591+msgstr "ሊብሬ ቢሮ ማቅረቢያ"
1592+
1593+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
1594+msgid "LibreOffice Draw document"
1595+msgstr "ሊብሬ ቢሮ መሳያ ሰነድ"
1596+
1597+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
1598+msgid "Unknown LibreOffice document"
1599+msgstr "ያልታወቀ የ ሊብሬ ቢሮ ሰነድ"
1600+
1601+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
1602+msgid "Unknown type document"
1603+msgstr "ያልታወቀ የ ሰነድ አይነት"
1604+
1605+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
1606+msgid "Go to position..."
1607+msgstr "መሄጃ ወደ ቦታ..."
1608+
1609+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
1610+#: ../src/app/qml/pdfView/PdfView.qml:228
1611+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
1612+msgid "Disable night mode"
1613+msgstr "የ ማታ ዘዴ ማሰናከያ"
1614+
1615+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
1616+#: ../src/app/qml/pdfView/PdfView.qml:228
1617+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
1618+msgid "Enable night mode"
1619+msgstr "የ ማታ ዘዴ ማስቻያ"
1620+
1621+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
1622+msgid "Go to position"
1623+msgstr "መሄጃ ወደ ቦታ"
1624+
1625+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
1626+msgid "Choose a position between 1% and 100%"
1627+msgstr "ቦታ ይምረጡ በ 1% እና 100% መካከል"
1628+
1629+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
1630+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
1631+msgid "GO!"
1632+msgstr "እንሂድ!"
1633+
1634+#: ../src/app/qml/loView/LOViewPage.qml:167
1635+msgid "LibreOffice binaries not found."
1636+msgstr "የ ሊብሬ ቢሮ binaries አልተገኘም"
1637+
1638+#: ../src/app/qml/loView/LOViewPage.qml:170
1639+msgid "Error while loading LibreOffice."
1640+msgstr "ሊብሬ ቢሮ ሲጫን ስህተት ተፈጥሯል"
1641+
1642+#: ../src/app/qml/loView/LOViewPage.qml:173
1643+msgid ""
1644+"Document not loaded.\n"
1645+"The requested document may be corrupt or protected by a password."
1646+msgstr ""
1647+"ሰነዱ አክተጫነም\n"
1648+"የሚፈለገው ሰነድ ምናልባት የተበላሸ ይሆናል: ወይንም በ መግቢያ ቃል የሚጠበቅ ይሆናል"
1649+
1650+#: ../src/app/qml/loView/LOViewPage.qml:228
1651+msgid "This sheet has no content."
1652+msgstr "ይህ ወረቀት ምንም ይዞታ የለውም"
1653+
1654+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
1655+#. Document Viewer for rendering LibreOffice/MS-Office documents.
1656+#. Ref. https://docs.libreoffice.org/libreofficekit.html
1657+#: ../src/app/qml/loView/Splashscreen.qml:45
1658+msgid "Powered by LibreOfficeKit"
1659+msgstr "በ ሊብሬ ቢሮ ጥቅል የቀረበ"
1660+
1661+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
1662+#. This is the default name for a sheet in LibreOffice.
1663+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
1664+#, qt-format
1665+msgid "Sheet%1"
1666+msgstr "ወረቀት%1"
1667+
1668+#: ../src/app/qml/loView/ZoomSelector.qml:122
1669+msgid "Fit width"
1670+msgstr "በ ስፋቱ ልክ"
1671+
1672+#: ../src/app/qml/loView/ZoomSelector.qml:123
1673+msgid "Fit height"
1674+msgstr "በ እርዝመቱ ልክ"
1675+
1676+#: ../src/app/qml/loView/ZoomSelector.qml:124
1677+msgid "Automatic"
1678+msgstr "ራሱ በራሱ"
1679+>>>>>>> MERGE-SOURCE
1680
1681 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
1682-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
1683-#: ../src/app/qml/pdfView/PdfView.qml:37
1684+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
1685+#: ../src/app/qml/pdfView/PdfView.qml:153
1686 msgid "Contents"
1687 msgstr "ይዞታዎች"
1688
1689+<<<<<<< TREE
1690 #: ../src/app/qml/pdfView/PdfContentsPage.qml:38
1691 msgid "Hide table of contents"
1692 msgstr "የ ማውጫ ሰንጠረዥ መደበቂያ"
1693
1694+=======
1695+>>>>>>> MERGE-SOURCE
1696 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
1697 #. while the second one (%2) refers to the total pages count.
1698-#: ../src/app/qml/pdfView/PdfView.qml:34
1699+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
1700+#: ../src/app/qml/pdfView/PdfView.qml:56
1701 #, qt-format
1702 msgid "Page %1 of %2"
1703 msgstr "ገጽ %1 ከ %2"
1704
1705-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
1706+#: ../src/app/qml/pdfView/PdfView.qml:203
1707+msgid "Search"
1708+msgstr "መፈለጊያ"
1709+
1710+#: ../src/app/qml/pdfView/PdfView.qml:213
1711 msgid "Go to page..."
1712 msgstr "መሄጃ ወደ ገጽ..."
1713
1714+<<<<<<< TREE
1715 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
1716 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
1717 msgid "Disable night mode"
1718@@ -343,14 +512,22 @@
1719 msgstr "የ ማታ ዘዴ ማስቻያ"
1720
1721 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
1722+=======
1723+#: ../src/app/qml/pdfView/PdfView.qml:221
1724+msgid "Presentation"
1725+msgstr "ማቅረቢያ"
1726+
1727+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
1728+>>>>>>> MERGE-SOURCE
1729 msgid "Go to page"
1730 msgstr "መሄጃ ወደ ገጽ"
1731
1732-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
1733+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
1734 #, qt-format
1735 msgid "Choose a page between 1 and %1"
1736 msgstr "ይምረጡ ገጽ በ 1 እና %1 መካከል"
1737
1738+<<<<<<< TREE
1739 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
1740 msgid "GO!"
1741 msgstr "እንሂድ!"
1742@@ -370,5 +547,39 @@
1743 msgstr "መክፈቻ"
1744
1745 #: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
1746+=======
1747+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
1748+msgid "File does not exist."
1749+msgstr "ፋይሉ አልነበረም"
1750+
1751+#. TRANSLATORS: This string is used for renaming a copied file,
1752+#. when a file with the same name already exists in user's
1753+#. Documents folder.
1754+#.
1755+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
1756+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
1757+#.
1758+#. where "2" is given by the argument "%1"
1759+#.
1760+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
1761+#, qt-format
1762+msgid "copy %1"
1763+msgstr "ኮፒ %1"
1764+
1765+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
1766+msgid "Document Viewer"
1767+msgstr "ሰነድ መመልከቻ"
1768+
1769+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
1770+>>>>>>> MERGE-SOURCE
1771 msgid "documents;viewer;pdf;reader;"
1772 msgstr "ሰነዶች: መመልከቻ: pdf: ማንበቢያ:"
1773+
1774+#~ msgid "File does not exist"
1775+#~ msgstr "ፋይሉ አልተገኘም"
1776+
1777+#~ msgid "No document found"
1778+#~ msgstr "ምንም ሰነድ አልተገኘም"
1779+
1780+#~ msgid "Hide table of contents"
1781+#~ msgstr "የ ማውጫ ሰንጠረዥ መደበቂያ"
1782
1783=== added file 'po/ar.po'
1784--- po/ar.po 1970-01-01 00:00:00 +0000
1785+++ po/ar.po 2017-04-05 07:49:18 +0000
1786@@ -0,0 +1,507 @@
1787+# Arabic translation for ubuntu-docviewer-app
1788+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1789+# This file is distributed under the same license as the ubuntu-docviewer-app package.
1790+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1791+#
1792+msgid ""
1793+msgstr ""
1794+"Project-Id-Version: ubuntu-docviewer-app\n"
1795+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1796+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
1797+"PO-Revision-Date: 2016-01-29 06:41+0000\n"
1798+"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1799+"Language-Team: Arabic <ar@li.org>\n"
1800+"MIME-Version: 1.0\n"
1801+"Content-Type: text/plain; charset=UTF-8\n"
1802+"Content-Transfer-Encoding: 8bit\n"
1803+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
1804+"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
1805+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
1806+"X-Generator: Launchpad (build 18335)\n"
1807+
1808+#: ../src/app/qml/common/CommandLineProxy.qml:49
1809+msgid "Some of the provided arguments are not valid."
1810+msgstr ""
1811+
1812+#: ../src/app/qml/common/CommandLineProxy.qml:58
1813+msgid "Open ubuntu-docviewer-app displaying the selected file"
1814+msgstr ""
1815+
1816+#: ../src/app/qml/common/CommandLineProxy.qml:65
1817+msgid "Run fullscreen"
1818+msgstr "تشغيل ملء الشاشة"
1819+
1820+#: ../src/app/qml/common/CommandLineProxy.qml:71
1821+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
1822+msgstr ""
1823+
1824+#: ../src/app/qml/common/CommandLineProxy.qml:77
1825+msgid ""
1826+"Show documents from the given folder, instead of ~/Documents.\n"
1827+"The path must exist prior to running ubuntu-docviewer-app"
1828+msgstr ""
1829+"عرض المستندات من المجلد المعطى، بدلا من مجلد ~/Documents.\n"
1830+"يجب أن يكون المجلد موجودا في مكانه قبل تشغيل تطبيق أوبونتو لعرض المستندات."
1831+
1832+#: ../src/app/qml/common/DetailsPage.qml:26
1833+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
1834+#: ../src/app/qml/pdfView/PdfView.qml:235
1835+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
1836+msgid "Details"
1837+msgstr "التفاصيل"
1838+
1839+#: ../src/app/qml/common/DetailsPage.qml:42
1840+msgid "File"
1841+msgstr "ملف"
1842+
1843+#: ../src/app/qml/common/DetailsPage.qml:47
1844+msgid "Location"
1845+msgstr "الموقع"
1846+
1847+#: ../src/app/qml/common/DetailsPage.qml:52
1848+msgid "Size"
1849+msgstr "الحجم"
1850+
1851+#: ../src/app/qml/common/DetailsPage.qml:57
1852+msgid "Created"
1853+msgstr "تم إنشاؤها"
1854+
1855+#: ../src/app/qml/common/DetailsPage.qml:62
1856+msgid "Last modified"
1857+msgstr "آخر تعديل"
1858+
1859+#: ../src/app/qml/common/DetailsPage.qml:69
1860+msgid "MIME type"
1861+msgstr "نوع MIME"
1862+
1863+#: ../src/app/qml/common/ErrorDialog.qml:23
1864+msgid "Error"
1865+msgstr "خطأ"
1866+
1867+#: ../src/app/qml/common/ErrorDialog.qml:26
1868+#: ../src/app/qml/common/PickImportedDialog.qml:54
1869+#: ../src/app/qml/common/RejectedImportDialog.qml:38
1870+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
1871+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
1872+msgid "Close"
1873+msgstr "إغلاق"
1874+
1875+#: ../src/app/qml/common/PickImportedDialog.qml:29
1876+msgid "Multiple documents imported"
1877+msgstr "ثم استيراد مستندات متعددة"
1878+
1879+#: ../src/app/qml/common/PickImportedDialog.qml:30
1880+msgid "Choose which one to open:"
1881+msgstr "اختر أيها تريد فتحه:"
1882+
1883+#: ../src/app/qml/common/RejectedImportDialog.qml:28
1884+msgid "File not supported"
1885+msgid_plural "Files not supported"
1886+msgstr[0] "الملف غير مدعوم"
1887+msgstr[1] "الملفات غير مدعومة"
1888+msgstr[2] "الملفات غير مدعومة"
1889+msgstr[3] "الملفات غير مدعومة"
1890+msgstr[4] "الملفات غير مدعومة"
1891+msgstr[5] "الملفات غير مدعومة"
1892+
1893+#: ../src/app/qml/common/RejectedImportDialog.qml:29
1894+msgid "Following document has not been imported:"
1895+msgid_plural "Following documents have not been imported:"
1896+msgstr[0] "المستند التالي لم يتم استيراده:"
1897+msgstr[1] "المستندات التالية لم يتم استيرادها:"
1898+msgstr[2] "المستندات التالية لم يتم استيرادها:"
1899+msgstr[3] "المستندات التالية لم يتم استيرادها:"
1900+msgstr[4] "المستندات التالية لم يتم استيرادها:"
1901+msgstr[5] "المستندات التالية لم يتم استيرادها:"
1902+
1903+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
1904+msgid "Unknown file type"
1905+msgstr "نوع ملف غير معروف"
1906+
1907+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
1908+msgid ""
1909+"This file is not supported.\n"
1910+"Do you want to open it as a plain text?"
1911+msgstr ""
1912+"هذا الملف غير مدعوم.\n"
1913+"هل ترغب بفتحه كنص عادي؟"
1914+
1915+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
1916+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
1917+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
1918+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
1919+#: ../src/app/qml/pdfView/PdfView.qml:180
1920+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
1921+msgid "Cancel"
1922+msgstr "إلغاء"
1923+
1924+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
1925+msgid "Yes"
1926+msgstr "نعم"
1927+
1928+#. TRANSLATORS: %1 is the size of a file, expressed in GB
1929+#: ../src/app/qml/common/utils.js:22
1930+#, qt-format
1931+msgid "%1 GB"
1932+msgstr "%1 ج.بايت"
1933+
1934+#. TRANSLATORS: %1 is the size of a file, expressed in MB
1935+#: ../src/app/qml/common/utils.js:26
1936+#, qt-format
1937+msgid "%1 MB"
1938+msgstr "%1 م.بايت"
1939+
1940+#. TRANSLATORS: %1 is the size of a file, expressed in kB
1941+#: ../src/app/qml/common/utils.js:30
1942+#, qt-format
1943+msgid "%1 kB"
1944+msgstr "%1 ك. بايت"
1945+
1946+#. TRANSLATORS: %1 is the size of a file, expressed in byte
1947+#: ../src/app/qml/common/utils.js:33
1948+#, qt-format
1949+msgid "%1 byte"
1950+msgstr "%1 بايت"
1951+
1952+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
1953+msgid "Delete file"
1954+msgstr "حذف الملف"
1955+
1956+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
1957+#, qt-format
1958+msgid "Delete %1 file"
1959+msgid_plural "Delete %1 files"
1960+msgstr[0] "حذف ملف واحد (%1)"
1961+msgstr[1] "حذف ملف واحد (%1)"
1962+msgstr[2] "حذف ملفين (%1)"
1963+msgstr[3] "حذف %1 ملفات"
1964+msgstr[4] "حذف %1 ملفا"
1965+msgstr[5] "حذف %1 ملف"
1966+
1967+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
1968+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
1969+msgid "Are you sure you want to permanently delete this file?"
1970+msgid_plural "Are you sure you want to permanently delete these files?"
1971+msgstr[0] "هل أنت متأكد من رغبتك في حذف هذا الملف بشكل دائم؟"
1972+msgstr[1] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
1973+msgstr[2] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
1974+msgstr[3] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
1975+msgstr[4] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
1976+msgstr[5] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
1977+
1978+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
1979+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
1980+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
1981+msgid "Delete"
1982+msgstr "حذف"
1983+
1984+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
1985+msgid "Share"
1986+msgstr "مشاركة"
1987+
1988+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
1989+msgid "No documents found"
1990+msgstr ""
1991+
1992+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
1993+msgid ""
1994+"Connect your device to any computer and simply drag files to the Documents "
1995+"folder or insert removable media containing documents."
1996+msgstr ""
1997+
1998+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
1999+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
2000+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
2001+#, qt-format
2002+msgid "Today, %1"
2003+msgstr "اليوم، %1"
2004+
2005+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
2006+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
2007+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
2008+#, qt-format
2009+msgid "Yesterday, %1"
2010+msgstr "أمس، %1"
2011+
2012+#. TRANSLATORS: this is a datetime formatting string,
2013+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
2014+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
2015+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
2016+msgid "yyyy/MM/dd hh:mm"
2017+msgstr "dd/MM/yyyy hh:mm"
2018+
2019+#. TRANSLATORS: this is a datetime formatting string,
2020+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
2021+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
2022+msgid "dddd, hh:mm"
2023+msgstr "dddd, hh:mm"
2024+
2025+#: ../src/app/qml/documentPage/DocumentPage.qml:23
2026+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
2027+msgid "Documents"
2028+msgstr "المستندات"
2029+
2030+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
2031+msgid "Search..."
2032+msgstr "بحث..."
2033+
2034+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
2035+msgid "Sorting settings..."
2036+msgstr "إعدادات الفرز..."
2037+
2038+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
2039+msgid "Switch to single column list"
2040+msgstr "التحويل إلى نمط القائمة العمودية"
2041+
2042+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
2043+msgid "Switch to grid"
2044+msgstr "التحويل إلى نمط الشبكة"
2045+
2046+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
2047+msgid "Pick"
2048+msgstr "اختيار"
2049+
2050+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
2051+msgid "Back"
2052+msgstr "عودة"
2053+
2054+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
2055+msgid "search in documents..."
2056+msgstr "بحث في المستندات..."
2057+
2058+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
2059+msgid "Select None"
2060+msgstr "اختر لا شيء"
2061+
2062+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
2063+msgid "Select All"
2064+msgstr "اختر الكل"
2065+
2066+#: ../src/app/qml/documentPage/SearchEmptyState.qml:24
2067+msgid "No matching document found"
2068+msgstr "لم يُعثر على مستندات مطابقة"
2069+
2070+#: ../src/app/qml/documentPage/SearchEmptyState.qml:26
2071+msgid ""
2072+"Please ensure that your query is not misspelled and/or try a different query."
2073+msgstr ""
2074+"برجاء التأكد من أن استعلامك لا يحتوي أخطاء إملائية و/أو حاول استخدام استعلام "
2075+"آخر."
2076+
2077+#: ../src/app/qml/documentPage/SectionHeader.qml:13
2078+msgid "Today"
2079+msgstr "اليوم"
2080+
2081+#: ../src/app/qml/documentPage/SectionHeader.qml:16
2082+msgid "Yesterday"
2083+msgstr "أمس"
2084+
2085+#: ../src/app/qml/documentPage/SectionHeader.qml:19
2086+msgid "Earlier this week"
2087+msgstr "في وقت سابق من هذا الأسبوع"
2088+
2089+#: ../src/app/qml/documentPage/SectionHeader.qml:22
2090+msgid "Earlier this month"
2091+msgstr "في وقت سابق من هذا الشهر"
2092+
2093+#: ../src/app/qml/documentPage/SectionHeader.qml:24
2094+msgid "Even earlier..."
2095+msgstr "حتى وقت سابق..."
2096+
2097+#: ../src/app/qml/documentPage/SharePage.qml:23
2098+msgid "Share to"
2099+msgstr "مشاركة إلى"
2100+
2101+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
2102+msgid "Sorting settings"
2103+msgstr "إعدادات الفرز"
2104+
2105+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
2106+msgid "Sort by date (Latest first)"
2107+msgstr "ترتيب حسب التاريخ (الأحدث أولا)"
2108+
2109+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
2110+msgid "Sort by name (A-Z)"
2111+msgstr "ترتيب حسب الاسم"
2112+
2113+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
2114+msgid "Sort by size (Smaller first)"
2115+msgstr "ترتيب حسب الحجم (الأصغر أولا)"
2116+
2117+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
2118+msgid "Reverse order"
2119+msgstr "ترتيب عكسي"
2120+
2121+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
2122+#: ../src/app/qml/textView/TextView.qml:43
2123+msgid "Loading..."
2124+msgstr "يجري التحميل"
2125+
2126+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
2127+msgid "LibreOffice text document"
2128+msgstr "مستند نصي ليبر أوفيس"
2129+
2130+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
2131+msgid "LibreOffice spread sheet"
2132+msgstr "جدول ممتد ليبر أوفيس"
2133+
2134+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
2135+msgid "LibreOffice presentation"
2136+msgstr "عرض تقديمي ليبر أوفيس"
2137+
2138+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
2139+msgid "LibreOffice Draw document"
2140+msgstr "مستند رسم ليبر أوفيس"
2141+
2142+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
2143+msgid "Unknown LibreOffice document"
2144+msgstr "مستند ليبر أوفيس مجهول"
2145+
2146+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
2147+msgid "Unknown type document"
2148+msgstr "نوع مستند مجهول"
2149+
2150+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
2151+msgid "Go to position..."
2152+msgstr "الذهاب للموضع..."
2153+
2154+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
2155+#: ../src/app/qml/pdfView/PdfView.qml:228
2156+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
2157+msgid "Disable night mode"
2158+msgstr "تعطيل الوضع الليلي"
2159+
2160+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
2161+#: ../src/app/qml/pdfView/PdfView.qml:228
2162+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
2163+msgid "Enable night mode"
2164+msgstr "تفعيل الوضع الليلي"
2165+
2166+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
2167+msgid "Go to position"
2168+msgstr "انتقل للموضع"
2169+
2170+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
2171+msgid "Choose a position between 1% and 100%"
2172+msgstr "اختر موضع بين 1% و 100%"
2173+
2174+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
2175+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
2176+msgid "GO!"
2177+msgstr "اذهب!"
2178+
2179+#: ../src/app/qml/loView/LOViewPage.qml:167
2180+msgid "LibreOffice binaries not found."
2181+msgstr ""
2182+
2183+#: ../src/app/qml/loView/LOViewPage.qml:170
2184+msgid "Error while loading LibreOffice."
2185+msgstr "حدث خطأ أثناء تحميل ليبر أوفيس"
2186+
2187+#: ../src/app/qml/loView/LOViewPage.qml:173
2188+msgid ""
2189+"Document not loaded.\n"
2190+"The requested document may be corrupt or protected by a password."
2191+msgstr ""
2192+"لم يتم تحميل المستند.\n"
2193+"قد يكون المستند المطلوب معطوبا أو أنه محمي بكلمة سر."
2194+
2195+#: ../src/app/qml/loView/LOViewPage.qml:228
2196+msgid "This sheet has no content."
2197+msgstr ""
2198+
2199+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
2200+#. Document Viewer for rendering LibreOffice/MS-Office documents.
2201+#. Ref. https://docs.libreoffice.org/libreofficekit.html
2202+#: ../src/app/qml/loView/Splashscreen.qml:45
2203+msgid "Powered by LibreOfficeKit"
2204+msgstr "مدعوم من LibreOfficeKit"
2205+
2206+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
2207+#. This is the default name for a sheet in LibreOffice.
2208+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
2209+#, qt-format
2210+msgid "Sheet%1"
2211+msgstr ""
2212+
2213+#: ../src/app/qml/loView/ZoomSelector.qml:122
2214+msgid "Fit width"
2215+msgstr "ملائمة العرض"
2216+
2217+#: ../src/app/qml/loView/ZoomSelector.qml:123
2218+msgid "Fit height"
2219+msgstr "ملائمة الارتفاع"
2220+
2221+#: ../src/app/qml/loView/ZoomSelector.qml:124
2222+msgid "Automatic"
2223+msgstr "تلقائي"
2224+
2225+#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
2226+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
2227+#: ../src/app/qml/pdfView/PdfView.qml:153
2228+msgid "Contents"
2229+msgstr "المحتويات"
2230+
2231+#. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
2232+#. while the second one (%2) refers to the total pages count.
2233+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
2234+#: ../src/app/qml/pdfView/PdfView.qml:56
2235+#, qt-format
2236+msgid "Page %1 of %2"
2237+msgstr "صفحة %1 من %2"
2238+
2239+#: ../src/app/qml/pdfView/PdfView.qml:203
2240+msgid "Search"
2241+msgstr ""
2242+
2243+#: ../src/app/qml/pdfView/PdfView.qml:213
2244+msgid "Go to page..."
2245+msgstr "اذهب إلى الصفحة..."
2246+
2247+#: ../src/app/qml/pdfView/PdfView.qml:221
2248+msgid "Presentation"
2249+msgstr ""
2250+
2251+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
2252+msgid "Go to page"
2253+msgstr "اذهب إلى الصفحة"
2254+
2255+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
2256+#, qt-format
2257+msgid "Choose a page between 1 and %1"
2258+msgstr "اختر صفحة بين 1 و %1"
2259+
2260+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
2261+msgid "File does not exist."
2262+msgstr "الملف غير موجود."
2263+
2264+#. TRANSLATORS: This string is used for renaming a copied file,
2265+#. when a file with the same name already exists in user's
2266+#. Documents folder.
2267+#.
2268+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
2269+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
2270+#.
2271+#. where "2" is given by the argument "%1"
2272+#.
2273+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
2274+#, qt-format
2275+msgid "copy %1"
2276+msgstr "نسخة %1"
2277+
2278+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
2279+msgid "Document Viewer"
2280+msgstr "عارض المستندات"
2281+
2282+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
2283+msgid "documents;viewer;pdf;reader;"
2284+msgstr "مستندات;عارض;قاريء;قارئ;مستند;المستندات;المستند;"
2285+
2286+#~ msgid "File does not exist"
2287+#~ msgstr "الملف غير موجود"
2288+
2289+#~ msgid "No document found"
2290+#~ msgstr "لم يُعثر على مستندات"
2291+
2292+#~ msgid "Hide table of contents"
2293+#~ msgstr "إخفاء جدول المحتويات"
2294
2295=== renamed file 'po/ar.po' => 'po/ar.po.moved'
2296=== modified file 'po/ast.po'
2297--- po/ast.po 2015-11-03 05:30:48 +0000
2298+++ po/ast.po 2017-04-05 07:49:18 +0000
2299@@ -7,14 +7,20 @@
2300 msgstr ""
2301 "Project-Id-Version: ubuntu-docviewer-app\n"
2302 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2303+<<<<<<< TREE
2304 "POT-Creation-Date: 2015-07-24 11:10+0200\n"
2305 "PO-Revision-Date: 2015-11-02 17:44+0000\n"
2306+=======
2307+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
2308+"PO-Revision-Date: 2016-12-16 01:56+0000\n"
2309+>>>>>>> MERGE-SOURCE
2310 "Last-Translator: enolp <enolp@softastur.org>\n"
2311 "Language-Team: Asturian <ast@li.org>\n"
2312 "MIME-Version: 1.0\n"
2313 "Content-Type: text/plain; charset=UTF-8\n"
2314 "Content-Transfer-Encoding: 8bit\n"
2315 "Plural-Forms: nplurals=2; plural=n != 1;\n"
2316+<<<<<<< TREE
2317 "X-Launchpad-Export-Date: 2015-11-03 05:30+0000\n"
2318 "X-Generator: Launchpad (build 17838)\n"
2319
2320@@ -40,44 +46,73 @@
2321 #: ../src/app/qml/common/DetailsPage.qml:27
2322 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
2323 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
2324+=======
2325+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
2326+"X-Generator: Launchpad (build 18335)\n"
2327+
2328+#: ../src/app/qml/common/CommandLineProxy.qml:49
2329+msgid "Some of the provided arguments are not valid."
2330+msgstr "Nun son válidos dellos arguementos qu'apurriesti."
2331+
2332+#: ../src/app/qml/common/CommandLineProxy.qml:58
2333+msgid "Open ubuntu-docviewer-app displaying the selected file"
2334+msgstr ""
2335+
2336+#: ../src/app/qml/common/CommandLineProxy.qml:65
2337+msgid "Run fullscreen"
2338+msgstr "Executar a pantalla completa"
2339+
2340+#: ../src/app/qml/common/CommandLineProxy.qml:71
2341+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
2342+msgstr ""
2343+
2344+#: ../src/app/qml/common/CommandLineProxy.qml:77
2345+msgid ""
2346+"Show documents from the given folder, instead of ~/Documents.\n"
2347+"The path must exist prior to running ubuntu-docviewer-app"
2348+msgstr ""
2349+
2350+#: ../src/app/qml/common/DetailsPage.qml:26
2351+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
2352+#: ../src/app/qml/pdfView/PdfView.qml:235
2353+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
2354+>>>>>>> MERGE-SOURCE
2355 msgid "Details"
2356 msgstr "Detalles"
2357
2358-#: ../src/app/qml/common/DetailsPage.qml:33
2359+#: ../src/app/qml/common/DetailsPage.qml:42
2360+msgid "File"
2361+msgstr "Ficheru"
2362+
2363+#: ../src/app/qml/common/DetailsPage.qml:47
2364 msgid "Location"
2365 msgstr "Allugamientu"
2366
2367-#: ../src/app/qml/common/DetailsPage.qml:37
2368+#: ../src/app/qml/common/DetailsPage.qml:52
2369 msgid "Size"
2370 msgstr "Tamañu"
2371
2372-#: ../src/app/qml/common/DetailsPage.qml:42
2373+#: ../src/app/qml/common/DetailsPage.qml:57
2374 msgid "Created"
2375 msgstr "Creáu"
2376
2377-#: ../src/app/qml/common/DetailsPage.qml:47
2378+#: ../src/app/qml/common/DetailsPage.qml:62
2379 msgid "Last modified"
2380 msgstr "Cabera modificación"
2381
2382-#: ../src/app/qml/common/DetailsPage.qml:54
2383+#: ../src/app/qml/common/DetailsPage.qml:69
2384 msgid "MIME type"
2385 msgstr "Triba MIME"
2386
2387-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
2388+#: ../src/app/qml/common/ErrorDialog.qml:23
2389 msgid "Error"
2390 msgstr "Fallu"
2391
2392-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
2393-msgid "File does not exist"
2394-msgstr "Nun esiste'l ficheru"
2395-
2396-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
2397-#: ../src/app/qml/common/PickImportedDialog.qml:47
2398+#: ../src/app/qml/common/ErrorDialog.qml:26
2399+#: ../src/app/qml/common/PickImportedDialog.qml:54
2400 #: ../src/app/qml/common/RejectedImportDialog.qml:38
2401-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
2402+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
2403 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
2404-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
2405-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
2406 msgid "Close"
2407 msgstr "Zarrar"
2408
2409@@ -101,30 +136,29 @@
2410 msgstr[0] "Nun s'importó'l documentu de darréu:"
2411 msgstr[1] "Nun s'importaron los documentos de darréu:"
2412
2413-#: ../src/app/qml/common/ToastWithAction.qml:97
2414-msgid "Dismiss"
2415-msgstr "Descartar"
2416-
2417-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
2418+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
2419 msgid "Unknown file type"
2420 msgstr "Triba de ficheru desconocida"
2421
2422-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
2423+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
2424 msgid ""
2425-"Sorry but we can't find a way to display this file. Do you want to open it "
2426-"as a plain text?"
2427+"This file is not supported.\n"
2428+"Do you want to open it as a plain text?"
2429 msgstr ""
2430-"Sentímoslo, pero nun atopamos un mou d'amosar esti ficheru. ¿Quies abrilu "
2431-"como testu planu?"
2432-
2433-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
2434+
2435+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
2436+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
2437+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
2438+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
2439+#: ../src/app/qml/pdfView/PdfView.qml:180
2440+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
2441+msgid "Cancel"
2442+msgstr "Encaboxar"
2443+
2444+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
2445 msgid "Yes"
2446 msgstr "Sí"
2447
2448-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
2449-msgid "No"
2450-msgstr "Non"
2451-
2452 #. TRANSLATORS: %1 is the size of a file, expressed in GB
2453 #: ../src/app/qml/common/utils.js:22
2454 #, qt-format
2455@@ -149,100 +183,75 @@
2456 msgid "%1 byte"
2457 msgstr "%1 byte"
2458
2459-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
2460+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
2461 msgid "Delete file"
2462 msgstr "Desaniciar ficheru"
2463
2464-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
2465+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
2466 #, qt-format
2467 msgid "Delete %1 file"
2468 msgid_plural "Delete %1 files"
2469 msgstr[0] "Desaniciar %1 ficheru"
2470 msgstr[1] "Desaniciar %1 ficheros"
2471
2472-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
2473-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
2474+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
2475+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
2476 msgid "Are you sure you want to permanently delete this file?"
2477 msgid_plural "Are you sure you want to permanently delete these files?"
2478 msgstr[0] "¿De xuru que quies desaniciar dafechu esti ficheru?"
2479 msgstr[1] "¿De xuru que quies desaniciar dafechu estos ficheros?"
2480
2481-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
2482-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
2483-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
2484-msgid "Cancel"
2485-msgstr "Encaboxar"
2486-
2487-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
2488+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
2489 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
2490-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
2491+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
2492 msgid "Delete"
2493 msgstr "Desaniciar"
2494
2495-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
2496-msgid "No document found"
2497-msgstr "Nun s'alcontró'l documentu"
2498+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
2499+msgid "Share"
2500+msgstr "Compartir"
2501+
2502+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
2503+msgid "No documents found"
2504+msgstr "Nun s'alcontraron documentos"
2505
2506 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
2507 msgid ""
2508 "Connect your device to any computer and simply drag files to the Documents "
2509-"folder."
2510+"folder or insert removable media containing documents."
2511 msgstr ""
2512-"Coneuta'l to preséu a cualesquier ordenador p'arrastrar cenciellamente "
2513-"ficheros a la carpeta Documentos."
2514+"Coneuta'l to preséu a cualesquier ordenador y namái arrastra ficheros na "
2515+"carpeta Documentos o inxerta'l mediu estrayible que contién los documentos."
2516
2517 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
2518 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
2519-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
2520-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
2521+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
2522 #, qt-format
2523 msgid "Today, %1"
2524 msgstr "Güei, %1"
2525
2526 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
2527 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
2528-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
2529-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
2530+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
2531 #, qt-format
2532 msgid "Yesterday, %1"
2533 msgstr "Ayeri, %1"
2534
2535 #. TRANSLATORS: this is a datetime formatting string,
2536 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
2537-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
2538-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
2539+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
2540+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
2541+msgid "yyyy/MM/dd hh:mm"
2542+msgstr "dd/MM/yyyy hh:mm"
2543+
2544+#. TRANSLATORS: this is a datetime formatting string,
2545+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
2546+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
2547 msgid "dddd, hh:mm"
2548 msgstr "dddd, hh:mm"
2549
2550-#. TRANSLATORS: this is a datetime formatting string,
2551-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
2552-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
2553-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
2554-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
2555-msgid "dd-MM-yyyy hh:mm"
2556-msgstr "dd-MM-yyyy hh:mm"
2557-
2558-#: ../src/app/qml/documentPage/DocumentListView.qml:157
2559-msgid "Today"
2560-msgstr "Güei"
2561-
2562-#: ../src/app/qml/documentPage/DocumentListView.qml:160
2563-msgid "Yesterday"
2564-msgstr "Ayeri"
2565-
2566-#: ../src/app/qml/documentPage/DocumentListView.qml:163
2567-msgid "Earlier this week"
2568-msgstr "Más tarde d'esta selmana"
2569-
2570-#: ../src/app/qml/documentPage/DocumentListView.qml:166
2571-msgid "Earlier this month"
2572-msgstr "Más tarde d'esti mes"
2573-
2574-#: ../src/app/qml/documentPage/DocumentListView.qml:168
2575-msgid "Even earlier..."
2576-msgstr "Incluso más tarde..."
2577-
2578-#: ../src/app/qml/documentPage/DocumentPage.qml:24
2579+#: ../src/app/qml/documentPage/DocumentPage.qml:23
2580+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
2581 msgid "Documents"
2582 msgstr "Documentos"
2583
2584@@ -250,27 +259,23 @@
2585 msgid "Search..."
2586 msgstr "Guetar..."
2587
2588-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
2589+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
2590 msgid "Sorting settings..."
2591 msgstr "Axustes d'orde..."
2592
2593-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
2594-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
2595+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
2596 msgid "Switch to single column list"
2597 msgstr "Cambiar al llistáu de columnes cencielles"
2598
2599-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
2600-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
2601+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
2602 msgid "Switch to grid"
2603 msgstr "Cambiar a rexáu"
2604
2605-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
2606+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
2607 msgid "Pick"
2608 msgstr "Escoyer"
2609
2610 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
2611-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
2612-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
2613 msgid "Back"
2614 msgstr "Atrás"
2615
2616@@ -278,11 +283,11 @@
2617 msgid "search in documents..."
2618 msgstr "guetar en documentos..."
2619
2620-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
2621+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
2622 msgid "Select None"
2623 msgstr "Nun esbillar nada"
2624
2625-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
2626+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
2627 msgid "Select All"
2628 msgstr "Esbillar too"
2629
2630@@ -294,8 +299,37 @@
2631 msgid ""
2632 "Please ensure that your query is not misspelled and/or try a different query."
2633 msgstr ""
2634-"Asegúrate que la to solicitú nun ta mal escrita y/o intenta otra solicitú "
2635-"diferente, por favor."
2636+<<<<<<< TREE
2637+"Asegúrate que la to solicitú nun ta mal escrita y/o intenta otra solicitú "
2638+"diferente, por favor."
2639+=======
2640+"Asegúrate que la to solicitú nun ta mal escrita y/o intenta otra solicitú "
2641+"diferente, por favor."
2642+
2643+#: ../src/app/qml/documentPage/SectionHeader.qml:13
2644+msgid "Today"
2645+msgstr "Güei"
2646+
2647+#: ../src/app/qml/documentPage/SectionHeader.qml:16
2648+msgid "Yesterday"
2649+msgstr "Ayeri"
2650+
2651+#: ../src/app/qml/documentPage/SectionHeader.qml:19
2652+msgid "Earlier this week"
2653+msgstr "Más tarde d'esta selmana"
2654+
2655+#: ../src/app/qml/documentPage/SectionHeader.qml:22
2656+msgid "Earlier this month"
2657+msgstr "Más tarde d'esti mes"
2658+
2659+#: ../src/app/qml/documentPage/SectionHeader.qml:24
2660+msgid "Even earlier..."
2661+msgstr "Incluso más tarde..."
2662+
2663+#: ../src/app/qml/documentPage/SharePage.qml:23
2664+msgid "Share to"
2665+msgstr "Compartir con"
2666+>>>>>>> MERGE-SOURCE
2667
2668 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
2669 msgid "Sorting settings"
2670@@ -315,66 +349,180 @@
2671
2672 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
2673 msgid "Reverse order"
2674-msgstr "Orde inversu"
2675+<<<<<<< TREE
2676+msgstr "Orde inversu"
2677+=======
2678+msgstr "Orde inversu"
2679+
2680+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
2681+#: ../src/app/qml/textView/TextView.qml:43
2682+msgid "Loading..."
2683+msgstr "Cargando..."
2684+
2685+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
2686+msgid "LibreOffice text document"
2687+msgstr "Documentu de testu de LibreOffice"
2688+
2689+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
2690+msgid "LibreOffice spread sheet"
2691+msgstr "Fueya de cálculu de LibreOffice"
2692+
2693+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
2694+msgid "LibreOffice presentation"
2695+msgstr "Presentación de LibreOffice"
2696+
2697+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
2698+msgid "LibreOffice Draw document"
2699+msgstr "Documentu Draw de LibreOffice"
2700+
2701+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
2702+msgid "Unknown LibreOffice document"
2703+msgstr "Documentu desconocíu de LibreOffice"
2704+
2705+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
2706+msgid "Unknown type document"
2707+msgstr "Triba desconocida de documentu"
2708+
2709+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
2710+msgid "Go to position..."
2711+msgstr "Dir a la posición..."
2712+
2713+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
2714+#: ../src/app/qml/pdfView/PdfView.qml:228
2715+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
2716+msgid "Disable night mode"
2717+msgstr "Deshabilitar mou nueche"
2718+
2719+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
2720+#: ../src/app/qml/pdfView/PdfView.qml:228
2721+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
2722+msgid "Enable night mode"
2723+msgstr "Habilitar mou nueche"
2724+
2725+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
2726+msgid "Go to position"
2727+msgstr "Dir a la posición..."
2728+
2729+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
2730+msgid "Choose a position between 1% and 100%"
2731+msgstr "Escueyi una posición ente 1% y 100%"
2732+
2733+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
2734+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
2735+msgid "GO!"
2736+msgstr "¡DIR!"
2737+
2738+#: ../src/app/qml/loView/LOViewPage.qml:167
2739+msgid "LibreOffice binaries not found."
2740+msgstr "Nun s'alcontraron los binarios de LibreOffice"
2741+
2742+#: ../src/app/qml/loView/LOViewPage.qml:170
2743+msgid "Error while loading LibreOffice."
2744+msgstr "Fallu entrín se cargaba LibreOffice."
2745+
2746+#: ../src/app/qml/loView/LOViewPage.qml:173
2747+msgid ""
2748+"Document not loaded.\n"
2749+"The requested document may be corrupt or protected by a password."
2750+msgstr ""
2751+
2752+#: ../src/app/qml/loView/LOViewPage.qml:228
2753+msgid "This sheet has no content."
2754+msgstr "Esta fueya de cálculu nun tien conteníu."
2755+
2756+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
2757+#. Document Viewer for rendering LibreOffice/MS-Office documents.
2758+#. Ref. https://docs.libreoffice.org/libreofficekit.html
2759+#: ../src/app/qml/loView/Splashscreen.qml:45
2760+msgid "Powered by LibreOfficeKit"
2761+msgstr "Cola potencia de LibreOfficeKit"
2762+
2763+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
2764+#. This is the default name for a sheet in LibreOffice.
2765+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
2766+#, qt-format
2767+msgid "Sheet%1"
2768+msgstr ""
2769+
2770+#: ../src/app/qml/loView/ZoomSelector.qml:122
2771+msgid "Fit width"
2772+msgstr ""
2773+
2774+#: ../src/app/qml/loView/ZoomSelector.qml:123
2775+msgid "Fit height"
2776+msgstr ""
2777+
2778+#: ../src/app/qml/loView/ZoomSelector.qml:124
2779+msgid "Automatic"
2780+msgstr ""
2781+>>>>>>> MERGE-SOURCE
2782
2783 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
2784-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
2785-#: ../src/app/qml/pdfView/PdfView.qml:37
2786+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
2787+#: ../src/app/qml/pdfView/PdfView.qml:153
2788 msgid "Contents"
2789 msgstr "Conteníos"
2790
2791-#: ../src/app/qml/pdfView/PdfContentsPage.qml:38
2792-msgid "Hide table of contents"
2793-msgstr "Anubrir tabla de conteníos"
2794-
2795 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
2796 #. while the second one (%2) refers to the total pages count.
2797-#: ../src/app/qml/pdfView/PdfView.qml:34
2798+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
2799+#: ../src/app/qml/pdfView/PdfView.qml:56
2800 #, qt-format
2801 msgid "Page %1 of %2"
2802 msgstr "Páxina %1 de %2"
2803
2804-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
2805+#: ../src/app/qml/pdfView/PdfView.qml:203
2806+msgid "Search"
2807+msgstr ""
2808+
2809+#: ../src/app/qml/pdfView/PdfView.qml:213
2810 msgid "Go to page..."
2811 msgstr "Dir a la páxina..."
2812
2813-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
2814-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
2815-msgid "Disable night mode"
2816-msgstr "Deshabilitar mou nueche"
2817-
2818-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
2819-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
2820-msgid "Enable night mode"
2821-msgstr "Habilitar mou nueche"
2822-
2823-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
2824+#: ../src/app/qml/pdfView/PdfView.qml:221
2825+msgid "Presentation"
2826+msgstr ""
2827+
2828+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
2829 msgid "Go to page"
2830 msgstr "Dir a la páxina"
2831
2832-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
2833+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
2834 #, qt-format
2835 msgid "Choose a page between 1 and %1"
2836 msgstr "Escueyi una páxina ente 1 y %1"
2837
2838-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
2839-msgid "GO!"
2840-msgstr "¡DIR!"
2841-
2842-#: ../src/app/qml/textView/TextView.qml:42
2843-msgid "Loading..."
2844-msgstr "Cargando..."
2845-
2846-#: ../src/app/qml/ubuntu-docviewer-app.qml:240
2847-msgid "Document successfully imported!"
2848-msgid_plural "Documents successfully imported!"
2849-msgstr[0] "¡Importóse con ésitu'l documentu!"
2850-msgstr[1] "¡Importáronse con ésitu los documentos!"
2851-
2852-#: ../src/app/qml/ubuntu-docviewer-app.qml:243
2853-msgid "Open"
2854-msgstr "Abrir"
2855-
2856-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
2857+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
2858+msgid "File does not exist."
2859+msgstr ""
2860+
2861+#. TRANSLATORS: This string is used for renaming a copied file,
2862+#. when a file with the same name already exists in user's
2863+#. Documents folder.
2864+#.
2865+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
2866+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
2867+#.
2868+#. where "2" is given by the argument "%1"
2869+#.
2870+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
2871+#, qt-format
2872+msgid "copy %1"
2873+msgstr "copiar %1"
2874+
2875+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
2876+msgid "Document Viewer"
2877+msgstr "Visor de documentos"
2878+
2879+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
2880 msgid "documents;viewer;pdf;reader;"
2881 msgstr "documentos;visor;pdf;llector;"
2882+
2883+#~ msgid "File does not exist"
2884+#~ msgstr "Nun esiste'l ficheru"
2885+
2886+#~ msgid "No document found"
2887+#~ msgstr "Nun s'alcontró'l documentu"
2888+
2889+#~ msgid "Hide table of contents"
2890+#~ msgstr "Anubrir tabla de conteníos"
2891
2892=== modified file 'po/br.po'
2893--- po/br.po 2015-08-26 06:10:38 +0000
2894+++ po/br.po 2017-04-05 07:49:18 +0000
2895@@ -7,14 +7,20 @@
2896 msgstr ""
2897 "Project-Id-Version: ubuntu-docviewer-app\n"
2898 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2899+<<<<<<< TREE
2900 "POT-Creation-Date: 2015-07-24 11:10+0200\n"
2901 "PO-Revision-Date: 2015-08-25 14:07+0000\n"
2902+=======
2903+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
2904+"PO-Revision-Date: 2016-09-12 06:22+0000\n"
2905+>>>>>>> MERGE-SOURCE
2906 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
2907 "Language-Team: Breton <br@li.org>\n"
2908 "MIME-Version: 1.0\n"
2909 "Content-Type: text/plain; charset=UTF-8\n"
2910 "Content-Transfer-Encoding: 8bit\n"
2911 "Plural-Forms: nplurals=2; plural=n > 1;\n"
2912+<<<<<<< TREE
2913 "X-Launchpad-Export-Date: 2015-08-26 06:10+0000\n"
2914 "X-Generator: Launchpad (build 17690)\n"
2915
2916@@ -40,44 +46,77 @@
2917 #: ../src/app/qml/common/DetailsPage.qml:27
2918 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
2919 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
2920+=======
2921+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
2922+"X-Generator: Launchpad (build 18335)\n"
2923+
2924+#: ../src/app/qml/common/CommandLineProxy.qml:49
2925+msgid "Some of the provided arguments are not valid."
2926+msgstr "Darn eus an arguzennoù pourchaset n'int ket reizh."
2927+
2928+#: ../src/app/qml/common/CommandLineProxy.qml:58
2929+msgid "Open ubuntu-docviewer-app displaying the selected file"
2930+msgstr "Digeriñ ubuntu-docviewer-app evit diskwel ar restr diuzet"
2931+
2932+#: ../src/app/qml/common/CommandLineProxy.qml:65
2933+msgid "Run fullscreen"
2934+msgstr "Lañsañ gant ur skramm leun"
2935+
2936+#: ../src/app/qml/common/CommandLineProxy.qml:71
2937+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
2938+msgstr ""
2939+"Digeriñ ubuntu-docviewer-app er mod diuzañ. Implijet evit an amprouadoù "
2940+"hepken."
2941+
2942+#: ../src/app/qml/common/CommandLineProxy.qml:77
2943+msgid ""
2944+"Show documents from the given folder, instead of ~/Documents.\n"
2945+"The path must exist prior to running ubuntu-docviewer-app"
2946+msgstr ""
2947+"Diskouez teulioù an teulias pourchaset e-lec'h ~/Teulioù.\n"
2948+"Ret en d'an hent-se bezañ anezhañ a-raok lañsañ ubuntu-docviewer-app"
2949+
2950+#: ../src/app/qml/common/DetailsPage.qml:26
2951+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
2952+#: ../src/app/qml/pdfView/PdfView.qml:235
2953+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
2954+>>>>>>> MERGE-SOURCE
2955 msgid "Details"
2956 msgstr "Munudoù"
2957
2958-#: ../src/app/qml/common/DetailsPage.qml:33
2959+#: ../src/app/qml/common/DetailsPage.qml:42
2960+msgid "File"
2961+msgstr "Restr"
2962+
2963+#: ../src/app/qml/common/DetailsPage.qml:47
2964 msgid "Location"
2965 msgstr "Lec'h"
2966
2967-#: ../src/app/qml/common/DetailsPage.qml:37
2968+#: ../src/app/qml/common/DetailsPage.qml:52
2969 msgid "Size"
2970 msgstr "Ment"
2971
2972-#: ../src/app/qml/common/DetailsPage.qml:42
2973+#: ../src/app/qml/common/DetailsPage.qml:57
2974 msgid "Created"
2975 msgstr "Krouet"
2976
2977-#: ../src/app/qml/common/DetailsPage.qml:47
2978+#: ../src/app/qml/common/DetailsPage.qml:62
2979 msgid "Last modified"
2980 msgstr "Kemm diwezhañ"
2981
2982-#: ../src/app/qml/common/DetailsPage.qml:54
2983+#: ../src/app/qml/common/DetailsPage.qml:69
2984 msgid "MIME type"
2985 msgstr "seurt MIME"
2986
2987-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
2988+#: ../src/app/qml/common/ErrorDialog.qml:23
2989 msgid "Error"
2990 msgstr "Fazi"
2991
2992-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
2993-msgid "File does not exist"
2994-msgstr "Ar restr n'eus ket anezhi"
2995-
2996-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
2997-#: ../src/app/qml/common/PickImportedDialog.qml:47
2998+#: ../src/app/qml/common/ErrorDialog.qml:26
2999+#: ../src/app/qml/common/PickImportedDialog.qml:54
3000 #: ../src/app/qml/common/RejectedImportDialog.qml:38
3001-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
3002+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
3003 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
3004-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
3005-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
3006 msgid "Close"
3007 msgstr "Serriñ"
3008
3009@@ -101,30 +140,31 @@
3010 msgstr[0] "N'eo ket bet enporzhiet an teul-mañ :"
3011 msgstr[1] "N'eo ket bet enporzhiet an teulioù-mañ :"
3012
3013-#: ../src/app/qml/common/ToastWithAction.qml:97
3014-msgid "Dismiss"
3015-msgstr "Disteurel"
3016-
3017-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
3018+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
3019 msgid "Unknown file type"
3020 msgstr "Seurt restr dianav"
3021
3022-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
3023+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
3024 msgid ""
3025-"Sorry but we can't find a way to display this file. Do you want to open it "
3026-"as a plain text?"
3027+"This file is not supported.\n"
3028+"Do you want to open it as a plain text?"
3029 msgstr ""
3030-"Digarezit, met n'hon eus ket kavet penaos digeriñ ar restr-mañ. Ha fellout a "
3031-"ra deoc'h digeriñ anezhi evel pa vije testenn blaen ?"
3032-
3033-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
3034+"N'eo ket kemeret ar restr-mañ e karg.\n"
3035+"Ha fellout a ra deoc'h digeriñ anezhi evel ur restr destenn ?"
3036+
3037+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
3038+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
3039+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
3040+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
3041+#: ../src/app/qml/pdfView/PdfView.qml:180
3042+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
3043+msgid "Cancel"
3044+msgstr "Nullañ"
3045+
3046+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
3047 msgid "Yes"
3048 msgstr "Ya"
3049
3050-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
3051-msgid "No"
3052-msgstr "Ket"
3053-
3054 #. TRANSLATORS: %1 is the size of a file, expressed in GB
3055 #: ../src/app/qml/common/utils.js:22
3056 #, qt-format
3057@@ -149,100 +189,75 @@
3058 msgid "%1 byte"
3059 msgstr "%1 okted"
3060
3061-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
3062+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
3063 msgid "Delete file"
3064 msgstr "Diverkañ ar restr"
3065
3066-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
3067+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
3068 #, qt-format
3069 msgid "Delete %1 file"
3070 msgid_plural "Delete %1 files"
3071 msgstr[0] "Diverkañ %1 restr"
3072 msgstr[1] "Diverkañ %1 restr"
3073
3074-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
3075-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
3076+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
3077+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
3078 msgid "Are you sure you want to permanently delete this file?"
3079 msgid_plural "Are you sure you want to permanently delete these files?"
3080 msgstr[0] "Ha sur oc'h e fell deoc'h diverkañ ar restr-mañ da viken ?"
3081 msgstr[1] "Ha sur oc'h e fell deoc'h diverkañ ar restroù-mañ da viken ?"
3082
3083-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
3084-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
3085-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
3086-msgid "Cancel"
3087-msgstr "Nullañ"
3088-
3089-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
3090+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
3091 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
3092-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
3093+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
3094 msgid "Delete"
3095 msgstr "Diverkañ"
3096
3097-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
3098-msgid "No document found"
3099+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
3100+msgid "Share"
3101+msgstr "Rannañ"
3102+
3103+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
3104+msgid "No documents found"
3105 msgstr "N'eus bet kavet teul ebet"
3106
3107 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
3108 msgid ""
3109 "Connect your device to any computer and simply drag files to the Documents "
3110-"folder."
3111+"folder or insert removable media containing documents."
3112 msgstr ""
3113-"Kevreit ho penveg ouzh un urzhiataer bennak ha riklit restroù er renkell "
3114-"Teulioù."
3115+"Kevreit ho penveg ouzh forzh peseurt urzhiataer ha riklit restroù en teuliad "
3116+"Teulioù pe enlakait ur benveg lemm-laka gant teulioù ennañ."
3117
3118 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
3119 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
3120-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
3121-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
3122+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
3123 #, qt-format
3124 msgid "Today, %1"
3125 msgstr "Hiziv, da %1"
3126
3127 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
3128 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
3129-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
3130-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
3131+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
3132 #, qt-format
3133 msgid "Yesterday, %1"
3134 msgstr "Dec'h, da %1"
3135
3136 #. TRANSLATORS: this is a datetime formatting string,
3137 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
3138-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
3139-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
3140+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
3141+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
3142+msgid "yyyy/MM/dd hh:mm"
3143+msgstr "dd/MM/yyyy hh:mm"
3144+
3145+#. TRANSLATORS: this is a datetime formatting string,
3146+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
3147+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
3148 msgid "dddd, hh:mm"
3149 msgstr "dddd, hh:mm"
3150
3151-#. TRANSLATORS: this is a datetime formatting string,
3152-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
3153-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
3154-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
3155-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
3156-msgid "dd-MM-yyyy hh:mm"
3157-msgstr "dd-MM-yyyy hh:mm"
3158-
3159-#: ../src/app/qml/documentPage/DocumentListView.qml:157
3160-msgid "Today"
3161-msgstr "Hiziv"
3162-
3163-#: ../src/app/qml/documentPage/DocumentListView.qml:160
3164-msgid "Yesterday"
3165-msgstr "Dec'h"
3166-
3167-#: ../src/app/qml/documentPage/DocumentListView.qml:163
3168-msgid "Earlier this week"
3169-msgstr "Abretoc'h er sizhun-mañ"
3170-
3171-#: ../src/app/qml/documentPage/DocumentListView.qml:166
3172-msgid "Earlier this month"
3173-msgstr "Abretoc'h er miz-mañ"
3174-
3175-#: ../src/app/qml/documentPage/DocumentListView.qml:168
3176-msgid "Even earlier..."
3177-msgstr "Abretoc'h c'hoazh..."
3178-
3179-#: ../src/app/qml/documentPage/DocumentPage.qml:24
3180+#: ../src/app/qml/documentPage/DocumentPage.qml:23
3181+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
3182 msgid "Documents"
3183 msgstr "Teulioù"
3184
3185@@ -250,27 +265,23 @@
3186 msgid "Search..."
3187 msgstr "Klask..."
3188
3189-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
3190+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
3191 msgid "Sorting settings..."
3192 msgstr "Arvetennoù renkañ..."
3193
3194-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
3195-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
3196+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
3197 msgid "Switch to single column list"
3198 msgstr "Ober gant ur roll war ur bann hepken"
3199
3200-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
3201-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
3202+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
3203 msgid "Switch to grid"
3204 msgstr "Ober gant ur gael"
3205
3206-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
3207+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
3208 msgid "Pick"
3209 msgstr "Tapout"
3210
3211 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
3212-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
3213-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
3214 msgid "Back"
3215 msgstr "Distreiñ"
3216
3217@@ -278,11 +289,11 @@
3218 msgid "search in documents..."
3219 msgstr "klask en teulioù..."
3220
3221-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
3222+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
3223 msgid "Select None"
3224 msgstr "Chom hep diuzañ netra"
3225
3226-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
3227+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
3228 msgid "Select All"
3229 msgstr "Diuzañ pep tra"
3230
3231@@ -293,7 +304,35 @@
3232 #: ../src/app/qml/documentPage/SearchEmptyState.qml:26
3233 msgid ""
3234 "Please ensure that your query is not misspelled and/or try a different query."
3235-msgstr "Gwiriit hag-eñ eo skrivet mat ho koulenn pe esaeit ur goulenn all."
3236+<<<<<<< TREE
3237+msgstr "Gwiriit hag-eñ eo skrivet mat ho koulenn pe esaeit ur goulenn all."
3238+=======
3239+msgstr "Gwiriit hag-eñ eo skrivet mat ho koulenn pe esaeit ur goulenn all."
3240+
3241+#: ../src/app/qml/documentPage/SectionHeader.qml:13
3242+msgid "Today"
3243+msgstr "Hiziv"
3244+
3245+#: ../src/app/qml/documentPage/SectionHeader.qml:16
3246+msgid "Yesterday"
3247+msgstr "Dec'h"
3248+
3249+#: ../src/app/qml/documentPage/SectionHeader.qml:19
3250+msgid "Earlier this week"
3251+msgstr "Abretoc'h er sizhun-mañ"
3252+
3253+#: ../src/app/qml/documentPage/SectionHeader.qml:22
3254+msgid "Earlier this month"
3255+msgstr "Abretoc'h er miz-mañ"
3256+
3257+#: ../src/app/qml/documentPage/SectionHeader.qml:24
3258+msgid "Even earlier..."
3259+msgstr "Abretoc'h c'hoazh..."
3260+
3261+#: ../src/app/qml/documentPage/SharePage.qml:23
3262+msgid "Share to"
3263+msgstr "Rannañ gant"
3264+>>>>>>> MERGE-SOURCE
3265
3266 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
3267 msgid "Sorting settings"
3268@@ -313,66 +352,182 @@
3269
3270 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
3271 msgid "Reverse order"
3272-msgstr "urzh kontrol"
3273+<<<<<<< TREE
3274+msgstr "urzh kontrol"
3275+=======
3276+msgstr "urzh kontrol"
3277+
3278+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
3279+#: ../src/app/qml/textView/TextView.qml:43
3280+msgid "Loading..."
3281+msgstr "O kargañ..."
3282+
3283+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
3284+msgid "LibreOffice text document"
3285+msgstr "teul testenn LibreOffice"
3286+
3287+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
3288+msgid "LibreOffice spread sheet"
3289+msgstr "Follenn jediñ LibreOffice"
3290+
3291+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
3292+msgid "LibreOffice presentation"
3293+msgstr "Kinnigadur LibreOffice"
3294+
3295+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
3296+msgid "LibreOffice Draw document"
3297+msgstr "Teul tresadenn LibreOffice"
3298+
3299+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
3300+msgid "Unknown LibreOffice document"
3301+msgstr "Teul LibreOffice dianav"
3302+
3303+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
3304+msgid "Unknown type document"
3305+msgstr "Seut teul dianav"
3306+
3307+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
3308+msgid "Go to position..."
3309+msgstr "Mont d'al lec'h..."
3310+
3311+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
3312+#: ../src/app/qml/pdfView/PdfView.qml:228
3313+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
3314+msgid "Disable night mode"
3315+msgstr "diweredekaat ar mod noz"
3316+
3317+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
3318+#: ../src/app/qml/pdfView/PdfView.qml:228
3319+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
3320+msgid "Enable night mode"
3321+msgstr "Gweredekaat ar mod noz"
3322+
3323+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
3324+msgid "Go to position"
3325+msgstr "Mont d'al lec'h"
3326+
3327+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
3328+msgid "Choose a position between 1% and 100%"
3329+msgstr "Choaz ul lec'h etre 1 % ha 100 %"
3330+
3331+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
3332+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
3333+msgid "GO!"
3334+msgstr "DEOMP !"
3335+
3336+#: ../src/app/qml/loView/LOViewPage.qml:167
3337+msgid "LibreOffice binaries not found."
3338+msgstr "N'eo ket bet kavet danvez binarel LibreOffice"
3339+
3340+#: ../src/app/qml/loView/LOViewPage.qml:170
3341+msgid "Error while loading LibreOffice."
3342+msgstr "Fazi pa oad o kargañ LibreOffice."
3343+
3344+#: ../src/app/qml/loView/LOViewPage.qml:173
3345+msgid ""
3346+"Document not loaded.\n"
3347+"The requested document may be corrupt or protected by a password."
3348+msgstr ""
3349+"N'eo ket bet karget an teul.\n"
3350+"Brein pe gwarezet gant ur ger-tremen eo an teul goulennet marteze."
3351+
3352+#: ../src/app/qml/loView/LOViewPage.qml:228
3353+msgid "This sheet has no content."
3354+msgstr "N'eus netra er follenn-mañ"
3355+
3356+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
3357+#. Document Viewer for rendering LibreOffice/MS-Office documents.
3358+#. Ref. https://docs.libreoffice.org/libreofficekit.html
3359+#: ../src/app/qml/loView/Splashscreen.qml:45
3360+msgid "Powered by LibreOfficeKit"
3361+msgstr "Kaset en-dro gant LibreOfficeKit"
3362+
3363+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
3364+#. This is the default name for a sheet in LibreOffice.
3365+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
3366+#, qt-format
3367+msgid "Sheet%1"
3368+msgstr "Follenn%1"
3369+
3370+#: ../src/app/qml/loView/ZoomSelector.qml:122
3371+msgid "Fit width"
3372+msgstr "Keidañ gant al ledander"
3373+
3374+#: ../src/app/qml/loView/ZoomSelector.qml:123
3375+msgid "Fit height"
3376+msgstr "Keidañ gant an uhelder"
3377+
3378+#: ../src/app/qml/loView/ZoomSelector.qml:124
3379+msgid "Automatic"
3380+msgstr "Emgefreek"
3381+>>>>>>> MERGE-SOURCE
3382
3383 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
3384-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
3385-#: ../src/app/qml/pdfView/PdfView.qml:37
3386+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
3387+#: ../src/app/qml/pdfView/PdfView.qml:153
3388 msgid "Contents"
3389 msgstr "Taolenn"
3390
3391-#: ../src/app/qml/pdfView/PdfContentsPage.qml:38
3392-msgid "Hide table of contents"
3393-msgstr "Kuzhat an daolenn"
3394-
3395 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
3396 #. while the second one (%2) refers to the total pages count.
3397-#: ../src/app/qml/pdfView/PdfView.qml:34
3398+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
3399+#: ../src/app/qml/pdfView/PdfView.qml:56
3400 #, qt-format
3401 msgid "Page %1 of %2"
3402 msgstr "Pajenn %1 diwar %2"
3403
3404-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
3405+#: ../src/app/qml/pdfView/PdfView.qml:203
3406+msgid "Search"
3407+msgstr "Klask"
3408+
3409+#: ../src/app/qml/pdfView/PdfView.qml:213
3410 msgid "Go to page..."
3411 msgstr "Mont d'ar bajenn..."
3412
3413-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
3414-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
3415-msgid "Disable night mode"
3416-msgstr "diweredekaat ar mod noz"
3417-
3418-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
3419-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
3420-msgid "Enable night mode"
3421-msgstr "Gweredekaat ar mod noz"
3422-
3423-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
3424+#: ../src/app/qml/pdfView/PdfView.qml:221
3425+msgid "Presentation"
3426+msgstr "Kinnigadur"
3427+
3428+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
3429 msgid "Go to page"
3430 msgstr "Mont d'ar bajenn"
3431
3432-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
3433+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
3434 #, qt-format
3435 msgid "Choose a page between 1 and %1"
3436 msgstr "Choaz ur bajenn etre 1 ha %1"
3437
3438-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
3439-msgid "GO!"
3440-msgstr "DEOMP !"
3441-
3442-#: ../src/app/qml/textView/TextView.qml:42
3443-msgid "Loading..."
3444-msgstr "O kargañ..."
3445-
3446-#: ../src/app/qml/ubuntu-docviewer-app.qml:240
3447-msgid "Document successfully imported!"
3448-msgid_plural "Documents successfully imported!"
3449-msgstr[0] "Teul enporzhiet evel ma oa dleet !"
3450-msgstr[1] "Teulioù enporzhiet evel ma oa dleet !"
3451-
3452-#: ../src/app/qml/ubuntu-docviewer-app.qml:243
3453-msgid "Open"
3454-msgstr "Digeriñ"
3455-
3456-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
3457+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
3458+msgid "File does not exist."
3459+msgstr "N'eus ket eus ar restr"
3460+
3461+#. TRANSLATORS: This string is used for renaming a copied file,
3462+#. when a file with the same name already exists in user's
3463+#. Documents folder.
3464+#.
3465+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
3466+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
3467+#.
3468+#. where "2" is given by the argument "%1"
3469+#.
3470+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
3471+#, qt-format
3472+msgid "copy %1"
3473+msgstr "eilañ %1"
3474+
3475+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
3476+msgid "Document Viewer"
3477+msgstr "Lenner teulioù"
3478+
3479+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
3480 msgid "documents;viewer;pdf;reader;"
3481 msgstr "teulioù;diskouezer;pdf;lenner"
3482+
3483+#~ msgid "File does not exist"
3484+#~ msgstr "Ar restr n'eus ket anezhi"
3485+
3486+#~ msgid "No document found"
3487+#~ msgstr "N'eus bet kavet teul ebet"
3488+
3489+#~ msgid "Hide table of contents"
3490+#~ msgstr "Kuzhat an daolenn"
3491
3492=== added file 'po/bs.po'
3493--- po/bs.po 1970-01-01 00:00:00 +0000
3494+++ po/bs.po 2017-04-05 07:49:18 +0000
3495@@ -0,0 +1,499 @@
3496+# Bosnian translation for ubuntu-docviewer-app
3497+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3498+# This file is distributed under the same license as the ubuntu-docviewer-app package.
3499+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
3500+#
3501+msgid ""
3502+msgstr ""
3503+"Project-Id-Version: ubuntu-docviewer-app\n"
3504+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3505+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
3506+"PO-Revision-Date: 2016-03-20 14:09+0000\n"
3507+"Last-Translator: Kenan Gutić <Unknown>\n"
3508+"Language-Team: Bosnian <bs@li.org>\n"
3509+"MIME-Version: 1.0\n"
3510+"Content-Type: text/plain; charset=UTF-8\n"
3511+"Content-Transfer-Encoding: 8bit\n"
3512+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
3513+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
3514+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
3515+"X-Generator: Launchpad (build 18335)\n"
3516+
3517+#: ../src/app/qml/common/CommandLineProxy.qml:49
3518+msgid "Some of the provided arguments are not valid."
3519+msgstr "Neki od datih argumenata nisu validni."
3520+
3521+#: ../src/app/qml/common/CommandLineProxy.qml:58
3522+msgid "Open ubuntu-docviewer-app displaying the selected file"
3523+msgstr "Otvori ubuntu-docviewer-app prikazujući odabrani dokument"
3524+
3525+#: ../src/app/qml/common/CommandLineProxy.qml:65
3526+msgid "Run fullscreen"
3527+msgstr "Pokreni u punom prikazu"
3528+
3529+#: ../src/app/qml/common/CommandLineProxy.qml:71
3530+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
3531+msgstr ""
3532+"Otvori ubuntu-docviewer-app u modu za odabir. Koristiti samo za testiranje."
3533+
3534+#: ../src/app/qml/common/CommandLineProxy.qml:77
3535+msgid ""
3536+"Show documents from the given folder, instead of ~/Documents.\n"
3537+"The path must exist prior to running ubuntu-docviewer-app"
3538+msgstr ""
3539+"Pokaži dokumente iz datog direktorija, umjesto iz ~/Documents.\n"
3540+"Putanja mora postojati prije pokretanja ubuntu-docviewer-app"
3541+
3542+#: ../src/app/qml/common/DetailsPage.qml:26
3543+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
3544+#: ../src/app/qml/pdfView/PdfView.qml:235
3545+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
3546+msgid "Details"
3547+msgstr "Detalji"
3548+
3549+#: ../src/app/qml/common/DetailsPage.qml:42
3550+msgid "File"
3551+msgstr "Datoteka"
3552+
3553+#: ../src/app/qml/common/DetailsPage.qml:47
3554+msgid "Location"
3555+msgstr "Lokacija"
3556+
3557+#: ../src/app/qml/common/DetailsPage.qml:52
3558+msgid "Size"
3559+msgstr "Veličina"
3560+
3561+#: ../src/app/qml/common/DetailsPage.qml:57
3562+msgid "Created"
3563+msgstr "Kreirano"
3564+
3565+#: ../src/app/qml/common/DetailsPage.qml:62
3566+msgid "Last modified"
3567+msgstr "Zadnja izmjena"
3568+
3569+#: ../src/app/qml/common/DetailsPage.qml:69
3570+msgid "MIME type"
3571+msgstr "MIME vrsta"
3572+
3573+#: ../src/app/qml/common/ErrorDialog.qml:23
3574+msgid "Error"
3575+msgstr "Greška"
3576+
3577+#: ../src/app/qml/common/ErrorDialog.qml:26
3578+#: ../src/app/qml/common/PickImportedDialog.qml:54
3579+#: ../src/app/qml/common/RejectedImportDialog.qml:38
3580+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
3581+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
3582+msgid "Close"
3583+msgstr "Zatvori"
3584+
3585+#: ../src/app/qml/common/PickImportedDialog.qml:29
3586+msgid "Multiple documents imported"
3587+msgstr "Višestruki dokumenti ubačeni"
3588+
3589+#: ../src/app/qml/common/PickImportedDialog.qml:30
3590+msgid "Choose which one to open:"
3591+msgstr "Izaberite koji ćete otvoriti:"
3592+
3593+#: ../src/app/qml/common/RejectedImportDialog.qml:28
3594+msgid "File not supported"
3595+msgid_plural "Files not supported"
3596+msgstr[0] "Dokument nije podržan"
3597+msgstr[1] "Dokumenti nisu podržani"
3598+msgstr[2] "Dokumenti nisu podržani"
3599+
3600+#: ../src/app/qml/common/RejectedImportDialog.qml:29
3601+msgid "Following document has not been imported:"
3602+msgid_plural "Following documents have not been imported:"
3603+msgstr[0] "Sljedeći dokument nije ubačen:"
3604+msgstr[1] "Sljedeći dokumenti nisu ubačeni:"
3605+msgstr[2] "Sljedeći dokumenti nisu ubačeni:"
3606+
3607+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
3608+msgid "Unknown file type"
3609+msgstr "Nepoznata vrsta dokumenta"
3610+
3611+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
3612+msgid ""
3613+"This file is not supported.\n"
3614+"Do you want to open it as a plain text?"
3615+msgstr ""
3616+"Ovaj dokument nije podržan.\n"
3617+"Da li ga želite otvoriti kao obični tekst?"
3618+
3619+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
3620+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
3621+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
3622+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
3623+#: ../src/app/qml/pdfView/PdfView.qml:180
3624+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
3625+msgid "Cancel"
3626+msgstr "Odustani"
3627+
3628+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
3629+msgid "Yes"
3630+msgstr "Da"
3631+
3632+#. TRANSLATORS: %1 is the size of a file, expressed in GB
3633+#: ../src/app/qml/common/utils.js:22
3634+#, qt-format
3635+msgid "%1 GB"
3636+msgstr "%1 GB"
3637+
3638+#. TRANSLATORS: %1 is the size of a file, expressed in MB
3639+#: ../src/app/qml/common/utils.js:26
3640+#, qt-format
3641+msgid "%1 MB"
3642+msgstr "%1 MB"
3643+
3644+#. TRANSLATORS: %1 is the size of a file, expressed in kB
3645+#: ../src/app/qml/common/utils.js:30
3646+#, qt-format
3647+msgid "%1 kB"
3648+msgstr "%1 kB"
3649+
3650+#. TRANSLATORS: %1 is the size of a file, expressed in byte
3651+#: ../src/app/qml/common/utils.js:33
3652+#, qt-format
3653+msgid "%1 byte"
3654+msgstr "%1 bajt"
3655+
3656+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
3657+msgid "Delete file"
3658+msgstr "Obriši datoteku"
3659+
3660+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
3661+#, qt-format
3662+msgid "Delete %1 file"
3663+msgid_plural "Delete %1 files"
3664+msgstr[0] "Obriši %1 datoteku"
3665+msgstr[1] "Obriši %1 datoteke"
3666+msgstr[2] "Obriši %1 datoteke"
3667+
3668+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
3669+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
3670+msgid "Are you sure you want to permanently delete this file?"
3671+msgid_plural "Are you sure you want to permanently delete these files?"
3672+msgstr[0] "Jeste li sigurni da želite trajno obrisati ovu datoteku?"
3673+msgstr[1] "Jeste li sigurni da želite trajno obrisati ove datoteke?"
3674+msgstr[2] "Jeste li sigurni da želite trajno obrisati ove datoteke?"
3675+
3676+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
3677+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
3678+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
3679+msgid "Delete"
3680+msgstr "Obriši"
3681+
3682+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
3683+msgid "Share"
3684+msgstr "Podijeli"
3685+
3686+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
3687+msgid "No documents found"
3688+msgstr "Nema pronađenih dokumenata"
3689+
3690+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
3691+msgid ""
3692+"Connect your device to any computer and simply drag files to the Documents "
3693+"folder or insert removable media containing documents."
3694+msgstr ""
3695+"Povežite svoj uređaj sa bilo kojim računarom i jednostavno prevucite "
3696+"dokumente u direktorij Dokumenti ili ubacite uklonjivi uređaj koji sadržava "
3697+"dokumente."
3698+
3699+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
3700+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
3701+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
3702+#, qt-format
3703+msgid "Today, %1"
3704+msgstr "Danas, %1"
3705+
3706+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
3707+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
3708+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
3709+#, qt-format
3710+msgid "Yesterday, %1"
3711+msgstr "Jučer, %1"
3712+
3713+#. TRANSLATORS: this is a datetime formatting string,
3714+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
3715+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
3716+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
3717+msgid "yyyy/MM/dd hh:mm"
3718+msgstr "dd.MM.yyyy hh:mm"
3719+
3720+#. TRANSLATORS: this is a datetime formatting string,
3721+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
3722+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
3723+msgid "dddd, hh:mm"
3724+msgstr "dddd, hh:mm"
3725+
3726+#: ../src/app/qml/documentPage/DocumentPage.qml:23
3727+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
3728+msgid "Documents"
3729+msgstr "Dokumenti"
3730+
3731+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
3732+msgid "Search..."
3733+msgstr "Traži..."
3734+
3735+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
3736+msgid "Sorting settings..."
3737+msgstr "Sortiram postavke..."
3738+
3739+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
3740+msgid "Switch to single column list"
3741+msgstr "Prebaci na listu sa jednom kolonom"
3742+
3743+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
3744+msgid "Switch to grid"
3745+msgstr "Prebaci na mrežu"
3746+
3747+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
3748+msgid "Pick"
3749+msgstr "Odaberi"
3750+
3751+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
3752+msgid "Back"
3753+msgstr "Nazad"
3754+
3755+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
3756+msgid "search in documents..."
3757+msgstr "traži u dokumentima..."
3758+
3759+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
3760+msgid "Select None"
3761+msgstr "Poništi izbor"
3762+
3763+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
3764+msgid "Select All"
3765+msgstr "Izaberi sve"
3766+
3767+#: ../src/app/qml/documentPage/SearchEmptyState.qml:24
3768+msgid "No matching document found"
3769+msgstr "Nisu pronađeni dokumenti koji se podudaraju"
3770+
3771+#: ../src/app/qml/documentPage/SearchEmptyState.qml:26
3772+msgid ""
3773+"Please ensure that your query is not misspelled and/or try a different query."
3774+msgstr ""
3775+"Molim uvjerite se da vaš upit nije pogrešno napisan i/ili pokušajte drugi "
3776+"upit."
3777+
3778+#: ../src/app/qml/documentPage/SectionHeader.qml:13
3779+msgid "Today"
3780+msgstr "Danas"
3781+
3782+#: ../src/app/qml/documentPage/SectionHeader.qml:16
3783+msgid "Yesterday"
3784+msgstr "Jučer"
3785+
3786+#: ../src/app/qml/documentPage/SectionHeader.qml:19
3787+msgid "Earlier this week"
3788+msgstr "Ranije ove sedmice"
3789+
3790+#: ../src/app/qml/documentPage/SectionHeader.qml:22
3791+msgid "Earlier this month"
3792+msgstr "Ranije ovog mjeseca"
3793+
3794+#: ../src/app/qml/documentPage/SectionHeader.qml:24
3795+msgid "Even earlier..."
3796+msgstr "Još ranije..."
3797+
3798+#: ../src/app/qml/documentPage/SharePage.qml:23
3799+msgid "Share to"
3800+msgstr "Podijeli sa"
3801+
3802+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
3803+msgid "Sorting settings"
3804+msgstr "Sortiram postavke"
3805+
3806+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
3807+msgid "Sort by date (Latest first)"
3808+msgstr "Sortiraj po datumu (novije prvo)"
3809+
3810+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
3811+msgid "Sort by name (A-Z)"
3812+msgstr "Sortiraj po imenu (A-Z)"
3813+
3814+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
3815+msgid "Sort by size (Smaller first)"
3816+msgstr "Sortiraj po veličini (manje prvo)"
3817+
3818+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
3819+msgid "Reverse order"
3820+msgstr "Okreni red"
3821+
3822+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
3823+#: ../src/app/qml/textView/TextView.qml:43
3824+msgid "Loading..."
3825+msgstr "Učitavanje..."
3826+
3827+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
3828+msgid "LibreOffice text document"
3829+msgstr "LibreOffice tekstualni dokument"
3830+
3831+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
3832+msgid "LibreOffice spread sheet"
3833+msgstr "LibreOffice tabelarni dokument"
3834+
3835+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
3836+msgid "LibreOffice presentation"
3837+msgstr "LibreOffice prezentacija"
3838+
3839+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
3840+msgid "LibreOffice Draw document"
3841+msgstr "LibreOffice nacrt"
3842+
3843+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
3844+msgid "Unknown LibreOffice document"
3845+msgstr "Nepoznat LibreOffice dokument"
3846+
3847+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
3848+msgid "Unknown type document"
3849+msgstr "Nepoznat tip dokumenta"
3850+
3851+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
3852+msgid "Go to position..."
3853+msgstr "Idi na poziciju..."
3854+
3855+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
3856+#: ../src/app/qml/pdfView/PdfView.qml:228
3857+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
3858+msgid "Disable night mode"
3859+msgstr "Isključni noćni režim"
3860+
3861+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
3862+#: ../src/app/qml/pdfView/PdfView.qml:228
3863+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
3864+msgid "Enable night mode"
3865+msgstr "Uključi noćni režim"
3866+
3867+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
3868+msgid "Go to position"
3869+msgstr "Idi na poziciju"
3870+
3871+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
3872+msgid "Choose a position between 1% and 100%"
3873+msgstr "Izaberite poziciju između 1% i 100%"
3874+
3875+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
3876+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
3877+msgid "GO!"
3878+msgstr "IDI!"
3879+
3880+#: ../src/app/qml/loView/LOViewPage.qml:167
3881+msgid "LibreOffice binaries not found."
3882+msgstr "Nisu pronađeni LibreOffice binaries."
3883+
3884+#: ../src/app/qml/loView/LOViewPage.qml:170
3885+msgid "Error while loading LibreOffice."
3886+msgstr "Greška pri učitavanja LibreOffice."
3887+
3888+#: ../src/app/qml/loView/LOViewPage.qml:173
3889+msgid ""
3890+"Document not loaded.\n"
3891+"The requested document may be corrupt or protected by a password."
3892+msgstr ""
3893+"Dokument nije učitan.\n"
3894+"Traženi dokument možda sadržava greške ili je zaštićen šifrom."
3895+
3896+#: ../src/app/qml/loView/LOViewPage.qml:228
3897+msgid "This sheet has no content."
3898+msgstr "Ovaj list nema sadržaja"
3899+
3900+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
3901+#. Document Viewer for rendering LibreOffice/MS-Office documents.
3902+#. Ref. https://docs.libreoffice.org/libreofficekit.html
3903+#: ../src/app/qml/loView/Splashscreen.qml:45
3904+msgid "Powered by LibreOfficeKit"
3905+msgstr "Pokreće LibreOfficeKit"
3906+
3907+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
3908+#. This is the default name for a sheet in LibreOffice.
3909+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
3910+#, qt-format
3911+msgid "Sheet%1"
3912+msgstr "List%1"
3913+
3914+#: ../src/app/qml/loView/ZoomSelector.qml:122
3915+msgid "Fit width"
3916+msgstr "Uklopi širinu"
3917+
3918+#: ../src/app/qml/loView/ZoomSelector.qml:123
3919+msgid "Fit height"
3920+msgstr "Uklopi visinu"
3921+
3922+#: ../src/app/qml/loView/ZoomSelector.qml:124
3923+msgid "Automatic"
3924+msgstr "Automatski"
3925+
3926+#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
3927+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
3928+#: ../src/app/qml/pdfView/PdfView.qml:153
3929+msgid "Contents"
3930+msgstr "Sadržaji"
3931+
3932+#. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
3933+#. while the second one (%2) refers to the total pages count.
3934+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
3935+#: ../src/app/qml/pdfView/PdfView.qml:56
3936+#, qt-format
3937+msgid "Page %1 of %2"
3938+msgstr "Stranica %1 od %2"
3939+
3940+#: ../src/app/qml/pdfView/PdfView.qml:203
3941+msgid "Search"
3942+msgstr "Traži"
3943+
3944+#: ../src/app/qml/pdfView/PdfView.qml:213
3945+msgid "Go to page..."
3946+msgstr "Idi na stranicu..."
3947+
3948+#: ../src/app/qml/pdfView/PdfView.qml:221
3949+msgid "Presentation"
3950+msgstr "Prezentacija"
3951+
3952+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
3953+msgid "Go to page"
3954+msgstr "Idi na stranicu"
3955+
3956+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
3957+#, qt-format
3958+msgid "Choose a page between 1 and %1"
3959+msgstr "Izaberi stranicu između 1 i %1"
3960+
3961+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
3962+msgid "File does not exist."
3963+msgstr "Datoteka ne postoji."
3964+
3965+#. TRANSLATORS: This string is used for renaming a copied file,
3966+#. when a file with the same name already exists in user's
3967+#. Documents folder.
3968+#.
3969+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
3970+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
3971+#.
3972+#. where "2" is given by the argument "%1"
3973+#.
3974+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
3975+#, qt-format
3976+msgid "copy %1"
3977+msgstr "kopija %1"
3978+
3979+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
3980+msgid "Document Viewer"
3981+msgstr "Preglednik dokumenta"
3982+
3983+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
3984+msgid "documents;viewer;pdf;reader;"
3985+msgstr "dokumenti;preglednik;pdf;čitač;"
3986+
3987+#~ msgid "File does not exist"
3988+#~ msgstr "Datoteka ne postoji"
3989+
3990+#~ msgid "Hide table of contents"
3991+#~ msgstr "Sakrij tabelu sadržaja"
3992+
3993+#~ msgid "No document found"
3994+#~ msgstr "Dokumen nije pronađen"
3995
3996=== renamed file 'po/bs.po' => 'po/bs.po.moved'
3997=== modified file 'po/ca.po'
3998--- po/ca.po 2015-08-18 05:56:20 +0000
3999+++ po/ca.po 2017-04-05 07:49:18 +0000
4000@@ -7,14 +7,15 @@
4001 msgstr ""
4002 "Project-Id-Version: ubuntu-docviewer-app\n"
4003 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4004-"POT-Creation-Date: 2015-07-24 11:10+0200\n"
4005-"PO-Revision-Date: 2015-06-25 06:34+0000\n"
4006-"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
4007+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
4008+"PO-Revision-Date: 2016-11-29 17:19+0000\n"
4009+"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
4010 "Language-Team: Catalan <ca@li.org>\n"
4011 "MIME-Version: 1.0\n"
4012 "Content-Type: text/plain; charset=UTF-8\n"
4013 "Content-Transfer-Encoding: 8bit\n"
4014 "Plural-Forms: nplurals=2; plural=n != 1;\n"
4015+<<<<<<< TREE
4016 "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n"
4017 "X-Generator: Launchpad (build 17690)\n"
4018
4019@@ -40,44 +41,76 @@
4020 #: ../src/app/qml/common/DetailsPage.qml:27
4021 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
4022 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
4023+=======
4024+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
4025+"X-Generator: Launchpad (build 18335)\n"
4026+
4027+#: ../src/app/qml/common/CommandLineProxy.qml:49
4028+msgid "Some of the provided arguments are not valid."
4029+msgstr "Alguns dels arguments proveïts no són vàlids."
4030+
4031+#: ../src/app/qml/common/CommandLineProxy.qml:58
4032+msgid "Open ubuntu-docviewer-app displaying the selected file"
4033+msgstr "Obre l'ubuntu-docviewer-app per mostrar el fitxer seleccionat"
4034+
4035+#: ../src/app/qml/common/CommandLineProxy.qml:65
4036+msgid "Run fullscreen"
4037+msgstr "Executa-ho a pantalla completa"
4038+
4039+#: ../src/app/qml/common/CommandLineProxy.qml:71
4040+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
4041+msgstr ""
4042+"Obre l'ubuntu-docviewer-app en mode de selecció. Sols s'usa per a proves."
4043+
4044+#: ../src/app/qml/common/CommandLineProxy.qml:77
4045+msgid ""
4046+"Show documents from the given folder, instead of ~/Documents.\n"
4047+"The path must exist prior to running ubuntu-docviewer-app"
4048+msgstr ""
4049+"Mostra els documents des de la carpeta donada, en comptes de ~/Documents.\n"
4050+"El camí ha d'existir abans d'executar l'ubuntu-docviewer-app"
4051+
4052+#: ../src/app/qml/common/DetailsPage.qml:26
4053+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
4054+#: ../src/app/qml/pdfView/PdfView.qml:235
4055+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
4056+>>>>>>> MERGE-SOURCE
4057 msgid "Details"
4058 msgstr "Detalls"
4059
4060-#: ../src/app/qml/common/DetailsPage.qml:33
4061+#: ../src/app/qml/common/DetailsPage.qml:42
4062+msgid "File"
4063+msgstr "Fitxer"
4064+
4065+#: ../src/app/qml/common/DetailsPage.qml:47
4066 msgid "Location"
4067 msgstr "Ubicació"
4068
4069-#: ../src/app/qml/common/DetailsPage.qml:37
4070+#: ../src/app/qml/common/DetailsPage.qml:52
4071 msgid "Size"
4072 msgstr "Mida"
4073
4074-#: ../src/app/qml/common/DetailsPage.qml:42
4075+#: ../src/app/qml/common/DetailsPage.qml:57
4076 msgid "Created"
4077 msgstr "Creat"
4078
4079-#: ../src/app/qml/common/DetailsPage.qml:47
4080+#: ../src/app/qml/common/DetailsPage.qml:62
4081 msgid "Last modified"
4082 msgstr "Darrera modificació"
4083
4084-#: ../src/app/qml/common/DetailsPage.qml:54
4085+#: ../src/app/qml/common/DetailsPage.qml:69
4086 msgid "MIME type"
4087 msgstr "Tipus MIME"
4088
4089-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
4090+#: ../src/app/qml/common/ErrorDialog.qml:23
4091 msgid "Error"
4092 msgstr "Error"
4093
4094-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
4095-msgid "File does not exist"
4096-msgstr "El fitxer no existeix"
4097-
4098-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
4099-#: ../src/app/qml/common/PickImportedDialog.qml:47
4100+#: ../src/app/qml/common/ErrorDialog.qml:26
4101+#: ../src/app/qml/common/PickImportedDialog.qml:54
4102 #: ../src/app/qml/common/RejectedImportDialog.qml:38
4103-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
4104+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
4105 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
4106-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
4107-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
4108 msgid "Close"
4109 msgstr "Tanca"
4110
4111@@ -101,28 +134,31 @@
4112 msgstr[0] "El document següent no s'ha importat:"
4113 msgstr[1] "Els documents següents no s'han importat:"
4114
4115-#: ../src/app/qml/common/ToastWithAction.qml:97
4116-msgid "Dismiss"
4117-msgstr "Descarta"
4118-
4119-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
4120+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
4121 msgid "Unknown file type"
4122 msgstr "Tipus de fitxer desconegut"
4123
4124-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
4125+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
4126 msgid ""
4127-"Sorry but we can't find a way to display this file. Do you want to open it "
4128-"as a plain text?"
4129+"This file is not supported.\n"
4130+"Do you want to open it as a plain text?"
4131 msgstr ""
4132-
4133-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
4134+"Aquest fitxer no té suport.\n"
4135+"Voleu obrir-lo com a text simple?"
4136+
4137+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
4138+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
4139+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
4140+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
4141+#: ../src/app/qml/pdfView/PdfView.qml:180
4142+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
4143+msgid "Cancel"
4144+msgstr "Cancel·la"
4145+
4146+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
4147 msgid "Yes"
4148 msgstr "Sí"
4149
4150-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
4151-msgid "No"
4152-msgstr "No"
4153-
4154 #. TRANSLATORS: %1 is the size of a file, expressed in GB
4155 #: ../src/app/qml/common/utils.js:22
4156 #, qt-format
4157@@ -147,98 +183,76 @@
4158 msgid "%1 byte"
4159 msgstr "%1 byte"
4160
4161-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
4162+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
4163 msgid "Delete file"
4164 msgstr "Suprimeix el fitxer"
4165
4166-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
4167+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
4168 #, qt-format
4169 msgid "Delete %1 file"
4170 msgid_plural "Delete %1 files"
4171 msgstr[0] "Suprimeix %1 fitxer"
4172 msgstr[1] "Suprimeix %1 fitxers"
4173
4174-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
4175-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
4176+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
4177+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
4178 msgid "Are you sure you want to permanently delete this file?"
4179 msgid_plural "Are you sure you want to permanently delete these files?"
4180 msgstr[0] "Segur que voleu suprimir permanentment aquest fitxer?"
4181 msgstr[1] "Segur que voleu suprimir permanentment aquests fitxers?"
4182
4183-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
4184-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
4185-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
4186-msgid "Cancel"
4187-msgstr "Cancel·la"
4188-
4189-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
4190+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
4191 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
4192-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
4193+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
4194 msgid "Delete"
4195 msgstr "Suprimeix"
4196
4197-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
4198-msgid "No document found"
4199+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
4200+msgid "Share"
4201+msgstr "Comparteix"
4202+
4203+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
4204+msgid "No documents found"
4205 msgstr "No s'ha trobat cap document"
4206
4207 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
4208 msgid ""
4209 "Connect your device to any computer and simply drag files to the Documents "
4210-"folder."
4211+"folder or insert removable media containing documents."
4212 msgstr ""
4213+"Connecteu el vostre dispositiu a qualsevol ordinador i simplement "
4214+"arrossegueu fitxers a la carpeta Documents o inseriu un mitjà removible que "
4215+"contingui documents."
4216
4217 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
4218 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
4219-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
4220-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
4221+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
4222 #, qt-format
4223 msgid "Today, %1"
4224 msgstr "Avui, a les %1"
4225
4226 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
4227 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
4228-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
4229-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
4230+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
4231 #, qt-format
4232 msgid "Yesterday, %1"
4233 msgstr "Ahir, a les %1"
4234
4235 #. TRANSLATORS: this is a datetime formatting string,
4236 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
4237-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
4238-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
4239+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
4240+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
4241+msgid "yyyy/MM/dd hh:mm"
4242+msgstr "dd/MM/yyyy hh:mm"
4243+
4244+#. TRANSLATORS: this is a datetime formatting string,
4245+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
4246+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
4247 msgid "dddd, hh:mm"
4248 msgstr "dddd, H.mm"
4249
4250-#. TRANSLATORS: this is a datetime formatting string,
4251-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
4252-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
4253-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
4254-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
4255-msgid "dd-MM-yyyy hh:mm"
4256-msgstr "dd/MM/yyyy H.mm"
4257-
4258-#: ../src/app/qml/documentPage/DocumentListView.qml:157
4259-msgid "Today"
4260-msgstr "Avui"
4261-
4262-#: ../src/app/qml/documentPage/DocumentListView.qml:160
4263-msgid "Yesterday"
4264-msgstr "Ahir"
4265-
4266-#: ../src/app/qml/documentPage/DocumentListView.qml:163
4267-msgid "Earlier this week"
4268-msgstr ""
4269-
4270-#: ../src/app/qml/documentPage/DocumentListView.qml:166
4271-msgid "Earlier this month"
4272-msgstr ""
4273-
4274-#: ../src/app/qml/documentPage/DocumentListView.qml:168
4275-msgid "Even earlier..."
4276-msgstr ""
4277-
4278-#: ../src/app/qml/documentPage/DocumentPage.qml:24
4279+#: ../src/app/qml/documentPage/DocumentPage.qml:23
4280+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
4281 msgid "Documents"
4282 msgstr "Documents"
4283
4284@@ -246,27 +260,23 @@
4285 msgid "Search..."
4286 msgstr "Cerca..."
4287
4288-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
4289+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
4290 msgid "Sorting settings..."
4291 msgstr "Paràmetres d'ordenació..."
4292
4293-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
4294-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
4295+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
4296 msgid "Switch to single column list"
4297-msgstr ""
4298+msgstr "Canvia a llista de columna única"
4299
4300-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
4301-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
4302+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
4303 msgid "Switch to grid"
4304-msgstr ""
4305+msgstr "Canvia a graella"
4306
4307-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
4308+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
4309 msgid "Pick"
4310 msgstr "Tria"
4311
4312 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
4313-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
4314-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
4315 msgid "Back"
4316 msgstr "Enrere"
4317
4318@@ -274,22 +284,48 @@
4319 msgid "search in documents..."
4320 msgstr "Cerca en els documents..."
4321
4322-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
4323+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
4324 msgid "Select None"
4325 msgstr "No seleccionis res"
4326
4327-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
4328+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
4329 msgid "Select All"
4330 msgstr "Selecciona-ho tot"
4331
4332 #: ../src/app/qml/documentPage/SearchEmptyState.qml:24
4333 msgid "No matching document found"
4334-msgstr ""
4335+msgstr "No s'ha trobat cap document que concordi"
4336
4337 #: ../src/app/qml/documentPage/SearchEmptyState.qml:26
4338 msgid ""
4339 "Please ensure that your query is not misspelled and/or try a different query."
4340 msgstr ""
4341+"Si us plau assegureu-vos que la vostra consulta no està mal escrita i/o "
4342+"proveu una consulta diferent."
4343+
4344+#: ../src/app/qml/documentPage/SectionHeader.qml:13
4345+msgid "Today"
4346+msgstr "Avui"
4347+
4348+#: ../src/app/qml/documentPage/SectionHeader.qml:16
4349+msgid "Yesterday"
4350+msgstr "Ahir"
4351+
4352+#: ../src/app/qml/documentPage/SectionHeader.qml:19
4353+msgid "Earlier this week"
4354+msgstr "Fa uns dies"
4355+
4356+#: ../src/app/qml/documentPage/SectionHeader.qml:22
4357+msgid "Earlier this month"
4358+msgstr "Fa unes setmanes"
4359+
4360+#: ../src/app/qml/documentPage/SectionHeader.qml:24
4361+msgid "Even earlier..."
4362+msgstr "Fa molt de temps..."
4363+
4364+#: ../src/app/qml/documentPage/SharePage.qml:23
4365+msgid "Share to"
4366+msgstr "Comparteix a"
4367
4368 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
4369 msgid "Sorting settings"
4370@@ -311,64 +347,176 @@
4371 msgid "Reverse order"
4372 msgstr "Ordre invers"
4373
4374+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
4375+#: ../src/app/qml/textView/TextView.qml:43
4376+msgid "Loading..."
4377+msgstr "S’està carregant…"
4378+
4379+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
4380+msgid "LibreOffice text document"
4381+msgstr "Document de text del LibreOffice"
4382+
4383+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
4384+msgid "LibreOffice spread sheet"
4385+msgstr "Full de càlcul del LibreOffice"
4386+
4387+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
4388+msgid "LibreOffice presentation"
4389+msgstr "Presentació del LibreOffice"
4390+
4391+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
4392+msgid "LibreOffice Draw document"
4393+msgstr "Dibuix del LibreOffice"
4394+
4395+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
4396+msgid "Unknown LibreOffice document"
4397+msgstr "Document desconegut del LibreOffice"
4398+
4399+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
4400+msgid "Unknown type document"
4401+msgstr "Tipus de document desconegut"
4402+
4403+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
4404+msgid "Go to position..."
4405+msgstr "Vés a la posició..."
4406+
4407+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
4408+#: ../src/app/qml/pdfView/PdfView.qml:228
4409+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
4410+msgid "Disable night mode"
4411+msgstr "Inhabilita el mode nocturn"
4412+
4413+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
4414+#: ../src/app/qml/pdfView/PdfView.qml:228
4415+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
4416+msgid "Enable night mode"
4417+msgstr "Habilita el mode nocturn"
4418+
4419+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
4420+msgid "Go to position"
4421+msgstr "Vés a la posició"
4422+
4423+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
4424+msgid "Choose a position between 1% and 100%"
4425+msgstr "Escull una posició entre 1% i100&%"
4426+
4427+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
4428+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
4429+msgid "GO!"
4430+msgstr "Vés-hi"
4431+
4432+#: ../src/app/qml/loView/LOViewPage.qml:167
4433+msgid "LibreOffice binaries not found."
4434+msgstr "No s'han trobat els binaris del LibreOffice"
4435+
4436+#: ../src/app/qml/loView/LOViewPage.qml:170
4437+msgid "Error while loading LibreOffice."
4438+msgstr "S'ha produït un error quan es carregava el LibreOffice"
4439+
4440+#: ../src/app/qml/loView/LOViewPage.qml:173
4441+msgid ""
4442+"Document not loaded.\n"
4443+"The requested document may be corrupt or protected by a password."
4444+msgstr ""
4445+"Document no carregat.\n"
4446+"El document demanat pot estar corromput o protegit mitjançant contrasenya."
4447+
4448+#: ../src/app/qml/loView/LOViewPage.qml:228
4449+msgid "This sheet has no content."
4450+msgstr "Aquest full no té cap contingut."
4451+
4452+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
4453+#. Document Viewer for rendering LibreOffice/MS-Office documents.
4454+#. Ref. https://docs.libreoffice.org/libreofficekit.html
4455+#: ../src/app/qml/loView/Splashscreen.qml:45
4456+msgid "Powered by LibreOfficeKit"
4457+msgstr "Funciona amb el LibreOfficeKit"
4458+
4459+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
4460+#. This is the default name for a sheet in LibreOffice.
4461+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
4462+#, qt-format
4463+msgid "Sheet%1"
4464+msgstr "Full%1"
4465+
4466+#: ../src/app/qml/loView/ZoomSelector.qml:122
4467+msgid "Fit width"
4468+msgstr "Ajusta a l'amplada"
4469+
4470+#: ../src/app/qml/loView/ZoomSelector.qml:123
4471+msgid "Fit height"
4472+msgstr "Ajusta l'alçada"
4473+
4474+#: ../src/app/qml/loView/ZoomSelector.qml:124
4475+msgid "Automatic"
4476+msgstr "Automàtic"
4477+
4478 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
4479-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
4480-#: ../src/app/qml/pdfView/PdfView.qml:37
4481+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
4482+#: ../src/app/qml/pdfView/PdfView.qml:153
4483 msgid "Contents"
4484 msgstr "Contingut"
4485
4486-#: ../src/app/qml/pdfView/PdfContentsPage.qml:38
4487-msgid "Hide table of contents"
4488-msgstr "Oculta la taula de continguts"
4489-
4490 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
4491 #. while the second one (%2) refers to the total pages count.
4492-#: ../src/app/qml/pdfView/PdfView.qml:34
4493+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
4494+#: ../src/app/qml/pdfView/PdfView.qml:56
4495 #, qt-format
4496 msgid "Page %1 of %2"
4497 msgstr "Pàgina %1 de %2"
4498
4499-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
4500+#: ../src/app/qml/pdfView/PdfView.qml:203
4501+msgid "Search"
4502+msgstr "Cerca"
4503+
4504+#: ../src/app/qml/pdfView/PdfView.qml:213
4505 msgid "Go to page..."
4506 msgstr "Vés a la pàgina..."
4507
4508-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
4509-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
4510-msgid "Disable night mode"
4511-msgstr "Inhabilita el mode nocturn"
4512-
4513-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
4514-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
4515-msgid "Enable night mode"
4516-msgstr "Habilita el mode nocturn"
4517-
4518-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
4519+#: ../src/app/qml/pdfView/PdfView.qml:221
4520+msgid "Presentation"
4521+msgstr "Presentació"
4522+
4523+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
4524 msgid "Go to page"
4525 msgstr "Vés a la pàgina"
4526
4527-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
4528+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
4529 #, qt-format
4530 msgid "Choose a page between 1 and %1"
4531 msgstr "Trieu una pàgina entre 1 i %1"
4532
4533-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
4534-msgid "GO!"
4535-msgstr "Vés-hi"
4536-
4537-#: ../src/app/qml/textView/TextView.qml:42
4538-msgid "Loading..."
4539-msgstr "S’està carregant…"
4540-
4541-#: ../src/app/qml/ubuntu-docviewer-app.qml:240
4542-msgid "Document successfully imported!"
4543-msgid_plural "Documents successfully imported!"
4544-msgstr[0] "S'ha importat correctament el document"
4545-msgstr[1] "S'han importat correctament els documents"
4546-
4547-#: ../src/app/qml/ubuntu-docviewer-app.qml:243
4548-msgid "Open"
4549-msgstr "Obre"
4550-
4551-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
4552+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
4553+msgid "File does not exist."
4554+msgstr "El fitxer no existeix."
4555+
4556+#. TRANSLATORS: This string is used for renaming a copied file,
4557+#. when a file with the same name already exists in user's
4558+#. Documents folder.
4559+#.
4560+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
4561+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
4562+#.
4563+#. where "2" is given by the argument "%1"
4564+#.
4565+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
4566+#, qt-format
4567+msgid "copy %1"
4568+msgstr "còpia %1"
4569+
4570+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
4571+msgid "Document Viewer"
4572+msgstr "Visualitzador de documents"
4573+
4574+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
4575 msgid "documents;viewer;pdf;reader;"
4576 msgstr "documents;visualitzador;pdf;lector;"
4577+
4578+#~ msgid "File does not exist"
4579+#~ msgstr "El fitxer no existeix"
4580+
4581+#~ msgid "No document found"
4582+#~ msgstr "No s'ha trobat cap document"
4583+
4584+#~ msgid "Hide table of contents"
4585+#~ msgstr "Oculta la taula de continguts"
4586
4587=== modified file 'po/com.ubuntu.docviewer.pot'
4588--- po/com.ubuntu.docviewer.pot 2015-07-24 09:12:38 +0000
4589+++ po/com.ubuntu.docviewer.pot 2017-04-05 07:49:18 +0000
4590@@ -8,7 +8,7 @@
4591 msgstr ""
4592 "Project-Id-Version: \n"
4593 "Report-Msgid-Bugs-To: \n"
4594-"POT-Creation-Date: 2015-07-24 11:10+0200\n"
4595+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
4596 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
4597 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
4598 "Language-Team: LANGUAGE <LL@li.org>\n"
4599@@ -18,66 +18,68 @@
4600 "Content-Transfer-Encoding: 8bit\n"
4601 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
4602
4603-#. TRANSLATORS: This string is used for renaming a copied file,
4604-#. when a file with the same name already exists in user's
4605-#. Documents folder.
4606-#.
4607-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
4608-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
4609-#.
4610-#. where "2" is given by the argument "%1"
4611-#.
4612-#: ../src/app/content-communicator.cpp:105
4613-#, qt-format
4614-msgid "copy %1"
4615-msgstr ""
4616-
4617-#: ../src/app/docviewer-application.cpp:171
4618-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
4619-msgid "Document Viewer"
4620-msgstr ""
4621-
4622-#: ../src/app/qml/common/DetailsPage.qml:27
4623-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
4624-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
4625+#: ../src/app/qml/common/CommandLineProxy.qml:49
4626+msgid "Some of the provided arguments are not valid."
4627+msgstr ""
4628+
4629+#: ../src/app/qml/common/CommandLineProxy.qml:58
4630+msgid "Open ubuntu-docviewer-app displaying the selected file"
4631+msgstr ""
4632+
4633+#: ../src/app/qml/common/CommandLineProxy.qml:65
4634+msgid "Run fullscreen"
4635+msgstr ""
4636+
4637+#: ../src/app/qml/common/CommandLineProxy.qml:71
4638+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
4639+msgstr ""
4640+
4641+#: ../src/app/qml/common/CommandLineProxy.qml:77
4642+msgid ""
4643+"Show documents from the given folder, instead of ~/Documents.\n"
4644+"The path must exist prior to running ubuntu-docviewer-app"
4645+msgstr ""
4646+
4647+#: ../src/app/qml/common/DetailsPage.qml:26
4648+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
4649+#: ../src/app/qml/pdfView/PdfView.qml:235
4650+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
4651 msgid "Details"
4652 msgstr ""
4653
4654-#: ../src/app/qml/common/DetailsPage.qml:33
4655+#: ../src/app/qml/common/DetailsPage.qml:42
4656+msgid "File"
4657+msgstr ""
4658+
4659+#: ../src/app/qml/common/DetailsPage.qml:47
4660 msgid "Location"
4661 msgstr ""
4662
4663-#: ../src/app/qml/common/DetailsPage.qml:37
4664+#: ../src/app/qml/common/DetailsPage.qml:52
4665 msgid "Size"
4666 msgstr ""
4667
4668-#: ../src/app/qml/common/DetailsPage.qml:42
4669+#: ../src/app/qml/common/DetailsPage.qml:57
4670 msgid "Created"
4671 msgstr ""
4672
4673-#: ../src/app/qml/common/DetailsPage.qml:47
4674+#: ../src/app/qml/common/DetailsPage.qml:62
4675 msgid "Last modified"
4676 msgstr ""
4677
4678-#: ../src/app/qml/common/DetailsPage.qml:54
4679+#: ../src/app/qml/common/DetailsPage.qml:69
4680 msgid "MIME type"
4681 msgstr ""
4682
4683-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
4684+#: ../src/app/qml/common/ErrorDialog.qml:23
4685 msgid "Error"
4686 msgstr ""
4687
4688-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
4689-msgid "File does not exist"
4690-msgstr ""
4691-
4692-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
4693-#: ../src/app/qml/common/PickImportedDialog.qml:47
4694+#: ../src/app/qml/common/ErrorDialog.qml:26
4695+#: ../src/app/qml/common/PickImportedDialog.qml:54
4696 #: ../src/app/qml/common/RejectedImportDialog.qml:38
4697-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
4698+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
4699 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
4700-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
4701-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
4702 msgid "Close"
4703 msgstr ""
4704
4705@@ -101,28 +103,29 @@
4706 msgstr[0] ""
4707 msgstr[1] ""
4708
4709-#: ../src/app/qml/common/ToastWithAction.qml:97
4710-msgid "Dismiss"
4711-msgstr ""
4712-
4713-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
4714+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
4715 msgid "Unknown file type"
4716 msgstr ""
4717
4718-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
4719+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
4720 msgid ""
4721-"Sorry but we can't find a way to display this file. Do you want to open it "
4722-"as a plain text?"
4723-msgstr ""
4724-
4725-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
4726+"This file is not supported.\n"
4727+"Do you want to open it as a plain text?"
4728+msgstr ""
4729+
4730+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
4731+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
4732+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
4733+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
4734+#: ../src/app/qml/pdfView/PdfView.qml:180
4735+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
4736+msgid "Cancel"
4737+msgstr ""
4738+
4739+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
4740 msgid "Yes"
4741 msgstr ""
4742
4743-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
4744-msgid "No"
4745-msgstr ""
4746-
4747 #. TRANSLATORS: %1 is the size of a file, expressed in GB
4748 #: ../src/app/qml/common/utils.js:22
4749 #, qt-format
4750@@ -147,98 +150,73 @@
4751 msgid "%1 byte"
4752 msgstr ""
4753
4754-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
4755+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
4756 msgid "Delete file"
4757 msgstr ""
4758
4759-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
4760+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
4761 #, qt-format
4762 msgid "Delete %1 file"
4763 msgid_plural "Delete %1 files"
4764 msgstr[0] ""
4765 msgstr[1] ""
4766
4767-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
4768-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
4769+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
4770+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
4771 msgid "Are you sure you want to permanently delete this file?"
4772 msgid_plural "Are you sure you want to permanently delete these files?"
4773 msgstr[0] ""
4774 msgstr[1] ""
4775
4776-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
4777-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
4778-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
4779-msgid "Cancel"
4780-msgstr ""
4781-
4782-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
4783+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
4784 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
4785-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
4786+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
4787 msgid "Delete"
4788 msgstr ""
4789
4790-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
4791-msgid "No document found"
4792+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
4793+msgid "Share"
4794+msgstr ""
4795+
4796+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
4797+msgid "No documents found"
4798 msgstr ""
4799
4800 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
4801 msgid ""
4802 "Connect your device to any computer and simply drag files to the Documents "
4803-"folder."
4804+"folder or insert removable media containing documents."
4805 msgstr ""
4806
4807 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
4808 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
4809-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
4810-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
4811+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
4812 #, qt-format
4813 msgid "Today, %1"
4814 msgstr ""
4815
4816 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
4817 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
4818-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
4819-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
4820+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
4821 #, qt-format
4822 msgid "Yesterday, %1"
4823 msgstr ""
4824
4825 #. TRANSLATORS: this is a datetime formatting string,
4826 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
4827-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
4828-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
4829+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
4830+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
4831+msgid "yyyy/MM/dd hh:mm"
4832+msgstr ""
4833+
4834+#. TRANSLATORS: this is a datetime formatting string,
4835+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
4836+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
4837 msgid "dddd, hh:mm"
4838 msgstr ""
4839
4840-#. TRANSLATORS: this is a datetime formatting string,
4841-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
4842-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
4843-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
4844-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
4845-msgid "dd-MM-yyyy hh:mm"
4846-msgstr ""
4847-
4848-#: ../src/app/qml/documentPage/DocumentListView.qml:157
4849-msgid "Today"
4850-msgstr ""
4851-
4852-#: ../src/app/qml/documentPage/DocumentListView.qml:160
4853-msgid "Yesterday"
4854-msgstr ""
4855-
4856-#: ../src/app/qml/documentPage/DocumentListView.qml:163
4857-msgid "Earlier this week"
4858-msgstr ""
4859-
4860-#: ../src/app/qml/documentPage/DocumentListView.qml:166
4861-msgid "Earlier this month"
4862-msgstr ""
4863-
4864-#: ../src/app/qml/documentPage/DocumentListView.qml:168
4865-msgid "Even earlier..."
4866-msgstr ""
4867-
4868-#: ../src/app/qml/documentPage/DocumentPage.qml:24
4869+#: ../src/app/qml/documentPage/DocumentPage.qml:23
4870+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
4871 msgid "Documents"
4872 msgstr ""
4873
4874@@ -246,27 +224,23 @@
4875 msgid "Search..."
4876 msgstr ""
4877
4878-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
4879+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
4880 msgid "Sorting settings..."
4881 msgstr ""
4882
4883-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
4884-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
4885+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
4886 msgid "Switch to single column list"
4887 msgstr ""
4888
4889-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
4890-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
4891+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
4892 msgid "Switch to grid"
4893 msgstr ""
4894
4895-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
4896+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
4897 msgid "Pick"
4898 msgstr ""
4899
4900 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
4901-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
4902-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
4903 msgid "Back"
4904 msgstr ""
4905
4906@@ -274,11 +248,11 @@
4907 msgid "search in documents..."
4908 msgstr ""
4909
4910-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
4911+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
4912 msgid "Select None"
4913 msgstr ""
4914
4915-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
4916+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
4917 msgid "Select All"
4918 msgstr ""
4919
4920@@ -291,6 +265,30 @@
4921 "Please ensure that your query is not misspelled and/or try a different query."
4922 msgstr ""
4923
4924+#: ../src/app/qml/documentPage/SectionHeader.qml:13
4925+msgid "Today"
4926+msgstr ""
4927+
4928+#: ../src/app/qml/documentPage/SectionHeader.qml:16
4929+msgid "Yesterday"
4930+msgstr ""
4931+
4932+#: ../src/app/qml/documentPage/SectionHeader.qml:19
4933+msgid "Earlier this week"
4934+msgstr ""
4935+
4936+#: ../src/app/qml/documentPage/SectionHeader.qml:22
4937+msgid "Earlier this month"
4938+msgstr ""
4939+
4940+#: ../src/app/qml/documentPage/SectionHeader.qml:24
4941+msgid "Even earlier..."
4942+msgstr ""
4943+
4944+#: ../src/app/qml/documentPage/SharePage.qml:23
4945+msgid "Share to"
4946+msgstr ""
4947+
4948 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
4949 msgid "Sorting settings"
4950 msgstr ""
4951@@ -311,64 +309,165 @@
4952 msgid "Reverse order"
4953 msgstr ""
4954
4955+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
4956+#: ../src/app/qml/textView/TextView.qml:43
4957+msgid "Loading..."
4958+msgstr ""
4959+
4960+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
4961+msgid "LibreOffice text document"
4962+msgstr ""
4963+
4964+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
4965+msgid "LibreOffice spread sheet"
4966+msgstr ""
4967+
4968+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
4969+msgid "LibreOffice presentation"
4970+msgstr ""
4971+
4972+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
4973+msgid "LibreOffice Draw document"
4974+msgstr ""
4975+
4976+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
4977+msgid "Unknown LibreOffice document"
4978+msgstr ""
4979+
4980+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
4981+msgid "Unknown type document"
4982+msgstr ""
4983+
4984+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
4985+msgid "Go to position..."
4986+msgstr ""
4987+
4988+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
4989+#: ../src/app/qml/pdfView/PdfView.qml:228
4990+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
4991+msgid "Disable night mode"
4992+msgstr ""
4993+
4994+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
4995+#: ../src/app/qml/pdfView/PdfView.qml:228
4996+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
4997+msgid "Enable night mode"
4998+msgstr ""
4999+
5000+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches