Merge lp:~fabian-pijcke/qpdfview/qpdfview into lp:qpdfview/0.2.x

Proposed by Fabian Pijcke
Status: Merged
Merged at revision: 182
Proposed branch: lp:~fabian-pijcke/qpdfview/qpdfview
Merge into: lp:qpdfview/0.2.x
Diff against target: 250 lines (+36/-32)
2 files modified
sources/mainwindow.cpp (+4/-0)
translations/qpdfview_fr.ts (+32/-32)
To merge this branch: bzr merge lp:~fabian-pijcke/qpdfview/qpdfview
Reviewer Review Type Date Requested Status
Adam Reichold Approve
Review via email: mp+103642@code.launchpad.net

Description of the change

- Filename of the currently active document is shown in the title bar
- Translation update for 'fr_FR'

To post a comment you must log in.
Revision history for this message
Adam Reichold (adamreichold) wrote :

Thanks for your contribution.

Revision history for this message
Adam Reichold (adamreichold) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sources/mainwindow.cpp'
--- sources/mainwindow.cpp 2012-04-22 10:54:58 +0000
+++ sources/mainwindow.cpp 2012-04-26 09:45:39 +0000
@@ -615,6 +615,8 @@
615615
616 m_outlineView->setMainView(documentView);616 m_outlineView->setMainView(documentView);
617 m_thumbnailsView->setMainView(documentView);617 m_thumbnailsView->setMainView(documentView);
618
619 this->setWindowTitle(m_tabWidget->tabText(index) + " - qpdfview");
618 }620 }
619 else621 else
620 {622 {
@@ -669,6 +671,8 @@
669671
670 m_outlineView->setMainView(0);672 m_outlineView->setMainView(0);
671 m_thumbnailsView->setMainView(0);673 m_thumbnailsView->setMainView(0);
674
675 this->setWindowTitle("qpdfview");
672 }676 }
673}677}
674678
675679
=== modified file 'translations/qpdfview_fr.ts'
--- translations/qpdfview_fr.ts 2012-04-22 10:58:19 +0000
+++ translations/qpdfview_fr.ts 2012-04-26 09:45:39 +0000
@@ -1,42 +1,42 @@
1<?xml version="1.0" encoding="utf-8"?>1<?xml version="1.0" encoding="utf-8"?>
2<!DOCTYPE TS>2<!DOCTYPE TS>
3<TS version="2.0" language="de_DE">3<TS version="2.0" language="fr_FR">
4<context>4<context>
5 <name>BookmarksMenu</name>5 <name>BookmarksMenu</name>
6 <message>6 <message>
7 <location filename="../sources/miscellaneous.cpp" line="587"/>7 <location filename="../sources/miscellaneous.cpp" line="587"/>
8 <source>Bookmarks</source>8 <source>Bookmarks</source>
9 <translation type="unfinished"></translation>9 <translation>Repères</translation>
10 </message>10 </message>
11 <message>11 <message>
12 <location filename="../sources/miscellaneous.cpp" line="595"/>12 <location filename="../sources/miscellaneous.cpp" line="595"/>
13 <source>&amp;Add entry</source>13 <source>&amp;Add entry</source>
14 <translation type="unfinished"></translation>14 <translation>&amp;Ajouter un repère</translation>
15 </message>15 </message>
16 <message>16 <message>
17 <location filename="../sources/miscellaneous.cpp" line="599"/>17 <location filename="../sources/miscellaneous.cpp" line="599"/>
18 <source>&amp;Remove entries on current page</source>18 <source>&amp;Remove entries on current page</source>
19 <translation type="unfinished"></translation>19 <translation>&amp;Retirer les repères de cette page</translation>
20 </message>20 </message>
21 <message>21 <message>
22 <location filename="../sources/miscellaneous.cpp" line="603"/>22 <location filename="../sources/miscellaneous.cpp" line="603"/>
23 <source>Go to &amp;previous entry</source>23 <source>Go to &amp;previous entry</source>
24 <translation type="unfinished"></translation>24 <translation>Aller au repère &amp;précédent</translation>
25 </message>25 </message>
26 <message>26 <message>
27 <location filename="../sources/miscellaneous.cpp" line="607"/>27 <location filename="../sources/miscellaneous.cpp" line="607"/>
28 <source>Go to &amp;next entry</source>28 <source>Go to &amp;next entry</source>
29 <translation type="unfinished"></translation>29 <translation>Aller au repère &amp;suivant</translation>
30 </message>30 </message>
31 <message>31 <message>
32 <location filename="../sources/miscellaneous.cpp" line="611"/>32 <location filename="../sources/miscellaneous.cpp" line="611"/>
33 <source>&amp;Clear list</source>33 <source>&amp;Clear list</source>
34 <translation type="unfinished"></translation>34 <translation>&amp;Enlever tous les repères</translation>
35 </message>35 </message>
36 <message>36 <message>
37 <location filename="../sources/miscellaneous.cpp" line="653"/>37 <location filename="../sources/miscellaneous.cpp" line="653"/>
38 <source>%2 on page %1</source>38 <source>%2 on page %1</source>
39 <translation type="unfinished"></translation>39 <translation>%2 en page %1</translation>
40 </message>40 </message>
41</context>41</context>
42<context>42<context>
@@ -44,7 +44,7 @@
44 <message>44 <message>
45 <location filename="../sources/document.cpp" line="705"/>45 <location filename="../sources/document.cpp" line="705"/>
46 <source>Maximum page cache size is too small. Increased it to %1 bytes to hold at least three pages.</source>46 <source>Maximum page cache size is too small. Increased it to %1 bytes to hold at least three pages.</source>
47 <translation type="unfinished"></translation>47 <translation>Mémoire cache allouée pour les pages insuffisante. Incrémentée de %1 octets pour contenir au moins trois pages.</translation>
48 </message>48 </message>
49</context>49</context>
50<context>50<context>
@@ -52,12 +52,12 @@
52 <message>52 <message>
53 <location filename="../sources/documentview.cpp" line="856"/>53 <location filename="../sources/documentview.cpp" line="856"/>
54 <source>Information</source>54 <source>Information</source>
55 <translation type="unfinished"></translation>55 <translation>Informations</translation>
56 </message>56 </message>
57 <message>57 <message>
58 <location filename="../sources/documentview.cpp" line="856"/>58 <location filename="../sources/documentview.cpp" line="856"/>
59 <source>Opening URL is disabled in the settings.</source>59 <source>Opening URL is disabled in the settings.</source>
60 <translation type="unfinished"></translation>60 <translation>Ouverture par URL désactivée dans les options</translation>
61 </message>61 </message>
62</context>62</context>
63<context>63<context>
@@ -70,7 +70,7 @@
70 <message>70 <message>
71 <location filename="../sources/mainwindow.cpp" line="923"/>71 <location filename="../sources/mainwindow.cpp" line="923"/>
72 <source>Open in new &amp;tab...</source>72 <source>Open in new &amp;tab...</source>
73 <translation type="unfinished"></translation>73 <translation>Ouvrir dans un nouvel ongle&amp;t</translation>
74 </message>74 </message>
75 <message>75 <message>
76 <location filename="../sources/mainwindow.cpp" line="951"/>76 <location filename="../sources/mainwindow.cpp" line="951"/>
@@ -292,7 +292,7 @@
292 <location filename="../sources/mainwindow.cpp" line="1343"/>292 <location filename="../sources/mainwindow.cpp" line="1343"/>
293 <location filename="../sources/mainwindow.cpp" line="1344"/>293 <location filename="../sources/mainwindow.cpp" line="1344"/>
294 <source>Scale to %1%</source>294 <source>Scale to %1%</source>
295 <translation type="unfinished"></translation>295 <translation>Redimension à %1%</translation>
296 </message>296 </message>
297 <message utf8="true">297 <message utf8="true">
298 <location filename="../sources/mainwindow.cpp" line="1188"/>298 <location filename="../sources/mainwindow.cpp" line="1188"/>
@@ -304,22 +304,22 @@
304 <location filename="../sources/mainwindow.cpp" line="1363"/>304 <location filename="../sources/mainwindow.cpp" line="1363"/>
305 <location filename="../sources/mainwindow.cpp" line="1364"/>305 <location filename="../sources/mainwindow.cpp" line="1364"/>
306 <source>Rotate by %1°</source>306 <source>Rotate by %1°</source>
307 <translation type="unfinished"></translation>307 <translation>Rotation de %1°</translation>
308 </message>308 </message>
309 <message>309 <message>
310 <location filename="../sources/mainwindow.cpp" line="1219"/>310 <location filename="../sources/mainwindow.cpp" line="1219"/>
311 <source>Presentation...</source>311 <source>Presentation...</source>
312 <translation type="unfinished"></translation>312 <translation>Mode présentation</translation>
313 </message>313 </message>
314 <message>314 <message>
315 <location filename="../sources/mainwindow.cpp" line="1251"/>315 <location filename="../sources/mainwindow.cpp" line="1251"/>
316 <source>Close all tabs &amp;but current tab</source>316 <source>Close all tabs &amp;but current tab</source>
317 <translation type="unfinished"></translation>317 <translation>Fermeture de tous les onglets inactifs</translation>
318 </message>318 </message>
319 <message>319 <message>
320 <location filename="../sources/mainwindow.cpp" line="1257"/>320 <location filename="../sources/mainwindow.cpp" line="1257"/>
321 <source>&amp;Contents</source>321 <source>&amp;Contents</source>
322 <translation type="unfinished"></translation>322 <translation>Contenu</translation>
323 </message>323 </message>
324 <message>324 <message>
325 <location filename="../sources/mainwindow.cpp" line="1375"/>325 <location filename="../sources/mainwindow.cpp" line="1375"/>
@@ -377,7 +377,7 @@
377 <message>377 <message>
378 <location filename="../sources/mainwindow.cpp" line="398"/>378 <location filename="../sources/mainwindow.cpp" line="398"/>
379 <source>Searched %1% of the the current document...</source>379 <source>Searched %1% of the the current document...</source>
380 <translation type="unfinished"></translation>380 <translation>Recherche effectuée à %1% dans le document actuel</translation>
381 </message>381 </message>
382 <message>382 <message>
383 <location filename="../sources/mainwindow.cpp" line="223"/>383 <location filename="../sources/mainwindow.cpp" line="223"/>
@@ -405,12 +405,12 @@
405 <message>405 <message>
406 <location filename="../sources/pageview.cpp" line="352"/>406 <location filename="../sources/pageview.cpp" line="352"/>
407 <source>Open URL &quot;%1&quot;.</source>407 <source>Open URL &quot;%1&quot;.</source>
408 <translation type="unfinished"></translation>408 <translation>Ouvrir l'URL &quot;%1&quot;.</translation>
409 </message>409 </message>
410 <message>410 <message>
411 <location filename="../sources/pageview.cpp" line="356"/>411 <location filename="../sources/pageview.cpp" line="356"/>
412 <source>Go to page %1.</source>412 <source>Go to page %1.</source>
413 <translation type="unfinished"></translation>413 <translation>Aller à la page %1.</translation>
414 </message>414 </message>
415</context>415</context>
416<context>416<context>
@@ -418,12 +418,12 @@
418 <message>418 <message>
419 <location filename="../sources/miscellaneous.cpp" line="454"/>419 <location filename="../sources/miscellaneous.cpp" line="454"/>
420 <source>Open URL &quot;%1&quot;.</source>420 <source>Open URL &quot;%1&quot;.</source>
421 <translation type="unfinished"></translation>421 <translation>Ouvrir l'URL &quot;%1&quot;.</translation>
422 </message>422 </message>
423 <message>423 <message>
424 <location filename="../sources/miscellaneous.cpp" line="458"/>424 <location filename="../sources/miscellaneous.cpp" line="458"/>
425 <source>Go to page %1.</source>425 <source>Go to page %1.</source>
426 <translation type="unfinished"></translation>426 <translation>Allter à la page %1.</translation>
427 </message>427 </message>
428</context>428</context>
429<context>429<context>
@@ -431,12 +431,12 @@
431 <message>431 <message>
432 <location filename="../sources/miscellaneous.cpp" line="501"/>432 <location filename="../sources/miscellaneous.cpp" line="501"/>
433 <source>Recently &amp;used</source>433 <source>Recently &amp;used</source>
434 <translation type="unfinished"></translation>434 <translation>&amp;Récemment ouvert</translation>
435 </message>435 </message>
436 <message>436 <message>
437 <location filename="../sources/miscellaneous.cpp" line="510"/>437 <location filename="../sources/miscellaneous.cpp" line="510"/>
438 <source>&amp;Clear list</source>438 <source>&amp;Clear list</source>
439 <translation type="unfinished"></translation>439 <translation>&amp;Vider la liste</translation>
440 </message>440 </message>
441</context>441</context>
442<context>442<context>
@@ -451,42 +451,42 @@
451 <location filename="../sources/miscellaneous.cpp" line="816"/>451 <location filename="../sources/miscellaneous.cpp" line="816"/>
452 <location filename="../sources/miscellaneous.cpp" line="864"/>452 <location filename="../sources/miscellaneous.cpp" line="864"/>
453 <source>%1 MB</source>453 <source>%1 MB</source>
454 <translation type="unfinished"></translation>454 <translation>%1 MO</translation>
455 </message>455 </message>
456 <message>456 <message>
457 <location filename="../sources/miscellaneous.cpp" line="828"/>457 <location filename="../sources/miscellaneous.cpp" line="828"/>
458 <source>Automatic &amp;refresh:</source>458 <source>Automatic &amp;refresh:</source>
459 <translation type="unfinished"></translation>459 <translation>Rafraîchissement automatique</translation>
460 </message>460 </message>
461 <message>461 <message>
462 <location filename="../sources/miscellaneous.cpp" line="829"/>462 <location filename="../sources/miscellaneous.cpp" line="829"/>
463 <source>Open &amp;URL:</source>463 <source>Open &amp;URL:</source>
464 <translation type="unfinished"></translation>464 <translation>Ouvrir l'&amp;URL:</translation>
465 </message>465 </message>
466 <message>466 <message>
467 <location filename="../sources/miscellaneous.cpp" line="830"/>467 <location filename="../sources/miscellaneous.cpp" line="830"/>
468 <source>&amp;Antialiasing:</source>468 <source>&amp;Antialiasing:</source>
469 <translation type="unfinished"></translation>469 <translation>&amp;Antialiasing:</translation>
470 </message>470 </message>
471 <message>471 <message>
472 <location filename="../sources/miscellaneous.cpp" line="831"/>472 <location filename="../sources/miscellaneous.cpp" line="831"/>
473 <source>&amp;Text antialiasing:</source>473 <source>&amp;Text antialiasing:</source>
474 <translation type="unfinished"></translation>474 <translation>Antialiasing du &amp;texte:</translation>
475 </message>475 </message>
476 <message>476 <message>
477 <location filename="../sources/miscellaneous.cpp" line="832"/>477 <location filename="../sources/miscellaneous.cpp" line="832"/>
478 <source>Text &amp;hinting:</source>478 <source>Text &amp;hinting:</source>
479 <translation type="unfinished"></translation>479 <translation>Indications sur le texte:</translation>
480 </message>480 </message>
481 <message>481 <message>
482 <location filename="../sources/miscellaneous.cpp" line="833"/>482 <location filename="../sources/miscellaneous.cpp" line="833"/>
483 <source>Maximum page cache &amp;size:</source>483 <source>Maximum page cache &amp;size:</source>
484 <translation type="unfinished"></translation>484 <translation>Taille de &amp;cache maximum pour les pages:</translation>
485 </message>485 </message>
486 <message>486 <message>
487 <location filename="../sources/miscellaneous.cpp" line="834"/>487 <location filename="../sources/miscellaneous.cpp" line="834"/>
488 <source>&amp;Prefetch distance:</source>488 <source>&amp;Prefetch distance:</source>
489 <translation type="unfinished"></translation>489 <translation>Distance de pré-ouverture:</translation>
490 </message>490 </message>
491</context>491</context>
492</TS>492</TS>

Subscribers

People subscribed via source and target branches

to all changes: