ubuntu-touch-coreapps-reviewers team mailing list archive

[Michael Zanetti <michael.zanetti@xxxxxxxxxxxxx>]

Michael Zanetti has proposed merging lp:~mzanetti/reminders-app/translations-fixes into lp:reminders-app.

Commit message:
update translations

Requested reviews:
  Ubuntu Notes app developers (notes-app-dev)

For more details, see:
https://code.launchpad.net/~mzanetti/reminders-app/translations-fixes/+merge/295994
-- 
Your team Ubuntu Notes app developers is requested to review the proposed merge of lp:~mzanetti/reminders-app/translations-fixes into lp:reminders-app.

=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot	2015-09-21 16:40:11 +0000
+++ po/com.ubuntu.reminders.pot	2016-05-28 20:30:01 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the  package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,16 +8,16 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-21 18:39+0200\n"
+"POT-Creation-Date: 2016-05-28 22:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: com.ubuntu.reminders.desktop.in.in.h:1 src/app/qml/reminders.qml:562
+#: com.ubuntu.reminders.desktop.in.in.h:1 src/app/qml/Reminders.qml:559
 msgid "Notes"
 msgstr ""
 
@@ -25,6 +25,100 @@
 msgid "Ubuntu Notes app, powered by Evernote"
 msgstr ""
 
+#: src/app/qml/Reminders.qml:100 src/app/qml/Reminders.qml:263
+#: src/app/qml/Reminders.qml:268 src/app/qml/components/NoteHeader.qml:52
+#: src/app/qml/components/PageWithBottomEdge.qml:123
+#: src/app/qml/ui/EditNoteView.qml:42 src/app/qml/ui/NotesPage.qml:68
+msgid "Untitled"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:419
+msgid "Default notebook"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:537
+msgid "Select note to attach imported file"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:537
+msgid "Select note to attach imported files"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:587
+msgid "Notebooks"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:621
+msgid "Reminders"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:638 src/app/qml/components/NotesDelegate.qml:80
+msgid "Tags"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:651
+msgid "Accounts"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:670
+msgid ""
+"No note selected.\n"
+"Select a note to see it in detail."
+msgstr ""
+
+#: src/app/qml/Reminders.qml:713
+msgid "Sync with Evernote"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:714
+msgid "Notes can be stored on this device, or optionally synced with Evernote."
+msgstr ""
+
+#: src/app/qml/Reminders.qml:715
+msgid "To sync with Evernote, you need an Evernote account."
+msgstr ""
+
+#: src/app/qml/Reminders.qml:730
+msgid "Not Now"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:739
+msgid "Set Up…"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:754
+#, qt-format
+msgid "Importing %1 items"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:755
+msgid "Importing 1 item"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:757
+msgid ""
+"Do you want to create a new note for those items or do you want to attach "
+"them to an existing note?"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:758
+msgid ""
+"Do you want to create a new note for this item or do you want to attach it "
+"to an existing note?"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:764
+msgid "Create new note"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:769
+msgid "Attach to existing note"
+msgstr ""
+
+#: src/app/qml/Reminders.qml:774
+msgid "Cancel import"
+msgstr ""
+
 #: src/app/qml/components/ConflictDelegate.qml:35
 msgid "Notebook:"
 msgstr ""
@@ -45,34 +139,26 @@
 msgid "Enter a tag name or select one from the list to attach it to the note."
 msgstr ""
 
-#: src/app/qml/components/EditTagsDialog.qml:62
+#: src/app/qml/components/EditTagsDialog.qml:61
 msgid "Tag name"
 msgstr ""
 
-#: src/app/qml/components/EditTagsDialog.qml:142
-#: src/app/qml/ui/NotebooksPage.qml:209 src/app/qml/ui/TagsPage.qml:147
+#: src/app/qml/components/EditTagsDialog.qml:146
+#: src/app/qml/ui/NotebooksPage.qml:213 src/app/qml/ui/TagsPage.qml:147
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: Button to close the edit mode
 #. TRANSLATORS: Button to close the note viewer
