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

[David Planella]

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

[Alan Pope 🍺🐧🐱 🦄 (popey)]

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.

[Stefano Verzegnassi (verzegnassi-stefano)]

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.

[Stefano Verzegnassi (verzegnassi-stefano)]

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]

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.

=== modified file '.bzrignore'
--- .bzrignore	2014-10-28 22:10:16 +0000
+++ .bzrignore	2017-04-05 07:49:18 +0000
@@ -1,11 +1,11 @@
 Makefile
 ubuntu-docviewer-app
 *.user
+*.user.*
 moc_file.cpp
 launcher/build-docviewer-launcher-Desktop-Debug/
 launcher/build-docviewer-launcher-Desktop-Release/
 launcher/src/docviewer-launcher.pro.user
-*.cmake
 CMakeFiles
 *_automoc.cpp
 moc_*

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-24 20:50:40 +0000
+++ CMakeLists.txt	2017-04-05 07:49:18 +0000
@@ -1,34 +1,26 @@
 project(com.ubuntu.docviewer C CXX)
 cmake_minimum_required(VERSION 2.8.9)
 
-find_program(INTLTOOL_MERGE intltool-merge)
-if(NOT INTLTOOL_MERGE)
-  message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
-endif(NOT INTLTOOL_MERGE)
-
-find_program(INTLTOOL_EXTRACT intltool-extract)
-if(NOT INTLTOOL_EXTRACT)
-  message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
-endif(NOT INTLTOOL_EXTRACT)
-
+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
 
+# Debugging purpose. Keep commented unless you need it.
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+
 include(FindPkgConfig)
-# Standard install paths
 include(GNUInstallDirs)
 
-option(INSTALL_TESTS "Install the tests on make install" on)
-option(CLICK_MODE "Installs to a contained location" on)
+option(INSTALL_TESTS    "Install the tests on make install" on)
+option(CLICK_MODE       "Installs to a contained location" on)
+option(NO_CACHE         "Disable caching of click dependencies (CLICK_MODE only)" off)
 
-set(APP_NAME ubuntu-docviewer-app)
-set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
-set(URLS_FILE "${PROJECT_NAME}.url-dispatcher")
-set(LP_PROJECT ubuntu-docviewer-app)
-set(ICON_FILE [e-mail])
-set(AUTOPILOT_DIR ubuntu_docviewer_app)
-set(EXEC "${APP_NAME}")
-set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
+set(APP_NAME            ubuntu-docviewer-app)
+set(DESKTOP_FILE        "${PROJECT_NAME}.desktop")
+set(LP_PROJECT          ubuntu-docviewer-app)
+set(ICON_FILE           docviewer-app.png)
+set(AUTOPILOT_DIR       ubuntu_docviewer_app)
 
 # Sets BZR_REVNO
 execute_process(
@@ -37,87 +29,26 @@
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-if(CLICK_MODE)
-    if(NOT DEFINED BZR_SOURCE)
-        set(BZR_SOURCE "lp:${LP_PROJECT}")
-        message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
-    endif(NOT DEFINED BZR_SOURCE)
-
-    if(NOT BZR_REVNO)
-        set(BZR_REVNO "latest")
-    endif(NOT BZR_REVNO)
-
-    # Find out the architecture for package building
-    # to determine the plugin's installation path
-    execute_process(
-        COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-            OUTPUT_VARIABLE ARCH_TRIPLET
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    execute_process(
-      COMMAND dpkg-architecture -qDEB_HOST_ARCH
-      OUTPUT_VARIABLE CLICK_ARCH
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    set(CMAKE_INSTALL_PREFIX /)
-    set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
-    set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
-    set(DATA_DIR /)
-    set(ICON ${ICON_FILE})
-    set(DESKTOP_DIR ${DATA_DIR})
-    set(URLS_DIR ${DATA_DIR})
-    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor docviewer-content.json ${URLS_FILE}
-            DESTINATION ${CMAKE_INSTALL_PREFIX})
-    # Make the click files visible in Qt Creator
-    file(GLOB CLICK_FILES
-         RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-         *.json *.json.in *.apparmor)
-
-    add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})
-else(CLICK_MODE)
-    # components PATH
-    execute_process(
-        COMMAND qmake -query QT_INSTALL_QML
-            OUTPUT_VARIABLE QT_IMPORTS_DIR
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
-    set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
-    set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-    set(APPLICATION_DIR ${CMAKE_INSTALL_DATADIR}/accounts/applications)
-endif(CLICK_MODE)
-
-file(GLOB_RECURSE I18N_SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
-     *.qml *.js *.cpp)
-list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/po/${DESKTOP_FILE}.in.in.h)
-list(SORT I18N_SRC_FILES)
-message("Found ${I18N_SRC_FILES}")
-
-file(GLOB SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js)
-add_custom_target(ubuntu-docviewer-app_QMlFiles ALL SOURCES ${SRC_FILES})
-
-file(GLOB RESOURCE_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.png *.svg)
-install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
-
-configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
-
-add_custom_target(${DESKTOP_FILE} ALL
-  COMMENT "Merging translations into ${DESKTOP_FILE}"
-  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
-)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} 
-        DESTINATION ${DESKTOP_DIR})
- 
+# Find out the architecture for package building
+# to determine the plugin's installation path
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+  OUTPUT_VARIABLE ARCH_TRIPLET
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_ARCH
+  OUTPUT_VARIABLE CLICK_ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+include(Click)
+
 # Tests
 enable_testing()
 
+add_subdirectory(po)
+add_subdirectory(click)
+add_subdirectory(data)
 add_subdirectory(src)
 add_subdirectory(tests)
-add_subdirectory(po)

=== removed file 'README'
--- README	2015-01-30 19:20:39 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-Usage
-=====
-ubuntu-docviewer-app [filename]
-
-filename : The path where the file you want to open is located.
-
-Compiling
-=========
-
-Install poppler's development files:
-sudo apt-get install libpoppler-qt5-dev
-
-Install Qt5 private development files:
-sudo apt-get install qtdeclarative5-private-dev qtbase5-private-dev
-
-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:
-
-apt-get install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf
-
-

