Ubuntu Notes app

Merge lp:~rpadovani/reminders-app/translationsUpdate into lp:reminders-app

  1. translationsUpdate
  2. Merge into trunk
Proposed by Riccardo Padovani
Status: Merged
Approved by: David Planella
Approved revision: 194
Merged at revision: 195
Proposed branch: lp:~rpadovani/reminders-app/translationsUpdate
Merge into: lp:reminders-app
Diff against target: 331 lines (+85/-61)
3 files modified
po/com.ubuntu.reminders.pot (+83/-59)
src/app/qml/components/PulldownListView.qml (+1/-1)
src/app/qml/reminders.qml (+1/-1)
To merge this branch: bzr merge lp:~rpadovani/reminders-app/translationsUpdate
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+227999@code.launchpad.net

Commit message

Added a couple of new i18n.tr, updated the translations template

Description of the change

Added a couple of new i18n.tr, updated the translations template

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

PASSED: Continuous integration, rev:193
http://91.189.93.70:8080/job/reminders-app-ci/464/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1120
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/160

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/464/rebuild

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Thanks! Just a small nitpick: see the inline comment about the copyright notice on the .pot file.

review: Needs Fixing
lp:~rpadovani/reminders-app/translationsUpdate updated
194. By Riccardo Padovani

Fixed copyright in translations template

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:194
http://91.189.93.70:8080/job/reminders-app-ci/465/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1126
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/161

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/465/rebuild

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot 2014-05-15 09:27:34 +0000
+++ po/com.ubuntu.reminders.pot 2014-07-24 10:32:59 +0000
@@ -1,4 +1,4 @@
1# reminders-app translations.1# reminders-app translations
2# Copyright (C) 2014 Canonical Ltd.2# Copyright (C) 2014 Canonical Ltd.
3# This file is distributed under the same license as the reminders-app package.3# This file is distributed under the same license as the reminders-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: com.ubuntu.reminders\n"9"Project-Id-Version: com.ubuntu.reminders\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-05-15 11:25+0200\n"11"POT-Creation-Date: 2014-07-23 23:40+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,48 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../src/app/qml/reminders.qml:19620#: ../src/app/qml/reminders.qml:201
21msgid "Notes"21msgid "Notes"
22msgstr ""22msgstr ""
2323
24#: ../src/app/qml/reminders.qml:22524#: ../src/app/qml/reminders.qml:230
25msgid "Notebooks"25msgid "Notebooks"
26msgstr ""26msgstr ""
2727
28#: ../src/app/qml/reminders.qml:25328#: ../src/app/qml/reminders.qml:258
29#: ../.build/com.ubuntu.reminders.desktop.js:129#: ../.build/com.ubuntu.reminders.desktop.js:1
30msgid "Reminders"30msgid "Reminders"
31msgstr ""31msgstr ""
3232
33#: ../src/app/qml/reminders.qml:31033#: ../src/app/qml/reminders.qml:278
34msgid ""
35"No note selected.\n"
36"Select a note to see it in detail."
37msgstr ""
38
39#: ../src/app/qml/reminders.qml:315
34msgid "No account available"40msgid "No account available"
35msgstr ""41msgstr ""
3642
37#: ../src/app/qml/reminders.qml:31143#: ../src/app/qml/reminders.qml:316
38msgid "Please setup an account in the system settings"44msgid "Please setup an account in the system settings"
39msgstr ""45msgstr ""
4046
41#: ../src/app/qml/reminders.qml:32547#: ../src/app/qml/reminders.qml:336
42msgid "Open account settings"48#: ../src/app/qml/ui/AccountSelectorPage.qml:63
49msgid "Add account"
43msgstr ""50msgstr ""
4451
45#: ../src/app/qml/components/NotebooksDelegate.qml:6652#: ../src/app/qml/components/NotebooksDelegate.qml:68
46#, qt-format53#, qt-format
47msgid "Last edited %1"54msgid "Last edited %1"
48msgstr ""55msgstr ""
4956
50#: ../src/app/qml/components/NotebooksDelegate.qml:7257#: ../src/app/qml/components/NotebooksDelegate.qml:75
51msgid "Shared"58msgid "Shared"
52msgstr ""59msgstr ""
5360
54#: ../src/app/qml/components/NotebooksDelegate.qml:7261#: ../src/app/qml/components/NotebooksDelegate.qml:75
55msgid "Private"62msgid "Private"
56msgstr ""63msgstr ""
5764
@@ -59,12 +66,16 @@
59msgid "Release to refresh"66msgid "Release to refresh"
60msgstr ""67msgstr ""
6168
62#: ../src/app/qml/components/RemindersDelegate.qml:5169#: ../src/app/qml/components/PulldownListView.qml:40
70msgid "Pull down to refresh"
71msgstr ""
72
73#: ../src/app/qml/components/RemindersDelegate.qml:50
63#: ../src/app/qml/ui/SetReminderView.qml:5574#: ../src/app/qml/ui/SetReminderView.qml:55
64msgid "Clear reminder"75msgid "Clear reminder"
65msgstr ""76msgstr ""
6677
67#: ../src/app/qml/components/RemindersDelegate.qml:5178#: ../src/app/qml/components/RemindersDelegate.qml:50
68msgid "Mark as done"79msgid "Mark as done"
69msgstr ""80msgstr ""
7081
@@ -76,69 +87,65 @@
76msgid "Use it!"87msgid "Use it!"
77msgstr ""88msgstr ""
7889
79#: ../src/app/qml/ui/EditNoteView.qml:9090#: ../src/app/qml/ui/EditNoteView.qml:98
80#: ../src/app/qml/ui/EditNoteView.qml:10291#: ../src/app/qml/ui/EditNoteView.qml:110
81msgid "Untitled"92msgid "Untitled"
82msgstr ""93msgstr ""
8394
84#: ../src/app/qml/ui/NotePage.qml:33 ../src/app/qml/ui/NotesPage.qml:7195#: ../src/app/qml/ui/NotePage.qml:34 ../src/app/qml/ui/NotesPage.qml:112
85msgid "Delete"96msgid "Edit"
86msgstr ""97msgstr ""
8798
88#: ../src/app/qml/ui/NotePage.qml:42 ../src/app/qml/ui/NotesPage.qml:7999#: ../src/app/qml/ui/NotePage.qml:43 ../src/app/qml/ui/NotesPage.qml:96
89msgid "Edit reminder"100msgid "Edit reminder"
90msgstr ""101msgstr ""
91102
92#: ../src/app/qml/ui/NotePage.qml:42 ../src/app/qml/ui/NotesPage.qml:79103#: ../src/app/qml/ui/NotePage.qml:43 ../src/app/qml/ui/NotesPage.qml:96
93#: ../src/app/qml/ui/SetReminderView.qml:66104#: ../src/app/qml/ui/SetReminderView.qml:66
94msgid "Set reminder"105msgid "Set reminder"
95msgstr ""106msgstr ""
96107
97#: ../src/app/qml/ui/NotePage.qml:54 ../src/app/qml/ui/NotesPage.qml:93108#: ../src/app/qml/ui/NotePage.qml:57 ../src/app/qml/ui/NotesPage.qml:86
98msgid "Edit"109msgid "Delete"
99msgstr ""110msgstr ""
100111
101#: ../src/app/qml/ui/NotebooksPage.qml:38 ../src/app/qml/ui/NotesPage.qml:44112#: ../src/app/qml/ui/NotebooksPage.qml:41
102#: ../src/app/qml/ui/RemindersPage.qml:33113msgid "Add notebook"
103#: ../src/app/qml/ui/SearchNotesPage.qml:56114msgstr ""
115
116#: ../src/app/qml/ui/NotebooksPage.qml:51 ../src/app/qml/ui/NotesPage.qml:55
117#: ../src/app/qml/ui/RemindersPage.qml:34
118#: ../src/app/qml/ui/SearchNotesPage.qml:58
104msgid "Search"119msgid "Search"
105msgstr ""120msgstr ""
106121
107#: ../src/app/qml/ui/NotebooksPage.qml:46 ../src/app/qml/ui/NotesPage.qml:52122#: ../src/app/qml/ui/NotebooksPage.qml:61 ../src/app/qml/ui/NotesPage.qml:65
108msgid "Refresh"123msgid "Refresh"
109msgstr ""124msgstr ""
110125
111#: ../src/app/qml/ui/NotebooksPage.qml:56 ../src/app/qml/ui/NotesPage.qml:60126#: ../src/app/qml/ui/NotebooksPage.qml:71 ../src/app/qml/ui/NotesPage.qml:75
112#: ../src/app/qml/ui/RemindersPage.qml:43127#: ../src/app/qml/ui/RemindersPage.qml:44
113msgid "Accounts"128msgid "Accounts"
114msgstr ""129msgstr ""
115130
116#: ../src/app/qml/ui/NotebooksPage.qml:65131#: ../src/app/qml/ui/NotebooksPage.qml:173
117msgid "Add notebook"
118msgstr ""
119
120#: ../src/app/qml/ui/NotebooksPage.qml:164
121msgid "Cancel"132msgid "Cancel"
122msgstr ""133msgstr ""
123134
124#: ../src/app/qml/ui/NotebooksPage.qml:172135#: ../src/app/qml/ui/NotebooksPage.qml:182
125msgid "Save"136msgid "Save"
126msgstr ""137msgstr ""
127138
128#: ../src/app/qml/ui/NotesPage.qml:103139#: ../src/app/qml/ui/NotesPage.qml:45
129msgid "Add note"140msgid "Add note"
130msgstr ""141msgstr ""
131142
132#: ../src/app/qml/ui/NotesPage.qml:173143#: ../src/app/qml/ui/NotesPage.qml:185
133msgid ""144msgid ""
134"No notes available. You can create new notes using the \"Add note\" button."145"No notes available. You can create new notes using the \"Add note\" button."
135msgstr ""146msgstr ""
136147
137#: ../src/app/qml/ui/RemindersPage.qml:52148#: ../src/app/qml/ui/RemindersPage.qml:108
138msgid "Add reminder"
139msgstr ""
140
141#: ../src/app/qml/ui/RemindersPage.qml:113
142msgid ""149msgid ""
143"No reminders available. You can create new reminders using the \"Add reminder"150"No reminders available. You can create new reminders using the \"Add reminder"
144"\" button or by setting a reminder when viewing a note."151"\" button or by setting a reminder when viewing a note."
@@ -148,7 +155,7 @@
148msgid "Select date and time for the reminder:"155msgid "Select date and time for the reminder:"
149msgstr ""156msgstr ""
150157
151#: ../src/plugin/Evernote/note.cpp:82 ../src/plugin/Evernote/note.cpp:239158#: ../src/plugin/Evernote/note.cpp:82 ../src/plugin/Evernote/note.cpp:240
152msgid "Today"159msgid "Today"
153msgstr ""160msgstr ""
154161
@@ -164,72 +171,89 @@
164msgid "Two weeks ago"171msgid "Two weeks ago"
165msgstr ""172msgstr ""
166173
167#: ../src/plugin/Evernote/note.cpp:94174#. TRANSLATORS: the first argument refers to a month name and the second to a year
175#: ../src/plugin/Evernote/note.cpp:95
168#, qt-format176#, qt-format
169msgid "%1 %2"177msgid "%1 %2"
170msgstr ""178msgstr ""
171179
172#: ../src/plugin/Evernote/note.cpp:227180#: ../src/plugin/Evernote/note.cpp:228
173msgid "Done"181msgid "Done"
174msgstr ""182msgstr ""
175183
176#: ../src/plugin/Evernote/note.cpp:233184#: ../src/plugin/Evernote/note.cpp:234
177msgid "No date"185msgid "No date"
178msgstr ""186msgstr ""
179187
180#: ../src/plugin/Evernote/note.cpp:236188#: ../src/plugin/Evernote/note.cpp:237
181msgid "Overdue"189msgid "Overdue"
182msgstr ""190msgstr ""
183191
184#: ../src/plugin/Evernote/note.cpp:242192#: ../src/plugin/Evernote/note.cpp:243
185msgid "Tomorrow"193msgid "Tomorrow"
186msgstr ""194msgstr ""
187195
188#: ../src/plugin/Evernote/note.cpp:245196#: ../src/plugin/Evernote/note.cpp:246
189msgid "Next week"197msgid "Next week"
190msgstr ""198msgstr ""
191199
192#: ../src/plugin/Evernote/note.cpp:248200#: ../src/plugin/Evernote/note.cpp:249
193msgid "In two weeks"201msgid "In two weeks"
194msgstr ""202msgstr ""
195203
196#: ../src/plugin/Evernote/note.cpp:250204#: ../src/plugin/Evernote/note.cpp:251
197msgid "Later"205msgid "Later"
198msgstr ""206msgstr ""
199207
200#. TRANSLATORS: this is part of a longer string - "Last updated: today"208#. TRANSLATORS: this is part of a longer string - "Last updated: today"
201#: ../src/plugin/Evernote/notebook.cpp:99209#: ../src/plugin/Evernote/notebook.cpp:100
202msgid "today"210msgid "today"
203msgstr ""211msgstr ""
204212
205#. TRANSLATORS: this is part of a longer string - "Last updated: yesterday"213#. TRANSLATORS: this is part of a longer string - "Last updated: yesterday"
206#: ../src/plugin/Evernote/notebook.cpp:103214#: ../src/plugin/Evernote/notebook.cpp:104
207msgid "yesterday"215msgid "yesterday"
208msgstr ""216msgstr ""
209217
210#. TRANSLATORS: this is part of a longer string - "Last updated: last week"218#. TRANSLATORS: this is part of a longer string - "Last updated: last week"
211#: ../src/plugin/Evernote/notebook.cpp:107219#: ../src/plugin/Evernote/notebook.cpp:108
212msgid "last week"220msgid "last week"
213msgstr ""221msgstr ""
214222
215#. TRANSLATORS: this is part of a longer string - "Last updated: two weeks ago"223#. TRANSLATORS: this is part of a longer string - "Last updated: two weeks ago"
216#: ../src/plugin/Evernote/notebook.cpp:111224#: ../src/plugin/Evernote/notebook.cpp:112
217msgid "two weeks ago"225msgid "two weeks ago"
218msgstr ""226msgstr ""
219227
220#. TRANSLATORS: this is used in the notes list to group notes created on the same month228#. TRANSLATORS: this is used in the notes list to group notes created on the same month
221#. the first parameter refers to a month name and the second to a year229#. the first parameter refers to a month name and the second to a year
222#: ../src/plugin/Evernote/notebook.cpp:115230#: ../src/plugin/Evernote/notebook.cpp:116
223#, qt-format231#, qt-format
224msgid "on %1 %2"232msgid "on %1 %2"
225msgstr ""233msgstr ""
226234
227#: ../src/plugin/Evernote/notesstore.cpp:217235#: ../src/plugin/Evernote/notesstore.cpp:223
228#, qt-format236#, qt-format
229msgid "Error refreshing notes: %1"237msgid "Error refreshing notes: %1"
230msgstr ""238msgstr ""
231239
232#: ../src/plugin/Evernote/notesstore.cpp:368240#: ../src/plugin/Evernote/notesstore.cpp:375
233#, qt-format241#, qt-format
234msgid "Error refreshing notebooks: %1"242msgid "Error refreshing notebooks: %1"
235msgstr ""243msgstr ""
244
245#: ../src/plugin/Evernote/jobs/evernotejob.cpp:87
246msgid "Authentication expired."
247msgstr ""
248
249#: ../src/plugin/Evernote/jobs/evernotejob.cpp:91
250msgid "Limit exceeded."
251msgstr ""
252
253#: ../src/plugin/Evernote/jobs/evernotejob.cpp:95
254msgid "Rate limit exceeded."
255msgstr ""
256
257#: ../src/plugin/Evernote/jobs/evernotejob.cpp:99
258msgid "Quota exceeded."
259msgstr ""
236260
=== modified file 'src/app/qml/components/PulldownListView.qml'
--- src/app/qml/components/PulldownListView.qml 2014-05-14 12:59:20 +0000
+++ src/app/qml/components/PulldownListView.qml 2014-07-24 10:32:59 +0000
@@ -37,7 +37,7 @@
37 anchors.bottom: root.contentItem.top;37 anchors.bottom: root.contentItem.top;
38 fontSize: 'medium'38 fontSize: 'medium'
39 horizontalAlignment: Text.AlignHCenter39 horizontalAlignment: Text.AlignHCenter
40 text: priv.toBeReloaded ? i18n.tr("Release to refresh") : ("Pull down to refresh")40 text: priv.toBeReloaded ? i18n.tr("Release to refresh") : i18n.tr("Pull down to refresh")
41 color: "#b3b3b3" 41 color: "#b3b3b3"
42 }42 }
4343
4444
=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml 2014-07-08 12:21:36 +0000
+++ src/app/qml/reminders.qml 2014-07-24 10:32:59 +0000
@@ -275,7 +275,7 @@
275 anchors.centerIn: parent275 anchors.centerIn: parent
276 anchors.horizontalCenterOffset: pagestack.width / 2276 anchors.horizontalCenterOffset: pagestack.width / 2
277 visible: !root.narrowMode277 visible: !root.narrowMode
278 text: "No note selected.\nSelect a note to see it in detail."278 text: i18n.tr("No note selected.\nSelect a note to see it in detail.")
279 wrapMode: Text.WordWrap279 wrapMode: Text.WordWrap
280 horizontalAlignment: Text.AlignHCenter280 horizontalAlignment: Text.AlignHCenter
281 fontSize: "large"281 fontSize: "large"

Subscribers

People subscribed via source and target branches