-#: src/app/qml/components/EditTagsDialog.qml:190
-#: src/app/qml/ui/EditNoteView.qml:605 src/app/qml/ui/NoteView.qml:150
+#: src/app/qml/components/EditTagsDialog.qml:202
+#: src/app/qml/ui/EditNoteView.qml:604 src/app/qml/ui/NoteView.qml:150
 msgid "Close"
 msgstr ""
 
-#: src/app/qml/components/NoteHeader.qml:52
-#: src/app/qml/components/PageWithBottomEdge.qml:123
-#: src/app/qml/reminders.qml:100 src/app/qml/reminders.qml:266
-#: src/app/qml/reminders.qml:271 src/app/qml/ui/EditNoteView.qml:43
-#: src/app/qml/ui/NotesPage.qml:67
-msgid "Untitled"
-msgstr ""
-
 #. TRANSLATORS: Button that deletes a reminder
 #: src/app/qml/components/NotebooksDelegate.qml:36
 #: src/app/qml/components/NotesDelegate.qml:53
-#: src/app/qml/components/TagsDelegate.qml:34 src/app/qml/ui/NotesPage.qml:91
+#: src/app/qml/components/TagsDelegate.qml:34 src/app/qml/ui/NotesPage.qml:90
 #: src/app/qml/ui/SetReminderView.qml:76
 msgid "Delete"
 msgstr ""
@@ -94,13 +180,9 @@
 msgid "Reminder"
 msgstr ""
 
-#: src/app/qml/components/NotesDelegate.qml:80 src/app/qml/reminders.qml:641
-msgid "Tags"
-msgstr ""
-
 #. TRANSLATORS: Button to go from note viewer to note editor
 #: src/app/qml/components/NotesDelegate.qml:87 src/app/qml/ui/NoteView.qml:172
-#: src/app/qml/ui/NotesPage.qml:113
+#: src/app/qml/ui/NotesPage.qml:112
 msgid "Edit"
 msgstr ""
 
@@ -125,7 +207,7 @@
 msgstr ""
 
 #: src/app/qml/components/RemindersDelegate.qml:57
-#: src/app/qml/ui/NotesPage.qml:99
+#: src/app/qml/ui/NotesPage.qml:98
 msgid "Edit reminder"
 msgstr ""
 
@@ -170,124 +252,41 @@
 msgstr ""
 
 #: src/app/qml/components/ResolveConflictConfirmationDialog.qml:57
-#: src/app/qml/reminders.qml:744
 msgid "Yes"
 msgstr ""
 
 #: src/app/qml/components/ResolveConflictConfirmationDialog.qml:66
-#: src/app/qml/reminders.qml:734
 msgid "No"
 msgstr ""
 
-#: src/app/qml/components/SortingDialog.qml:20
+#: src/app/qml/components/SortingDialog.qml:9
 msgid "Sort by"
 msgstr ""
 
-#: src/app/qml/components/SortingDialog.qml:29
+#: src/app/qml/components/SortingDialog.qml:19
 msgid "Date created (newest first)"
 msgstr ""
 
-#: src/app/qml/components/SortingDialog.qml:30
+#: src/app/qml/components/SortingDialog.qml:20
 msgid "Date created (oldest first)"
 msgstr ""
 
-#: src/app/qml/components/SortingDialog.qml:31
+#: src/app/qml/components/SortingDialog.qml:21
 msgid "Date updated (newest first)"
 msgstr ""
 
-#: src/app/qml/components/SortingDialog.qml:32
+#: src/app/qml/components/SortingDialog.qml:22
 msgid "Date updated (oldest first)"
 msgstr ""
 
-#: src/app/qml/components/SortingDialog.qml:33
+#: src/app/qml/components/SortingDialog.qml:23
 msgid "Title (ascending)"
 msgstr ""
 
-#: src/app/qml/components/SortingDialog.qml:34
+#: src/app/qml/components/SortingDialog.qml:24
 msgid "Title (descending)"
 msgstr ""
 
