qpdfview

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

  1. qpdfview
  2. 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
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
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
6 m_outlineView->setMainView(documentView);
7 m_thumbnailsView->setMainView(documentView);
8+
9+ this->setWindowTitle(m_tabWidget->tabText(index) + " - qpdfview");
10 }
11 else
12 {
13@@ -669,6 +671,8 @@
14
15 m_outlineView->setMainView(0);
16 m_thumbnailsView->setMainView(0);
17+
18+ this->setWindowTitle("qpdfview");
19 }
20 }
21
22
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 <?xml version="1.0" encoding="utf-8"?>
28 <!DOCTYPE TS>
29-<TS version="2.0" language="de_DE">
30+<TS version="2.0" language="fr_FR">
31 <context>
32 <name>BookmarksMenu</name>
33 <message>
34 <location filename="../sources/miscellaneous.cpp" line="587"/>
35 <source>Bookmarks</source>
36- <translation type="unfinished"></translation>
37+ <translation>Repères</translation>
38 </message>
39 <message>
40 <location filename="../sources/miscellaneous.cpp" line="595"/>
41 <source>&amp;Add entry</source>
42- <translation type="unfinished"></translation>
43+ <translation>&amp;Ajouter un repère</translation>
44 </message>
45 <message>
46 <location filename="../sources/miscellaneous.cpp" line="599"/>
47 <source>&amp;Remove entries on current page</source>
48- <translation type="unfinished"></translation>
49+ <translation>&amp;Retirer les repères de cette page</translation>
50 </message>
51 <message>
52 <location filename="../sources/miscellaneous.cpp" line="603"/>
53 <source>Go to &amp;previous entry</source>
54- <translation type="unfinished"></translation>
55+ <translation>Aller au repère &amp;précédent</translation>
56 </message>
57 <message>
58 <location filename="../sources/miscellaneous.cpp" line="607"/>
59 <source>Go to &amp;next entry</source>
60- <translation type="unfinished"></translation>
61+ <translation>Aller au repère &amp;suivant</translation>
62 </message>
63 <message>
64 <location filename="../sources/miscellaneous.cpp" line="611"/>
65 <source>&amp;Clear list</source>
66- <translation type="unfinished"></translation>
67+ <translation>&amp;Enlever tous les repères</translation>
68 </message>
69 <message>
70 <location filename="../sources/miscellaneous.cpp" line="653"/>
71 <source>%2 on page %1</source>
72- <translation type="unfinished"></translation>
73+ <translation>%2 en page %1</translation>
74 </message>
75 </context>
76 <context>
77@@ -44,7 +44,7 @@
78 <message>
79 <location filename="../sources/document.cpp" line="705"/>
80 <source>Maximum page cache size is too small. Increased it to %1 bytes to hold at least three pages.</source>
81- <translation type="unfinished"></translation>
82+ <translation>Mémoire cache allouée pour les pages insuffisante. Incrémentée de %1 octets pour contenir au moins trois pages.</translation>
83 </message>
84 </context>
85 <context>
86@@ -52,12 +52,12 @@
87 <message>
88 <location filename="../sources/documentview.cpp" line="856"/>
89 <source>Information</source>
90- <translation type="unfinished"></translation>
91+ <translation>Informations</translation>
92 </message>
93 <message>
94 <location filename="../sources/documentview.cpp" line="856"/>
95 <source>Opening URL is disabled in the settings.</source>
96- <translation type="unfinished"></translation>
97+ <translation>Ouverture par URL désactivée dans les options</translation>
98 </message>
99 </context>
100 <context>
101@@ -70,7 +70,7 @@
102 <message>
103 <location filename="../sources/mainwindow.cpp" line="923"/>
104 <source>Open in new &amp;tab...</source>
105- <translation type="unfinished"></translation>
106+ <translation>Ouvrir dans un nouvel ongle&amp;t</translation>
107 </message>
108 <message>
109 <location filename="../sources/mainwindow.cpp" line="951"/>
110@@ -292,7 +292,7 @@
111 <location filename="../sources/mainwindow.cpp" line="1343"/>
112 <location filename="../sources/mainwindow.cpp" line="1344"/>
113 <source>Scale to %1%</source>
114- <translation type="unfinished"></translation>
115+ <translation>Redimension à %1%</translation>
116 </message>
117 <message utf8="true">
118 <location filename="../sources/mainwindow.cpp" line="1188"/>
119@@ -304,22 +304,22 @@
120 <location filename="../sources/mainwindow.cpp" line="1363"/>
121 <location filename="../sources/mainwindow.cpp" line="1364"/>
122 <source>Rotate by %1°</source>
123- <translation type="unfinished"></translation>
124+ <translation>Rotation de %1°</translation>
125 </message>
126 <message>
127 <location filename="../sources/mainwindow.cpp" line="1219"/>
128 <source>Presentation...</source>
129- <translation type="unfinished"></translation>
130+ <translation>Mode présentation</translation>
131 </message>
132 <message>
133 <location filename="../sources/mainwindow.cpp" line="1251"/>
134 <source>Close all tabs &amp;but current tab</source>
135- <translation type="unfinished"></translation>
136+ <translation>Fermeture de tous les onglets inactifs</translation>
137 </message>
138 <message>
139 <location filename="../sources/mainwindow.cpp" line="1257"/>
140 <source>&amp;Contents</source>
141- <translation type="unfinished"></translation>
142+ <translation>Contenu</translation>
143 </message>
144 <message>
145 <location filename="../sources/mainwindow.cpp" line="1375"/>
146@@ -377,7 +377,7 @@
147 <message>
148 <location filename="../sources/mainwindow.cpp" line="398"/>
149 <source>Searched %1% of the the current document...</source>
150- <translation type="unfinished"></translation>
151+ <translation>Recherche effectuée à %1% dans le document actuel</translation>
152 </message>
153 <message>
154 <location filename="../sources/mainwindow.cpp" line="223"/>
155@@ -405,12 +405,12 @@
156 <message>
157 <location filename="../sources/pageview.cpp" line="352"/>
158 <source>Open URL &quot;%1&quot;.</source>
159- <translation type="unfinished"></translation>
160+ <translation>Ouvrir l'URL &quot;%1&quot;.</translation>
161 </message>
162 <message>
163 <location filename="../sources/pageview.cpp" line="356"/>
164 <source>Go to page %1.</source>
165- <translation type="unfinished"></translation>
166+ <translation>Aller à la page %1.</translation>
167 </message>
168 </context>
169 <context>
170@@ -418,12 +418,12 @@
171 <message>
172 <location filename="../sources/miscellaneous.cpp" line="454"/>
173 <source>Open URL &quot;%1&quot;.</source>
174- <translation type="unfinished"></translation>
175+ <translation>Ouvrir l'URL &quot;%1&quot;.</translation>
176 </message>
177 <message>
178 <location filename="../sources/miscellaneous.cpp" line="458"/>
179 <source>Go to page %1.</source>
180- <translation type="unfinished"></translation>
181+ <translation>Allter à la page %1.</translation>
182 </message>
183 </context>
184 <context>
185@@ -431,12 +431,12 @@
186 <message>
187 <location filename="../sources/miscellaneous.cpp" line="501"/>
188 <source>Recently &amp;used</source>
189- <translation type="unfinished"></translation>
190+ <translation>&amp;Récemment ouvert</translation>
191 </message>
192 <message>
193 <location filename="../sources/miscellaneous.cpp" line="510"/>
194 <source>&amp;Clear list</source>
195- <translation type="unfinished"></translation>
196+ <translation>&amp;Vider la liste</translation>
197 </message>
198 </context>
199 <context>
200@@ -451,42 +451,42 @@
201 <location filename="../sources/miscellaneous.cpp" line="816"/>
202 <location filename="../sources/miscellaneous.cpp" line="864"/>
203 <source>%1 MB</source>
204- <translation type="unfinished"></translation>
205+ <translation>%1 MO</translation>
206 </message>
207 <message>
208 <location filename="../sources/miscellaneous.cpp" line="828"/>
209 <source>Automatic &amp;refresh:</source>
210- <translation type="unfinished"></translation>
211+ <translation>Rafraîchissement automatique</translation>
212 </message>
213 <message>
214 <location filename="../sources/miscellaneous.cpp" line="829"/>
215 <source>Open &amp;URL:</source>
216- <translation type="unfinished"></translation>
217+ <translation>Ouvrir l'&amp;URL:</translation>
218 </message>
219 <message>
220 <location filename="../sources/miscellaneous.cpp" line="830"/>
221 <source>&amp;Antialiasing:</source>
222- <translation type="unfinished"></translation>
223+ <translation>&amp;Antialiasing:</translation>
224 </message>
225 <message>
226 <location filename="../sources/miscellaneous.cpp" line="831"/>
227 <source>&amp;Text antialiasing:</source>
228- <translation type="unfinished"></translation>
229+ <translation>Antialiasing du &amp;texte:</translation>
230 </message>
231 <message>
232 <location filename="../sources/miscellaneous.cpp" line="832"/>
233 <source>Text &amp;hinting:</source>
234- <translation type="unfinished"></translation>
235+ <translation>Indications sur le texte:</translation>
236 </message>
237 <message>
238 <location filename="../sources/miscellaneous.cpp" line="833"/>
239 <source>Maximum page cache &amp;size:</source>
240- <translation type="unfinished"></translation>
241+ <translation>Taille de &amp;cache maximum pour les pages:</translation>
242 </message>
243 <message>
244 <location filename="../sources/miscellaneous.cpp" line="834"/>
245 <source>&amp;Prefetch distance:</source>
246- <translation type="unfinished"></translation>
247+ <translation>Distance de pré-ouverture:</translation>
248 </message>
249 </context>
250 </TS>

Subscribers

People subscribed via source and target branches

to all changes: