Merge lp:~leonardolemos/pantheon-mail/make-ui-translatable into lp:~elementary-apps/pantheon-mail/trunk
- make-ui-translatable
- Merge into trunk
Proposed by
Leonardo Lemos
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Corentin Noël | ||||
Approved revision: | 1923 | ||||
Merged at revision: | 1921 | ||||
Proposed branch: | lp:~leonardolemos/pantheon-mail/make-ui-translatable | ||||
Merge into: | lp:~elementary-apps/pantheon-mail/trunk | ||||
Diff against target: |
912 lines (+579/-27) 13 files modified
data/ui/CMakeLists.txt (+12/-12) po/CMakeLists.txt (+1/-0) po/geary.pot (+556/-5) src/client/accounts/account-dialog-account-list-pane.vala (+1/-1) src/client/accounts/account-dialog-remove-confirm-pane.vala (+1/-1) src/client/accounts/account-dialog-remove-fail-pane.vala (+1/-1) src/client/accounts/account-spinner-page.vala (+1/-1) src/client/accounts/add-edit-page.vala (+1/-1) src/client/components/conversation-find-bar.vala (+1/-1) src/client/composer/composer-widget.vala (+1/-1) src/client/dialogs/certificate-warning-dialog.vala (+1/-1) src/client/dialogs/password-dialog.vala (+1/-1) src/client/dialogs/upgrade-dialog.vala (+1/-1) |
||||
To merge this branch: | bzr merge lp:~leonardolemos/pantheon-mail/make-ui-translatable | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
elementary Apps team | Pending | ||
Review via email:
|
Commit message
Change .glade files to .ui allowing them to be translated.
Description of the change
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
RabbitBot (rabbitbot-a) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'data/ui/CMakeLists.txt' |
2 | --- data/ui/CMakeLists.txt 2015-12-01 19:36:39 +0000 |
3 | +++ data/ui/CMakeLists.txt 2015-12-15 13:33:03 +0000 |
4 | @@ -1,19 +1,19 @@ |
5 | set(UI_DEST share/geary/ui) |
6 | |
7 | install(FILES accelerators.ui DESTINATION ${UI_DEST}) |
8 | -install(FILES account_list.glade DESTINATION ${UI_DEST}) |
9 | -install(FILES account_cannot_remove.glade DESTINATION ${UI_DEST}) |
10 | -install(FILES account_spinner.glade DESTINATION ${UI_DEST}) |
11 | +install(FILES account_list.ui DESTINATION ${UI_DEST}) |
12 | +install(FILES account_cannot_remove.ui DESTINATION ${UI_DEST}) |
13 | +install(FILES account_spinner.ui DESTINATION ${UI_DEST}) |
14 | install(FILES app_menu.interface DESTINATION ${UI_DEST}) |
15 | -install(FILES certificate_warning_dialog.glade DESTINATION ${UI_DEST}) |
16 | -install(FILES composer.glade DESTINATION ${UI_DEST}) |
17 | +install(FILES certificate_warning_dialog.ui DESTINATION ${UI_DEST}) |
18 | +install(FILES composer.ui DESTINATION ${UI_DEST}) |
19 | install(FILES composer_accelerators.ui DESTINATION ${UI_DEST}) |
20 | -install(FILES edit_alternate_emails.glade DESTINATION ${UI_DEST}) |
21 | -install(FILES find_bar.glade DESTINATION ${UI_DEST}) |
22 | -install(FILES login.glade DESTINATION ${UI_DEST}) |
23 | -install(FILES message.glade DESTINATION ${UI_DEST}) |
24 | -install(FILES password-dialog.glade DESTINATION ${UI_DEST}) |
25 | -install(FILES remove_confirm.glade DESTINATION ${UI_DEST}) |
26 | +install(FILES edit_alternate_emails.ui DESTINATION ${UI_DEST}) |
27 | +install(FILES find_bar.ui DESTINATION ${UI_DEST}) |
28 | +install(FILES login.ui DESTINATION ${UI_DEST}) |
29 | +install(FILES message.ui DESTINATION ${UI_DEST}) |
30 | +install(FILES password-dialog.ui DESTINATION ${UI_DEST}) |
31 | +install(FILES remove_confirm.ui DESTINATION ${UI_DEST}) |
32 | install(FILES toolbar_empty_menu.ui DESTINATION ${UI_DEST}) |
33 | install(FILES toolbar_mark_menu.ui DESTINATION ${UI_DEST}) |
34 | -install(FILES upgrade_dialog.glade DESTINATION ${UI_DEST}) |
35 | +install(FILES upgrade_dialog.ui DESTINATION ${UI_DEST}) |
36 | |
37 | === renamed file 'data/ui/account_cannot_remove.glade' => 'data/ui/account_cannot_remove.ui' |
38 | === renamed file 'data/ui/account_list.glade' => 'data/ui/account_list.ui' |
39 | === renamed file 'data/ui/account_spinner.glade' => 'data/ui/account_spinner.ui' |
40 | === renamed file 'data/ui/certificate_warning_dialog.glade' => 'data/ui/certificate_warning_dialog.ui' |
41 | === renamed file 'data/ui/composer.glade' => 'data/ui/composer.ui' |
42 | === renamed file 'data/ui/edit_alternate_emails.glade' => 'data/ui/edit_alternate_emails.ui' |
43 | === renamed file 'data/ui/find_bar.glade' => 'data/ui/find_bar.ui' |
44 | === renamed file 'data/ui/login.glade' => 'data/ui/login.ui' |
45 | === renamed file 'data/ui/message.glade' => 'data/ui/message.ui' |
46 | === renamed file 'data/ui/password-dialog.glade' => 'data/ui/password-dialog.ui' |
47 | === renamed file 'data/ui/remove_confirm.glade' => 'data/ui/remove_confirm.ui' |
48 | === renamed file 'data/ui/upgrade_dialog.glade' => 'data/ui/upgrade_dialog.ui' |
49 | === modified file 'po/CMakeLists.txt' |
50 | --- po/CMakeLists.txt 2015-11-20 20:12:38 +0000 |
51 | +++ po/CMakeLists.txt 2015-12-15 13:33:03 +0000 |
52 | @@ -2,4 +2,5 @@ |
53 | add_translations_directory(${GETTEXT_PACKAGE}) |
54 | add_translations_catalog(${GETTEXT_PACKAGE} |
55 | ../src |
56 | + ../data |
57 | ) |
58 | |
59 | === modified file 'po/geary.pot' |
60 | --- po/geary.pot 2015-11-30 17:51:54 +0000 |
61 | +++ po/geary.pot 2015-12-15 13:33:03 +0000 |
62 | @@ -8,7 +8,7 @@ |
63 | msgstr "" |
64 | "Project-Id-Version: PACKAGE VERSION\n" |
65 | "Report-Msgid-Bugs-To: \n" |
66 | -"POT-Creation-Date: 2015-11-30 11:51-0600\n" |
67 | +"POT-Creation-Date: 2015-12-14 14:34-0200\n" |
68 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
69 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
70 | "Language-Team: LANGUAGE <LL@li.org>\n" |
71 | @@ -87,7 +87,8 @@ |
72 | msgid "Archive" |
73 | msgstr "" |
74 | |
75 | -#: ../src/engine/api/geary-special-folder-type.vala:58 |
76 | +#: ../src/engine/api/geary-special-folder-type.vala:58 ../data/ui/login.ui:633 |
77 | +#: ../data/ui/login.ui:650 |
78 | msgid "None" |
79 | msgstr "" |
80 | |
81 | @@ -910,90 +911,112 @@ |
82 | msgstr "" |
83 | |
84 | #: ../src/client/accounts/add-edit-page.vala:233 |
85 | +#: ../src/client/accounts/add-edit-page.vala:234 |
86 | msgid "Enter your account information to get started." |
87 | msgstr "" |
88 | |
89 | #: ../src/client/accounts/add-edit-page.vala:253 |
90 | +#: ../src/client/accounts/add-edit-page.vala:254 |
91 | msgid "2 weeks back" |
92 | msgstr "" |
93 | |
94 | #: ../src/client/accounts/add-edit-page.vala:254 |
95 | +#: ../src/client/accounts/add-edit-page.vala:255 |
96 | msgid "1 month back" |
97 | msgstr "" |
98 | |
99 | #: ../src/client/accounts/add-edit-page.vala:255 |
100 | +#: ../src/client/accounts/add-edit-page.vala:256 |
101 | msgid "3 months back" |
102 | msgstr "" |
103 | |
104 | #: ../src/client/accounts/add-edit-page.vala:256 |
105 | +#: ../src/client/accounts/add-edit-page.vala:257 |
106 | msgid "6 months back" |
107 | msgstr "" |
108 | |
109 | #: ../src/client/accounts/add-edit-page.vala:257 |
110 | +#: ../src/client/accounts/add-edit-page.vala:258 |
111 | msgid "1 year back" |
112 | msgstr "" |
113 | |
114 | #: ../src/client/accounts/add-edit-page.vala:258 |
115 | +#: ../src/client/accounts/add-edit-page.vala:259 |
116 | msgid "2 years back" |
117 | msgstr "" |
118 | |
119 | #: ../src/client/accounts/add-edit-page.vala:259 |
120 | +#: ../src/client/accounts/add-edit-page.vala:260 |
121 | msgid "4 years back" |
122 | msgstr "" |
123 | |
124 | #: ../src/client/accounts/add-edit-page.vala:261 |
125 | +#: ../src/client/accounts/add-edit-page.vala:262 |
126 | msgid "Everything" |
127 | msgstr "" |
128 | |
129 | #: ../src/client/accounts/add-edit-page.vala:280 |
130 | +#: ../src/client/accounts/add-edit-page.vala:281 |
131 | msgid "Edit" |
132 | msgstr "" |
133 | |
134 | #: ../src/client/accounts/add-edit-page.vala:282 |
135 | +#: ../src/client/accounts/add-edit-page.vala:283 |
136 | msgid "Preview" |
137 | msgstr "" |
138 | |
139 | #: ../src/client/accounts/add-edit-page.vala:723 |
140 | +#: ../src/client/accounts/add-edit-page.vala:725 |
141 | msgid "Remem_ber passwords" |
142 | msgstr "" |
143 | |
144 | #: ../src/client/accounts/add-edit-page.vala:730 |
145 | +#: ../src/client/accounts/add-edit-page.vala:732 ../data/ui/login.ui:62 |
146 | msgid "Remem_ber password" |
147 | msgstr "" |
148 | |
149 | #: ../src/client/accounts/add-edit-page.vala:764 |
150 | +#: ../src/client/accounts/add-edit-page.vala:766 |
151 | msgid "Unable to validate:\n" |
152 | msgstr "" |
153 | |
154 | #: ../src/client/accounts/add-edit-page.vala:766 |
155 | +#: ../src/client/accounts/add-edit-page.vala:768 |
156 | msgid " • Invalid account nickname.\n" |
157 | msgstr "" |
158 | |
159 | #: ../src/client/accounts/add-edit-page.vala:769 |
160 | +#: ../src/client/accounts/add-edit-page.vala:771 |
161 | msgid " • Email address already added to Geary.\n" |
162 | msgstr "" |
163 | |
164 | #: ../src/client/accounts/add-edit-page.vala:773 |
165 | +#: ../src/client/accounts/add-edit-page.vala:775 |
166 | msgid " • IMAP connection error.\n" |
167 | msgstr "" |
168 | |
169 | #: ../src/client/accounts/add-edit-page.vala:776 |
170 | +#: ../src/client/accounts/add-edit-page.vala:778 |
171 | msgid " • IMAP username or password incorrect.\n" |
172 | msgstr "" |
173 | |
174 | #: ../src/client/accounts/add-edit-page.vala:779 |
175 | +#: ../src/client/accounts/add-edit-page.vala:781 |
176 | msgid " • SMTP connection error.\n" |
177 | msgstr "" |
178 | |
179 | #: ../src/client/accounts/add-edit-page.vala:782 |
180 | +#: ../src/client/accounts/add-edit-page.vala:784 |
181 | msgid " • SMTP username or password incorrect.\n" |
182 | msgstr "" |
183 | |
184 | #: ../src/client/accounts/add-edit-page.vala:786 |
185 | +#: ../src/client/accounts/add-edit-page.vala:788 |
186 | msgid " • Connection error.\n" |
187 | msgstr "" |
188 | |
189 | #: ../src/client/accounts/add-edit-page.vala:790 |
190 | +#: ../src/client/accounts/add-edit-page.vala:792 |
191 | msgid " • Username or password incorrect.\n" |
192 | msgstr "" |
193 | |
194 | @@ -1212,6 +1235,7 @@ |
195 | msgstr "" |
196 | |
197 | #: ../src/client/conversation-viewer/conversation-viewer.vala:1297 |
198 | +#: ../data/ui/composer.ui:29 |
199 | msgid "_Copy" |
200 | msgstr "" |
201 | |
202 | @@ -1220,6 +1244,7 @@ |
203 | msgstr "" |
204 | |
205 | #: ../src/client/conversation-viewer/conversation-viewer.vala:1310 |
206 | +#: ../data/ui/composer.ui:106 |
207 | msgid "Copy _Link" |
208 | msgstr "" |
209 | |
210 | @@ -1425,14 +1450,17 @@ |
211 | msgstr "" |
212 | |
213 | #: ../src/client/components/stock.vala:18 |
214 | +#: ../data/ui/account_cannot_remove.ui:74 |
215 | msgid "_OK" |
216 | msgstr "" |
217 | |
218 | -#: ../src/client/components/stock.vala:19 |
219 | +#: ../src/client/components/stock.vala:19 ../data/ui/remove_confirm.ui:153 |
220 | +#: ../data/ui/edit_alternate_emails.ui:160 ../data/ui/password-dialog.ui:196 |
221 | msgid "_Cancel" |
222 | msgstr "" |
223 | |
224 | #: ../src/client/components/stock.vala:23 |
225 | +#: ../src/client/dialogs/preferences-dialog.vala:84 |
226 | msgid "_Close" |
227 | msgstr "" |
228 | |
229 | @@ -1448,7 +1476,7 @@ |
230 | msgid "_Print..." |
231 | msgstr "" |
232 | |
233 | -#: ../src/client/components/stock.vala:30 |
234 | +#: ../src/client/components/stock.vala:30 ../data/ui/remove_confirm.ui:168 |
235 | msgid "_Remove" |
236 | msgstr "" |
237 | |
238 | @@ -1469,6 +1497,7 @@ |
239 | #: ../src/client/components/main-toolbar.vala:144 |
240 | #: ../src/client/composer/composer-headerbar.vala:90 |
241 | #: ../src/client/components/main-toolbar.vala:162 |
242 | +#: ../src/client/composer/composer-headerbar.vala:75 |
243 | msgid "Menu" |
244 | msgstr "" |
245 | |
246 | @@ -1481,13 +1510,535 @@ |
247 | msgstr "" |
248 | |
249 | #: ../src/client/accounts/add-edit-page.vala:233 |
250 | +#: ../src/client/accounts/add-edit-page.vala:234 |
251 | msgid "Welcome to Mail" |
252 | msgstr "" |
253 | |
254 | -#: ../src/client/composer/composer-toolbar.vala:43 |
255 | +#: ../src/client/composer/composer-toolbar.vala:43 ../data/ui/composer.ui:75 |
256 | msgid "More options" |
257 | msgstr "" |
258 | |
259 | #: ../src/client/components/main-toolbar.vala:312 |
260 | msgid "Search %s" |
261 | msgstr "" |
262 | + |
263 | +#: ../src/client/dialogs/preferences-dialog.vala:23 |
264 | +msgid "Reading" |
265 | +msgstr "" |
266 | + |
267 | +#: ../src/client/dialogs/preferences-dialog.vala:28 |
268 | +msgid "Automatically select next message:" |
269 | +msgstr "" |
270 | + |
271 | +#: ../src/client/dialogs/preferences-dialog.vala:33 |
272 | +msgid "Conversation previews:" |
273 | +msgstr "" |
274 | + |
275 | +#: ../src/client/dialogs/preferences-dialog.vala:38 |
276 | +msgid "Three-pane layout:" |
277 | +msgstr "" |
278 | + |
279 | +#: ../src/client/dialogs/preferences-dialog.vala:42 ../data/ui/login.ui:853 |
280 | +msgid "Composer" |
281 | +msgstr "" |
282 | + |
283 | +#: ../src/client/dialogs/preferences-dialog.vala:47 |
284 | +msgid "Spell check:" |
285 | +msgstr "" |
286 | + |
287 | +#: ../src/client/dialogs/preferences-dialog.vala:51 |
288 | +msgid "Notifications" |
289 | +msgstr "" |
290 | + |
291 | +#: ../src/client/dialogs/preferences-dialog.vala:56 |
292 | +msgid "Always watch for new mail:" |
293 | +msgstr "" |
294 | + |
295 | +#: ../src/client/application/geary-controller.vala:61 |
296 | +msgid "Delete Conversation" |
297 | +msgstr "" |
298 | + |
299 | +#: ../src/client/application/geary-controller.vala:62 |
300 | +msgid "Delete Conversation (Shift+Delete)" |
301 | +msgstr "" |
302 | + |
303 | +#: ../src/client/application/geary-controller.vala:63 |
304 | +msgid "Delete Conversations (Shift+Delete)" |
305 | +msgstr "" |
306 | + |
307 | +#: ../data/ui/remove_confirm.ui:43 |
308 | +msgid "" |
309 | +"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this " |
310 | +"account?</span> " |
311 | +msgstr "" |
312 | + |
313 | +#: ../data/ui/remove_confirm.ui:58 |
314 | +msgid "" |
315 | +"All email associated with this account will be removed from your computer. " |
316 | +"This will not affect email on the server." |
317 | +msgstr "" |
318 | + |
319 | +#: ../data/ui/remove_confirm.ui:80 |
320 | +msgid "Nickname:" |
321 | +msgstr "" |
322 | + |
323 | +#: ../data/ui/remove_confirm.ui:94 |
324 | +msgid "Email address:" |
325 | +msgstr "" |
326 | + |
327 | +#: ../data/ui/find_bar.ui:59 |
328 | +msgid "Find" |
329 | +msgstr "" |
330 | + |
331 | +#: ../data/ui/find_bar.ui:72 |
332 | +msgid "Previous Result" |
333 | +msgstr "" |
334 | + |
335 | +#: ../data/ui/find_bar.ui:91 |
336 | +msgid "Next result" |
337 | +msgstr "" |
338 | + |
339 | +#: ../data/ui/find_bar.ui:107 |
340 | +msgid "_Case sensitive" |
341 | +msgstr "" |
342 | + |
343 | +#: ../data/ui/find_bar.ui:127 |
344 | +msgid "label" |
345 | +msgstr "" |
346 | + |
347 | +#: ../data/ui/upgrade_dialog.ui:60 |
348 | +msgid "Geary update in progress…" |
349 | +msgstr "" |
350 | + |
351 | +#: ../data/ui/edit_alternate_emails.ui:112 |
352 | +msgid "Remove email address" |
353 | +msgstr "" |
354 | + |
355 | +#: ../data/ui/edit_alternate_emails.ui:136 |
356 | +msgid "" |
357 | +"Some email services require additional addresses be configured on the " |
358 | +"server. Contact your email provider for more information." |
359 | +msgstr "" |
360 | + |
361 | +#: ../data/ui/edit_alternate_emails.ui:175 |
362 | +msgid "_Update" |
363 | +msgstr "" |
364 | + |
365 | +#: ../data/ui/account_spinner.ui:41 |
366 | +msgid "Please wait while Geary validates your account." |
367 | +msgstr "" |
368 | + |
369 | +#: ../data/ui/composer.ui:8 |
370 | +msgid "_Undo" |
371 | +msgstr "" |
372 | + |
373 | +#: ../data/ui/composer.ui:15 |
374 | +msgid "_Redo" |
375 | +msgstr "" |
376 | + |
377 | +#: ../data/ui/composer.ui:22 |
378 | +msgid "Cu_t" |
379 | +msgstr "" |
380 | + |
381 | +#: ../data/ui/composer.ui:36 |
382 | +msgid "_Paste" |
383 | +msgstr "" |
384 | + |
385 | +#: ../data/ui/composer.ui:43 |
386 | +msgid "_Left" |
387 | +msgstr "" |
388 | + |
389 | +#: ../data/ui/composer.ui:48 |
390 | +msgid "_Right" |
391 | +msgstr "" |
392 | + |
393 | +#: ../data/ui/composer.ui:53 |
394 | +msgid "_Center" |
395 | +msgstr "" |
396 | + |
397 | +#: ../data/ui/composer.ui:58 |
398 | +msgid "_Justify" |
399 | +msgstr "" |
400 | + |
401 | +#: ../data/ui/composer.ui:63 |
402 | +msgid "Link (Ctrl+L)" |
403 | +msgstr "" |
404 | + |
405 | +#: ../data/ui/composer.ui:70 |
406 | +msgid "C_olor" |
407 | +msgstr "" |
408 | + |
409 | +#: ../data/ui/composer.ui:81 |
410 | +msgid "Quote text (Ctrl+])" |
411 | +msgstr "" |
412 | + |
413 | +#: ../data/ui/composer.ui:87 |
414 | +msgid "Unquote text (Ctrl+[)" |
415 | +msgstr "" |
416 | + |
417 | +#: ../data/ui/composer.ui:93 |
418 | +msgid "Remove formatting (Ctrl+Space)" |
419 | +msgstr "" |
420 | + |
421 | +#: ../data/ui/composer.ui:100 |
422 | +msgctxt "Clipboard paste with rich text" |
423 | +msgid "Paste _With Formatting" |
424 | +msgstr "" |
425 | + |
426 | +#: ../data/ui/composer.ui:111 |
427 | +msgid "Bold (Ctrl+B)" |
428 | +msgstr "" |
429 | + |
430 | +#: ../data/ui/composer.ui:118 |
431 | +msgid "Italic (Ctrl+I)" |
432 | +msgstr "" |
433 | + |
434 | +#: ../data/ui/composer.ui:125 |
435 | +msgid "Underline (Ctrl+U)" |
436 | +msgstr "" |
437 | + |
438 | +#: ../data/ui/composer.ui:132 |
439 | +msgid "Strikethrough (Ctrl+K)" |
440 | +msgstr "" |
441 | + |
442 | +#: ../data/ui/composer.ui:139 |
443 | +msgid "_Rich Text" |
444 | +msgstr "" |
445 | + |
446 | +#: ../data/ui/composer.ui:145 |
447 | +msgid "Show Extended Fields" |
448 | +msgstr "" |
449 | + |
450 | +#: ../data/ui/composer.ui:157 |
451 | +msgctxt "Label" |
452 | +msgid "Close and Save" |
453 | +msgstr "" |
454 | + |
455 | +#: ../data/ui/composer.ui:158 |
456 | +msgctxt "Short Label" |
457 | +msgid "Close and Save" |
458 | +msgstr "" |
459 | + |
460 | +#: ../data/ui/composer.ui:159 |
461 | +msgctxt "Tooltip" |
462 | +msgid "Close and Save" |
463 | +msgstr "" |
464 | + |
465 | +#: ../data/ui/composer.ui:165 |
466 | +msgctxt "Label" |
467 | +msgid "Close and Discard" |
468 | +msgstr "" |
469 | + |
470 | +#: ../data/ui/composer.ui:166 |
471 | +msgctxt "Short Label" |
472 | +msgid "Close and Discard" |
473 | +msgstr "" |
474 | + |
475 | +#: ../data/ui/composer.ui:167 |
476 | +msgctxt "Tooltip" |
477 | +msgid "Close and Discard" |
478 | +msgstr "" |
479 | + |
480 | +#: ../data/ui/composer.ui:173 |
481 | +msgid "Lar_ge" |
482 | +msgstr "" |
483 | + |
484 | +#: ../data/ui/composer.ui:174 |
485 | +msgid "Large" |
486 | +msgstr "" |
487 | + |
488 | +#: ../data/ui/composer.ui:179 |
489 | +msgid "_Medium" |
490 | +msgstr "" |
491 | + |
492 | +#: ../data/ui/composer.ui:180 |
493 | +msgid "Medium" |
494 | +msgstr "" |
495 | + |
496 | +#: ../data/ui/composer.ui:185 |
497 | +msgid "_Small" |
498 | +msgstr "" |
499 | + |
500 | +#: ../data/ui/composer.ui:186 |
501 | +msgid "Small" |
502 | +msgstr "" |
503 | + |
504 | +#: ../data/ui/composer.ui:191 |
505 | +msgid "S_ans Serif" |
506 | +msgstr "" |
507 | + |
508 | +#: ../data/ui/composer.ui:192 |
509 | +msgid "Sans Serif" |
510 | +msgstr "" |
511 | + |
512 | +#: ../data/ui/composer.ui:197 |
513 | +msgid "S_erif" |
514 | +msgstr "" |
515 | + |
516 | +#: ../data/ui/composer.ui:198 |
517 | +msgid "Serif" |
518 | +msgstr "" |
519 | + |
520 | +#: ../data/ui/composer.ui:203 |
521 | +msgid "_Fixed Width" |
522 | +msgstr "" |
523 | + |
524 | +#: ../data/ui/composer.ui:204 |
525 | +msgid "Fixed Width" |
526 | +msgstr "" |
527 | + |
528 | +#: ../data/ui/composer.ui:209 ../data/ui/composer.ui:210 |
529 | +msgid "Detach" |
530 | +msgstr "" |
531 | + |
532 | +#: ../data/ui/composer.ui:211 |
533 | +msgid "Detach (Ctrl+D)" |
534 | +msgstr "" |
535 | + |
536 | +#: ../data/ui/composer.ui:218 |
537 | +msgid "_Send" |
538 | +msgstr "" |
539 | + |
540 | +#: ../data/ui/composer.ui:219 |
541 | +msgid "Send" |
542 | +msgstr "" |
543 | + |
544 | +#: ../data/ui/composer.ui:220 |
545 | +msgid "Send (Ctrl+Enter)" |
546 | +msgstr "" |
547 | + |
548 | +#: ../data/ui/composer.ui:226 |
549 | +msgid "_Attach File" |
550 | +msgstr "" |
551 | + |
552 | +#: ../data/ui/composer.ui:227 ../data/ui/composer.ui:228 |
553 | +msgid "Attach File" |
554 | +msgstr "" |
555 | + |
556 | +#: ../data/ui/composer.ui:234 |
557 | +msgid "_Include Original Attachments" |
558 | +msgstr "" |
559 | + |
560 | +#: ../data/ui/composer.ui:235 ../data/ui/composer.ui:236 |
561 | +msgid "Include Original Attachments" |
562 | +msgstr "" |
563 | + |
564 | +#: ../data/ui/composer.ui:242 |
565 | +msgid "Application Menu" |
566 | +msgstr "" |
567 | + |
568 | +#. Address(es) e-mail is to be sent to |
569 | +#: ../data/ui/composer.ui:289 |
570 | +msgid "_To" |
571 | +msgstr "" |
572 | + |
573 | +#: ../data/ui/composer.ui:308 |
574 | +msgid "_Cc" |
575 | +msgstr "" |
576 | + |
577 | +#: ../data/ui/composer.ui:362 |
578 | +msgid "_Subject" |
579 | +msgstr "" |
580 | + |
581 | +#: ../data/ui/composer.ui:381 |
582 | +msgid "_Bcc" |
583 | +msgstr "" |
584 | + |
585 | +#: ../data/ui/composer.ui:411 |
586 | +msgid "_Reply-To" |
587 | +msgstr "" |
588 | + |
589 | +#. Geary account mail will be sent from |
590 | +#: ../data/ui/composer.ui:440 |
591 | +msgid "From" |
592 | +msgstr "" |
593 | + |
594 | +#: ../data/ui/composer.ui:519 |
595 | +msgid "Drop files here" |
596 | +msgstr "" |
597 | + |
598 | +#: ../data/ui/composer.ui:535 |
599 | +msgid "To add them as attachments" |
600 | +msgstr "" |
601 | + |
602 | +#: ../data/ui/account_cannot_remove.ui:40 |
603 | +msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> " |
604 | +msgstr "" |
605 | + |
606 | +#: ../data/ui/account_cannot_remove.ui:56 |
607 | +msgid "" |
608 | +"A composer window associated with this account is currently open. Send or " |
609 | +"discard the message and try again." |
610 | +msgstr "" |
611 | + |
612 | +#: ../data/ui/login.ui:34 |
613 | +msgid "Addi_tional email addresses…" |
614 | +msgstr "" |
615 | + |
616 | +#: ../data/ui/login.ui:46 |
617 | +msgid "_Save sent mail" |
618 | +msgstr "" |
619 | + |
620 | +#: ../data/ui/login.ui:86 ../data/ui/password-dialog.ui:108 |
621 | +msgid "Password" |
622 | +msgstr "" |
623 | + |
624 | +#: ../data/ui/login.ui:97 ../data/ui/login.ui:545 |
625 | +msgid "_Password:" |
626 | +msgstr "" |
627 | + |
628 | +#: ../data/ui/login.ui:130 |
629 | +msgid "E_mail address:" |
630 | +msgstr "" |
631 | + |
632 | +#: ../data/ui/login.ui:152 |
633 | +msgid "Work, Home, etc." |
634 | +msgstr "" |
635 | + |
636 | +#: ../data/ui/login.ui:163 |
637 | +msgid "N_ickname:" |
638 | +msgstr "" |
639 | + |
640 | +#: ../data/ui/login.ui:195 |
641 | +msgid "N_ame:" |
642 | +msgstr "" |
643 | + |
644 | +#: ../data/ui/login.ui:211 |
645 | +msgid "S_ervice:" |
646 | +msgstr "" |
647 | + |
648 | +#: ../data/ui/login.ui:298 |
649 | +msgid "IMAP settings" |
650 | +msgstr "" |
651 | + |
652 | +#: ../data/ui/login.ui:315 |
653 | +msgid "Se_rver:" |
654 | +msgstr "" |
655 | + |
656 | +#: ../data/ui/login.ui:347 |
657 | +msgid "P_ort" |
658 | +msgstr "" |
659 | + |
660 | +#: ../data/ui/login.ui:409 |
661 | +msgid "Ser_ver:" |
662 | +msgstr "" |
663 | + |
664 | +#: ../data/ui/login.ui:427 |
665 | +msgid "Por_t" |
666 | +msgstr "" |
667 | + |
668 | +#: ../data/ui/login.ui:446 |
669 | +msgid "SMTP settings" |
670 | +msgstr "" |
671 | + |
672 | +#: ../data/ui/login.ui:462 |
673 | +msgid "User_name:" |
674 | +msgstr "" |
675 | + |
676 | +#: ../data/ui/login.ui:480 |
677 | +msgid "Pass_word:" |
678 | +msgstr "" |
679 | + |
680 | +#: ../data/ui/login.ui:499 |
681 | +msgid "SMTP username" |
682 | +msgstr "" |
683 | + |
684 | +#: ../data/ui/login.ui:514 |
685 | +msgid "SMTP password" |
686 | +msgstr "" |
687 | + |
688 | +#: ../data/ui/login.ui:527 |
689 | +msgid "_Username:" |
690 | +msgstr "" |
691 | + |
692 | +#: ../data/ui/login.ui:564 |
693 | +msgid "IMAP username" |
694 | +msgstr "" |
695 | + |
696 | +#: ../data/ui/login.ui:579 |
697 | +msgid "IMAP password" |
698 | +msgstr "" |
699 | + |
700 | +#: ../data/ui/login.ui:593 |
701 | +msgid "Encr_yption:" |
702 | +msgstr "" |
703 | + |
704 | +#: ../data/ui/login.ui:613 |
705 | +msgid "Encrypt_ion:" |
706 | +msgstr "" |
707 | + |
708 | +#: ../data/ui/login.ui:634 ../data/ui/login.ui:651 |
709 | +msgid "SSL/TLS" |
710 | +msgstr "" |
711 | + |
712 | +#: ../data/ui/login.ui:635 ../data/ui/login.ui:652 |
713 | +msgid "STARTTLS" |
714 | +msgstr "" |
715 | + |
716 | +#: ../data/ui/login.ui:663 |
717 | +msgid "No authentication re_quired" |
718 | +msgstr "" |
719 | + |
720 | +#: ../data/ui/login.ui:679 |
721 | +msgid "Use IMAP cre_dentials" |
722 | +msgstr "" |
723 | + |
724 | +#: ../data/ui/login.ui:783 |
725 | +msgid "Storage" |
726 | +msgstr "" |
727 | + |
728 | +#: ../data/ui/login.ui:804 |
729 | +msgid "_Download mail" |
730 | +msgstr "" |
731 | + |
732 | +#: ../data/ui/login.ui:867 |
733 | +msgid "Save dra_fts on server" |
734 | +msgstr "" |
735 | + |
736 | +#: ../data/ui/login.ui:884 |
737 | +msgid "Si_gn emails (HTML allowed):" |
738 | +msgstr "" |
739 | + |
740 | +#: ../data/ui/account_list.ui:69 |
741 | +msgid "Add account" |
742 | +msgstr "" |
743 | + |
744 | +#: ../data/ui/account_list.ui:82 |
745 | +msgid "Edit account" |
746 | +msgstr "" |
747 | + |
748 | +#: ../data/ui/account_list.ui:95 |
749 | +msgid "Remove account" |
750 | +msgstr "" |
751 | + |
752 | +#: ../data/ui/certificate_warning_dialog.ui:7 |
753 | +msgid "Untrusted Connection" |
754 | +msgstr "" |
755 | + |
756 | +#: ../data/ui/certificate_warning_dialog.ui:29 |
757 | +msgid "_Always Trust This Server" |
758 | +msgstr "" |
759 | + |
760 | +#: ../data/ui/certificate_warning_dialog.ui:43 |
761 | +msgid "_Trust This Server" |
762 | +msgstr "" |
763 | + |
764 | +#: ../data/ui/certificate_warning_dialog.ui:57 |
765 | +msgid "_Don't Trust This Server" |
766 | +msgstr "" |
767 | + |
768 | +#: ../data/ui/password-dialog.ui:74 |
769 | +msgid "SMTP Credentials" |
770 | +msgstr "" |
771 | + |
772 | +#: ../data/ui/password-dialog.ui:91 |
773 | +msgid "Username" |
774 | +msgstr "" |
775 | + |
776 | +#: ../data/ui/password-dialog.ui:152 |
777 | +msgid "_Remember password" |
778 | +msgstr "" |
779 | + |
780 | +#: ../data/ui/password-dialog.ui:210 |
781 | +msgid "_Authenticate" |
782 | +msgstr "" |
783 | |
784 | === modified file 'src/client/accounts/account-dialog-account-list-pane.vala' |
785 | --- src/client/accounts/account-dialog-account-list-pane.vala 2015-02-06 20:43:33 +0000 |
786 | +++ src/client/accounts/account-dialog-account-list-pane.vala 2015-12-15 13:33:03 +0000 |
787 | @@ -24,7 +24,7 @@ |
788 | |
789 | public AccountDialogAccountListPane(Gtk.Stack stack) { |
790 | base(stack); |
791 | - Gtk.Builder builder = GearyApplication.instance.create_builder("account_list.glade"); |
792 | + Gtk.Builder builder = GearyApplication.instance.create_builder("account_list.ui"); |
793 | pack_end((Gtk.Box) builder.get_object("container")); |
794 | Gtk.ActionGroup actions = (Gtk.ActionGroup) builder.get_object("account list actions"); |
795 | edit_action = actions.get_action("edit_account"); |
796 | |
797 | === modified file 'src/client/accounts/account-dialog-remove-confirm-pane.vala' |
798 | --- src/client/accounts/account-dialog-remove-confirm-pane.vala 2015-02-06 20:43:33 +0000 |
799 | +++ src/client/accounts/account-dialog-remove-confirm-pane.vala 2015-12-15 13:33:03 +0000 |
800 | @@ -17,7 +17,7 @@ |
801 | public AccountDialogRemoveConfirmPane(Gtk.Stack stack) { |
802 | base(stack); |
803 | |
804 | - Gtk.Builder builder = GearyApplication.instance.create_builder("remove_confirm.glade"); |
805 | + Gtk.Builder builder = GearyApplication.instance.create_builder("remove_confirm.ui"); |
806 | pack_end((Gtk.Box) builder.get_object("container")); |
807 | Gtk.ActionGroup actions = (Gtk.ActionGroup) builder.get_object("actions"); |
808 | account_nickname_label = (Gtk.Label) builder.get_object("account_nickname_label"); |
809 | |
810 | === modified file 'src/client/accounts/account-dialog-remove-fail-pane.vala' |
811 | --- src/client/accounts/account-dialog-remove-fail-pane.vala 2015-02-06 20:43:33 +0000 |
812 | +++ src/client/accounts/account-dialog-remove-fail-pane.vala 2015-12-15 13:33:03 +0000 |
813 | @@ -11,7 +11,7 @@ |
814 | public AccountDialogRemoveFailPane(Gtk.Stack stack) { |
815 | base(stack); |
816 | |
817 | - Gtk.Builder builder = GearyApplication.instance.create_builder("account_cannot_remove.glade"); |
818 | + Gtk.Builder builder = GearyApplication.instance.create_builder("account_cannot_remove.ui"); |
819 | pack_end((Gtk.Box) builder.get_object("container")); |
820 | Gtk.ActionGroup actions = (Gtk.ActionGroup) builder.get_object("actions"); |
821 | actions.get_action("ok_action").activate.connect(() => { ok(); }); |
822 | |
823 | === modified file 'src/client/accounts/account-spinner-page.vala' |
824 | --- src/client/accounts/account-spinner-page.vala 2015-02-06 20:43:33 +0000 |
825 | +++ src/client/accounts/account-spinner-page.vala 2015-12-15 13:33:03 +0000 |
826 | @@ -9,7 +9,7 @@ |
827 | public AccountSpinnerPage() { |
828 | Object(orientation: Gtk.Orientation.VERTICAL, spacing: 4); |
829 | |
830 | - Gtk.Builder builder = GearyApplication.instance.create_builder("account_spinner.glade"); |
831 | + Gtk.Builder builder = GearyApplication.instance.create_builder("account_spinner.ui"); |
832 | pack_end((Gtk.Box) builder.get_object("container")); |
833 | } |
834 | } |
835 | |
836 | === modified file 'src/client/accounts/add-edit-page.vala' |
837 | --- src/client/accounts/add-edit-page.vala 2015-11-30 18:02:37 +0000 |
838 | +++ src/client/accounts/add-edit-page.vala 2015-12-15 13:33:03 +0000 |
839 | @@ -222,7 +222,7 @@ |
840 | public AddEditPage() { |
841 | Object(orientation: Gtk.Orientation.VERTICAL, spacing: 4); |
842 | |
843 | - Gtk.Builder builder = GearyApplication.instance.create_builder("login.glade"); |
844 | + Gtk.Builder builder = GearyApplication.instance.create_builder("login.ui"); |
845 | |
846 | // Primary container. |
847 | container_widget = (Gtk.Widget) builder.get_object("container"); |
848 | |
849 | === modified file 'src/client/components/conversation-find-bar.vala' |
850 | --- src/client/components/conversation-find-bar.vala 2015-02-06 20:43:33 +0000 |
851 | +++ src/client/components/conversation-find-bar.vala 2015-12-15 13:33:03 +0000 |
852 | @@ -36,7 +36,7 @@ |
853 | public ConversationFindBar(ConversationWebView web_view) { |
854 | this.web_view = web_view; |
855 | |
856 | - builder = GearyApplication.instance.create_builder("find_bar.glade"); |
857 | + builder = GearyApplication.instance.create_builder("find_bar.ui"); |
858 | |
859 | key_press_event.connect(on_key_press); |
860 | button_press_event.connect(on_button_press); |
861 | |
862 | === modified file 'src/client/composer/composer-widget.vala' |
863 | --- src/client/composer/composer-widget.vala 2015-03-20 22:50:31 +0000 |
864 | +++ src/client/composer/composer-widget.vala 2015-12-15 13:33:03 +0000 |
865 | @@ -292,7 +292,7 @@ |
866 | setup_drag_destination(this); |
867 | |
868 | add_events(Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK); |
869 | - builder = GearyApplication.instance.create_builder("composer.glade"); |
870 | + builder = GearyApplication.instance.create_builder("composer.ui"); |
871 | |
872 | Gtk.Box box = builder.get_object("composer") as Gtk.Box; |
873 | attachments_box = builder.get_object("attachments_box") as Gtk.Box; |
874 | |
875 | === modified file 'src/client/dialogs/certificate-warning-dialog.vala' |
876 | --- src/client/dialogs/certificate-warning-dialog.vala 2015-02-06 20:43:33 +0000 |
877 | +++ src/client/dialogs/certificate-warning-dialog.vala 2015-12-15 13:33:03 +0000 |
878 | @@ -17,7 +17,7 @@ |
879 | |
880 | public CertificateWarningDialog(Gtk.Window? parent, Geary.AccountInformation account_information, |
881 | Geary.Service service, TlsCertificateFlags warnings, bool is_validation) { |
882 | - Gtk.Builder builder = GearyApplication.instance.create_builder("certificate_warning_dialog.glade"); |
883 | + Gtk.Builder builder = GearyApplication.instance.create_builder("certificate_warning_dialog.ui"); |
884 | |
885 | dialog = (Gtk.Dialog) builder.get_object("CertificateWarningDialog"); |
886 | dialog.transient_for = parent; |
887 | |
888 | === modified file 'src/client/dialogs/password-dialog.vala' |
889 | --- src/client/dialogs/password-dialog.vala 2015-02-06 20:43:33 +0000 |
890 | +++ src/client/dialogs/password-dialog.vala 2015-12-15 13:33:03 +0000 |
891 | @@ -25,7 +25,7 @@ |
892 | |
893 | public PasswordDialog(Gtk.Window? parent, bool smtp, Geary.AccountInformation account_information, |
894 | Geary.ServiceFlag password_flags) { |
895 | - Gtk.Builder builder = GearyApplication.instance.create_builder("password-dialog.glade"); |
896 | + Gtk.Builder builder = GearyApplication.instance.create_builder("password-dialog.ui"); |
897 | |
898 | dialog = (Gtk.Dialog) builder.get_object("PasswordDialog"); |
899 | dialog.transient_for = parent; |
900 | |
901 | === modified file 'src/client/dialogs/upgrade-dialog.vala' |
902 | --- src/client/dialogs/upgrade-dialog.vala 2015-02-06 20:43:33 +0000 |
903 | +++ src/client/dialogs/upgrade-dialog.vala 2015-12-15 13:33:03 +0000 |
904 | @@ -22,7 +22,7 @@ |
905 | */ |
906 | public UpgradeDialog() { |
907 | // Load UI. |
908 | - Gtk.Builder builder = GearyApplication.instance.create_builder("upgrade_dialog.glade"); |
909 | + Gtk.Builder builder = GearyApplication.instance.create_builder("upgrade_dialog.ui"); |
910 | dialog = (Gtk.Dialog) builder.get_object("dialog"); |
911 | |
912 | // Hook up signals. |
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.