-#: src/app/qml/reminders.qml:422
-msgid "Default notebook"
-msgstr ""
-
-#: src/app/qml/reminders.qml:540
-msgid "Select note to attach imported file"
-msgstr ""
-
-#: src/app/qml/reminders.qml:540
-msgid "Select note to attach imported files"
-msgstr ""
-
-#: src/app/qml/reminders.qml:590
-msgid "Notebooks"
-msgstr ""
-
-#: src/app/qml/reminders.qml:624
-msgid "Reminders"
-msgstr ""
-
-#: src/app/qml/reminders.qml:654
-msgid "Accounts"
-msgstr ""
-
-#: src/app/qml/reminders.qml:673
-msgid ""
-"No note selected.\n"
-"Select a note to see it in detail."
-msgstr ""
-
-#: src/app/qml/reminders.qml:716
-msgid "Setup Evernote connection?"
-msgstr ""
-
-#: src/app/qml/reminders.qml:717
-msgid "Notes can be stored on this device, or optionally synced with Evernote."
-msgstr ""
-
-#: src/app/qml/reminders.qml:718
-msgid ""
-"In order to synchronize notes with Evernote, an account at Evernote is "
-"required."
-msgstr ""
-
-#: src/app/qml/reminders.qml:719
-msgid "Do you want to setup an account now?"
-msgstr ""
-
-#: src/app/qml/reminders.qml:759
-#, qt-format
-msgid "Importing %1 items"
-msgstr ""
-
-#: src/app/qml/reminders.qml:760
-msgid "Importing 1 item"
-msgstr ""
-
-#: src/app/qml/reminders.qml:762
-msgid ""
-"Do you want to create a new note for those items or do you want to attach "
-"them to an existing note?"
-msgstr ""
-
-#: src/app/qml/reminders.qml:763
-msgid ""
-"Do you want to create a new note for this item or do you want to attach it "
-"to an existing note?"
-msgstr ""
-
-#: src/app/qml/reminders.qml:769
-msgid "Create new note"
-msgstr ""
-
-#: src/app/qml/reminders.qml:774
-msgid "Attach to existing note"
-msgstr ""
-
-#: src/app/qml/reminders.qml:779
-msgid "Cancel import"
-msgstr ""
-
 #: src/app/qml/ui/AccountSelectorPage.qml:29
 msgid "Select account"
 msgstr ""
@@ -309,31 +308,31 @@
 msgid "Add new account"
 msgstr ""
 
-#: src/app/qml/ui/EditNoteView.qml:425
+#: src/app/qml/ui/EditNoteView.qml:424
 msgid "Font"
 msgstr ""
 
-#: src/app/qml/ui/EditNoteView.qml:437
+#: src/app/qml/ui/EditNoteView.qml:436
 msgid "Size"
 msgstr ""
 
 #. TRANSLATORS: Toolbar button for "Bold"
-#: src/app/qml/ui/EditNoteView.qml:460
+#: src/app/qml/ui/EditNoteView.qml:459
 msgid "B"
 msgstr ""
 
 #. TRANSLATORS: Toolbar button for "Italic"
-#: src/app/qml/ui/EditNoteView.qml:473
+#: src/app/qml/ui/EditNoteView.qml:472
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: Toolbar button for "Underline"
-#: src/app/qml/ui/EditNoteView.qml:487
+#: src/app/qml/ui/EditNoteView.qml:486
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: Toolbar button for "Strikeout"
-#: src/app/qml/ui/EditNoteView.qml:501
+#: src/app/qml/ui/EditNoteView.qml:500
 msgid "T"
 msgstr ""
 
@@ -343,8 +342,8 @@
 
 #: src/app/qml/ui/NoteConflictView.qml:54
 msgid ""
-"This note has been modified in multiple places. Please choose the version to "
-"be opened and delete the other."
+"This note has been modified in multiple places. Open each version to check "
+"the content, then swipe to delete one of them."
 msgstr ""
 
 #: src/app/qml/ui/NoteConflictView.qml:63
@@ -371,7 +370,7 @@
 msgid "Add notebook"
 msgstr ""
 