=== added file 'README-Autopilot.md'
--- README-Autopilot.md	1970-01-01 00:00:00 +0000
+++ README-Autopilot.md	2017-04-05 07:49:18 +0000
@@ -0,0 +1,81 @@
+Running Autopilot tests
+=======================
+
+As of wily 15.10, some autopilot tests are broken in trunk. As such autopilot failures
+can be excused until they are fixed in trunk.
+
+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.
+
+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:
+
+- [Ubuntu - Quality](http://developer.ubuntu.com/start/quality)
+- [Autopilot - Python](https://developer.ubuntu.com/api/autopilot/python/1.5.0/)
+
+For help and options on running tests, see:
+
+- [Autopilot tests](https://developer.ubuntu.com/en/start/platform/guides/running-autopilot-tests/)
+
+Prerequisites
+=============
+
+Install the following autopilot packages required to run the tests,
+
+    $ sudo apt-get install python3-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot python3-autopilot-vis
+
+Running tests on the desktop
+============================
+
+Using terminal:
+
+*  Branch the Doc Viewer app code, for example,
+
+    $ bzr branch lp:ubuntu-docviewer-app
+    
+*  Navigate to the tests/autopilot directory.
+
+    $ cd ubuntu-docviewer-app/tests/autopilot
+
+*  run all tests.
+
+    $ autopilot3 run -vv ubuntu_docviewer_app
+
+* to list all tests:
+
+    $ autopilot3 list ubuntu_docviewer_app
+
+ To run only one test (for instance: ubuntu_docviewer_app.tests.test_docviewer.TestMainWindow.test_open_pdf_file)
+
+
+    $ autopilot3 run -vv ubuntu_docviewer_app.tests.test_docviewer.TestMainWindow.test_open_pdf_file
+
+* Debugging tests using autopilot vis
+
+    $ autopilot3 launch -i Qt qmlscene app/ubuntu-docviewer-app.qml
+
+    $ autopilot3 vis
+
+Running tests using Ubuntu SDK
+==============================
+
+Refer this [tutorial](https://developer.ubuntu.com/en/start/platform/guides/running-autopilot-tests/) to run tests on Ubuntu SDK: 
+
+Running tests on device or emulator:
+====================================
+
+Using autopkg:
+
+*  Branch the Doc Viewer app code, for example,
+
+    $ bzr branch lp:ubuntu-docviewer-app
+
+*  Navigate to the source directory.
+
+    $ cd ubuntu-docviewer-app
+
+*  Build a click package
+    
+    $ click-buddy .
+
+*  Run the tests on device (assumes only one click package in the directory)
+
+    $ adt-run . *.click --- ssh -s adb -- -p <PASSWORD>

=== added file 'README-Developers.md'
--- README-Developers.md	1970-01-01 00:00:00 +0000
+++ README-Developers.md	2017-04-05 07:49:18 +0000
@@ -0,0 +1,43 @@
+Dependencies
+============
+**DEPENDENCIES ARE NEEDED TO BE INSTALLED TO BUILD AND RUN THE APP**
+
+A complete list of dependencies for the project can be found in ubuntu-docviewer-app/debian/control
+
+The following essential packages are also required to develop this app:
+* [ubuntu-sdk](http://developer.ubuntu.com/start)
+* intltool   - run  `sudo apt-get install intltool` 
+
+Compiling
+=========
+
+**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**
+
+* Install poppler's development files:
+    sudo apt install libpoppler-qt5-dev
+
+* Install Qt5 private development files:
+    sudo apt install qtdeclarative5-private-dev qtbase5-private-dev
+
+* 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:
+
+    apt install libpoppler-qt5-dev:armhf qtdeclarative5-private-dev:armhf qtbase5-private-dev:armhf
+
+LibreOffice viewer support
+==========================
+
+* If you want to enable the LibreOffice viewer feature, you'll need to have a
+  LibreOffice 5.0 installation on your development environment. 
+  To do so, type the following commands on a terminal:
+
+    sudo apt-get purge libreoffice-core
+    sudo add-apt-repository ppa:libreoffice/libreoffice-5-0
+    sudo apt-get update
+    sudo apt-get install libreoffice
+
+* Then to compile the LibreOffice viewer plugin you'll simply need to install
+  the LibreOffice Kit development files:
+
+    sudo apt install libreofficekit-dev

=== added file 'README-Mergeproposal.md'
--- README-Mergeproposal.md	1970-01-01 00:00:00 +0000
+++ README-Mergeproposal.md	2017-04-05 07:49:18 +0000
@@ -0,0 +1,36 @@
+Prerequisites to approving a Merge Proposal (MP)
+================================================
+
+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.
+
+Checklist
+=========
+
+*   Does the MP add/remove user visible strings? If Yes, has the pot file been
+    updated?
+
+*   Does the MP change the UI? If Yes, has it been approved by design, or
+    discussed with some of the DocViewer developers?
+
+*   Did you perform an exploratory manual test run of your code change and any
+    related functionality?
+
+*   If the MP fixes a bug or implements a feature, are there accompanying unit
+    and autopilot tests?
+
+*   Is the doc viewer app trunk buildable and runnable using Qtcreator?
+
+*   Was the debian changelog updated?
+
+*   Was the copyright years updated if necessary?
+
+The above checklist is more of a guideline to help doc viewer app trunk stay buildable,
+stable and up to date.
+
+Note: As of wily 15.10, some autopilot tests are broken in trunk. As such autopilot failures
+can be excused until they are fixed in trunk.
+
+Jenkins
+=======
+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)
+

=== added file 'README-Translations.md'
--- README-Translations.md	1970-01-01 00:00:00 +0000
+++ README-Translations.md	2017-04-05 07:49:18 +0000
@@ -0,0 +1,37 @@
+Updating translations
+=====================
+
+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.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+translatable messages to translators. So whenever you add new translatable
+messages in the code, make sure to follow these steps:
+
+ 1. Run click-buddy retaining the build directory:
+    `click-buddy --dir . --no-clean`
+ 2. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
+ 3. Push the branch and send a merge proposal as usual
+
+And that's it, once the branch lands Launchpad should take care of all the rest!
+
+Behind the scenes
+=================
+
+Behind the scenes, whenever the po/*.pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual po/*.po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations for core apps follow the standard [gettext format](https://www.gnu.org/software/gettext/).
+
+ [Launchpad Translations](https://translations.launchpad.net/ubuntu-docviewer-app)
+ [gettext format](https://www.gnu.org/software/gettext/)

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2017-04-05 07:49:18 +0000
@@ -0,0 +1,30 @@
+ReadMe - Ubuntu Doc Viewer App
+==============================
+Ubuntu Doc Viewer App is the official document viewer app for Ubuntu Touch. We follow an open
+source model where the code is available to anyone to branch and hack on. The
+ubuntu doc viewer app follows a test driven development (TDD) where tests are
+written in parallel to feature implementation to help spot regressions easier.
+
+Usage
+=====
+ubuntu-docviewer-app [filename]
+
+filename : The path where the file you want to open is located.
+
+Dependencies
+============
+**DEPENDENCIES ARE NEEDED TO BE INSTALLED TO BUILD AND RUN THE APP**.
+
+A complete list of dependencies for the project can be found in ubuntu-docviewer-app/debian/control
+
+The following essential packages are also required to develop this app:
+* [ubuntu-sdk](http://developer.ubuntu.com/start)
+* intltool   - run  `sudo apt-get install intltool`
+
+Useful Links
+============
+Here are some useful links with regards to the Doc Viewer App development.
+
+* [Home Page](https://developer.ubuntu.com/en/community/core-apps/docviewer/)
+* [Doc Viewer App Wiki](https://wiki.ubuntu.com/Touch/CoreApps/DocViewer)
+* [Project page](https://launchpad.net/ubuntu-docviewer-app) 

=== removed file 'README.translations'
--- README.translations	2015-01-24 00:03:13 +0000
+++ README.translations	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# Updating translations
-
-Translations for the Document Viewer app happen in [Launchpad Translations] and
-are automatically committed daily on the trunk branch in the po/ folder.
-
-They are then built and installed as part of the package build, so that
-developers don't really need to worry about them.
-
-However, there is one task that needs to be taken care of: exposing new
-translatable messages to translators. So whenever you add new translatable
-messages in the code, make sure to follow these steps:
-
- 1. Run click-buddy retaining the build directory:
-    `click-buddy --dir . --no-clean`
- 2. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
- 3. Push the branch and send a merge proposal as usual
-
-And that's it, once the branch lands Launchpad should take care of all the rest!
-
-# Behind the scenes
-
-Behind the scenes, whenever the po/*.pot file (also known as translations template)
-is committed to trunk Launchpad reads it and updates the translatable strings
-exposed in the web UI. This will enable translators to work on the new strings.
-The translations template contains all translatable strings that have been
-extracted from the source code files.
-
-Launchpad will then store translations in its database and will commit them daily
-in the form of textual po/*.po files to trunk. The PO files are also usually
-referred to as the translations files. You'll find a translation file for each
-language the app has got at least a translated message available for.
-
-Translations for core apps follow the standard [gettext format].
-
- [Launchpad Translations]: https://translations.launchpad.net/ubuntu-docviewer-app
- [gettext format]: https://www.gnu.org/software/gettext/

=== added directory 'click'
=== added file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ click/CMakeLists.txt	2017-04-05 07:49:18 +0000
@@ -0,0 +1,18 @@
+if(CLICK_MODE)
+  if(NOT BZR_REVNO)
+    set(BZR_REVNO "latest")
+  endif(NOT BZR_REVNO)
+
+  configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES docviewer.apparmor docviewer-content.json com.ubuntu.docviewer.url-dispatcher DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)
+
+
+# Make the click files visible in Qt Creator
+file(GLOB CLICK_FILES
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  *.json *.json.in *.apparmor
+)
+
+add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})

=== added file 'click/com.ubuntu.docviewer.url-dispatcher'
--- click/com.ubuntu.docviewer.url-dispatcher	1970-01-01 00:00:00 +0000
+++ click/com.ubuntu.docviewer.url-dispatcher	2017-04-05 07:49:18 +0000
@@ -0,0 +1,5 @@
+[
+    {
+        "protocol": "document"
+    }
+]

=== added file 'click/disable-file-locking.xcd'
--- click/disable-file-locking.xcd	1970-01-01 00:00:00 +0000
+++ click/disable-file-locking.xcd	2017-04-05 07:49:18 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
+  <dependency file="main"/>
+  <oor:component-data oor:package="org.openoffice.Office" oor:name="Common">
+    <node oor:name="Misc">
+        <prop oor:name="UseLocking">
+          <value>false</value>
+        </prop>
+    </node>
+  </oor:component-data>
+</oor:data>

=== added file 'click/disable-lo-features.sh'
--- click/disable-lo-features.sh	1970-01-01 00:00:00 +0000
+++ click/disable-lo-features.sh	2017-04-05 07:49:18 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# $1 is the temp folder where the packages have been extracted
+TEMP_PATH=$1
+LO_PATH=$TEMP_PATH/opt/libreoffice/lib/libreoffice
+LO_REGISTRY=$LO_PATH/share/registry
+
+THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+echo "Disable file locking in LibreOffice"
+cp $THIS_DIR/disable-file-locking.xcd $LO_REGISTRY
+
+echo "Disable spell checking in LibreOffice"
+cp $THIS_DIR/disable-spell-check.xcd $LO_REGISTRY

=== added file 'click/disable-spell-check.xcd'
--- click/disable-spell-check.xcd	1970-01-01 00:00:00 +0000
+++ click/disable-spell-check.xcd	2017-04-05 07:49:18 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
+  <dependency file="main"/>
+  <oor:component-data oor:package="org.openoffice.Office" oor:name="Linguistic">
+    <node oor:name="General">
+        <node oor:name="DictionaryList">
+            <prop oor:name="ActiveDictionaries">
+              <value>IgnoreAllList</value>
+            </prop>
+        </node>
+    </node>
+    <node oor:name="GrammarChecking">
+        <prop oor:name="IsAutoCheck">
+            <value>false</value>
+        </prop>
+    </node>
+    <node oor:name="SpellChecking">
+        <prop oor:name="IsSpellAuto">
+            <value>false</value>
+        </prop>
+    </node>
+  </oor:component-data>
+</oor:data>

=== added file 'click/docviewer-content.json'
--- click/docviewer-content.json	1970-01-01 00:00:00 +0000
+++ click/docviewer-content.json	2017-04-05 07:49:18 +0000
@@ -0,0 +1,8 @@
+{
+    "destination": [
+        "documents"
+    ],
+    "source": [
+        "documents"
+    ]
+}

=== added file 'click/docviewer-libs.json'
--- click/docviewer-libs.json	1970-01-01 00:00:00 +0000
+++ click/docviewer-libs.json	2017-04-05 07:49:18 +0000
@@ -0,0 +1,94 @@
+{   
+    "armhf": [
+        {
+            "url": "http://ports.ubuntu.com/ubuntu-ports",
+            "dist": "vivid",
+            "component": "main",
+            "packages": [
+                "libboost-date-time1.55.0",
+                "libgl1-mesa-glx",
+                "libxcb-dri3-0",
+                "libxcb-glx0",
+                "libxcb-present0",
+                "libxshmfence1",
+                "libxslt1.1",
+                "libxt6",
+                "libxxf86vm1",
+                "gconf-service",
+                "gconf-service-backend",
+                "gconf2-common",
+                "libgconf-2-4"
+            ]
+        },
+        {
+            "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
+            "dist": "vivid",
+            "component": "main",
+            "packages": [
+                "libreoffice-vanilla"
+            ]
+        }
+    ],
+
+    "i386": [
+        {
+            "url": "http://archive.ubuntu.com/ubuntu",
+            "dist": "vivid",
+            "component": "main",
+            "packages": [
+                "libboost-date-time1.55.0",
+                "libgl1-mesa-glx",
+                "libxcb-dri3-0",
+                "libxcb-glx0",
+                "libxcb-present0",
+                "libxshmfence1",
+                "libxslt1.1",
+                "libxt6",
+                "libxxf86vm1",
+                "gconf-service",
+                "gconf-service-backend",
+                "gconf2-common",
+                "libgconf-2-4"
+            ]
+        },
+        {
+            "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
+            "dist": "vivid",
+            "component": "main",
+            "packages": [
+                "libreoffice-vanilla"
+            ]
+        }
+    ],
+
+    "amd64": [
+        {
+            "url": "http://archive.ubuntu.com/ubuntu",
+            "dist": "vivid",
+            "component": "main",
+            "packages": [
+                "libboost-date-time1.55.0",
+                "libgl1-mesa-glx",
+                "libxcb-dri3-0",
+                "libxcb-glx0",
+                "libxcb-present0",
+                "libxshmfence1",
+                "libxslt1.1",
+                "libxt6",
+                "libxxf86vm1",
+                "gconf-service",
+                "gconf-service-backend",
+                "gconf2-common",
+                "libgconf-2-4"
+            ]
+        },
+        {
+            "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
+            "dist": "vivid",
+            "component": "main",
+            "packages": [
+                "libreoffice-vanilla"
+            ]
+        }
+    ]
+}

=== added file 'click/docviewer.apparmor'
--- click/docviewer.apparmor	1970-01-01 00:00:00 +0000
+++ click/docviewer.apparmor	2017-04-05 07:49:18 +0000
@@ -0,0 +1,18 @@
+{
+    "policy_groups": [
+        "content_exchange_source",
+        "content_exchange",
+        "keep-display-on"
+    ],
+    "read_path": [
+        "@{HOME}/Documents/",
+        "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
+        "@{PROC}/*/mounts",
+        "/dev/disk/by-label/"
+    ],
+    "write_path": [
+        "@{HOME}/Documents/",
+        "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/"
+    ],
+    "policy_version": 1.3
+}
\ No newline at end of file

=== added file 'click/manifest.json.in'
--- click/manifest.json.in	1970-01-01 00:00:00 +0000
+++ click/manifest.json.in	2017-04-05 07:49:18 +0000
@@ -0,0 +1,25 @@
+{
+    "name": "com.ubuntu.docviewer",
+    "title": "Document Viewer",
+    "description": "Document Viewer application for Ubuntu devices",
+    "framework": "ubuntu-sdk-15.04.4",
+    "architecture": "@CLICK_ARCH@",
+    "icon": "@ICON@",
+    "hooks": {
+        "docviewer": {
+            "apparmor": "docviewer.apparmor",
+            "desktop": "com.ubuntu.docviewer.desktop",
+            "content-hub": "docviewer-content.json",
+            "urls": "com.ubuntu.docviewer.url-dispatcher"
+        }
+    },
+    "version": "2.1.@BZR_REVNO@",
+    "maintainer": "Ubuntu App Cats <[e-mail]>",
+    "x-source": {
+        "vcs-bzr": "@BZR_SOURCE@",
+        "vcs-bzr-revno": "@BZR_REVNO@"
+    },
+    "x-test": {
+        "autopilot": "@AUTOPILOT_DIR@"
+    }
+}

=== added directory 'cmake'
=== added directory 'cmake/modules'
=== added file 'cmake/modules/Click.cmake'
--- cmake/modules/Click.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/Click.cmake	2017-04-05 07:49:18 +0000
@@ -0,0 +1,80 @@
+if(CLICK_MODE)
+  if(NOT DEFINED BZR_SOURCE)
+    set(BZR_SOURCE "lp:${LP_PROJECT}")
+    message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+  endif(NOT DEFINED BZR_SOURCE)
+
+  set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
+  set(CMAKE_INSTALL_PREFIX /)
+  set(DATA_DIR /)
+
+  # Path for ubuntu-docviewer-app executable
+  set(BIN_DIR ${DATA_DIR}lib/${ARCH_TRIPLET}/bin)
+
+  # If running in CLICK_MODE, include binary dependencies of docviewer
+  set(GET_CLICK_DEPS_TOOL ${CMAKE_SOURCE_DIR}/tools/get-click-deps)
+  set(DEPS_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/click/docviewer-libs.json)
+  set(CUSTOM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-lo-features.sh)
+  set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
+
+  MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
+
+  if(NO_CACHE)
+    # It has been specified not to cache .click dependencies on the machine.
+    # This is meant to be used for automatic builds (e.g. Jenkins Bot).
+    execute_process(
+      COMMAND mkdir ${UPSTREAM_LIBS_DIR}
+      COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
+    )
+  else(NO_CACHE)
+    # Cache the .click dependencies for next usage. (Default)
+    # Useful on developer machine.
+    get_filename_component(BLD_CONFIGURATION_NAME ${CMAKE_BINARY_DIR} NAME)
+    set(UPSTREAM_CACHE $ENV{HOME}/dev/upstream-libs-docviewer/${BLD_CONFIGURATION_NAME})
+    MESSAGE("Upstream libs cache path: ${UPSTREAM_CACHE}")
+
+    if(EXISTS "${UPSTREAM_CACHE}")
+      MESSAGE("Upstream libs cache exists.")
+      file(COPY ${UPSTREAM_CACHE}/upstream-libs/ DESTINATION ${UPSTREAM_LIBS_DIR} PATTERN * )
+    else()
+      MESSAGE("Cache miss, downloading from network.")
+      file(MAKE_DIRECTORY ${UPSTREAM_LIBS_DIR})
+      file(MAKE_DIRECTORY ${UPSTREAM_CACHE})
+      execute_process(
+        COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
+      )
+      # Cache for next usage.
+      file(COPY ${UPSTREAM_LIBS_DIR} DESTINATION ${UPSTREAM_CACHE} )
+    endif() #EXISTS "${UPSTREAM_CACHE}"
+  endif() #NO_CACHE
+
+  MESSAGE("Installing upstream libs from ${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
+  file(GLOB_RECURSE UPSTREAM_LIBS "${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/*")
+  foreach(ITEM ${UPSTREAM_LIBS})
+    IF( IS_DIRECTORY "${ITEM}" )
+      LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
+    ELSE()
+      LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
+    ENDIF()
+  endforeach()
+  MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
+  INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
+
+  MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
+  INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
+else(CLICK_MODE)
+  execute_process(
+    COMMAND qmake -query QT_INSTALL_QML
+    OUTPUT_VARIABLE QT_IMPORTS_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  if (QT_IMPORTS_DIR STREQUAL "")
+     set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml")
+     message(STATUS "QT_IMPORTS_DIR is empty using default one: ${QT_IMPORTS_DIR}")
+  else()
+     message(STATUS "QT_IMPORTS_DIR set to ${QT_IMPORTS_DIR}")
+  endif()
+
+  set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
+endif(CLICK_MODE)

=== removed file 'com.ubuntu.docviewer.url-dispatcher'
--- com.ubuntu.docviewer.url-dispatcher	2015-02-13 15:30:01 +0000
+++ com.ubuntu.docviewer.url-dispatcher	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[
-    {
-        "protocol": "document"
-    }
-]

=== added directory 'data'
=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2017-04-05 07:49:18 +0000
@@ -0,0 +1,27 @@
+if(CLICK_MODE)
+  set(ICON ${ICON_FILE})
+  set(DESKTOP_DIR ${DATA_DIR})
+
+  install(FILES ${ICON_FILE} DESTINATION ${DATA_DIR})
+else(CLICK_MODE)
+  set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
+  set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+
+  install(DIRECTORY icons/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
+    FILES_MATCHING PATTERN *.png
+  )
+endif(CLICK_MODE)
+
+set(EXEC "${APP_NAME}")
+
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
+
+add_custom_target(${DESKTOP_FILE} ALL
+  COMMENT "Merging translations into ${DESKTOP_FILE}"
+  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
+    ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE}
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+  DESTINATION ${DESKTOP_DIR}
+)

=== renamed file 'com.ubuntu.docviewer.desktop.in.in' => 'data/com.ubuntu.docviewer.desktop.in.in'
--- com.ubuntu.docviewer.desktop.in.in	2015-07-30 11:14:35 +0000
+++ data/com.ubuntu.docviewer.desktop.in.in	2017-04-05 07:49:18 +0000
@@ -9,4 +9,4 @@
 MimeType=text/plain;application/pdf
 X-Ubuntu-Touch=true
 X-Ubuntu-Splash-Show-Header=true
-_X-Ubuntu-Splash-Title=Document Viewer
+_X-Ubuntu-Splash-Title=Documents

=== added file 'data/docviewer-app.png'
Binary 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
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-24 20:50:40 +0000
+++ debian/changelog	2017-04-05 07:49:18 +0000
@@ -1,3 +1,56 @@
+ubuntu-docviewer-app (2.1) vivid; urgency=medium
+
+  * Fixed an issue with the documents list not updating the model entries (LP: #1483218)
+  * New theming/UI components in OTA-10 fully supported (LP: #1551259)
+  * LibreOffice viewer: added support for spreadsheet documents with multiple sheets (LP: #1537755)
+  * LibreOffice viewer: limited zoom value to a minimum/maximum value (LP: #1501424)
+  * LibreOffice viewer: added a double-tap-to-zoom gesture (LP: #1541582)
+  * LibreOffice viewer: use QQuickAsyncImageProvider for thumbnails
+  * LibreOffice viewer: show content at the center of the window (LP: #1515655)
+  * LibreOffice viewer: better support for HiDPI screens (LP: #1535264)
+  * More zoom options for LibreOffice presentations (LP: #1515649)
+  * A manual zoom (1.0x) is now default for Libreoffice spreadsheets (LP: #1513960)
+  * Resolved a content-hub issue that prevents users to export a document to another app (LP: #1544149)
+  * Resolved an issue occurring when the user tries to delete a document stored in a external media (LP: #1524293)
+  * Full-screen presentation mode for PDF documents (LP: #1534761)
+  * Updated night mode shader
+  * Updated and expanded READMEs
+  * UI improvements
+
+ -- Stefano Verzegnassi <[e-mail]>  Thu, 11 Feb 2016 18:36:48 +0100
+
+ubuntu-docviewer-app (2.0) vivid; urgency=medium
+
+  * Updated application icon (LP: #1476659 and LP: #1432392)
+  * Updated translations
+  * Added support to Office documents through libreofficekit
+  * General performance improvements
+  * UX more consistent with the design guidelines
+  * Updated to ubuntu-sdk-14.04.1 (QtQuick 2.4 and Ubuntu.Components 1.3) (LP: #1508363)
+  * A more intuitive UI when importing a new document
+  * Added a 'share' action for exporting a document to another app/web service (LP: #1494818)
+  * Removed GridView from documents page (will be reintroduced in future)
+  * Refactored app initialization
+  * Better zoom support on desktop
+  * Switched to QML Ubuntu.ContentHub APIs (LP: #1469422)
+  * Switched to QML Ubuntu.Components.Arguments APIs
+  * Changed header behaviour in the PDF viewer (LP: #1453403)
+  * Fix for stage mode being forced on Nexus 10 (LP: #1479483)
+
+ -- Stefano Verzegnassi <[e-mail]>  Wed, 02 Dec 2015 16:08:55 +0100
+
+ubuntu-docviewer-app (0.3.181) vivid; urgency=medium
+
+  [ Roman Shchekin ]
+  * Improved multithreading in the PDF viewer
+
+  [ Stefano Verzegnassi ]
+  * Don't show duplicated entries from VFAT file systems (LP: #1477713)
+  * Fixed bad strings in the translation template (LP: #1477502)
+  * Restored contextual actions in the documents page (LP: #1447995)
+
+ -- Stefano Verzegnassi <[e-mail]>  Sat, 01 Aug 2015 07:43:03 +0200
+
 ubuntu-docviewer-app (0.3.154) vivid; urgency=medium
 
   * Fix missing icon for desktop: #1468418  

=== modified file 'debian/control'
--- debian/control	2015-02-23 12:49:52 +0000
+++ debian/control	2017-04-05 07:49:18 +0000
@@ -4,14 +4,13 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                intltool,
-               libcontent-hub-dev (>= 0.0+13.10.20130930.1),
                libpoppler-qt5-dev,
                pep8,
                pkg-config,
                pkg-kde-tools,
                python3-all,
                qt5-default,
-               qtbase5-dev,
+               qtbase5-dev (>= 5.4.0),
                qtchooser,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
@@ -22,20 +21,57 @@
 Standards-Version: 3.9.6
 Section: misc
 Homepage: https://launchpad.net/ubuntu-docviewer-app
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/trunk
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot
 
 Package: ubuntu-docviewer-app
 Architecture: any
-Depends: qtdeclarative5-qtquick2-plugin,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin,
-         ${misc:Depends}
+Depends: ${misc:Depends},
+         qtdeclarative5-documentviewer-common (= ${source:Version}),
+         qtdeclarative5-documentviewer-libreoffice (= ${source:Version}),
+         qtdeclarative5-documentviewer-pdf (= ${source:Version}),  
+         suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
+         qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
+         qtdeclarative5-ubuntu-content1,
+         qtdeclarative5-quicklayouts-plugin,
+         qtdeclarative5-window-plugin      
 Description: Document Viewer application
  Core Document Viewer application
 
+Package: qtdeclarative5-documentviewer-common
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${misc:Pre-Depends},
+Description: Document Viewer QML plugin
+ This package contains a plugin with some helper functions for the Ubuntu
+ Document Viewer.
+
+Package: qtdeclarative5-documentviewer-libreoffice
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${misc:Pre-Depends},
+         libreoffice-vanilla (>= 5.0.0) | libreoffice (>= 5.0.0)
+Description: LibreOffice QML plugin
+ This package contains a plugin that enables QML apps to read
+ and display any LibreOffice document.
+
+Package: qtdeclarative5-documentviewer-pdf
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${misc:Pre-Depends},
+         libpoppler-qt5-1
+Description: Poppler PDF QML plugin
+ This package contains a plugin that enables QML apps to read
+ and display any PDF document, via the Poppler Qt5 bindings.
+
 Package: ubuntu-docviewer-app-autopilot
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
+         python3-lxml,
          ubuntu-docviewer-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
          ${misc:Depends}

=== added file 'debian/qtdeclarative5-documentviewer-common.install'
--- debian/qtdeclarative5-documentviewer-common.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-documentviewer-common.install	2017-04-05 07:49:18 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/qml/DocumentViewer/qmldir
+usr/lib/*/qt5/qml/DocumentViewer/libfileqmlplugin.so

=== added file 'debian/qtdeclarative5-documentviewer-libreoffice.install'
--- debian/qtdeclarative5-documentviewer-libreoffice.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-documentviewer-libreoffice.install	2017-04-05 07:49:18 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/DocumentViewer/LibreOffice

=== added file 'debian/qtdeclarative5-documentviewer-pdf.install'
--- debian/qtdeclarative5-documentviewer-pdf.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-documentviewer-pdf.install	2017-04-05 07:49:18 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/DocumentViewer/PDF

=== modified file 'debian/rules'
--- debian/rules	2015-04-27 16:29:17 +0000
+++ debian/rules	2017-04-05 07:49:18 +0000
@@ -12,7 +12,7 @@
 
 override_dh_auto_test:
 	dh_auto_test
-	./run-pep8
+	./tools/run-pep8
 
 override_dh_install:
 	dh_install --fail-missing

=== modified file 'debian/ubuntu-docviewer-app.install'
--- debian/ubuntu-docviewer-app.install	2015-01-29 19:23:09 +0000
+++ debian/ubuntu-docviewer-app.install	2017-04-05 07:49:18 +0000
@@ -1,5 +1,4 @@
 usr/bin/ubuntu-docviewer-app
-usr/lib/*/qt5
 usr/share/applications
 usr/share/locale
 usr/share/ubuntu-docviewer-app

=== removed file 'docviewer-content.json'
--- docviewer-content.json	2015-02-13 15:30:01 +0000
+++ docviewer-content.json	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-    "destination": [
-        "documents"
-    ],
-    "source": [
-        "documents"
-    ]
-}

=== removed file 'docviewer.apparmor'
--- docviewer.apparmor	2015-05-13 14:22:36 +0000
+++ docviewer.apparmor	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-{
-    "policy_groups": [
-        "content_exchange_source",
-        "content_exchange"
-    ],
-    "read_path": [
-        "@{HOME}/Documents/",
-        "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
-        "@{PROC}/*/mounts",
-        "/dev/disk/by-label/"
-    ],
-    "write_path": [
-        "@{HOME}/Documents/"
-    ],
-    "policy_version": 1.2
-}

=== removed file '[e-mail]'
Binary files [e-mail]	2014-09-12 21:56:55 +0000 and [e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'manifest.json.in'
--- manifest.json.in	2015-02-13 15:30:01 +0000
+++ manifest.json.in	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-{
-    "name": "com.ubuntu.docviewer",
-    "title": "Document Viewer",
-    "description": "Document Viewer application for Ubuntu devices",
-    "framework": "ubuntu-sdk-14.10",
-    "architecture": "@CLICK_ARCH@",
-    "icon": "@ICON@",
-    "hooks": {
-        "docviewer": {
-            "apparmor": "docviewer.apparmor",
-            "desktop": "com.ubuntu.docviewer.desktop",
-            "content-hub": "docviewer-content.json",
-            "urls": "@URLS_FILE@"
-        }
-    },
-    "version": "0.3.@BZR_REVNO@",
-    "maintainer": "Ubuntu App Cats <[e-mail]>",
-    "x-source": {
-        "vcs-bzr": "@BZR_SOURCE@",
-        "vcs-bzr-revno": "@BZR_REVNO@"
-    },
-    "x-test": {
-        "autopilot": "@AUTOPILOT_DIR@"
-    }
-}

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-04-29 16:09:12 +0000
+++ po/CMakeLists.txt	2017-04-05 07:49:18 +0000
@@ -17,12 +17,22 @@
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 
+file(GLOB_RECURSE I18N_SRC_FILES
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/*.qml
+  ${CMAKE_SOURCE_DIR}/*.js
+  ${CMAKE_SOURCE_DIR}/*.cpp)
+list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in.in.h)
+list(SORT I18N_SRC_FILES)
+
+message("Found ${I18N_SRC_FILES}")
+
 # Creates the .pot file containing the translations template
 add_custom_target(${POT_FILE} ALL
   COMMENT "Generating translation template"
   # Extract the translatable messages from the desktop file 
   COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
-          --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
+          --srcdir=${CMAKE_SOURCE_DIR}/data ${DESKTOP_FILE}.in.in
   # Update the translation file
   COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
           --from-code=UTF-8
@@ -47,7 +57,6 @@
   RENAME ${DOMAIN}.mo)
 endforeach(PO_FILE)
 
-
 # make the translation files visible on qtcreator
 file(GLOB TRANSLATION_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

=== modified file 'po/am.po'
--- po/am.po	2015-09-23 06:28:55 +0000
+++ po/am.po	2017-04-05 07:49:18 +0000
@@ -7,14 +7,20 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2015-07-24 11:10+0200\n"
 "PO-Revision-Date: 2015-09-22 22:55+0000\n"
+=======
+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"PO-Revision-Date: 2016-03-10 20:13+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-09-23 06:28+0000\n"
 "X-Generator: Launchpad (build 17749)\n"
 
@@ -40,44 +46,75 @@
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
+=======
+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr "አንዳንድ የ ቀረቡት ክርክሮች ዋጋ የላቸውም"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr "የ ኡቡንቱ-ሰነድ መመልከቻ-መተግበሪያ የተመረጠውን ፋይል ማሳያ"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr "በ ሙሉ መመልከቻ ዘዴ ማስኬጃ"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr "የ ኡቡንቱ-ሰነድ መመልከቻ-መተግበሪያ በ ስእል ዘዴ: ለሙከራ ብቻ"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+"ሰነዶችን ማሳያ ከ ተሰጠው ፎልደር ውስጥ: instead of ~/Documents.\n"
+"መንገዱ ቀደም ብሎ መኖር አለበት የ ubuntu-docviewer-app ከማስኬዶት በፊት"
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "ዝርዝሮች"
 
-#: ../src/app/qml/common/DetailsPage.qml:33
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr "ፋይል"
+
+#: ../src/app/qml/common/DetailsPage.qml:47
 msgid "Location"
 msgstr "አካባቢ"
 
-#: ../src/app/qml/common/DetailsPage.qml:37
+#: ../src/app/qml/common/DetailsPage.qml:52
 msgid "Size"
 msgstr "መጠን"
 
-#: ../src/app/qml/common/DetailsPage.qml:42
+#: ../src/app/qml/common/DetailsPage.qml:57
 msgid "Created"
 msgstr "የተፈጠረው"
 
-#: ../src/app/qml/common/DetailsPage.qml:47
+#: ../src/app/qml/common/DetailsPage.qml:62
 msgid "Last modified"
 msgstr "መጨረሻ የተሻሻለው"
 
-#: ../src/app/qml/common/DetailsPage.qml:54
+#: ../src/app/qml/common/DetailsPage.qml:69
 msgid "MIME type"
 msgstr "MIME አይነት"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
+#: ../src/app/qml/common/ErrorDialog.qml:23
 msgid "Error"
 msgstr "ስህተት"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
-msgid "File does not exist"
-msgstr "ፋይሉ አልተገኘም"
-
-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
-#: ../src/app/qml/common/PickImportedDialog.qml:47
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
 #: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Close"
 msgstr "መዝጊያ"
 
@@ -98,6 +135,7 @@
 #: ../src/app/qml/common/RejectedImportDialog.qml:29
 msgid "Following document has not been imported:"
 msgid_plural "Following documents have not been imported:"
+<<<<<<< TREE
 msgstr[0] "የሚቀጥለው ሰነድ አልመጣም:"
 msgstr[1] "የሚቀጥሉት ሰነዶች አልመጡም:"
 
@@ -106,23 +144,36 @@
 msgstr "መደምሰሻ"
 
 #: ../src/app/qml/common/UnknownTypeDialog.qml:26
+=======
+msgstr[0] "የሚቀጥለው ሰነድ አልመጣም:"
+msgstr[1] "የሚቀጥሉት ሰነዶች አልመጡም:"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+>>>>>>> MERGE-SOURCE
 msgid "Unknown file type"
 msgstr "ያልታወቀ የፋይል አይነት"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
 msgid ""
-"Sorry but we can't find a way to display this file. Do you want to open it "
-"as a plain text?"
-msgstr "አዝናለሁ ይህን ፋይል ለማሳየት አልተቻለም: እንደ መደበኛ ጽሁፍ መክፈት ይፈልጋሉ?"
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
+msgstr ""
+"ይህ ፋይል የተደገፈ አይደለም\n"
+"እንደ መደበኛ ጽሁፍ መክፈት ይፈልጋሉ?"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr "መሰረዣ"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
 msgid "Yes"
 msgstr "አዎ"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
-msgid "No"
-msgstr "አይ"
-
 #. TRANSLATORS: %1 is the size of a file, expressed in GB
 #: ../src/app/qml/common/utils.js:22
 #, qt-format
@@ -147,98 +198,75 @@
 msgid "%1 byte"
 msgstr "%1 ባይት"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
 msgid "Delete file"
 msgstr "ፋይል ማጥፊያ"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
 #, qt-format
 msgid "Delete %1 file"
 msgid_plural "Delete %1 files"
 msgstr[0] "ማጥፊያ %1 ፋይል"
 msgstr[1] "ማጥፊያ %1 ፋይሎች"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
 msgid "Are you sure you want to permanently delete this file?"
 msgid_plural "Are you sure you want to permanently delete these files?"
 msgstr[0] "ይህን ፋይል በ እርግጥ በቋሚነት ማጥፋት ይፈልጋሉ?"
 msgstr[1] "እነዚህን ፋይሎች በ እርግጥ በቋሚነት ማጥፋት ይፈልጋሉ?"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
-msgid "Cancel"
-msgstr "መሰረዣ"
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
 msgid "Delete"
 msgstr "ማጥፊያ"
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
-msgid "No document found"
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr "ማካፈያ"
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
 msgstr "ምንም ሰነድ አልተገኘም"
 
 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
 msgid ""
 "Connect your device to any computer and simply drag files to the Documents "
-"folder."
-msgstr "የ እርስዎን አካል ከ ማንኛውም ኮምፒዩተር ጋር ያገናኙ እና ፋይሎችን ይጎትቱ ወደ ሰነዶች ፎልደር"
+"folder or insert removable media containing documents."
+msgstr ""
+"የ እርስዎን አካል ከ ኮምፒዩተር ጋር ያገናኙ እና ፋይሎች ይጎትቱ ወደ ሰነዶች ፎልደር ወይንም ያስገቡ የሚወልቅ አካል "
+"ሰነዱን የያዘውን"
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
 #, qt-format
 msgid "Today, %1"
 msgstr "ዛሬ, %1"
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
 #, qt-format
 msgid "Yesterday, %1"
 msgstr "ትናንትና, %1"
 
 #. TRANSLATORS: this is a datetime formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+msgid "yyyy/MM/dd hh:mm"
+msgstr "yyyy/MM/dd hh:mm"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
 msgid "dddd, hh:mm"
 msgstr "dddd, hh:mm"
 
-#. TRANSLATORS: this is a datetime formatting string,
-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
-msgid "dd-MM-yyyy hh:mm"
-msgstr "dd-MM-yyyy hh:mm"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:157
-msgid "Today"
-msgstr "ዛሬ"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:160
-msgid "Yesterday"
-msgstr "ትናንትና"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:163
-msgid "Earlier this week"
-msgstr "በዚህ ሳምንት መጀመሪያ"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:166
-msgid "Earlier this month"
-msgstr "በዚህ ወር መጀመሪያ"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:168
-msgid "Even earlier..."
-msgstr "ከዚያ ቀደም ብሎ..."
-
-#: ../src/app/qml/documentPage/DocumentPage.qml:24
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr "ሰነዶች"
 
@@ -246,27 +274,23 @@
 msgid "Search..."
 msgstr "መፈለጊያ..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
 msgid "Sorting settings..."
 msgstr "መለያ ማሰናጃዎች..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to single column list"
 msgstr "ወደ አንድ አምድ ዝርዝር መቀየሪያ"
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to grid"
 msgstr "ወደ ስኴር መቀየሪያ"
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
 msgid "Pick"
 msgstr "መምረጫ"
 
 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Back"
 msgstr "ወደ ኋላ"
 
@@ -274,11 +298,11 @@
 msgid "search in documents..."
 msgstr "በ ሰነድ ውስጥ መፈለጊያ..."
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select None"
 msgstr "ምንም አይምረጡ"
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select All"
 msgstr "ሁሉንም መምረጫ"
 
@@ -289,7 +313,35 @@
 #: ../src/app/qml/documentPage/SearchEmptyState.qml:26
 msgid ""
 "Please ensure that your query is not misspelled and/or try a different query."
-msgstr "እባክዎን ጥያቄዎ በ ትክክል መጻፉን ያረጋግጡ እና/ወይንም ሌላ ጥያቄ ይሞክሩ"
+<<<<<<< TREE
+msgstr "እባክዎን ጥያቄዎ በ ትክክል መጻፉን ያረጋግጡ እና/ወይንም ሌላ ጥያቄ ይሞክሩ"
+=======
+msgstr "እባክዎን ጥያቄዎ በ ትክክል መጻፉን ያረጋግጡ እና/ወይንም ሌላ ጥያቄ ይሞክሩ"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr "ዛሬ"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr "ትናንትና"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr "በዚህ ሳምንት መጀመሪያ"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr "በዚህ ወር መጀመሪያ"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr "ከዚያ ቀደም ብሎ..."
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr "ማካፈያ ለ"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
 msgid "Sorting settings"
@@ -309,29 +361,146 @@
 
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
 msgid "Reverse order"
-msgstr "በ ተቃራኒ ደንብ"
+<<<<<<< TREE
+msgstr "በ ተቃራኒ ደንብ"
+=======
+msgstr "በ ተቃራኒ ደንብ"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr "በመጫን ላይ..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr "ሊብሬ ቢሮ የ ጽሁፍ ሰነድ"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr "ሊብሬ ቢሮ ሰንጠረዥ"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr "ሊብሬ ቢሮ ማቅረቢያ"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr "ሊብሬ ቢሮ መሳያ ሰነድ"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr "ያልታወቀ የ ሊብሬ ቢሮ ሰነድ"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr "ያልታወቀ የ ሰነድ አይነት"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr "መሄጃ ወደ ቦታ..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr "የ ማታ ዘዴ ማሰናከያ"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr "የ ማታ ዘዴ ማስቻያ"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
+msgid "Go to position"
+msgstr "መሄጃ ወደ ቦታ"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
+msgid "Choose a position between 1% and 100%"
+msgstr "ቦታ ይምረጡ በ 1% እና 100% መካከል"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
+msgid "GO!"
+msgstr "እንሂድ!"
+
+#: ../src/app/qml/loView/LOViewPage.qml:167
+msgid "LibreOffice binaries not found."
+msgstr "የ ሊብሬ ቢሮ binaries አልተገኘም"
+
+#: ../src/app/qml/loView/LOViewPage.qml:170
+msgid "Error while loading LibreOffice."
+msgstr "ሊብሬ ቢሮ ሲጫን ስህተት ተፈጥሯል"
+
+#: ../src/app/qml/loView/LOViewPage.qml:173
+msgid ""
+"Document not loaded.\n"
+"The requested document may be corrupt or protected by a password."
+msgstr ""
+"ሰነዱ አክተጫነም\n"
+"የሚፈለገው ሰነድ ምናልባት የተበላሸ ይሆናል: ወይንም በ መግቢያ ቃል የሚጠበቅ ይሆናል"
+
+#: ../src/app/qml/loView/LOViewPage.qml:228
+msgid "This sheet has no content."
+msgstr "ይህ ወረቀት ምንም ይዞታ የለውም"
+
+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
+#. Document Viewer for rendering LibreOffice/MS-Office documents.
+#. Ref. https://docs.libreoffice.org/libreofficekit.html
+#: ../src/app/qml/loView/Splashscreen.qml:45
+msgid "Powered by LibreOfficeKit"
+msgstr "በ ሊብሬ ቢሮ ጥቅል የቀረበ"
+
+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
+#. This is the default name for a sheet in LibreOffice.
+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
+#, qt-format
+msgid "Sheet%1"
+msgstr "ወረቀት%1"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:122
+msgid "Fit width"
+msgstr "በ ስፋቱ ልክ"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:123
+msgid "Fit height"
+msgstr "በ እርዝመቱ ልክ"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:124
+msgid "Automatic"
+msgstr "ራሱ በራሱ"
+>>>>>>> MERGE-SOURCE
 
 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
-#: ../src/app/qml/pdfView/PdfView.qml:37
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
+#: ../src/app/qml/pdfView/PdfView.qml:153
 msgid "Contents"
 msgstr "ይዞታዎች"
 
+<<<<<<< TREE
 #: ../src/app/qml/pdfView/PdfContentsPage.qml:38
 msgid "Hide table of contents"
 msgstr "የ ማውጫ ሰንጠረዥ መደበቂያ"
 
+=======
+>>>>>>> MERGE-SOURCE
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
-#: ../src/app/qml/pdfView/PdfView.qml:34
+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
+#: ../src/app/qml/pdfView/PdfView.qml:56
 #, qt-format
 msgid "Page %1 of %2"
 msgstr "ገጽ %1 ከ %2"
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
+#: ../src/app/qml/pdfView/PdfView.qml:203
+msgid "Search"
+msgstr "መፈለጊያ"
+
+#: ../src/app/qml/pdfView/PdfView.qml:213
 msgid "Go to page..."
 msgstr "መሄጃ ወደ ገጽ..."
 
+<<<<<<< TREE
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
 msgid "Disable night mode"
@@ -343,14 +512,22 @@
 msgstr "የ ማታ ዘዴ ማስቻያ"
 
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
+=======
+#: ../src/app/qml/pdfView/PdfView.qml:221
+msgid "Presentation"
+msgstr "ማቅረቢያ"
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+>>>>>>> MERGE-SOURCE
 msgid "Go to page"
 msgstr "መሄጃ ወደ ገጽ"
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
 #, qt-format
 msgid "Choose a page between 1 and %1"
 msgstr "ይምረጡ ገጽ በ 1 እና %1 መካከል"
 
+<<<<<<< TREE
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
 msgid "GO!"
 msgstr "እንሂድ!"
@@ -370,5 +547,39 @@
 msgstr "መክፈቻ"
 
 #: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+=======
+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+msgid "File does not exist."
+msgstr "ፋይሉ አልነበረም"
+
+#. TRANSLATORS: This string is used for renaming a copied file,
+#. when a file with the same name already exists in user's
+#. Documents folder.
+#. 
+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+#. 
+#. where "2" is given by the argument "%1"
+#. 
+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#, qt-format
+msgid "copy %1"
+msgstr "ኮፒ %1"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "ሰነድ መመልከቻ"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+>>>>>>> MERGE-SOURCE
 msgid "documents;viewer;pdf;reader;"
 msgstr "ሰነዶች: መመልከቻ: pdf: ማንበቢያ:"
+
+#~ msgid "File does not exist"
+#~ msgstr "ፋይሉ አልተገኘም"
+
+#~ msgid "No document found"
+#~ msgstr "ምንም ሰነድ አልተገኘም"
+
+#~ msgid "Hide table of contents"
+#~ msgstr "የ ማውጫ ሰንጠረዥ መደበቂያ"

=== added file 'po/ar.po'
--- po/ar.po	1970-01-01 00:00:00 +0000
+++ po/ar.po	2017-04-05 07:49:18 +0000
@@ -0,0 +1,507 @@
+# Arabic translation for ubuntu-docviewer-app
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the ubuntu-docviewer-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-docviewer-app\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"PO-Revision-Date: 2016-01-29 06:41+0000\n"
+"Last-Translator: Ibrahim Saed <[e-mail]>\n"
+"Language-Team: Arabic <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
+"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr "تشغيل ملء الشاشة"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+"عرض المستندات من المجلد المعطى، بدلا من مجلد ~/Documents.\n"
+"يجب أن يكون المجلد موجودا في مكانه قبل تشغيل تطبيق أوبونتو لعرض المستندات."
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+msgid "Details"
+msgstr "التفاصيل"
+
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr "ملف"
+
+#: ../src/app/qml/common/DetailsPage.qml:47
+msgid "Location"
+msgstr "الموقع"
+
+#: ../src/app/qml/common/DetailsPage.qml:52
+msgid "Size"
+msgstr "الحجم"
+
+#: ../src/app/qml/common/DetailsPage.qml:57
+msgid "Created"
+msgstr "تم إنشاؤها"
+
+#: ../src/app/qml/common/DetailsPage.qml:62
+msgid "Last modified"
+msgstr "آخر تعديل"
+
+#: ../src/app/qml/common/DetailsPage.qml:69
+msgid "MIME type"
+msgstr "نوع MIME"
+
+#: ../src/app/qml/common/ErrorDialog.qml:23
+msgid "Error"
+msgstr "خطأ"
+
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
+#: ../src/app/qml/common/RejectedImportDialog.qml:38
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
+msgid "Close"
+msgstr "إغلاق"
+
+#: ../src/app/qml/common/PickImportedDialog.qml:29
+msgid "Multiple documents imported"
+msgstr "ثم استيراد مستندات متعددة"
+
+#: ../src/app/qml/common/PickImportedDialog.qml:30
+msgid "Choose which one to open:"
+msgstr "اختر أيها تريد فتحه:"
+
+#: ../src/app/qml/common/RejectedImportDialog.qml:28
+msgid "File not supported"
+msgid_plural "Files not supported"
+msgstr[0] "الملف غير مدعوم"
+msgstr[1] "الملفات غير مدعومة"
+msgstr[2] "الملفات غير مدعومة"
+msgstr[3] "الملفات غير مدعومة"
+msgstr[4] "الملفات غير مدعومة"
+msgstr[5] "الملفات غير مدعومة"
+
+#: ../src/app/qml/common/RejectedImportDialog.qml:29
+msgid "Following document has not been imported:"
+msgid_plural "Following documents have not been imported:"
+msgstr[0] "المستند التالي لم يتم استيراده:"
+msgstr[1] "المستندات التالية لم يتم استيرادها:"
+msgstr[2] "المستندات التالية لم يتم استيرادها:"
+msgstr[3] "المستندات التالية لم يتم استيرادها:"
+msgstr[4] "المستندات التالية لم يتم استيرادها:"
+msgstr[5] "المستندات التالية لم يتم استيرادها:"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+msgid "Unknown file type"
+msgstr "نوع ملف غير معروف"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
+msgid ""
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
+msgstr ""
+"هذا الملف غير مدعوم.\n"
+"هل ترغب بفتحه كنص عادي؟"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
+msgid "Yes"
+msgstr "نعم"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in GB
+#: ../src/app/qml/common/utils.js:22
+#, qt-format
+msgid "%1 GB"
+msgstr "%1 ج.بايت"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in MB
+#: ../src/app/qml/common/utils.js:26
+#, qt-format
+msgid "%1 MB"
+msgstr "%1 م.بايت"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in kB
+#: ../src/app/qml/common/utils.js:30
+#, qt-format
+msgid "%1 kB"
+msgstr "%1 ك. بايت"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in byte
+#: ../src/app/qml/common/utils.js:33
+#, qt-format
+msgid "%1 byte"
+msgstr "%1 بايت"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+msgid "Delete file"
+msgstr "حذف الملف"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
+#, qt-format
+msgid "Delete %1 file"
+msgid_plural "Delete %1 files"
+msgstr[0] "حذف ملف واحد (%1)"
+msgstr[1] "حذف ملف واحد (%1)"
+msgstr[2] "حذف ملفين (%1)"
+msgstr[3] "حذف %1 ملفات"
+msgstr[4] "حذف %1 ملفا"
+msgstr[5] "حذف %1 ملف"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
+msgid "Are you sure you want to permanently delete this file?"
+msgid_plural "Are you sure you want to permanently delete these files?"
+msgstr[0] "هل أنت متأكد من رغبتك في حذف هذا الملف بشكل دائم؟"
+msgstr[1] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
+msgstr[2] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
+msgstr[3] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
+msgstr[4] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
+msgstr[5] "هل أنت متأكد من رغبتك في حذف هذه الملفات بشكل دائم؟"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
+msgid "Delete"
+msgstr "حذف"
+
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr "مشاركة"
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
+msgid ""
+"Connect your device to any computer and simply drag files to the Documents "
+"folder or insert removable media containing documents."
+msgstr ""
+
+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
+#, qt-format
+msgid "Today, %1"
+msgstr "اليوم، %1"
+
+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
+#, qt-format
+msgid "Yesterday, %1"
+msgstr "أمس، %1"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+msgid "yyyy/MM/dd hh:mm"
+msgstr "dd/MM/yyyy hh:mm"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
+msgid "dddd, hh:mm"
+msgstr "dddd, hh:mm"
+
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+msgid "Documents"
+msgstr "المستندات"
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
+msgid "Search..."
+msgstr "بحث..."
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
+msgid "Sorting settings..."
+msgstr "إعدادات الفرز..."
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+msgid "Switch to single column list"
+msgstr "التحويل إلى نمط القائمة العمودية"
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+msgid "Switch to grid"
+msgstr "التحويل إلى نمط الشبكة"
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
+msgid "Pick"
+msgstr "اختيار"
+
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
+msgid "Back"
+msgstr "عودة"
+
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
+msgid "search in documents..."
+msgstr "بحث في المستندات..."
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+msgid "Select None"
+msgstr "اختر لا شيء"
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+msgid "Select All"
+msgstr "اختر الكل"
+
+#: ../src/app/qml/documentPage/SearchEmptyState.qml:24
+msgid "No matching document found"
+msgstr "لم يُعثر على مستندات مطابقة"
+
+#: ../src/app/qml/documentPage/SearchEmptyState.qml:26
+msgid ""
+"Please ensure that your query is not misspelled and/or try a different query."
+msgstr ""
+"برجاء التأكد من أن استعلامك لا يحتوي أخطاء إملائية و/أو حاول استخدام استعلام "
+"آخر."
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr "اليوم"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr "أمس"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr "في وقت سابق من هذا الأسبوع"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr "في وقت سابق من هذا الشهر"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr "حتى وقت سابق..."
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr "مشاركة إلى"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
+msgid "Sorting settings"
+msgstr "إعدادات الفرز"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
+msgid "Sort by date (Latest first)"
+msgstr "ترتيب حسب التاريخ (الأحدث أولا)"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
+msgid "Sort by name (A-Z)"
+msgstr "ترتيب حسب الاسم"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
+msgid "Sort by size (Smaller first)"
+msgstr "ترتيب حسب الحجم (الأصغر أولا)"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
+msgid "Reverse order"
+msgstr "ترتيب عكسي"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr "يجري التحميل"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr "مستند نصي ليبر أوفيس"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr "جدول ممتد ليبر أوفيس"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr "عرض تقديمي ليبر أوفيس"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr "مستند رسم ليبر أوفيس"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr "مستند ليبر أوفيس مجهول"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr "نوع مستند مجهول"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr "الذهاب للموضع..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr "تعطيل الوضع الليلي"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr "تفعيل الوضع الليلي"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
+msgid "Go to position"
+msgstr "انتقل للموضع"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
+msgid "Choose a position between 1% and 100%"
+msgstr "اختر موضع بين 1% و 100%"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
+msgid "GO!"
+msgstr "اذهب!"
+
+#: ../src/app/qml/loView/LOViewPage.qml:167
+msgid "LibreOffice binaries not found."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewPage.qml:170
+msgid "Error while loading LibreOffice."
+msgstr "حدث خطأ أثناء تحميل ليبر أوفيس"
+
+#: ../src/app/qml/loView/LOViewPage.qml:173
+msgid ""
+"Document not loaded.\n"
+"The requested document may be corrupt or protected by a password."
+msgstr ""
+"لم يتم تحميل المستند.\n"
+"قد يكون المستند المطلوب معطوبا أو أنه محمي بكلمة سر."
+
+#: ../src/app/qml/loView/LOViewPage.qml:228
+msgid "This sheet has no content."
+msgstr ""
+
+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
+#. Document Viewer for rendering LibreOffice/MS-Office documents.
+#. Ref. https://docs.libreoffice.org/libreofficekit.html
+#: ../src/app/qml/loView/Splashscreen.qml:45
+msgid "Powered by LibreOfficeKit"
+msgstr "مدعوم من LibreOfficeKit"
+
+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
+#. This is the default name for a sheet in LibreOffice.
+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
+#, qt-format
+msgid "Sheet%1"
+msgstr ""
+
+#: ../src/app/qml/loView/ZoomSelector.qml:122
+msgid "Fit width"
+msgstr "ملائمة العرض"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:123
+msgid "Fit height"
+msgstr "ملائمة الارتفاع"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:124
+msgid "Automatic"
+msgstr "تلقائي"
+
+#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
+#: ../src/app/qml/pdfView/PdfView.qml:153
+msgid "Contents"
+msgstr "المحتويات"
+
+#. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
+#. while the second one (%2) refers to the total pages count.
+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
+#: ../src/app/qml/pdfView/PdfView.qml:56
+#, qt-format
+msgid "Page %1 of %2"
+msgstr "صفحة %1 من %2"
+
+#: ../src/app/qml/pdfView/PdfView.qml:203
+msgid "Search"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfView.qml:213
+msgid "Go to page..."
+msgstr "اذهب إلى الصفحة..."
+
+#: ../src/app/qml/pdfView/PdfView.qml:221
+msgid "Presentation"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+msgid "Go to page"
+msgstr "اذهب إلى الصفحة"
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
+#, qt-format
+msgid "Choose a page between 1 and %1"
+msgstr "اختر صفحة بين 1 و %1"
+
+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+msgid "File does not exist."
+msgstr "الملف غير موجود."
+
+#. TRANSLATORS: This string is used for renaming a copied file,
+#. when a file with the same name already exists in user's
+#. Documents folder.
+#. 
+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+#. 
+#. where "2" is given by the argument "%1"
+#. 
+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#, qt-format
+msgid "copy %1"
+msgstr "نسخة %1"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "عارض المستندات"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+msgid "documents;viewer;pdf;reader;"
+msgstr "مستندات;عارض;قاريء;قارئ;مستند;المستندات;المستند;"
+
+#~ msgid "File does not exist"
+#~ msgstr "الملف غير موجود"
+
+#~ msgid "No document found"
+#~ msgstr "لم يُعثر على مستندات"
+
+#~ msgid "Hide table of contents"
+#~ msgstr "إخفاء جدول المحتويات"

=== renamed file 'po/ar.po' => 'po/ar.po.moved'
=== modified file 'po/ast.po'
--- po/ast.po	2015-11-03 05:30:48 +0000
+++ po/ast.po	2017-04-05 07:49:18 +0000
@@ -7,14 +7,20 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2015-07-24 11:10+0200\n"
 "PO-Revision-Date: 2015-11-02 17:44+0000\n"
+=======
+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"PO-Revision-Date: 2016-12-16 01:56+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: enolp <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-11-03 05:30+0000\n"
 "X-Generator: Launchpad (build 17838)\n"
 
@@ -40,44 +46,73 @@
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
+=======
+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr "Nun son válidos dellos arguementos qu'apurriesti."
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr "Executar a pantalla completa"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "Detalles"
 
-#: ../src/app/qml/common/DetailsPage.qml:33
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr "Ficheru"
+
+#: ../src/app/qml/common/DetailsPage.qml:47
 msgid "Location"
 msgstr "Allugamientu"
 
-#: ../src/app/qml/common/DetailsPage.qml:37
+#: ../src/app/qml/common/DetailsPage.qml:52
 msgid "Size"
 msgstr "Tamañu"
 
-#: ../src/app/qml/common/DetailsPage.qml:42
+#: ../src/app/qml/common/DetailsPage.qml:57
 msgid "Created"
 msgstr "Creáu"
 
-#: ../src/app/qml/common/DetailsPage.qml:47
+#: ../src/app/qml/common/DetailsPage.qml:62
 msgid "Last modified"
 msgstr "Cabera modificación"
 
-#: ../src/app/qml/common/DetailsPage.qml:54
+#: ../src/app/qml/common/DetailsPage.qml:69
 msgid "MIME type"
 msgstr "Triba MIME"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
+#: ../src/app/qml/common/ErrorDialog.qml:23
 msgid "Error"
 msgstr "Fallu"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
-msgid "File does not exist"
-msgstr "Nun esiste'l ficheru"
-
-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
-#: ../src/app/qml/common/PickImportedDialog.qml:47
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
 #: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Close"
 msgstr "Zarrar"
 
@@ -101,30 +136,29 @@
 msgstr[0] "Nun s'importó'l documentu de darréu:"
 msgstr[1] "Nun s'importaron los documentos de darréu:"
 
-#: ../src/app/qml/common/ToastWithAction.qml:97
-msgid "Dismiss"
-msgstr "Descartar"
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
 msgid "Unknown file type"
 msgstr "Triba de ficheru desconocida"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
 msgid ""
-"Sorry but we can't find a way to display this file. Do you want to open it "
-"as a plain text?"
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
 msgstr ""
-"Sentímoslo, pero nun atopamos un mou d'amosar esti ficheru. ¿Quies abrilu "
-"como testu planu?"
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
-msgid "No"
-msgstr "Non"
-
 #. TRANSLATORS: %1 is the size of a file, expressed in GB
 #: ../src/app/qml/common/utils.js:22
 #, qt-format
@@ -149,100 +183,75 @@
 msgid "%1 byte"
 msgstr "%1 byte"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
 msgid "Delete file"
 msgstr "Desaniciar ficheru"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
 #, qt-format
 msgid "Delete %1 file"
 msgid_plural "Delete %1 files"
 msgstr[0] "Desaniciar %1 ficheru"
 msgstr[1] "Desaniciar %1 ficheros"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
 msgid "Are you sure you want to permanently delete this file?"
 msgid_plural "Are you sure you want to permanently delete these files?"
 msgstr[0] "¿De xuru que quies desaniciar dafechu esti ficheru?"
 msgstr[1] "¿De xuru que quies desaniciar dafechu estos ficheros?"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
-msgid "Cancel"
-msgstr "Encaboxar"
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
 msgid "Delete"
 msgstr "Desaniciar"
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
-msgid "No document found"
-msgstr "Nun s'alcontró'l documentu"
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr "Compartir"
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
+msgstr "Nun s'alcontraron documentos"
 
 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
 msgid ""
 "Connect your device to any computer and simply drag files to the Documents "
-"folder."
+"folder or insert removable media containing documents."
 msgstr ""
-"Coneuta'l to preséu a cualesquier ordenador p'arrastrar cenciellamente "
-"ficheros a la carpeta Documentos."
+"Coneuta'l to preséu a cualesquier ordenador y namái arrastra ficheros na "
+"carpeta Documentos o inxerta'l mediu estrayible que contién los documentos."
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
 #, qt-format
 msgid "Today, %1"
 msgstr "Güei, %1"
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
 #, qt-format
 msgid "Yesterday, %1"
 msgstr "Ayeri, %1"
 
 #. TRANSLATORS: this is a datetime formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+msgid "yyyy/MM/dd hh:mm"
+msgstr "dd/MM/yyyy hh:mm"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
 msgid "dddd, hh:mm"
 msgstr "dddd, hh:mm"
 
-#. TRANSLATORS: this is a datetime formatting string,
-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
-msgid "dd-MM-yyyy hh:mm"
-msgstr "dd-MM-yyyy hh:mm"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:157
-msgid "Today"
-msgstr "Güei"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:160
-msgid "Yesterday"
-msgstr "Ayeri"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:163
-msgid "Earlier this week"
-msgstr "Más tarde d'esta selmana"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:166
-msgid "Earlier this month"
-msgstr "Más tarde d'esti mes"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:168
-msgid "Even earlier..."
-msgstr "Incluso más tarde..."
-
-#: ../src/app/qml/documentPage/DocumentPage.qml:24
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr "Documentos"
 
@@ -250,27 +259,23 @@
 msgid "Search..."
 msgstr "Guetar..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
 msgid "Sorting settings..."
 msgstr "Axustes d'orde..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to single column list"
 msgstr "Cambiar al llistáu de columnes cencielles"
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to grid"
 msgstr "Cambiar a rexáu"
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
 msgid "Pick"
 msgstr "Escoyer"
 
 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Back"
 msgstr "Atrás"
 
@@ -278,11 +283,11 @@
 msgid "search in documents..."
 msgstr "guetar en documentos..."
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select None"
 msgstr "Nun esbillar nada"
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select All"
 msgstr "Esbillar too"
 
@@ -294,8 +299,37 @@
 msgid ""
 "Please ensure that your query is not misspelled and/or try a different query."
 msgstr ""
-"Asegúrate que la to solicitú nun ta mal escrita y/o intenta otra solicitú "
-"diferente, por favor."
+<<<<<<< TREE
+"Asegúrate que la to solicitú nun ta mal escrita y/o intenta otra solicitú "
+"diferente, por favor."
+=======
+"Asegúrate que la to solicitú nun ta mal escrita y/o intenta otra solicitú "
+"diferente, por favor."
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr "Güei"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr "Ayeri"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr "Más tarde d'esta selmana"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr "Más tarde d'esti mes"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr "Incluso más tarde..."
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr "Compartir con"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
 msgid "Sorting settings"
@@ -315,66 +349,180 @@
 
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
 msgid "Reverse order"
-msgstr "Orde inversu"
+<<<<<<< TREE
+msgstr "Orde inversu"
+=======
+msgstr "Orde inversu"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr "Documentu de testu de LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr "Fueya de cálculu de LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr "Presentación de LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr "Documentu Draw de LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr "Documentu desconocíu de LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr "Triba desconocida de documentu"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr "Dir a la posición..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr "Deshabilitar mou nueche"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr "Habilitar mou nueche"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
+msgid "Go to position"
+msgstr "Dir a la posición..."
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
+msgid "Choose a position between 1% and 100%"
+msgstr "Escueyi una posición ente 1% y 100%"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
+msgid "GO!"
+msgstr "¡DIR!"
+
+#: ../src/app/qml/loView/LOViewPage.qml:167
+msgid "LibreOffice binaries not found."
+msgstr "Nun s'alcontraron los binarios de LibreOffice"
+
+#: ../src/app/qml/loView/LOViewPage.qml:170
+msgid "Error while loading LibreOffice."
+msgstr "Fallu entrín se cargaba LibreOffice."
+
+#: ../src/app/qml/loView/LOViewPage.qml:173
+msgid ""
+"Document not loaded.\n"
+"The requested document may be corrupt or protected by a password."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewPage.qml:228
+msgid "This sheet has no content."
+msgstr "Esta fueya de cálculu nun tien conteníu."
+
+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
+#. Document Viewer for rendering LibreOffice/MS-Office documents.
+#. Ref. https://docs.libreoffice.org/libreofficekit.html
+#: ../src/app/qml/loView/Splashscreen.qml:45
+msgid "Powered by LibreOfficeKit"
+msgstr "Cola potencia de LibreOfficeKit"
+
+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
+#. This is the default name for a sheet in LibreOffice.
+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
+#, qt-format
+msgid "Sheet%1"
+msgstr ""
+
+#: ../src/app/qml/loView/ZoomSelector.qml:122
+msgid "Fit width"
+msgstr ""
+
+#: ../src/app/qml/loView/ZoomSelector.qml:123
+msgid "Fit height"
+msgstr ""
+
+#: ../src/app/qml/loView/ZoomSelector.qml:124
+msgid "Automatic"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
-#: ../src/app/qml/pdfView/PdfView.qml:37
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
+#: ../src/app/qml/pdfView/PdfView.qml:153
 msgid "Contents"
 msgstr "Conteníos"
 
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:38
-msgid "Hide table of contents"
-msgstr "Anubrir tabla de conteníos"
-
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
-#: ../src/app/qml/pdfView/PdfView.qml:34
+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
+#: ../src/app/qml/pdfView/PdfView.qml:56
 #, qt-format
 msgid "Page %1 of %2"
 msgstr "Páxina %1 de %2"
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
+#: ../src/app/qml/pdfView/PdfView.qml:203
+msgid "Search"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfView.qml:213
 msgid "Go to page..."
 msgstr "Dir a la páxina..."
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
-msgid "Disable night mode"
-msgstr "Deshabilitar mou nueche"
-
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
-msgid "Enable night mode"
-msgstr "Habilitar mou nueche"
-
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
+#: ../src/app/qml/pdfView/PdfView.qml:221
+msgid "Presentation"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
 msgid "Go to page"
 msgstr "Dir a la páxina"
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
 #, qt-format
 msgid "Choose a page between 1 and %1"
 msgstr "Escueyi una páxina ente 1 y %1"
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
-msgid "GO!"
-msgstr "¡DIR!"
-
-#: ../src/app/qml/textView/TextView.qml:42
-msgid "Loading..."
-msgstr "Cargando..."
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:240
-msgid "Document successfully imported!"
-msgid_plural "Documents successfully imported!"
-msgstr[0] "¡Importóse con ésitu'l documentu!"
-msgstr[1] "¡Importáronse con ésitu los documentos!"
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:243
-msgid "Open"
-msgstr "Abrir"
-
-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+msgid "File does not exist."
+msgstr ""
+
+#. TRANSLATORS: This string is used for renaming a copied file,
+#. when a file with the same name already exists in user's
+#. Documents folder.
+#. 
+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+#. 
+#. where "2" is given by the argument "%1"
+#. 
+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#, qt-format
+msgid "copy %1"
+msgstr "copiar %1"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visor de documentos"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documentos;visor;pdf;llector;"
+
+#~ msgid "File does not exist"
+#~ msgstr "Nun esiste'l ficheru"
+
+#~ msgid "No document found"
+#~ msgstr "Nun s'alcontró'l documentu"
+
+#~ msgid "Hide table of contents"
+#~ msgstr "Anubrir tabla de conteníos"

=== modified file 'po/br.po'
--- po/br.po	2015-08-26 06:10:38 +0000
+++ po/br.po	2017-04-05 07:49:18 +0000
@@ -7,14 +7,20 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2015-07-24 11:10+0200\n"
 "PO-Revision-Date: 2015-08-25 14:07+0000\n"
+=======
+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"PO-Revision-Date: 2016-09-12 06:22+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Fohanno Thierry <[e-mail]>\n"
 "Language-Team: Breton <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-08-26 06:10+0000\n"
 "X-Generator: Launchpad (build 17690)\n"
 
@@ -40,44 +46,77 @@
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
+=======
+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr "Darn eus an arguzennoù pourchaset n'int ket reizh."
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr "Digeriñ ubuntu-docviewer-app evit diskwel ar restr diuzet"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr "Lañsañ gant ur skramm leun"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr ""
+"Digeriñ ubuntu-docviewer-app er mod diuzañ. Implijet evit an amprouadoù "
+"hepken."
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+"Diskouez teulioù an teulias pourchaset e-lec'h ~/Teulioù.\n"
+"Ret en d'an hent-se bezañ anezhañ a-raok lañsañ ubuntu-docviewer-app"
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "Munudoù"
 
-#: ../src/app/qml/common/DetailsPage.qml:33
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr "Restr"
+
+#: ../src/app/qml/common/DetailsPage.qml:47
 msgid "Location"
 msgstr "Lec'h"
 
-#: ../src/app/qml/common/DetailsPage.qml:37
+#: ../src/app/qml/common/DetailsPage.qml:52
 msgid "Size"
 msgstr "Ment"
 
-#: ../src/app/qml/common/DetailsPage.qml:42
+#: ../src/app/qml/common/DetailsPage.qml:57
 msgid "Created"
 msgstr "Krouet"
 
-#: ../src/app/qml/common/DetailsPage.qml:47
+#: ../src/app/qml/common/DetailsPage.qml:62
 msgid "Last modified"
 msgstr "Kemm diwezhañ"
 
-#: ../src/app/qml/common/DetailsPage.qml:54
+#: ../src/app/qml/common/DetailsPage.qml:69
 msgid "MIME type"
 msgstr "seurt MIME"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
+#: ../src/app/qml/common/ErrorDialog.qml:23
 msgid "Error"
 msgstr "Fazi"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
-msgid "File does not exist"
-msgstr "Ar restr n'eus ket anezhi"
-
-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
-#: ../src/app/qml/common/PickImportedDialog.qml:47
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
 #: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Close"
 msgstr "Serriñ"
 
@@ -101,30 +140,31 @@
 msgstr[0] "N'eo ket bet enporzhiet an teul-mañ :"
 msgstr[1] "N'eo ket bet enporzhiet an teulioù-mañ :"
 
-#: ../src/app/qml/common/ToastWithAction.qml:97
-msgid "Dismiss"
-msgstr "Disteurel"
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
 msgid "Unknown file type"
 msgstr "Seurt restr dianav"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
 msgid ""
-"Sorry but we can't find a way to display this file. Do you want to open it "
-"as a plain text?"
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
 msgstr ""
-"Digarezit, met n'hon eus ket kavet penaos digeriñ ar restr-mañ. Ha fellout a "
-"ra deoc'h digeriñ anezhi evel pa vije testenn blaen ?"
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
+"N'eo ket kemeret ar restr-mañ e karg.\n"
+"Ha fellout a ra deoc'h digeriñ anezhi evel ur restr destenn ?"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr "Nullañ"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
 msgid "Yes"
 msgstr "Ya"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
-msgid "No"
-msgstr "Ket"
-
 #. TRANSLATORS: %1 is the size of a file, expressed in GB
 #: ../src/app/qml/common/utils.js:22
 #, qt-format
@@ -149,100 +189,75 @@
 msgid "%1 byte"
 msgstr "%1 okted"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
 msgid "Delete file"
 msgstr "Diverkañ ar restr"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
 #, qt-format
 msgid "Delete %1 file"
 msgid_plural "Delete %1 files"
 msgstr[0] "Diverkañ %1 restr"
 msgstr[1] "Diverkañ %1 restr"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
 msgid "Are you sure you want to permanently delete this file?"
 msgid_plural "Are you sure you want to permanently delete these files?"
 msgstr[0] "Ha sur oc'h e fell deoc'h diverkañ ar restr-mañ da viken ?"
 msgstr[1] "Ha sur oc'h e fell deoc'h diverkañ ar restroù-mañ da viken ?"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
-msgid "Cancel"
-msgstr "Nullañ"
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
 msgid "Delete"
 msgstr "Diverkañ"
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
-msgid "No document found"
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr "Rannañ"
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
 msgstr "N'eus bet kavet teul ebet"
 
 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
 msgid ""
 "Connect your device to any computer and simply drag files to the Documents "
-"folder."
+"folder or insert removable media containing documents."
 msgstr ""
-"Kevreit ho penveg ouzh un urzhiataer bennak ha riklit restroù er renkell "
-"Teulioù."
+"Kevreit ho penveg ouzh forzh peseurt urzhiataer ha riklit restroù en teuliad "
+"Teulioù pe enlakait ur benveg lemm-laka gant teulioù ennañ."
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
 #, qt-format
 msgid "Today, %1"
 msgstr "Hiziv, da %1"
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
 #, qt-format
 msgid "Yesterday, %1"
 msgstr "Dec'h, da %1"
 
 #. TRANSLATORS: this is a datetime formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+msgid "yyyy/MM/dd hh:mm"
+msgstr "dd/MM/yyyy hh:mm"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
 msgid "dddd, hh:mm"
 msgstr "dddd, hh:mm"
 
-#. TRANSLATORS: this is a datetime formatting string,
-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
-msgid "dd-MM-yyyy hh:mm"
-msgstr "dd-MM-yyyy hh:mm"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:157
-msgid "Today"
-msgstr "Hiziv"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:160
-msgid "Yesterday"
-msgstr "Dec'h"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:163
-msgid "Earlier this week"
-msgstr "Abretoc'h er sizhun-mañ"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:166
-msgid "Earlier this month"
-msgstr "Abretoc'h er miz-mañ"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:168
-msgid "Even earlier..."
-msgstr "Abretoc'h c'hoazh..."
-
-#: ../src/app/qml/documentPage/DocumentPage.qml:24
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr "Teulioù"
 
@@ -250,27 +265,23 @@
 msgid "Search..."
 msgstr "Klask..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
 msgid "Sorting settings..."
 msgstr "Arvetennoù renkañ..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to single column list"
 msgstr "Ober gant ur roll war ur bann hepken"
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to grid"
 msgstr "Ober gant ur gael"
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
 msgid "Pick"
 msgstr "Tapout"
 
 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Back"
 msgstr "Distreiñ"
 
@@ -278,11 +289,11 @@
 msgid "search in documents..."
 msgstr "klask en teulioù..."
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select None"
 msgstr "Chom hep diuzañ netra"
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select All"
 msgstr "Diuzañ pep tra"
 
@@ -293,7 +304,35 @@
 #: ../src/app/qml/documentPage/SearchEmptyState.qml:26
 msgid ""
 "Please ensure that your query is not misspelled and/or try a different query."
-msgstr "Gwiriit hag-eñ eo skrivet mat ho koulenn pe esaeit ur goulenn all."
+<<<<<<< TREE
+msgstr "Gwiriit hag-eñ eo skrivet mat ho koulenn pe esaeit ur goulenn all."
+=======
+msgstr "Gwiriit hag-eñ eo skrivet mat ho koulenn pe esaeit ur goulenn all."
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr "Hiziv"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr "Dec'h"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr "Abretoc'h er sizhun-mañ"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr "Abretoc'h er miz-mañ"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr "Abretoc'h c'hoazh..."
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr "Rannañ gant"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
 msgid "Sorting settings"
@@ -313,66 +352,182 @@
 
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
 msgid "Reverse order"
-msgstr "urzh kontrol"
+<<<<<<< TREE
+msgstr "urzh kontrol"
+=======
+msgstr "urzh kontrol"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr "O kargañ..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr "teul testenn LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr "Follenn jediñ LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr "Kinnigadur LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr "Teul tresadenn LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr "Teul LibreOffice dianav"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr "Seut teul dianav"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr "Mont d'al lec'h..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr "diweredekaat ar mod noz"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr "Gweredekaat ar mod noz"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
+msgid "Go to position"
+msgstr "Mont d'al lec'h"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
+msgid "Choose a position between 1% and 100%"
+msgstr "Choaz ul lec'h etre 1 % ha 100 %"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
+msgid "GO!"
+msgstr "DEOMP !"
+
+#: ../src/app/qml/loView/LOViewPage.qml:167
+msgid "LibreOffice binaries not found."
+msgstr "N'eo ket bet kavet danvez binarel LibreOffice"
+
+#: ../src/app/qml/loView/LOViewPage.qml:170
+msgid "Error while loading LibreOffice."
+msgstr "Fazi pa oad o kargañ LibreOffice."
+
+#: ../src/app/qml/loView/LOViewPage.qml:173
+msgid ""
+"Document not loaded.\n"
+"The requested document may be corrupt or protected by a password."
+msgstr ""
+"N'eo ket bet karget an teul.\n"
+"Brein pe gwarezet gant ur ger-tremen eo an teul goulennet marteze."
+
+#: ../src/app/qml/loView/LOViewPage.qml:228
+msgid "This sheet has no content."
+msgstr "N'eus netra er follenn-mañ"
+
+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
+#. Document Viewer for rendering LibreOffice/MS-Office documents.
+#. Ref. https://docs.libreoffice.org/libreofficekit.html
+#: ../src/app/qml/loView/Splashscreen.qml:45
+msgid "Powered by LibreOfficeKit"
+msgstr "Kaset en-dro gant LibreOfficeKit"
+
+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
+#. This is the default name for a sheet in LibreOffice.
+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
+#, qt-format
+msgid "Sheet%1"
+msgstr "Follenn%1"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:122
+msgid "Fit width"
+msgstr "Keidañ gant al ledander"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:123
+msgid "Fit height"
+msgstr "Keidañ gant an uhelder"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:124
+msgid "Automatic"
+msgstr "Emgefreek"
+>>>>>>> MERGE-SOURCE
 
 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
-#: ../src/app/qml/pdfView/PdfView.qml:37
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
+#: ../src/app/qml/pdfView/PdfView.qml:153
 msgid "Contents"
 msgstr "Taolenn"
 
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:38
-msgid "Hide table of contents"
-msgstr "Kuzhat an daolenn"
-
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
-#: ../src/app/qml/pdfView/PdfView.qml:34
+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
+#: ../src/app/qml/pdfView/PdfView.qml:56
 #, qt-format
 msgid "Page %1 of %2"
 msgstr "Pajenn %1 diwar %2"
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
+#: ../src/app/qml/pdfView/PdfView.qml:203
+msgid "Search"
+msgstr "Klask"
+
+#: ../src/app/qml/pdfView/PdfView.qml:213
 msgid "Go to page..."
 msgstr "Mont d'ar bajenn..."
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
-msgid "Disable night mode"
-msgstr "diweredekaat ar mod noz"
-
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
-msgid "Enable night mode"
-msgstr "Gweredekaat ar mod noz"
-
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
+#: ../src/app/qml/pdfView/PdfView.qml:221
+msgid "Presentation"
+msgstr "Kinnigadur"
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
 msgid "Go to page"
 msgstr "Mont d'ar bajenn"
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
 #, qt-format
 msgid "Choose a page between 1 and %1"
 msgstr "Choaz ur bajenn etre 1 ha %1"
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
-msgid "GO!"
-msgstr "DEOMP !"
-
-#: ../src/app/qml/textView/TextView.qml:42
-msgid "Loading..."
-msgstr "O kargañ..."
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:240
-msgid "Document successfully imported!"
-msgid_plural "Documents successfully imported!"
-msgstr[0] "Teul enporzhiet evel ma oa dleet !"
-msgstr[1] "Teulioù enporzhiet evel ma oa dleet !"
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:243
-msgid "Open"
-msgstr "Digeriñ"
-
-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+msgid "File does not exist."
+msgstr "N'eus ket eus ar restr"
+
+#. TRANSLATORS: This string is used for renaming a copied file,
+#. when a file with the same name already exists in user's
+#. Documents folder.
+#. 
+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+#. 
+#. where "2" is given by the argument "%1"
+#. 
+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#, qt-format
+msgid "copy %1"
+msgstr "eilañ %1"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Lenner teulioù"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "teulioù;diskouezer;pdf;lenner"
+
+#~ msgid "File does not exist"
+#~ msgstr "Ar restr n'eus ket anezhi"
+
+#~ msgid "No document found"
+#~ msgstr "N'eus bet kavet teul ebet"
+
+#~ msgid "Hide table of contents"
+#~ msgstr "Kuzhat an daolenn"

=== added file 'po/bs.po'
--- po/bs.po	1970-01-01 00:00:00 +0000
+++ po/bs.po	2017-04-05 07:49:18 +0000
@@ -0,0 +1,499 @@
+# Bosnian translation for ubuntu-docviewer-app
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the ubuntu-docviewer-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-docviewer-app\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"PO-Revision-Date: 2016-03-20 14:09+0000\n"
+"Last-Translator: Kenan Gutić <Unknown>\n"
+"Language-Team: Bosnian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr "Neki od datih argumenata nisu validni."
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr "Otvori ubuntu-docviewer-app prikazujući odabrani dokument"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr "Pokreni u punom prikazu"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr ""
+"Otvori ubuntu-docviewer-app u modu za odabir. Koristiti samo za testiranje."
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+"Pokaži dokumente iz datog direktorija, umjesto iz ~/Documents.\n"
+"Putanja mora postojati prije pokretanja ubuntu-docviewer-app"
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+msgid "Details"
+msgstr "Detalji"
+
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr "Datoteka"
+
+#: ../src/app/qml/common/DetailsPage.qml:47
+msgid "Location"
+msgstr "Lokacija"
+
+#: ../src/app/qml/common/DetailsPage.qml:52
+msgid "Size"
+msgstr "Veličina"
+
+#: ../src/app/qml/common/DetailsPage.qml:57
+msgid "Created"
+msgstr "Kreirano"
+
+#: ../src/app/qml/common/DetailsPage.qml:62
+msgid "Last modified"
+msgstr "Zadnja izmjena"
+
+#: ../src/app/qml/common/DetailsPage.qml:69
+msgid "MIME type"
+msgstr "MIME vrsta"
+
+#: ../src/app/qml/common/ErrorDialog.qml:23
+msgid "Error"
+msgstr "Greška"
+
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
+#: ../src/app/qml/common/RejectedImportDialog.qml:38
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../src/app/qml/common/PickImportedDialog.qml:29
+msgid "Multiple documents imported"
+msgstr "Višestruki dokumenti ubačeni"
+
+#: ../src/app/qml/common/PickImportedDialog.qml:30
+msgid "Choose which one to open:"
+msgstr "Izaberite koji ćete otvoriti:"
+
+#: ../src/app/qml/common/RejectedImportDialog.qml:28
+msgid "File not supported"
+msgid_plural "Files not supported"
+msgstr[0] "Dokument nije podržan"
+msgstr[1] "Dokumenti nisu podržani"
+msgstr[2] "Dokumenti nisu podržani"
+
+#: ../src/app/qml/common/RejectedImportDialog.qml:29
+msgid "Following document has not been imported:"
+msgid_plural "Following documents have not been imported:"
+msgstr[0] "Sljedeći dokument nije ubačen:"
+msgstr[1] "Sljedeći dokumenti nisu ubačeni:"
+msgstr[2] "Sljedeći dokumenti nisu ubačeni:"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+msgid "Unknown file type"
+msgstr "Nepoznata vrsta dokumenta"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
+msgid ""
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
+msgstr ""
+"Ovaj dokument nije podržan.\n"
+"Da li ga želite otvoriti kao obični tekst?"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr "Odustani"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
+msgid "Yes"
+msgstr "Da"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in GB
+#: ../src/app/qml/common/utils.js:22
+#, qt-format
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in MB
+#: ../src/app/qml/common/utils.js:26
+#, qt-format
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in kB
+#: ../src/app/qml/common/utils.js:30
+#, qt-format
+msgid "%1 kB"
+msgstr "%1 kB"
+
+#. TRANSLATORS: %1 is the size of a file, expressed in byte
+#: ../src/app/qml/common/utils.js:33
+#, qt-format
+msgid "%1 byte"
+msgstr "%1 bajt"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+msgid "Delete file"
+msgstr "Obriši datoteku"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
+#, qt-format
+msgid "Delete %1 file"
+msgid_plural "Delete %1 files"
+msgstr[0] "Obriši %1 datoteku"
+msgstr[1] "Obriši %1 datoteke"
+msgstr[2] "Obriši %1 datoteke"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
+msgid "Are you sure you want to permanently delete this file?"
+msgid_plural "Are you sure you want to permanently delete these files?"
+msgstr[0] "Jeste li sigurni da želite trajno obrisati ovu datoteku?"
+msgstr[1] "Jeste li sigurni da želite trajno obrisati ove datoteke?"
+msgstr[2] "Jeste li sigurni da želite trajno obrisati ove datoteke?"
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
+msgid "Delete"
+msgstr "Obriši"
+
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr "Podijeli"
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
+msgstr "Nema pronađenih dokumenata"
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
+msgid ""
+"Connect your device to any computer and simply drag files to the Documents "
+"folder or insert removable media containing documents."
+msgstr ""
+"Povežite svoj uređaj sa bilo kojim računarom i jednostavno prevucite "
+"dokumente u direktorij Dokumenti ili ubacite uklonjivi uređaj koji sadržava "
+"dokumente."
+
+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
+#, qt-format
+msgid "Today, %1"
+msgstr "Danas, %1"
+
+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
+#, qt-format
+msgid "Yesterday, %1"
+msgstr "Jučer, %1"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+msgid "yyyy/MM/dd hh:mm"
+msgstr "dd.MM.yyyy hh:mm"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
+msgid "dddd, hh:mm"
+msgstr "dddd, hh:mm"
+
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+msgid "Documents"
+msgstr "Dokumenti"
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
+msgid "Search..."
+msgstr "Traži..."
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
+msgid "Sorting settings..."
+msgstr "Sortiram postavke..."
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+msgid "Switch to single column list"
+msgstr "Prebaci na listu sa jednom kolonom"
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+msgid "Switch to grid"
+msgstr "Prebaci na mrežu"
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
+msgid "Pick"
+msgstr "Odaberi"
+
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
+msgid "Back"
+msgstr "Nazad"
+
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
+msgid "search in documents..."
+msgstr "traži u dokumentima..."
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+msgid "Select None"
+msgstr "Poništi izbor"
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+msgid "Select All"
+msgstr "Izaberi sve"
+
+#: ../src/app/qml/documentPage/SearchEmptyState.qml:24
+msgid "No matching document found"
+msgstr "Nisu pronađeni dokumenti koji se podudaraju"
+
+#: ../src/app/qml/documentPage/SearchEmptyState.qml:26
+msgid ""
+"Please ensure that your query is not misspelled and/or try a different query."
+msgstr ""
+"Molim uvjerite se da vaš upit nije pogrešno napisan i/ili pokušajte drugi "
+"upit."
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr "Danas"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr "Jučer"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr "Ranije ove sedmice"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr "Ranije ovog mjeseca"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr "Još ranije..."
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr "Podijeli sa"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
+msgid "Sorting settings"
+msgstr "Sortiram postavke"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
+msgid "Sort by date (Latest first)"
+msgstr "Sortiraj po datumu (novije prvo)"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
+msgid "Sort by name (A-Z)"
+msgstr "Sortiraj po imenu (A-Z)"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
+msgid "Sort by size (Smaller first)"
+msgstr "Sortiraj po veličini (manje prvo)"
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
+msgid "Reverse order"
+msgstr "Okreni red"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr "Učitavanje..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr "LibreOffice tekstualni dokument"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr "LibreOffice tabelarni dokument"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr "LibreOffice prezentacija"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr "LibreOffice nacrt"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr "Nepoznat LibreOffice dokument"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr "Nepoznat tip dokumenta"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr "Idi na poziciju..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr "Isključni noćni režim"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr "Uključi noćni režim"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
+msgid "Go to position"
+msgstr "Idi na poziciju"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
+msgid "Choose a position between 1% and 100%"
+msgstr "Izaberite poziciju između 1% i 100%"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
+msgid "GO!"
+msgstr "IDI!"
+
+#: ../src/app/qml/loView/LOViewPage.qml:167
+msgid "LibreOffice binaries not found."
+msgstr "Nisu pronađeni LibreOffice binaries."
+
+#: ../src/app/qml/loView/LOViewPage.qml:170
+msgid "Error while loading LibreOffice."
+msgstr "Greška pri učitavanja LibreOffice."
+
+#: ../src/app/qml/loView/LOViewPage.qml:173
+msgid ""
+"Document not loaded.\n"
+"The requested document may be corrupt or protected by a password."
+msgstr ""
+"Dokument nije učitan.\n"
+"Traženi dokument možda sadržava greške ili je zaštićen šifrom."
+
+#: ../src/app/qml/loView/LOViewPage.qml:228
+msgid "This sheet has no content."
+msgstr "Ovaj list nema sadržaja"
+
+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
+#. Document Viewer for rendering LibreOffice/MS-Office documents.
+#. Ref. https://docs.libreoffice.org/libreofficekit.html
+#: ../src/app/qml/loView/Splashscreen.qml:45
+msgid "Powered by LibreOfficeKit"
+msgstr "Pokreće LibreOfficeKit"
+
+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
+#. This is the default name for a sheet in LibreOffice.
+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
+#, qt-format
+msgid "Sheet%1"
+msgstr "List%1"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:122
+msgid "Fit width"
+msgstr "Uklopi širinu"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:123
+msgid "Fit height"
+msgstr "Uklopi visinu"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:124
+msgid "Automatic"
+msgstr "Automatski"
+
+#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
+#: ../src/app/qml/pdfView/PdfView.qml:153
+msgid "Contents"
+msgstr "Sadržaji"
+
+#. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
+#. while the second one (%2) refers to the total pages count.
+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
+#: ../src/app/qml/pdfView/PdfView.qml:56
+#, qt-format
+msgid "Page %1 of %2"
+msgstr "Stranica %1 od %2"
+
+#: ../src/app/qml/pdfView/PdfView.qml:203
+msgid "Search"
+msgstr "Traži"
+
+#: ../src/app/qml/pdfView/PdfView.qml:213
+msgid "Go to page..."
+msgstr "Idi na stranicu..."
+
+#: ../src/app/qml/pdfView/PdfView.qml:221
+msgid "Presentation"
+msgstr "Prezentacija"
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+msgid "Go to page"
+msgstr "Idi na stranicu"
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
+#, qt-format
+msgid "Choose a page between 1 and %1"
+msgstr "Izaberi stranicu između 1 i %1"
+
+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+msgid "File does not exist."
+msgstr "Datoteka ne postoji."
+
+#. TRANSLATORS: This string is used for renaming a copied file,
+#. when a file with the same name already exists in user's
+#. Documents folder.
+#. 
+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+#. 
+#. where "2" is given by the argument "%1"
+#. 
+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#, qt-format
+msgid "copy %1"
+msgstr "kopija %1"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Preglednik dokumenta"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+msgid "documents;viewer;pdf;reader;"
+msgstr "dokumenti;preglednik;pdf;čitač;"
+
+#~ msgid "File does not exist"
+#~ msgstr "Datoteka ne postoji"
+
+#~ msgid "Hide table of contents"
+#~ msgstr "Sakrij tabelu sadržaja"
+
+#~ msgid "No document found"
+#~ msgstr "Dokumen nije pronađen"

=== renamed file 'po/bs.po' => 'po/bs.po.moved'
=== modified file 'po/ca.po'
--- po/ca.po	2015-08-18 05:56:20 +0000
+++ po/ca.po	2017-04-05 07:49:18 +0000
@@ -7,14 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-docviewer-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-07-24 11:10+0200\n"
-"PO-Revision-Date: 2015-06-25 06:34+0000\n"
-"Last-Translator: David Planella <[e-mail]>\n"
+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"PO-Revision-Date: 2016-11-29 17:19+0000\n"
+"Last-Translator: Walter Garcia-Fontes <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-08-18 05:56+0000\n"
 "X-Generator: Launchpad (build 17690)\n"
 
@@ -40,44 +41,76 @@
 #: ../src/app/qml/common/DetailsPage.qml:27
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
+=======
+"X-Launchpad-Export-Date: 2017-04-05 07:48+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr "Alguns dels arguments proveïts no són vàlids."
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr "Obre l'ubuntu-docviewer-app per mostrar el fitxer seleccionat"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr "Executa-ho a pantalla completa"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr ""
+"Obre l'ubuntu-docviewer-app en mode de selecció. Sols s'usa per a proves."
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+"Mostra els documents des de la carpeta donada, en comptes de ~/Documents.\n"
+"El camí ha d'existir abans d'executar l'ubuntu-docviewer-app"
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+>>>>>>> MERGE-SOURCE
 msgid "Details"
 msgstr "Detalls"
 
-#: ../src/app/qml/common/DetailsPage.qml:33
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr "Fitxer"
+
+#: ../src/app/qml/common/DetailsPage.qml:47
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../src/app/qml/common/DetailsPage.qml:37
+#: ../src/app/qml/common/DetailsPage.qml:52
 msgid "Size"
 msgstr "Mida"
 
-#: ../src/app/qml/common/DetailsPage.qml:42
+#: ../src/app/qml/common/DetailsPage.qml:57
 msgid "Created"
 msgstr "Creat"
 
-#: ../src/app/qml/common/DetailsPage.qml:47
+#: ../src/app/qml/common/DetailsPage.qml:62
 msgid "Last modified"
 msgstr "Darrera modificació"
 
-#: ../src/app/qml/common/DetailsPage.qml:54
+#: ../src/app/qml/common/DetailsPage.qml:69
 msgid "MIME type"
 msgstr "Tipus MIME"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
+#: ../src/app/qml/common/ErrorDialog.qml:23
 msgid "Error"
 msgstr "Error"
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
-msgid "File does not exist"
-msgstr "El fitxer no existeix"
-
-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
-#: ../src/app/qml/common/PickImportedDialog.qml:47
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
 #: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Close"
 msgstr "Tanca"
 
@@ -101,28 +134,31 @@
 msgstr[0] "El document següent no s'ha importat:"
 msgstr[1] "Els documents següents no s'han importat:"
 
-#: ../src/app/qml/common/ToastWithAction.qml:97
-msgid "Dismiss"
-msgstr "Descarta"
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
 msgid "Unknown file type"
 msgstr "Tipus de fitxer desconegut"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
 msgid ""
-"Sorry but we can't find a way to display this file. Do you want to open it "
-"as a plain text?"
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
 msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
+"Aquest fitxer no té suport.\n"
+"Voleu obrir-lo com a text simple?"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
-msgid "No"
-msgstr "No"
-
 #. TRANSLATORS: %1 is the size of a file, expressed in GB
 #: ../src/app/qml/common/utils.js:22
 #, qt-format
@@ -147,98 +183,76 @@
 msgid "%1 byte"
 msgstr "%1 byte"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
 msgid "Delete file"
 msgstr "Suprimeix el fitxer"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
 #, qt-format
 msgid "Delete %1 file"
 msgid_plural "Delete %1 files"
 msgstr[0] "Suprimeix %1 fitxer"
 msgstr[1] "Suprimeix %1 fitxers"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
 msgid "Are you sure you want to permanently delete this file?"
 msgid_plural "Are you sure you want to permanently delete these files?"
 msgstr[0] "Segur que voleu suprimir permanentment aquest fitxer?"
 msgstr[1] "Segur que voleu suprimir permanentment aquests fitxers?"
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
-msgid "No document found"
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr "Comparteix"
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
 msgstr "No s'ha trobat cap document"
 
 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
 msgid ""
 "Connect your device to any computer and simply drag files to the Documents "
-"folder."
+"folder or insert removable media containing documents."
 msgstr ""
+"Connecteu el vostre dispositiu a qualsevol ordinador i simplement "
+"arrossegueu fitxers a la carpeta Documents o inseriu un mitjà removible que "
+"contingui documents."
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
 #, qt-format
 msgid "Today, %1"
 msgstr "Avui, a les %1"
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
 #, qt-format
 msgid "Yesterday, %1"
 msgstr "Ahir, a les %1"
 
 #. TRANSLATORS: this is a datetime formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+msgid "yyyy/MM/dd hh:mm"
+msgstr "dd/MM/yyyy hh:mm"
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
 msgid "dddd, hh:mm"
 msgstr "dddd, H.mm"
 
-#. TRANSLATORS: this is a datetime formatting string,
-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
-msgid "dd-MM-yyyy hh:mm"
-msgstr "dd/MM/yyyy H.mm"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:157
-msgid "Today"
-msgstr "Avui"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:160
-msgid "Yesterday"
-msgstr "Ahir"
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:163
-msgid "Earlier this week"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:166
-msgid "Earlier this month"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:168
-msgid "Even earlier..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPage.qml:24
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr "Documents"
 
@@ -246,27 +260,23 @@
 msgid "Search..."
 msgstr "Cerca..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
 msgid "Sorting settings..."
 msgstr "Paràmetres d'ordenació..."
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to single column list"
-msgstr ""
+msgstr "Canvia a llista de columna única"
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to grid"
-msgstr ""
+msgstr "Canvia a graella"
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
 msgid "Pick"
 msgstr "Tria"
 
 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Back"
 msgstr "Enrere"
 
@@ -274,22 +284,48 @@
 msgid "search in documents..."
 msgstr "Cerca en els documents..."
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select None"
 msgstr "No seleccionis res"
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
 #: ../src/app/qml/documentPage/SearchEmptyState.qml:24
 msgid "No matching document found"
-msgstr ""
+msgstr "No s'ha trobat cap document que concordi"
 
 #: ../src/app/qml/documentPage/SearchEmptyState.qml:26
 msgid ""
 "Please ensure that your query is not misspelled and/or try a different query."
 msgstr ""
+"Si us plau assegureu-vos que la vostra consulta no està mal escrita i/o "
+"proveu una consulta diferent."
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr "Avui"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr "Ahir"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr "Fa uns dies"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr "Fa unes setmanes"
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr "Fa molt de temps..."
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr "Comparteix a"
 
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
 msgid "Sorting settings"
@@ -311,64 +347,176 @@
 msgid "Reverse order"
 msgstr "Ordre invers"
 
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr "S’està carregant…"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr "Document de text del LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr "Full de càlcul del LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr "Presentació del LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr "Dibuix del LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr "Document desconegut del LibreOffice"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr "Tipus de document desconegut"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr "Vés a la posició..."
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr "Inhabilita el mode nocturn"
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr "Habilita el mode nocturn"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
+msgid "Go to position"
+msgstr "Vés a la posició"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
+msgid "Choose a position between 1% and 100%"
+msgstr "Escull una posició entre 1% i100&%"
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
+msgid "GO!"
+msgstr "Vés-hi"
+
+#: ../src/app/qml/loView/LOViewPage.qml:167
+msgid "LibreOffice binaries not found."
+msgstr "No s'han trobat els binaris del LibreOffice"
+
+#: ../src/app/qml/loView/LOViewPage.qml:170
+msgid "Error while loading LibreOffice."
+msgstr "S'ha produït un error quan es carregava el LibreOffice"
+
+#: ../src/app/qml/loView/LOViewPage.qml:173
+msgid ""
+"Document not loaded.\n"
+"The requested document may be corrupt or protected by a password."
+msgstr ""
+"Document no carregat.\n"
+"El document demanat pot estar corromput o protegit mitjançant contrasenya."
+
+#: ../src/app/qml/loView/LOViewPage.qml:228
+msgid "This sheet has no content."
+msgstr "Aquest full no té cap contingut."
+
+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
+#. Document Viewer for rendering LibreOffice/MS-Office documents.
+#. Ref. https://docs.libreoffice.org/libreofficekit.html
+#: ../src/app/qml/loView/Splashscreen.qml:45
+msgid "Powered by LibreOfficeKit"
+msgstr "Funciona amb el LibreOfficeKit"
+
+#. TRANSLATORS: Please don't add any space between "Sheet" and "%1".
+#. This is the default name for a sheet in LibreOffice.
+#: ../src/app/qml/loView/SpreadsheetSelector.qml:64
+#, qt-format
+msgid "Sheet%1"
+msgstr "Full%1"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:122
+msgid "Fit width"
+msgstr "Ajusta a l'amplada"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:123
+msgid "Fit height"
+msgstr "Ajusta l'alçada"
+
+#: ../src/app/qml/loView/ZoomSelector.qml:124
+msgid "Automatic"
+msgstr "Automàtic"
+
 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:32
-#: ../src/app/qml/pdfView/PdfView.qml:37
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
+#: ../src/app/qml/pdfView/PdfView.qml:153
 msgid "Contents"
 msgstr "Contingut"
 
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:38
-msgid "Hide table of contents"
-msgstr "Oculta la taula de continguts"
-
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
-#: ../src/app/qml/pdfView/PdfView.qml:34
+#: ../src/app/qml/pdfView/PdfPresentation.qml:51
+#: ../src/app/qml/pdfView/PdfView.qml:56
 #, qt-format
 msgid "Page %1 of %2"
 msgstr "Pàgina %1 de %2"
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
+#: ../src/app/qml/pdfView/PdfView.qml:203
+msgid "Search"
+msgstr "Cerca"
+
+#: ../src/app/qml/pdfView/PdfView.qml:213
 msgid "Go to page..."
 msgstr "Vés a la pàgina..."
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
-msgid "Disable night mode"
-msgstr "Inhabilita el mode nocturn"
-
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
-msgid "Enable night mode"
-msgstr "Habilita el mode nocturn"
-
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
+#: ../src/app/qml/pdfView/PdfView.qml:221
+msgid "Presentation"
+msgstr "Presentació"
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
 msgid "Go to page"
 msgstr "Vés a la pàgina"
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
 #, qt-format
 msgid "Choose a page between 1 and %1"
 msgstr "Trieu una pàgina entre 1 i %1"
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
-msgid "GO!"
-msgstr "Vés-hi"
-
-#: ../src/app/qml/textView/TextView.qml:42
-msgid "Loading..."
-msgstr "S’està carregant…"
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:240
-msgid "Document successfully imported!"
-msgid_plural "Documents successfully imported!"
-msgstr[0] "S'ha importat correctament el document"
-msgstr[1] "S'han importat correctament els documents"
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:243
-msgid "Open"
-msgstr "Obre"
-
-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+msgid "File does not exist."
+msgstr "El fitxer no existeix."
+
+#. TRANSLATORS: This string is used for renaming a copied file,
+#. when a file with the same name already exists in user's
+#. Documents folder.
+#. 
+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+#. 
+#. where "2" is given by the argument "%1"
+#. 
+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#, qt-format
+msgid "copy %1"
+msgstr "còpia %1"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr "Visualitzador de documents"
+
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr "documents;visualitzador;pdf;lector;"
+
+#~ msgid "File does not exist"
+#~ msgstr "El fitxer no existeix"
+
+#~ msgid "No document found"
+#~ msgstr "No s'ha trobat cap document"
+
+#~ msgid "Hide table of contents"
+#~ msgstr "Oculta la taula de continguts"

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-07-24 09:12:38 +0000
+++ po/com.ubuntu.docviewer.pot	2017-04-05 07:49:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-24 11:10+0200\n"
+"POT-Creation-Date: 2016-02-05 23:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,66 +18,68 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#.
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#.
-#. where "2" is given by the argument "%1"
-#.
-#: ../src/app/content-communicator.cpp:105
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: ../src/app/docviewer-application.cpp:171
-#: /home/stefano/Progetti/docviewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:27
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:97
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:83
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
 msgid "Details"
 msgstr ""
 
-#: ../src/app/qml/common/DetailsPage.qml:33
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:47
 msgid "Location"
 msgstr ""
 
-#: ../src/app/qml/common/DetailsPage.qml:37
+#: ../src/app/qml/common/DetailsPage.qml:52
 msgid "Size"
 msgstr ""
 
-#: ../src/app/qml/common/DetailsPage.qml:42
+#: ../src/app/qml/common/DetailsPage.qml:57
 msgid "Created"
 msgstr ""
 
-#: ../src/app/qml/common/DetailsPage.qml:47
+#: ../src/app/qml/common/DetailsPage.qml:62
 msgid "Last modified"
 msgstr ""
 
-#: ../src/app/qml/common/DetailsPage.qml:54
+#: ../src/app/qml/common/DetailsPage.qml:69
 msgid "MIME type"
 msgstr ""
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
+#: ../src/app/qml/common/ErrorDialog.qml:23
 msgid "Error"
 msgstr ""
 
-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
-msgid "File does not exist"
-msgstr ""
-
-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
-#: ../src/app/qml/common/PickImportedDialog.qml:47
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
 #: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Close"
 msgstr ""
 
@@ -101,28 +103,29 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/common/ToastWithAction.qml:97
-msgid "Dismiss"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:26
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
 msgid "Unknown file type"
 msgstr ""
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
 msgid ""
-"Sorry but we can't find a way to display this file. Do you want to open it "
-"as a plain text?"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:29
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
 msgid "Yes"
 msgstr ""
 
-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
-msgid "No"
-msgstr ""
-
 #. TRANSLATORS: %1 is the size of a file, expressed in GB
 #: ../src/app/qml/common/utils.js:22
 #, qt-format
@@ -147,98 +150,73 @@
 msgid "%1 byte"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
 msgid "Delete file"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
 #, qt-format
 msgid "Delete %1 file"
 msgid_plural "Delete %1 files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
 msgid "Are you sure you want to permanently delete this file?"
 msgid_plural "Are you sure you want to permanently delete these files?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
-msgid "Cancel"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
 #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
 msgid "Delete"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
-msgid "No document found"
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
 msgid ""
 "Connect your device to any computer and simply drag files to the Documents "
-"folder."
+"folder or insert removable media containing documents."
 msgstr ""
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
 #, qt-format
 msgid "Today, %1"
 msgstr ""
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
 #, qt-format
 msgid "Yesterday, %1"
 msgstr ""
 
 #. TRANSLATORS: this is a datetime formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:58
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+msgid "yyyy/MM/dd hh:mm"
+msgstr ""
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
 msgid "dddd, hh:mm"
 msgstr ""
 
-#. TRANSLATORS: this is a datetime formatting string,
-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:47
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:63
-msgid "dd-MM-yyyy hh:mm"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:157
-msgid "Today"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:160
-msgid "Yesterday"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:163
-msgid "Earlier this week"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:166
-msgid "Earlier this month"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentListView.qml:168
-msgid "Even earlier..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPage.qml:24
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr ""
 
@@ -246,27 +224,23 @@
 msgid "Search..."
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:37
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
 msgid "Sorting settings..."
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to single column list"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:46
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
 msgid "Switch to grid"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
 msgid "Pick"
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Back"
 msgstr ""
 
@@ -274,11 +248,11 @@
 msgid "search in documents..."
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:52
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select None"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:54
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
 msgid "Select All"
 msgstr ""
 
@@ -291,6 +265,30 @@
 "Please ensure that your query is not misspelled and/or try a different query."
 msgstr ""
 
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr ""
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr ""
+
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
 msgid "Sorting settings"
 msgstr ""
@@ -311,64 +309,165 @@
 msgid "Reverse order"
 msgstr ""
 
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30