From 32cbe9fd0b9786eccbad33e6d4722ad4eb9be346 Mon Sep 17 00:00:00 2001 From: Stefan Hammer Date: Sun, 5 Jan 2014 12:41:04 +0100 Subject: [PATCH] Added more translator comments --- locales/tomdroid.pot | 202 +++++++++++++++++++++-------------------- res/values/strings.xml | 4 + 2 files changed, 107 insertions(+), 99 deletions(-) diff --git a/locales/tomdroid.pot b/locales/tomdroid.pot index 3be255b..62d0949 100644 --- a/locales/tomdroid.pot +++ b/locales/tomdroid.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-01-05 11:54+0100\n" +"POT-Creation-Date: 2014-01-05 12:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgstr "" msgid "Olivier Bilodeau" msgstr "" -#: tmp_strings.xml:32(g) tmp_strings.xml:61(g) tmp_strings.xml:78(g) tmp_strings.xml:256(g) tmp_strings.xml:257(g) tmp_strings.xml:258(g) tmp_strings.xml:259(g) +#: tmp_strings.xml:32(g) tmp_strings.xml:61(g) tmp_strings.xml:78(g) tmp_strings.xml:257(g) tmp_strings.xml:259(g) tmp_strings.xml:261(g) tmp_strings.xml:263(g) msgid "…" msgstr "" @@ -54,7 +54,7 @@ msgstr "" msgid "Warning" msgstr "" -#: tmp_strings.xml:44(g) tmp_strings.xml:84(g) tmp_strings.xml:86(g) tmp_strings.xml:255(g) tmp_strings.xml:278(g) tmp_strings.xml:286(g) tmp_strings.xml:290(g) tmp_strings.xml:292(g) tmp_strings.xml:294(g) tmp_strings.xml:296(g) tmp_strings.xml:298(g) tmp_strings.xml:300(g) tmp_strings.xml:302(g) tmp_strings.xml:304(g) tmp_strings.xml:306(g) tmp_strings.xml:308(g) tmp_strings.xml:310(g) tmp_strings.xml:312(g) +#: tmp_strings.xml:44(g) tmp_strings.xml:84(g) tmp_strings.xml:86(g) tmp_strings.xml:255(g) tmp_strings.xml:282(g) tmp_strings.xml:290(g) tmp_strings.xml:294(g) tmp_strings.xml:296(g) tmp_strings.xml:298(g) tmp_strings.xml:300(g) tmp_strings.xml:302(g) tmp_strings.xml:304(g) tmp_strings.xml:306(g) tmp_strings.xml:308(g) tmp_strings.xml:310(g) tmp_strings.xml:312(g) tmp_strings.xml:314(g) tmp_strings.xml:316(g) msgid "%1$s" msgstr "" @@ -67,7 +67,7 @@ msgstr "" msgid "\\n\\n" msgstr "" -#: tmp_strings.xml:46(g) tmp_strings.xml:266(g) tmp_strings.xml:268(g) tmp_strings.xml:270(g) tmp_strings.xml:272(g) tmp_strings.xml:353(g) tmp_strings.xml:366(g) tmp_strings.xml:369(g) tmp_strings.xml:376(g) tmp_strings.xml:378(g) tmp_strings.xml:380(g) tmp_strings.xml:384(g) tmp_strings.xml:386(g) +#: tmp_strings.xml:46(g) tmp_strings.xml:270(g) tmp_strings.xml:272(g) tmp_strings.xml:274(g) tmp_strings.xml:276(g) tmp_strings.xml:357(g) tmp_strings.xml:370(g) tmp_strings.xml:373(g) tmp_strings.xml:380(g) tmp_strings.xml:382(g) tmp_strings.xml:384(g) tmp_strings.xml:388(g) tmp_strings.xml:390(g) msgid "\\n" msgstr "" @@ -99,12 +99,12 @@ msgid "OK" msgstr "" #. negative Button -#: tmp_strings.xml:53(string) tmp_strings.xml:288(string) +#: tmp_strings.xml:53(string) tmp_strings.xml:292(string) msgid "Cancel" msgstr "" #. Button -#: tmp_strings.xml:55(string) tmp_strings.xml:287(string) +#: tmp_strings.xml:55(string) tmp_strings.xml:291(string) msgid "Close" msgstr "" @@ -676,422 +676,426 @@ msgstr "" msgid "Syncing with " msgstr "" -#: tmp_strings.xml:256(string) +#. placeholder-1 is "..." +#: tmp_strings.xml:257(string) msgid "connecting to service" msgstr "" -#: tmp_strings.xml:257(string) +#. placeholder-1 is "..." +#: tmp_strings.xml:259(string) msgid "getting list of remote notes" msgstr "" -#: tmp_strings.xml:258(string) +#. placeholder-1 is "..." +#: tmp_strings.xml:261(string) msgid "updating local notes" msgstr "" -#: tmp_strings.xml:259(string) +#. placeholder-1 is "..." +#: tmp_strings.xml:263(string) msgid "updating remote notes" msgstr "" -#: tmp_strings.xml:261(g) tmp_strings.xml:319(g) +#: tmp_strings.xml:265(g) tmp_strings.xml:323(g) msgid "'%1$s'" msgstr "" #. placeholder-1 will be replaced with the note title -#: tmp_strings.xml:261(string) +#: tmp_strings.xml:265(string) msgid "There was a conflict syncing the note " msgstr "" -#: tmp_strings.xml:262(string) +#: tmp_strings.xml:266(string) msgid "Please choose an action to resolve the conflict. You may edit either note before choosing, or view the difference by clicking on the labels below." msgstr "" -#: tmp_strings.xml:263(string) +#: tmp_strings.xml:267(string) msgid "The local version was already deleted. Please choose from one of the actions below." msgstr "" -#: tmp_strings.xml:264(string) +#: tmp_strings.xml:268(string) msgid "A note with that title already exists in the database. Please choose an action to resolve the conflict. You may edit either note before choosing, or view the difference by clicking on the labels below." msgstr "" #. Button (keep short!), placeholder is a linebreak -#: tmp_strings.xml:266(string) +#: tmp_strings.xml:270(string) msgid "OverwriteRemote" msgstr "" #. Button (keep short!), placeholder is a linebreak -#: tmp_strings.xml:268(string) +#: tmp_strings.xml:272(string) msgid "OverwriteLocal" msgstr "" #. Button (keep short!), placeholder is a linebreak -#: tmp_strings.xml:270(string) +#: tmp_strings.xml:274(string) msgid "DeleteRemote" msgstr "" #. Button (keep short!), placeholder is a linebreak -#: tmp_strings.xml:272(string) +#: tmp_strings.xml:276(string) msgid "CreateCopy" msgstr "" #. subheader in Conflict dialog (keep short!) -#: tmp_strings.xml:274(string) +#: tmp_strings.xml:278(string) msgid "Difference Between Files" msgstr "" -#: tmp_strings.xml:275(g) tmp_strings.xml:275(g) tmp_strings.xml:276(g) tmp_strings.xml:276(g) +#: tmp_strings.xml:279(g) tmp_strings.xml:279(g) tmp_strings.xml:280(g) tmp_strings.xml:280(g) msgid "--" msgstr "" -#: tmp_strings.xml:275(string) +#: tmp_strings.xml:279(string) msgid "Title Differences" msgstr "" -#: tmp_strings.xml:276(string) +#: tmp_strings.xml:280(string) msgid "Content Differences" msgstr "" #. placeholder-1 will be replaced with a number. -#: tmp_strings.xml:278(string) +#: tmp_strings.xml:282(string) msgid "Line :" msgstr "" #. subheader in Conflict dialog (keep short!) -#: tmp_strings.xml:280(string) +#: tmp_strings.xml:284(string) msgid "Local Version" msgstr "" #. subheader in Conflict dialog (keep short!) -#: tmp_strings.xml:282(string) +#: tmp_strings.xml:286(string) msgid "Remote Version" msgstr "" -#: tmp_strings.xml:283(string) +#: tmp_strings.xml:287(string) msgid "Deleted" msgstr "" #. placeholder-1 will be replaced with a note title. -#: tmp_strings.xml:286(string) +#: tmp_strings.xml:290(string) msgid " (old)" msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:290(string) +#: tmp_strings.xml:294(string) msgid "Authorization with successful." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:292(string) +#: tmp_strings.xml:296(string) msgid "Authorization with failed. Try again later!" msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:294(string) +#: tmp_strings.xml:298(string) msgid "Note deleted from successfully." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:296(string) +#: tmp_strings.xml:300(string) msgid "Note sent to successfully." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:298(string) +#: tmp_strings.xml:302(string) msgid "Note received from successfully." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:300(string) +#: tmp_strings.xml:304(string) msgid "Error deleting note from ." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:302(string) +#: tmp_strings.xml:306(string) msgid "Error sending note to ." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:304(string) +#: tmp_strings.xml:308(string) msgid "Error receiving note from ." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:306(string) +#: tmp_strings.xml:310(string) msgid "Error parsing response from ." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:308(string) +#: tmp_strings.xml:312(string) msgid "Error connecting to . You probably need to authenticate in \"Settings\"." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:310(string) +#: tmp_strings.xml:314(string) msgid "Notes deleted from successfully." msgstr "" #. placeholder-1 will be replaced with "Online Synchronization", "SD Card"... -#: tmp_strings.xml:312(string) +#: tmp_strings.xml:316(string) msgid "Sync with cancelled." msgstr "" #. menu items -#: tmp_strings.xml:316(string) +#: tmp_strings.xml:320(string) msgid "Edit Tags" msgstr "" -#: tmp_strings.xml:317(string) +#: tmp_strings.xml:321(string) msgid "Revert" msgstr "" #. placeholder-1 will be replaced with note-tag names -#: tmp_strings.xml:319(string) +#: tmp_strings.xml:323(string) msgid "Note Tags" msgstr "" -#: tmp_strings.xml:320(string) +#: tmp_strings.xml:324(string) msgid "Edit the tags below, separating with commas" msgstr "" -#: tmp_strings.xml:321(string) +#: tmp_strings.xml:325(string) msgid "Undelete Note" msgstr "" #. menu item with icon -#: tmp_strings.xml:323(string) +#: tmp_strings.xml:327(string) msgid "Import Note" msgstr "" #. menu item with icon -#: tmp_strings.xml:328(string) +#: tmp_strings.xml:332(string) msgid "Revert All" msgstr "" -#: tmp_strings.xml:329(string) +#: tmp_strings.xml:333(string) msgid "Revert Notes" msgstr "" -#: tmp_strings.xml:330(string) +#: tmp_strings.xml:334(string) msgid "This will revert your local notes to whatever versions exist on the remote service. Are you sure you want to do this?" msgstr "" -#: tmp_strings.xml:331(string) +#: tmp_strings.xml:335(string) msgid "Revert Note" msgstr "" -#: tmp_strings.xml:332(string) +#: tmp_strings.xml:336(string) msgid "This will revert a local note to whatever version exist on the remote service. Are you sure you want to do this?" msgstr "" #. backup notes -#: tmp_strings.xml:336(string) +#: tmp_strings.xml:340(string) msgid "Backup Notes?" msgstr "" -#: tmp_strings.xml:337(string) +#: tmp_strings.xml:341(string) msgid "Copy all local notes to SD Card? This may overwrite existing notes on the SD Card." msgstr "" -#: tmp_strings.xml:338(string) +#: tmp_strings.xml:342(string) msgid "Restore Notes" msgstr "" -#: tmp_strings.xml:339(string) +#: tmp_strings.xml:343(string) msgid "Restore Notes?" msgstr "" -#: tmp_strings.xml:340(string) +#: tmp_strings.xml:344(string) msgid "Pull all notes from SD Card? This may overwrite your existing notes." msgstr "" -#: tmp_strings.xml:341(string) +#: tmp_strings.xml:345(string) msgid "Notes backed up to SD card successfully." msgstr "" -#: tmp_strings.xml:342(string) +#: tmp_strings.xml:346(string) msgid "Notes restored from SD card successfully." msgstr "" -#: tmp_strings.xml:343(string) +#: tmp_strings.xml:347(string) msgid "Notes cleared successfully." msgstr "" #. send and receive notes -#: tmp_strings.xml:347(string) +#: tmp_strings.xml:351(string) msgid "Choose Send Method" msgstr "" -#: tmp_strings.xml:348(string) +#: tmp_strings.xml:352(string) msgid "How would you like to send the note?" msgstr "" -#: tmp_strings.xml:349(string) +#: tmp_strings.xml:353(string) msgid "As Text" msgstr "" -#: tmp_strings.xml:350(string) +#: tmp_strings.xml:354(string) msgid "As File" msgstr "" -#: tmp_strings.xml:351(string) +#: tmp_strings.xml:355(string) msgid "The note already exists in the database. Please choose an action to resolve the conflict. You may edit either note before choosing, or view the difference by clicking on the labels below." msgstr "" #. Button (keep short!), placeholder-1 is a linebreak -#: tmp_strings.xml:353(string) +#: tmp_strings.xml:357(string) msgid "CancelImport" msgstr "" -#: tmp_strings.xml:354(string) +#: tmp_strings.xml:358(string) msgid "File exceeds maximum import size - are you sure it is plain text?" msgstr "" -#: tmp_strings.xml:355(string) +#: tmp_strings.xml:359(string) msgid "Cannot read the note file." msgstr "" -#: tmp_strings.xml:356(string) +#: tmp_strings.xml:360(string) msgid "No files or directories" msgstr "" -#: tmp_strings.xml:357(string) +#: tmp_strings.xml:361(string) msgid "Choose a file below that is either a Tomboy note file (which will be imported) or a plain text file (which will create a new note):" msgstr "" #. Title of first Note -#: tmp_strings.xml:360(string) +#: tmp_strings.xml:364(string) msgid "Tomdroid's First Note" msgstr "" -#: tmp_strings.xml:364(g) +#: tmp_strings.xml:368(g) msgid "!\\n" msgstr "" #. placehoder-1 is a linebreak -#: tmp_strings.xml:364(item) +#: tmp_strings.xml:368(item) msgid "Welcome to Tomdroid" msgstr "" #. placehoder-1 is a linebreak -#: tmp_strings.xml:366(item) +#: tmp_strings.xml:370(item) msgid "You have no notes here yet. To get started, set your Synchronization preferences under Settings. There are two synchronization options described below." msgstr "" #. headline, please keep the = on beginning and end! -#: tmp_strings.xml:368(item) +#: tmp_strings.xml:372(item) msgid "=Online Synchronization=" msgstr "" -#: tmp_strings.xml:369(item) +#: tmp_strings.xml:373(item) msgid "Online Synchronization is what you are looking for if you want to sync to Tomboy-Online, your own Rainy/Snowy server or any server supporting the Tomboy Web REST API." msgstr "" -#: tmp_strings.xml:370(item) +#: tmp_strings.xml:374(item) msgid "To use it, set Sync Service to Online Synchronization in preferences then provide a Server URL. Here are some of the public ones:" msgstr "" -#: tmp_strings.xml:372(g) tmp_strings.xml:374(g) +#: tmp_strings.xml:376(g) tmp_strings.xml:378(g) msgid "-" msgstr "" -#: tmp_strings.xml:372(g) +#: tmp_strings.xml:376(g) msgid "- https://edge.tomboy-online.org/" msgstr "" #. placeholder-1 is a bulletlist icon, placeholder-2 a link to the webpage -#: tmp_strings.xml:372(item) +#: tmp_strings.xml:376(item) msgid "Tomboy Online" msgstr "" -#: tmp_strings.xml:374(g) +#: tmp_strings.xml:378(g) msgid "- https://www.notesync.org/\\n" msgstr "" #. placeholder-1 is a bulletlist icon, placeholder-2 a link to the webpage -#: tmp_strings.xml:374(item) +#: tmp_strings.xml:378(item) msgid "Rainy Sync Server" msgstr "" #. placehoder-1 is a linebreak -#: tmp_strings.xml:376(item) +#: tmp_strings.xml:380(item) msgid "Once set, hit the Sync logo on Tomdroid's top bar to synchronize your notes." msgstr "" #. placehoder-1 is a linebreak -#: tmp_strings.xml:378(item) +#: tmp_strings.xml:382(item) msgid "Note: you might want to back up your Tomboy notes before syncing, since this app is still under development and may corrupt your Tomboy notes." msgstr "" -#: tmp_strings.xml:380(g) +#: tmp_strings.xml:384(g) msgid "http://live.gnome.org/Tomboy/Directories" msgstr "" -#: tmp_strings.xml:380(g) +#: tmp_strings.xml:384(g) msgid "*.note" msgstr "" #. placehoder-1 is a link. placeholder-2 a file extension and placeholder-3 a linebreak -#: tmp_strings.xml:380(item) +#: tmp_strings.xml:384(item) msgid "Please see for the location of the files on all platforms." msgstr "" #. headline, please keep the = on beginning and end! -#: tmp_strings.xml:382(item) +#: tmp_strings.xml:386(item) msgid "=SD Card=" msgstr "" -#: tmp_strings.xml:384(g) +#: tmp_strings.xml:388(g) msgid "(*.note)" msgstr "" -#: tmp_strings.xml:384(g) +#: tmp_strings.xml:388(g) msgid "tomdroid/" msgstr "" #. placeholder-1 is a file extension, placeholder-2 a folder location and placeholder-3 a linebreak -#: tmp_strings.xml:384(item) +#: tmp_strings.xml:388(item) msgid "Put your Tomboy notes on your SD Card under . Once the notes are copied, set Sync Service to SD Card in preferences then hit the Sync logo on Tomdroid's top bar." msgstr "" -#: tmp_strings.xml:386(g) +#: tmp_strings.xml:390(g) msgid "http://launchpad.net/~tomdroid-dev" msgstr "" #. placehoder-1 is a link and placeholder-2 a linebreak -#: tmp_strings.xml:386(item) +#: tmp_strings.xml:390(item) msgid "Also, Tomdroid is always looking for new contributors. If you are interested join the tomdroid-dev team on Launchpad: ." msgstr "" -#: tmp_strings.xml:388(g) +#: tmp_strings.xml:392(g) msgid "https://bugs.launchpad.net/tomdroid" msgstr "" #. placehoder-1 is a link -#: tmp_strings.xml:388(item) +#: tmp_strings.xml:392(item) msgid "Lastly, if you encounter any issue, please report it at: " msgstr "" #. !!! 30 chars max !!! -#: tmp_strings.xml:396(string) +#: tmp_strings.xml:400(string) msgid "Tomdroid notes" msgstr "" #. !!! 4000 chars max !!! -#: tmp_strings.xml:398(string) +#: tmp_strings.xml:402(string) msgid "A Tomboy client for Android. Tomboy is a desktop note-taking app using a wikiwiki approach and a simple user interface.\\n\\n* Note format compatibility with Tomboy\\n* Online note synchronization with Rainy, Snowy or Tomboy Online\\n* SD Card importation\\n* Home screen shortcuts\\n* Send and receive text or note-files from any app\\n* Open source!" msgstr "" #. !!! 80 chars max !!! -#: tmp_strings.xml:401(string) +#: tmp_strings.xml:405(string) msgid "Note-taking app with online synchronization compatible with Tomboy" msgstr "" #. !!! 500 chars max !!! -#: tmp_strings.xml:404(string) +#: tmp_strings.xml:408(string) msgid "* Notes can now be created, edited and deleted\\n* Completely redesigned for both tablets and phones\\n* Sync your notes with compatible web-services or to your SD card\\n* Send and receive note files or text from any app\\n* More configurable than before\\n* Available in even more languages\\n\\n And much more, for a complete list of changes please see https://launchpad.net/tomdroid/+announcements" msgstr "" #. Launchpad Translation String -#: tmp_strings.xml:407(string) +#: tmp_strings.xml:411(string) msgid "translator-credits" msgstr "" diff --git a/res/values/strings.xml b/res/values/strings.xml index 646da06..08dc989 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -253,9 +253,13 @@ Syncing with %1$s + connecting to service… + getting list of remote notes… + updating local notes… + updating remote notes… There was a conflict syncing the note \'%1$s\'