-#: src/app/qml/ui/NotebooksPage.qml:52 src/app/qml/ui/NotesPage.qml:84
+#: src/app/qml/ui/NotebooksPage.qml:52 src/app/qml/ui/NotesPage.qml:83
 #: src/app/qml/ui/RemindersPage.qml:36 src/app/qml/ui/SearchNotesPage.qml:60
 #: src/app/qml/ui/TagsPage.qml:52
 msgid "Search"
@@ -382,36 +381,36 @@
 msgstr ""
 
 #. TRANSLATORS: Button that saves a reminder
-#: src/app/qml/ui/NotebooksPage.qml:175 src/app/qml/ui/SetReminderView.qml:88
+#: src/app/qml/ui/NotebooksPage.qml:178 src/app/qml/ui/SetReminderView.qml:88
 msgid "Save"
 msgstr ""
 
-#: src/app/qml/ui/NotebooksPage.qml:195
+#: src/app/qml/ui/NotebooksPage.qml:199
 msgid "Rename notebook"
 msgstr ""
 
-#: src/app/qml/ui/NotebooksPage.qml:196
+#: src/app/qml/ui/NotebooksPage.qml:200
 #, qt-format
 msgid "Enter a new name for notebook %1"
 msgstr ""
 
-#: src/app/qml/ui/NotebooksPage.qml:205 src/app/qml/ui/TagsPage.qml:143
+#: src/app/qml/ui/NotebooksPage.qml:209 src/app/qml/ui/TagsPage.qml:143
 msgid "Name cannot be empty"
 msgstr ""
 
-#: src/app/qml/ui/NotesPage.qml:43 src/app/qml/ui/NotesPage.qml:64
+#: src/app/qml/ui/NotesPage.qml:44 src/app/qml/ui/NotesPage.qml:65
 msgid "Add note"
 msgstr ""
 
-#: src/app/qml/ui/NotesPage.qml:72
+#: src/app/qml/ui/NotesPage.qml:73
 msgid "Sorting"
 msgstr ""
 
-#: src/app/qml/ui/NotesPage.qml:99
+#: src/app/qml/ui/NotesPage.qml:98
 msgid "Set reminder"
 msgstr ""
 
-#: src/app/qml/ui/NotesPage.qml:243
+#: src/app/qml/ui/NotesPage.qml:249
 msgid ""
 "No notes available. You can create new notes by pulling the note editor up "
 "from the bottom edge."
@@ -485,7 +484,7 @@
 msgstr ""
 
 #: src/libqtevernote/evernoteconnection.cpp:329
-#: src/libqtevernote/notesstore.cpp:1772
+#: src/libqtevernote/notesstore.cpp:1789
 msgid ""
 "Authentication for Evernote server expired. Please renew login information "
 "in the accounts settings."
@@ -599,27 +598,27 @@
 msgid "on %1 %2"
 msgstr ""
 
-#: src/libqtevernote/notesstore.cpp:415
+#: src/libqtevernote/notesstore.cpp:432
 msgid ""
 "This account is managed by Evernote. Use the Evernote website to delete "
 "notebooks."
 msgstr ""
 
-#: src/libqtevernote/notesstore.cpp:429
+#: src/libqtevernote/notesstore.cpp:446
 msgid ""
 "Cannot delete the default notebook. Set another notebook to be the default "
 "first."
 msgstr ""
 
-#: src/libqtevernote/notesstore.cpp:1775
+#: src/libqtevernote/notesstore.cpp:1792
 msgid "Rate limit for Evernote server exceeded. Please try again later."
 msgstr ""
 
-#: src/libqtevernote/notesstore.cpp:1778
+#: src/libqtevernote/notesstore.cpp:1795
 msgid "Upload quota for Evernote server exceed. Please try again later."
 msgstr ""
 
-#: src/libqtevernote/notesstore.cpp:1817
+#: src/libqtevernote/notesstore.cpp:1834
 msgid ""
 "This account is managed by Evernote. Please use the Evernote website to "
 "delete tags."