Merge lp:~fabian-pijcke/qpdfview/qpdfview into lp:qpdfview/0.2.x
- qpdfview
- Merge into 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adam Reichold | Approve | ||
Review via email:
|
Commit message
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
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Adam Reichold (adamreichold) wrote : | # |
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Adam Reichold (adamreichold) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'sources/mainwindow.cpp' | |||
2 | --- sources/mainwindow.cpp 2012-04-22 10:54:58 +0000 | |||
3 | +++ sources/mainwindow.cpp 2012-04-26 09:45:39 +0000 | |||
4 | @@ -615,6 +615,8 @@ | |||
5 | 615 | 615 | ||
6 | 616 | m_outlineView->setMainView(documentView); | 616 | m_outlineView->setMainView(documentView); |
7 | 617 | m_thumbnailsView->setMainView(documentView); | 617 | m_thumbnailsView->setMainView(documentView); |
8 | 618 | |||
9 | 619 | this->setWindowTitle(m_tabWidget->tabText(index) + " - qpdfview"); | ||
10 | 618 | } | 620 | } |
11 | 619 | else | 621 | else |
12 | 620 | { | 622 | { |
13 | @@ -669,6 +671,8 @@ | |||
14 | 669 | 671 | ||
15 | 670 | m_outlineView->setMainView(0); | 672 | m_outlineView->setMainView(0); |
16 | 671 | m_thumbnailsView->setMainView(0); | 673 | m_thumbnailsView->setMainView(0); |
17 | 674 | |||
18 | 675 | this->setWindowTitle("qpdfview"); | ||
19 | 672 | } | 676 | } |
20 | 673 | } | 677 | } |
21 | 674 | 678 | ||
22 | 675 | 679 | ||
23 | === modified file 'translations/qpdfview_fr.ts' | |||
24 | --- translations/qpdfview_fr.ts 2012-04-22 10:58:19 +0000 | |||
25 | +++ translations/qpdfview_fr.ts 2012-04-26 09:45:39 +0000 | |||
26 | @@ -1,42 +1,42 @@ | |||
27 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
28 | 2 | <!DOCTYPE TS> | 2 | <!DOCTYPE TS> |
30 | 3 | <TS version="2.0" language="de_DE"> | 3 | <TS version="2.0" language="fr_FR"> |
31 | 4 | <context> | 4 | <context> |
32 | 5 | <name>BookmarksMenu</name> | 5 | <name>BookmarksMenu</name> |
33 | 6 | <message> | 6 | <message> |
34 | 7 | <location filename="../sources/miscellaneous.cpp" line="587"/> | 7 | <location filename="../sources/miscellaneous.cpp" line="587"/> |
35 | 8 | <source>Bookmarks</source> | 8 | <source>Bookmarks</source> |
37 | 9 | <translation type="unfinished"></translation> | 9 | <translation>Repères</translation> |
38 | 10 | </message> | 10 | </message> |
39 | 11 | <message> | 11 | <message> |
40 | 12 | <location filename="../sources/miscellaneous.cpp" line="595"/> | 12 | <location filename="../sources/miscellaneous.cpp" line="595"/> |
41 | 13 | <source>&Add entry</source> | 13 | <source>&Add entry</source> |
43 | 14 | <translation type="unfinished"></translation> | 14 | <translation>&Ajouter un repère</translation> |
44 | 15 | </message> | 15 | </message> |
45 | 16 | <message> | 16 | <message> |
46 | 17 | <location filename="../sources/miscellaneous.cpp" line="599"/> | 17 | <location filename="../sources/miscellaneous.cpp" line="599"/> |
47 | 18 | <source>&Remove entries on current page</source> | 18 | <source>&Remove entries on current page</source> |
49 | 19 | <translation type="unfinished"></translation> | 19 | <translation>&Retirer les repères de cette page</translation> |
50 | 20 | </message> | 20 | </message> |
51 | 21 | <message> | 21 | <message> |
52 | 22 | <location filename="../sources/miscellaneous.cpp" line="603"/> | 22 | <location filename="../sources/miscellaneous.cpp" line="603"/> |
53 | 23 | <source>Go to &previous entry</source> | 23 | <source>Go to &previous entry</source> |
55 | 24 | <translation type="unfinished"></translation> | 24 | <translation>Aller au repère &précédent</translation> |
56 | 25 | </message> | 25 | </message> |
57 | 26 | <message> | 26 | <message> |
58 | 27 | <location filename="../sources/miscellaneous.cpp" line="607"/> | 27 | <location filename="../sources/miscellaneous.cpp" line="607"/> |
59 | 28 | <source>Go to &next entry</source> | 28 | <source>Go to &next entry</source> |
61 | 29 | <translation type="unfinished"></translation> | 29 | <translation>Aller au repère &suivant</translation> |
62 | 30 | </message> | 30 | </message> |
63 | 31 | <message> | 31 | <message> |
64 | 32 | <location filename="../sources/miscellaneous.cpp" line="611"/> | 32 | <location filename="../sources/miscellaneous.cpp" line="611"/> |
65 | 33 | <source>&Clear list</source> | 33 | <source>&Clear list</source> |
67 | 34 | <translation type="unfinished"></translation> | 34 | <translation>&Enlever tous les repères</translation> |
68 | 35 | </message> | 35 | </message> |
69 | 36 | <message> | 36 | <message> |
70 | 37 | <location filename="../sources/miscellaneous.cpp" line="653"/> | 37 | <location filename="../sources/miscellaneous.cpp" line="653"/> |
71 | 38 | <source>%2 on page %1</source> | 38 | <source>%2 on page %1</source> |
73 | 39 | <translation type="unfinished"></translation> | 39 | <translation>%2 en page %1</translation> |
74 | 40 | </message> | 40 | </message> |
75 | 41 | </context> | 41 | </context> |
76 | 42 | <context> | 42 | <context> |
77 | @@ -44,7 +44,7 @@ | |||
78 | 44 | <message> | 44 | <message> |
79 | 45 | <location filename="../sources/document.cpp" line="705"/> | 45 | <location filename="../sources/document.cpp" line="705"/> |
80 | 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> |
82 | 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> |
83 | 48 | </message> | 48 | </message> |
84 | 49 | </context> | 49 | </context> |
85 | 50 | <context> | 50 | <context> |
86 | @@ -52,12 +52,12 @@ | |||
87 | 52 | <message> | 52 | <message> |
88 | 53 | <location filename="../sources/documentview.cpp" line="856"/> | 53 | <location filename="../sources/documentview.cpp" line="856"/> |
89 | 54 | <source>Information</source> | 54 | <source>Information</source> |
91 | 55 | <translation type="unfinished"></translation> | 55 | <translation>Informations</translation> |
92 | 56 | </message> | 56 | </message> |
93 | 57 | <message> | 57 | <message> |
94 | 58 | <location filename="../sources/documentview.cpp" line="856"/> | 58 | <location filename="../sources/documentview.cpp" line="856"/> |
95 | 59 | <source>Opening URL is disabled in the settings.</source> | 59 | <source>Opening URL is disabled in the settings.</source> |
97 | 60 | <translation type="unfinished"></translation> | 60 | <translation>Ouverture par URL désactivée dans les options</translation> |
98 | 61 | </message> | 61 | </message> |
99 | 62 | </context> | 62 | </context> |
100 | 63 | <context> | 63 | <context> |
101 | @@ -70,7 +70,7 @@ | |||
102 | 70 | <message> | 70 | <message> |
103 | 71 | <location filename="../sources/mainwindow.cpp" line="923"/> | 71 | <location filename="../sources/mainwindow.cpp" line="923"/> |
104 | 72 | <source>Open in new &tab...</source> | 72 | <source>Open in new &tab...</source> |
106 | 73 | <translation type="unfinished"></translation> | 73 | <translation>Ouvrir dans un nouvel ongle&t</translation> |
107 | 74 | </message> | 74 | </message> |
108 | 75 | <message> | 75 | <message> |
109 | 76 | <location filename="../sources/mainwindow.cpp" line="951"/> | 76 | <location filename="../sources/mainwindow.cpp" line="951"/> |
110 | @@ -292,7 +292,7 @@ | |||
111 | 292 | <location filename="../sources/mainwindow.cpp" line="1343"/> | 292 | <location filename="../sources/mainwindow.cpp" line="1343"/> |
112 | 293 | <location filename="../sources/mainwindow.cpp" line="1344"/> | 293 | <location filename="../sources/mainwindow.cpp" line="1344"/> |
113 | 294 | <source>Scale to %1%</source> | 294 | <source>Scale to %1%</source> |
115 | 295 | <translation type="unfinished"></translation> | 295 | <translation>Redimension à %1%</translation> |
116 | 296 | </message> | 296 | </message> |
117 | 297 | <message utf8="true"> | 297 | <message utf8="true"> |
118 | 298 | <location filename="../sources/mainwindow.cpp" line="1188"/> | 298 | <location filename="../sources/mainwindow.cpp" line="1188"/> |
119 | @@ -304,22 +304,22 @@ | |||
120 | 304 | <location filename="../sources/mainwindow.cpp" line="1363"/> | 304 | <location filename="../sources/mainwindow.cpp" line="1363"/> |
121 | 305 | <location filename="../sources/mainwindow.cpp" line="1364"/> | 305 | <location filename="../sources/mainwindow.cpp" line="1364"/> |
122 | 306 | <source>Rotate by %1°</source> | 306 | <source>Rotate by %1°</source> |
124 | 307 | <translation type="unfinished"></translation> | 307 | <translation>Rotation de %1°</translation> |
125 | 308 | </message> | 308 | </message> |
126 | 309 | <message> | 309 | <message> |
127 | 310 | <location filename="../sources/mainwindow.cpp" line="1219"/> | 310 | <location filename="../sources/mainwindow.cpp" line="1219"/> |
128 | 311 | <source>Presentation...</source> | 311 | <source>Presentation...</source> |
130 | 312 | <translation type="unfinished"></translation> | 312 | <translation>Mode présentation</translation> |
131 | 313 | </message> | 313 | </message> |
132 | 314 | <message> | 314 | <message> |
133 | 315 | <location filename="../sources/mainwindow.cpp" line="1251"/> | 315 | <location filename="../sources/mainwindow.cpp" line="1251"/> |
134 | 316 | <source>Close all tabs &but current tab</source> | 316 | <source>Close all tabs &but current tab</source> |
136 | 317 | <translation type="unfinished"></translation> | 317 | <translation>Fermeture de tous les onglets inactifs</translation> |
137 | 318 | </message> | 318 | </message> |
138 | 319 | <message> | 319 | <message> |
139 | 320 | <location filename="../sources/mainwindow.cpp" line="1257"/> | 320 | <location filename="../sources/mainwindow.cpp" line="1257"/> |
140 | 321 | <source>&Contents</source> | 321 | <source>&Contents</source> |
142 | 322 | <translation type="unfinished"></translation> | 322 | <translation>Contenu</translation> |
143 | 323 | </message> | 323 | </message> |
144 | 324 | <message> | 324 | <message> |
145 | 325 | <location filename="../sources/mainwindow.cpp" line="1375"/> | 325 | <location filename="../sources/mainwindow.cpp" line="1375"/> |
146 | @@ -377,7 +377,7 @@ | |||
147 | 377 | <message> | 377 | <message> |
148 | 378 | <location filename="../sources/mainwindow.cpp" line="398"/> | 378 | <location filename="../sources/mainwindow.cpp" line="398"/> |
149 | 379 | <source>Searched %1% of the the current document...</source> | 379 | <source>Searched %1% of the the current document...</source> |
151 | 380 | <translation type="unfinished"></translation> | 380 | <translation>Recherche effectuée à %1% dans le document actuel</translation> |
152 | 381 | </message> | 381 | </message> |
153 | 382 | <message> | 382 | <message> |
154 | 383 | <location filename="../sources/mainwindow.cpp" line="223"/> | 383 | <location filename="../sources/mainwindow.cpp" line="223"/> |
155 | @@ -405,12 +405,12 @@ | |||
156 | 405 | <message> | 405 | <message> |
157 | 406 | <location filename="../sources/pageview.cpp" line="352"/> | 406 | <location filename="../sources/pageview.cpp" line="352"/> |
158 | 407 | <source>Open URL "%1".</source> | 407 | <source>Open URL "%1".</source> |
160 | 408 | <translation type="unfinished"></translation> | 408 | <translation>Ouvrir l'URL "%1".</translation> |
161 | 409 | </message> | 409 | </message> |
162 | 410 | <message> | 410 | <message> |
163 | 411 | <location filename="../sources/pageview.cpp" line="356"/> | 411 | <location filename="../sources/pageview.cpp" line="356"/> |
164 | 412 | <source>Go to page %1.</source> | 412 | <source>Go to page %1.</source> |
166 | 413 | <translation type="unfinished"></translation> | 413 | <translation>Aller à la page %1.</translation> |
167 | 414 | </message> | 414 | </message> |
168 | 415 | </context> | 415 | </context> |
169 | 416 | <context> | 416 | <context> |
170 | @@ -418,12 +418,12 @@ | |||
171 | 418 | <message> | 418 | <message> |
172 | 419 | <location filename="../sources/miscellaneous.cpp" line="454"/> | 419 | <location filename="../sources/miscellaneous.cpp" line="454"/> |
173 | 420 | <source>Open URL "%1".</source> | 420 | <source>Open URL "%1".</source> |
175 | 421 | <translation type="unfinished"></translation> | 421 | <translation>Ouvrir l'URL "%1".</translation> |
176 | 422 | </message> | 422 | </message> |
177 | 423 | <message> | 423 | <message> |
178 | 424 | <location filename="../sources/miscellaneous.cpp" line="458"/> | 424 | <location filename="../sources/miscellaneous.cpp" line="458"/> |
179 | 425 | <source>Go to page %1.</source> | 425 | <source>Go to page %1.</source> |
181 | 426 | <translation type="unfinished"></translation> | 426 | <translation>Allter à la page %1.</translation> |
182 | 427 | </message> | 427 | </message> |
183 | 428 | </context> | 428 | </context> |
184 | 429 | <context> | 429 | <context> |
185 | @@ -431,12 +431,12 @@ | |||
186 | 431 | <message> | 431 | <message> |
187 | 432 | <location filename="../sources/miscellaneous.cpp" line="501"/> | 432 | <location filename="../sources/miscellaneous.cpp" line="501"/> |
188 | 433 | <source>Recently &used</source> | 433 | <source>Recently &used</source> |
190 | 434 | <translation type="unfinished"></translation> | 434 | <translation>&Récemment ouvert</translation> |
191 | 435 | </message> | 435 | </message> |
192 | 436 | <message> | 436 | <message> |
193 | 437 | <location filename="../sources/miscellaneous.cpp" line="510"/> | 437 | <location filename="../sources/miscellaneous.cpp" line="510"/> |
194 | 438 | <source>&Clear list</source> | 438 | <source>&Clear list</source> |
196 | 439 | <translation type="unfinished"></translation> | 439 | <translation>&Vider la liste</translation> |
197 | 440 | </message> | 440 | </message> |
198 | 441 | </context> | 441 | </context> |
199 | 442 | <context> | 442 | <context> |
200 | @@ -451,42 +451,42 @@ | |||
201 | 451 | <location filename="../sources/miscellaneous.cpp" line="816"/> | 451 | <location filename="../sources/miscellaneous.cpp" line="816"/> |
202 | 452 | <location filename="../sources/miscellaneous.cpp" line="864"/> | 452 | <location filename="../sources/miscellaneous.cpp" line="864"/> |
203 | 453 | <source>%1 MB</source> | 453 | <source>%1 MB</source> |
205 | 454 | <translation type="unfinished"></translation> | 454 | <translation>%1 MO</translation> |
206 | 455 | </message> | 455 | </message> |
207 | 456 | <message> | 456 | <message> |
208 | 457 | <location filename="../sources/miscellaneous.cpp" line="828"/> | 457 | <location filename="../sources/miscellaneous.cpp" line="828"/> |
209 | 458 | <source>Automatic &refresh:</source> | 458 | <source>Automatic &refresh:</source> |
211 | 459 | <translation type="unfinished"></translation> | 459 | <translation>Rafraîchissement automatique</translation> |
212 | 460 | </message> | 460 | </message> |
213 | 461 | <message> | 461 | <message> |
214 | 462 | <location filename="../sources/miscellaneous.cpp" line="829"/> | 462 | <location filename="../sources/miscellaneous.cpp" line="829"/> |
215 | 463 | <source>Open &URL:</source> | 463 | <source>Open &URL:</source> |
217 | 464 | <translation type="unfinished"></translation> | 464 | <translation>Ouvrir l'&URL:</translation> |
218 | 465 | </message> | 465 | </message> |
219 | 466 | <message> | 466 | <message> |
220 | 467 | <location filename="../sources/miscellaneous.cpp" line="830"/> | 467 | <location filename="../sources/miscellaneous.cpp" line="830"/> |
221 | 468 | <source>&Antialiasing:</source> | 468 | <source>&Antialiasing:</source> |
223 | 469 | <translation type="unfinished"></translation> | 469 | <translation>&Antialiasing:</translation> |
224 | 470 | </message> | 470 | </message> |
225 | 471 | <message> | 471 | <message> |
226 | 472 | <location filename="../sources/miscellaneous.cpp" line="831"/> | 472 | <location filename="../sources/miscellaneous.cpp" line="831"/> |
227 | 473 | <source>&Text antialiasing:</source> | 473 | <source>&Text antialiasing:</source> |
229 | 474 | <translation type="unfinished"></translation> | 474 | <translation>Antialiasing du &texte:</translation> |
230 | 475 | </message> | 475 | </message> |
231 | 476 | <message> | 476 | <message> |
232 | 477 | <location filename="../sources/miscellaneous.cpp" line="832"/> | 477 | <location filename="../sources/miscellaneous.cpp" line="832"/> |
233 | 478 | <source>Text &hinting:</source> | 478 | <source>Text &hinting:</source> |
235 | 479 | <translation type="unfinished"></translation> | 479 | <translation>Indications sur le texte:</translation> |
236 | 480 | </message> | 480 | </message> |
237 | 481 | <message> | 481 | <message> |
238 | 482 | <location filename="../sources/miscellaneous.cpp" line="833"/> | 482 | <location filename="../sources/miscellaneous.cpp" line="833"/> |
239 | 483 | <source>Maximum page cache &size:</source> | 483 | <source>Maximum page cache &size:</source> |
241 | 484 | <translation type="unfinished"></translation> | 484 | <translation>Taille de &cache maximum pour les pages:</translation> |
242 | 485 | </message> | 485 | </message> |
243 | 486 | <message> | 486 | <message> |
244 | 487 | <location filename="../sources/miscellaneous.cpp" line="834"/> | 487 | <location filename="../sources/miscellaneous.cpp" line="834"/> |
245 | 488 | <source>&Prefetch distance:</source> | 488 | <source>&Prefetch distance:</source> |
247 | 489 | <translation type="unfinished"></translation> | 489 | <translation>Distance de pré-ouverture:</translation> |
248 | 490 | </message> | 490 | </message> |
249 | 491 | </context> | 491 | </context> |
250 | 492 | </TS> | 492 | </TS> |
Thanks for your contribution.