Ubuntu Notes app

Merge lp:~mzanetti/reminders-app/translations-fixes into lp:reminders-app

  1. translations-fixes
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 564
Merged at revision: 564
Proposed branch: lp:~mzanetti/reminders-app/translations-fixes
Merge into: lp:reminders-app
Diff against target: 474 lines (+136/-137)
1 file modified
po/com.ubuntu.reminders.pot (+136/-137)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/translations-fixes
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+295994@code.launchpad.net

Commit message

update translations

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:564
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/58/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/900/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/58/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.reminders.pot'
2--- po/com.ubuntu.reminders.pot 2015-09-21 16:40:11 +0000
3+++ po/com.ubuntu.reminders.pot 2016-05-28 20:30:01 +0000
4@@ -1,6 +1,6 @@
5 # SOME DESCRIPTIVE TITLE.
6 # Copyright (C) YEAR Canonical Ltd.
7-# This file is distributed under the same license as the PACKAGE package.
8+# This file is distributed under the same license as the package.
9 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
10 #
11 #, fuzzy
12@@ -8,16 +8,16 @@
13 msgstr ""
14 "Project-Id-Version: \n"
15 "Report-Msgid-Bugs-To: \n"
16-"POT-Creation-Date: 2015-09-21 18:39+0200\n"
17+"POT-Creation-Date: 2016-05-28 22:28+0200\n"
18 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
19 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
20 "Language-Team: LANGUAGE <LL@li.org>\n"
21 "Language: \n"
22 "MIME-Version: 1.0\n"
23-"Content-Type: text/plain; charset=CHARSET\n"
24+"Content-Type: text/plain; charset=UTF-8\n"
25 "Content-Transfer-Encoding: 8bit\n"
26
27-#: com.ubuntu.reminders.desktop.in.in.h:1 src/app/qml/reminders.qml:562
28+#: com.ubuntu.reminders.desktop.in.in.h:1 src/app/qml/Reminders.qml:559
29 msgid "Notes"
30 msgstr ""
31
32@@ -25,6 +25,100 @@
33 msgid "Ubuntu Notes app, powered by Evernote"
34 msgstr ""
35
36+#: src/app/qml/Reminders.qml:100 src/app/qml/Reminders.qml:263
37+#: src/app/qml/Reminders.qml:268 src/app/qml/components/NoteHeader.qml:52
38+#: src/app/qml/components/PageWithBottomEdge.qml:123
39+#: src/app/qml/ui/EditNoteView.qml:42 src/app/qml/ui/NotesPage.qml:68
40+msgid "Untitled"
41+msgstr ""
42+
43+#: src/app/qml/Reminders.qml:419
44+msgid "Default notebook"
45+msgstr ""
46+
47+#: src/app/qml/Reminders.qml:537
48+msgid "Select note to attach imported file"
49+msgstr ""
50+
51+#: src/app/qml/Reminders.qml:537
52+msgid "Select note to attach imported files"
53+msgstr ""
54+
55+#: src/app/qml/Reminders.qml:587
56+msgid "Notebooks"
57+msgstr ""
58+
59+#: src/app/qml/Reminders.qml:621
60+msgid "Reminders"
61+msgstr ""
62+
63+#: src/app/qml/Reminders.qml:638 src/app/qml/components/NotesDelegate.qml:80
64+msgid "Tags"
65+msgstr ""
66+
67+#: src/app/qml/Reminders.qml:651
68+msgid "Accounts"
69+msgstr ""
70+
71+#: src/app/qml/Reminders.qml:670
72+msgid ""
73+"No note selected.\n"
74+"Select a note to see it in detail."
75+msgstr ""
76+
77+#: src/app/qml/Reminders.qml:713
78+msgid "Sync with Evernote"
79+msgstr ""
80+
81+#: src/app/qml/Reminders.qml:714
82+msgid "Notes can be stored on this device, or optionally synced with Evernote."
83+msgstr ""
84+
85+#: src/app/qml/Reminders.qml:715
86+msgid "To sync with Evernote, you need an Evernote account."
87+msgstr ""
88+
89+#: src/app/qml/Reminders.qml:730
90+msgid "Not Now"
91+msgstr ""
92+
93+#: src/app/qml/Reminders.qml:739
94+msgid "Set Up…"
95+msgstr ""
96+
97+#: src/app/qml/Reminders.qml:754
98+#, qt-format
99+msgid "Importing %1 items"
100+msgstr ""
101+
102+#: src/app/qml/Reminders.qml:755
103+msgid "Importing 1 item"
104+msgstr ""
105+
106+#: src/app/qml/Reminders.qml:757
107+msgid ""
108+"Do you want to create a new note for those items or do you want to attach "
109+"them to an existing note?"
110+msgstr ""
111+
112+#: src/app/qml/Reminders.qml:758
113+msgid ""
114+"Do you want to create a new note for this item or do you want to attach it "
115+"to an existing note?"
116+msgstr ""
117+
118+#: src/app/qml/Reminders.qml:764
119+msgid "Create new note"
120+msgstr ""
121+
122+#: src/app/qml/Reminders.qml:769
123+msgid "Attach to existing note"
124+msgstr ""
125+
126+#: src/app/qml/Reminders.qml:774
127+msgid "Cancel import"
128+msgstr ""
129+
130 #: src/app/qml/components/ConflictDelegate.qml:35
131 msgid "Notebook:"
132 msgstr ""
133@@ -45,34 +139,26 @@
134 msgid "Enter a tag name or select one from the list to attach it to the note."
135 msgstr ""
136
137-#: src/app/qml/components/EditTagsDialog.qml:62
138+#: src/app/qml/components/EditTagsDialog.qml:61
139 msgid "Tag name"
140 msgstr ""
141
142-#: src/app/qml/components/EditTagsDialog.qml:142
143-#: src/app/qml/ui/NotebooksPage.qml:209 src/app/qml/ui/TagsPage.qml:147
144+#: src/app/qml/components/EditTagsDialog.qml:146
145+#: src/app/qml/ui/NotebooksPage.qml:213 src/app/qml/ui/TagsPage.qml:147
146 msgid "OK"
147 msgstr ""
148
149 #. TRANSLATORS: Button to close the edit mode
150 #. TRANSLATORS: Button to close the note viewer
151-#: src/app/qml/components/EditTagsDialog.qml:190
152-#: src/app/qml/ui/EditNoteView.qml:605 src/app/qml/ui/NoteView.qml:150
153+#: src/app/qml/components/EditTagsDialog.qml:202
154+#: src/app/qml/ui/EditNoteView.qml:604 src/app/qml/ui/NoteView.qml:150
155 msgid "Close"
156 msgstr ""
157
158-#: src/app/qml/components/NoteHeader.qml:52
159-#: src/app/qml/components/PageWithBottomEdge.qml:123
160-#: src/app/qml/reminders.qml:100 src/app/qml/reminders.qml:266
161-#: src/app/qml/reminders.qml:271 src/app/qml/ui/EditNoteView.qml:43
162-#: src/app/qml/ui/NotesPage.qml:67
163-msgid "Untitled"
164-msgstr ""
165-
166 #. TRANSLATORS: Button that deletes a reminder
167 #: src/app/qml/components/NotebooksDelegate.qml:36
168 #: src/app/qml/components/NotesDelegate.qml:53
169-#: src/app/qml/components/TagsDelegate.qml:34 src/app/qml/ui/NotesPage.qml:91
170+#: src/app/qml/components/TagsDelegate.qml:34 src/app/qml/ui/NotesPage.qml:90
171 #: src/app/qml/ui/SetReminderView.qml:76
172 msgid "Delete"
173 msgstr ""
174@@ -94,13 +180,9 @@
175 msgid "Reminder"
176 msgstr ""
177
178-#: src/app/qml/components/NotesDelegate.qml:80 src/app/qml/reminders.qml:641
179-msgid "Tags"
180-msgstr ""
181-
182 #. TRANSLATORS: Button to go from note viewer to note editor
183 #: src/app/qml/components/NotesDelegate.qml:87 src/app/qml/ui/NoteView.qml:172
184-#: src/app/qml/ui/NotesPage.qml:113
185+#: src/app/qml/ui/NotesPage.qml:112
186 msgid "Edit"
187 msgstr ""
188
189@@ -125,7 +207,7 @@
190 msgstr ""
191
192 #: src/app/qml/components/RemindersDelegate.qml:57
193-#: src/app/qml/ui/NotesPage.qml:99
194+#: src/app/qml/ui/NotesPage.qml:98
195 msgid "Edit reminder"
196 msgstr ""
197
198@@ -170,124 +252,41 @@
199 msgstr ""
200
201 #: src/app/qml/components/ResolveConflictConfirmationDialog.qml:57
202-#: src/app/qml/reminders.qml:744
203 msgid "Yes"
204 msgstr ""
205
206 #: src/app/qml/components/ResolveConflictConfirmationDialog.qml:66
207-#: src/app/qml/reminders.qml:734
208 msgid "No"
209 msgstr ""
210
211-#: src/app/qml/components/SortingDialog.qml:20
212+#: src/app/qml/components/SortingDialog.qml:9
213 msgid "Sort by"
214 msgstr ""
215
216-#: src/app/qml/components/SortingDialog.qml:29
217+#: src/app/qml/components/SortingDialog.qml:19
218 msgid "Date created (newest first)"
219 msgstr ""
220
221-#: src/app/qml/components/SortingDialog.qml:30
222+#: src/app/qml/components/SortingDialog.qml:20
223 msgid "Date created (oldest first)"
224 msgstr ""
225
226-#: src/app/qml/components/SortingDialog.qml:31
227+#: src/app/qml/components/SortingDialog.qml:21
228 msgid "Date updated (newest first)"
229 msgstr ""
230
231-#: src/app/qml/components/SortingDialog.qml:32
232+#: src/app/qml/components/SortingDialog.qml:22
233 msgid "Date updated (oldest first)"
234 msgstr ""
235
236-#: src/app/qml/components/SortingDialog.qml:33
237+#: src/app/qml/components/SortingDialog.qml:23
238 msgid "Title (ascending)"
239 msgstr ""
240
241-#: src/app/qml/components/SortingDialog.qml:34
242+#: src/app/qml/components/SortingDialog.qml:24
243 msgid "Title (descending)"
244 msgstr ""
245
246-#: src/app/qml/reminders.qml:422
247-msgid "Default notebook"
248-msgstr ""
249-
250-#: src/app/qml/reminders.qml:540
251-msgid "Select note to attach imported file"
252-msgstr ""
253-
254-#: src/app/qml/reminders.qml:540
255-msgid "Select note to attach imported files"
256-msgstr ""
257-
258-#: src/app/qml/reminders.qml:590
259-msgid "Notebooks"
260-msgstr ""
261-
262-#: src/app/qml/reminders.qml:624
263-msgid "Reminders"
264-msgstr ""
265-
266-#: src/app/qml/reminders.qml:654
267-msgid "Accounts"
268-msgstr ""
269-
270-#: src/app/qml/reminders.qml:673
271-msgid ""
272-"No note selected.\n"
273-"Select a note to see it in detail."
274-msgstr ""
275-
276-#: src/app/qml/reminders.qml:716
277-msgid "Setup Evernote connection?"
278-msgstr ""
279-
280-#: src/app/qml/reminders.qml:717
281-msgid "Notes can be stored on this device, or optionally synced with Evernote."
282-msgstr ""
283-
284-#: src/app/qml/reminders.qml:718
285-msgid ""
286-"In order to synchronize notes with Evernote, an account at Evernote is "
287-"required."
288-msgstr ""
289-
290-#: src/app/qml/reminders.qml:719
291-msgid "Do you want to setup an account now?"
292-msgstr ""
293-
294-#: src/app/qml/reminders.qml:759
295-#, qt-format
296-msgid "Importing %1 items"
297-msgstr ""
298-
299-#: src/app/qml/reminders.qml:760
300-msgid "Importing 1 item"
301-msgstr ""
302-
303-#: src/app/qml/reminders.qml:762
304-msgid ""
305-"Do you want to create a new note for those items or do you want to attach "
306-"them to an existing note?"
307-msgstr ""
308-
309-#: src/app/qml/reminders.qml:763
310-msgid ""
311-"Do you want to create a new note for this item or do you want to attach it "
312-"to an existing note?"
313-msgstr ""
314-
315-#: src/app/qml/reminders.qml:769
316-msgid "Create new note"
317-msgstr ""
318-
319-#: src/app/qml/reminders.qml:774
320-msgid "Attach to existing note"
321-msgstr ""
322-
323-#: src/app/qml/reminders.qml:779
324-msgid "Cancel import"
325-msgstr ""
326-
327 #: src/app/qml/ui/AccountSelectorPage.qml:29
328 msgid "Select account"
329 msgstr ""
330@@ -309,31 +308,31 @@
331 msgid "Add new account"
332 msgstr ""
333
334-#: src/app/qml/ui/EditNoteView.qml:425
335+#: src/app/qml/ui/EditNoteView.qml:424
336 msgid "Font"
337 msgstr ""
338
339-#: src/app/qml/ui/EditNoteView.qml:437
340+#: src/app/qml/ui/EditNoteView.qml:436
341 msgid "Size"
342 msgstr ""
343
344 #. TRANSLATORS: Toolbar button for "Bold"
345-#: src/app/qml/ui/EditNoteView.qml:460
346+#: src/app/qml/ui/EditNoteView.qml:459
347 msgid "B"
348 msgstr ""
349
350 #. TRANSLATORS: Toolbar button for "Italic"
351-#: src/app/qml/ui/EditNoteView.qml:473
352+#: src/app/qml/ui/EditNoteView.qml:472
353 msgid "I"
354 msgstr ""
355
356 #. TRANSLATORS: Toolbar button for "Underline"
357-#: src/app/qml/ui/EditNoteView.qml:487
358+#: src/app/qml/ui/EditNoteView.qml:486
359 msgid "U"
360 msgstr ""
361
362 #. TRANSLATORS: Toolbar button for "Strikeout"
363-#: src/app/qml/ui/EditNoteView.qml:501
364+#: src/app/qml/ui/EditNoteView.qml:500
365 msgid "T"
366 msgstr ""
367
368@@ -343,8 +342,8 @@
369
370 #: src/app/qml/ui/NoteConflictView.qml:54
371 msgid ""
372-"This note has been modified in multiple places. Please choose the version to "
373-"be opened and delete the other."
374+"This note has been modified in multiple places. Open each version to check "
375+"the content, then swipe to delete one of them."
376 msgstr ""
377
378 #: src/app/qml/ui/NoteConflictView.qml:63
379@@ -371,7 +370,7 @@
380 msgid "Add notebook"
381 msgstr ""
382
383-#: src/app/qml/ui/NotebooksPage.qml:52 src/app/qml/ui/NotesPage.qml:84
384+#: src/app/qml/ui/NotebooksPage.qml:52 src/app/qml/ui/NotesPage.qml:83
385 #: src/app/qml/ui/RemindersPage.qml:36 src/app/qml/ui/SearchNotesPage.qml:60
386 #: src/app/qml/ui/TagsPage.qml:52
387 msgid "Search"
388@@ -382,36 +381,36 @@
389 msgstr ""
390
391 #. TRANSLATORS: Button that saves a reminder
392-#: src/app/qml/ui/NotebooksPage.qml:175 src/app/qml/ui/SetReminderView.qml:88
393+#: src/app/qml/ui/NotebooksPage.qml:178 src/app/qml/ui/SetReminderView.qml:88
394 msgid "Save"
395 msgstr ""
396
397-#: src/app/qml/ui/NotebooksPage.qml:195
398+#: src/app/qml/ui/NotebooksPage.qml:199
399 msgid "Rename notebook"
400 msgstr ""
401
402-#: src/app/qml/ui/NotebooksPage.qml:196
403+#: src/app/qml/ui/NotebooksPage.qml:200
404 #, qt-format
405 msgid "Enter a new name for notebook %1"
406 msgstr ""
407
408-#: src/app/qml/ui/NotebooksPage.qml:205 src/app/qml/ui/TagsPage.qml:143
409+#: src/app/qml/ui/NotebooksPage.qml:209 src/app/qml/ui/TagsPage.qml:143
410 msgid "Name cannot be empty"
411 msgstr ""
412
413-#: src/app/qml/ui/NotesPage.qml:43 src/app/qml/ui/NotesPage.qml:64
414+#: src/app/qml/ui/NotesPage.qml:44 src/app/qml/ui/NotesPage.qml:65
415 msgid "Add note"
416 msgstr ""
417
418-#: src/app/qml/ui/NotesPage.qml:72
419+#: src/app/qml/ui/NotesPage.qml:73
420 msgid "Sorting"
421 msgstr ""
422
423-#: src/app/qml/ui/NotesPage.qml:99
424+#: src/app/qml/ui/NotesPage.qml:98
425 msgid "Set reminder"
426 msgstr ""
427
428-#: src/app/qml/ui/NotesPage.qml:243
429+#: src/app/qml/ui/NotesPage.qml:249
430 msgid ""
431 "No notes available. You can create new notes by pulling the note editor up "
432 "from the bottom edge."
433@@ -485,7 +484,7 @@
434 msgstr ""
435
436 #: src/libqtevernote/evernoteconnection.cpp:329
437-#: src/libqtevernote/notesstore.cpp:1772
438+#: src/libqtevernote/notesstore.cpp:1789
439 msgid ""
440 "Authentication for Evernote server expired. Please renew login information "
441 "in the accounts settings."
442@@ -599,27 +598,27 @@
443 msgid "on %1 %2"
444 msgstr ""
445
446-#: src/libqtevernote/notesstore.cpp:415
447+#: src/libqtevernote/notesstore.cpp:432
448 msgid ""
449 "This account is managed by Evernote. Use the Evernote website to delete "
450 "notebooks."
451 msgstr ""
452
453-#: src/libqtevernote/notesstore.cpp:429
454+#: src/libqtevernote/notesstore.cpp:446
455 msgid ""
456 "Cannot delete the default notebook. Set another notebook to be the default "
457 "first."
458 msgstr ""
459
460-#: src/libqtevernote/notesstore.cpp:1775
461+#: src/libqtevernote/notesstore.cpp:1792
462 msgid "Rate limit for Evernote server exceeded. Please try again later."
463 msgstr ""
464
465-#: src/libqtevernote/notesstore.cpp:1778
466+#: src/libqtevernote/notesstore.cpp:1795
467 msgid "Upload quota for Evernote server exceed. Please try again later."
468 msgstr ""
469
470-#: src/libqtevernote/notesstore.cpp:1817
471+#: src/libqtevernote/notesstore.cpp:1834
472 msgid ""
473 "This account is managed by Evernote. Please use the Evernote website to "
474 "delete tags."

Subscribers

People subscribed via source and target branches