Fixed the mixed up string files in .po files. Also fixed launchpad

bin/androidxml2po.bash

@@ -117,7 +117,7 @@ function usage
 {
     echo "Wrapper for xml2po for android and launchpad."
     echo "Usage: androidxml2po -i        Import .xml's from .po's. Updates the .xml's."
-    echo "       androidxml2po -e        Export/update .po's from string.xml's. Overwrites the .pot and merges the .po's."
+    echo "       androidxml2po -e        Export/update .po's from string.xml's. Overwrites the .pot and merges the .po's. (NOTE: SUPER BROKEN)"
     echo "       androidxml2po -t        Export/update .pot file"
     echo "Set variables correctly inside. Provide a string with value "translator-credits" for Launchpad."
     echo ""
@@ -146,3 +146,4 @@ while [ "$1" != "" ]; do
     shift
 done
 usage
+<

translations/strings.pot

@@ -1,17 +1,13 @@
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-07 00:49-0800\n"
-"POT-Creation-Date: 2012-02-06 17:51-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-07 07:32+0000\n"
-"X-Generator: Launchpad (build 14747)\n"
 
 #. People Editing Activity
 #: translations/strings.xml:8( name="EPE_action") 
@@ -45,9 +41,7 @@ msgstr ""
 
 #. warning before deleting a list you're the owner of
 #: translations/strings.xml:26( name="actfm_tag_operation_owner_delete") 
-msgid ""
+msgid "You are the owner of this shared list! If you delete it, it will be deleted for all list members. Are you sure you want to continue?"
-"You are the owner of this shared list! If you delete it, it will be deleted "
-"for all list members. Are you sure you want to continue?"
 msgstr ""
 
 #. menu item to take a picture
@@ -77,9 +71,7 @@ msgstr ""
 
 #. Text for prompt after sharing a task
 #: translations/strings.xml:44( name="actfm_view_task_text") 
-msgid ""
+msgid "Task was sent to %s! You're currently viewing your own tasks. Do you want to view this and other tasks you've assigned?"
-"Task was sent to %s! You're currently viewing your own tasks. Do you want to "
-"view this and other tasks you've assigned?"
 msgstr ""
 
 #. Ok button for task view prompt
@@ -179,16 +171,12 @@ msgstr ""
 
 #. Tag settings: login prompt from share
 #: translations/strings.xml:107( name="actfm_TVA_login_to_share") 
-msgid ""
+msgid "You need to be logged in to Astrid.com to share lists! Please log in or make this a private list."
-"You need to be logged in to Astrid.com to share lists! Please log in or make "
-"this a private list."
 msgstr ""
 
 #. task sharing dialog: intro
 #: translations/strings.xml:113( name="actfm_EPA_intro") 
-msgid ""
+msgid "Use Astrid to share shopping lists, party plans, or team projects and instantly see when people get stuff done!"
-"Use Astrid to share shopping lists, party plans, or team projects and "
-"instantly see when people get stuff done!"
 msgstr ""
 
 #. task sharing dialog: window title
@@ -298,9 +286,7 @@ msgstr ""
 
 #. task sharing login prompt
 #: translations/strings.xml:179( name="actfm_EPA_login_to_share") 
-msgid ""
+msgid "You need to be logged in to Astrid.com to share tasks! Please log in or make this a private task."
-"You need to be logged in to Astrid.com to share tasks! Please log in or make "
-"this a private task."
 msgstr ""
 
 #: translations/strings.xml:181( name="actfm_EPA_login_button") 
@@ -318,9 +304,7 @@ msgstr ""
 
 #. share login: Sharing Description
 #: translations/strings.xml:191( name="actfm_ALA_body") 
-msgid ""
+msgid "Astrid.com lets you access your tasks online, share, and delegate with others."
-"Astrid.com lets you access your tasks online, share, and delegate with "
-"others."
 msgstr ""
 
 #. share login: Sharing Login FB Prompt
@@ -492,9 +476,7 @@ msgstr ""
 
 #. Preference screen Restoring Tasks Help Dialog Text
 #: translations/strings.xml:307( name="backup_BPr_how_to_restore_dialog") 
-msgid ""
+msgid "You need to add the Astrid Power Pack to manage and restore your backups. As a favor, Astrid also automatically backs up your tasks, just in case."
-"You need to add the Astrid Power Pack to manage and restore your backups. As "
-"a favor, Astrid also automatically backs up your tasks, just in case."
 msgstr ""
 
 #. backup activity label
@@ -542,9 +524,7 @@ msgstr ""
 
 #. Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors)
 #: translations/strings.xml:339( name="import_summary_message") 
-msgid ""
+msgid "File %1$s contained %2$s.\\n\\n %3$s imported,\\n %4$s already exist\\n %5$s had errors\\n"
-"File %1$s contained %2$s.\\n\\n %3$s imported,\\n %4$s already exist\\n %5$s "
-"had errors\\n"
 msgstr ""
 
 #. Progress Dialog Title for importing
@@ -619,9 +599,7 @@ msgstr ""
 
 #. Dialog for Astrid having a critical update
 #: translations/strings.xml:401( name="DLG_please_update") 
-msgid ""
+msgid "Astrid should to be updated to the latest version in the Android market! Please do that before continuing, or wait a few seconds."
-"Astrid should to be updated to the latest version in the Android market! "
-"Please do that before continuing, or wait a few seconds."
 msgstr ""
 
 #. Button for going to Market
@@ -1384,9 +1362,7 @@ msgid "Purge Deleted Tasks"
 msgstr ""
 
 #: translations/strings.xml:869( name="EPr_manage_purge_deleted_message") 
-msgid ""
+msgid "Do you really want to purge all your deleted tasks?\\n\\nThese tasks will be gone forever!"
-"Do you really want to purge all your deleted tasks?\\n\\nThese tasks will be "
-"gone forever!"
 msgstr ""
 
 #: translations/strings.xml:870( name="EPr_manage_purge_deleted_status") 
@@ -1402,8 +1378,7 @@ msgid "Clear All Data"
 msgstr ""
 
 #: translations/strings.xml:873( name="EPr_manage_clear_all_message") 
-msgid ""
+msgid "Delete all tasks and settings in Astrid?\\n\\nWarning: can't be undone!"
-"Delete all tasks and settings in Astrid?\\n\\nWarning: can't be undone!"
 msgstr ""
 
 #: translations/strings.xml:875( name="EPr_manage_delete_completed_gcal") 
@@ -1478,17 +1453,12 @@ msgstr ""
 
 #. About text (%s => current version)
 #: translations/strings.xml:925( name="p_about_text") 
-msgid ""
+msgid "Current version: %s\\n\\n Astrid is open-source and proudly maintained by Todoroo, Inc."
-"Current version: %s\\n\\n Astrid is open-source and proudly maintained by "
-"Todoroo, Inc."
 msgstr ""
 
 #. Displayed when task killer found. %s => name of the application
 #: translations/strings.xml:935( name="task_killer_help") 
-msgid ""
+msgid "It looks like you are using an app that can kill processes (%s)! If you can, add Astrid to the exclusion list so it doesn't get killed. Otherwise, Astrid might not let you know when your tasks are due.\\n"
-"It looks like you are using an app that can kill processes (%s)! If you can, "
-"add Astrid to the exclusion list so it doesn't get killed. Otherwise, Astrid "
-"might not let you know when your tasks are due.\\n"
 msgstr ""
 
 #. Task killer dialog ok button
@@ -1503,10 +1473,7 @@ msgstr ""
 
 #. Astrid's Android Marketplace description. It never appears in the app itself.
 #: translations/strings.xml:948( name="marketplace_description") 
-msgid ""
+msgid "Astrid is the much loved open-source todo list / task manager designed to help you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget and more."
-"Astrid is the much loved open-source todo list / task manager designed to "
-"help you get stuff done. It features reminders, tags, sync, Locale plug-in, "
-"a widget and more."
 msgstr ""
 
 #. Preference Category: Defaults Title
@@ -1688,9 +1655,7 @@ msgstr ""
 
 #. Filter Screen Help Text
 #: translations/strings.xml:1089( name="CFA_help") 
-msgid ""
+msgid "This screen lets you create a new filters. Add criteria using the button below, short or long-press them to adjust, and then click \"View\"!"
-"This screen lets you create a new filters. Add criteria using the button "
-"below, short or long-press them to adjust, and then click \"View\"!"
 msgstr ""
 
 #. Filter Button: add new
@@ -1858,9 +1823,7 @@ msgstr ""
 
 #. short help for GTasks list activity
 #: translations/strings.xml:1211( name="gtasks_help_body") 
-msgid ""
+msgid "Drag the grabber on the left side of a task to rearrange it. Swipe the grabber left or right to change indentation."
-"Drag the grabber on the left side of a task to rearrange it. Swipe the "
-"grabber left or right to change indentation."
 msgstr ""
 
 #: translations/strings.xml:1214( name="CFC_gtasks_list_text") 
@@ -1888,9 +1851,7 @@ msgstr ""
 
 #. Instructions: Gtasks login
 #: translations/strings.xml:1230( name="gtasks_GLA_body") 
-msgid ""
+msgid "Please log in to Google Tasks Sync (Beta!). Non-migrated Google Apps accounts are currently unsupported."
-"Please log in to Google Tasks Sync (Beta!). Non-migrated Google Apps "
-"accounts are currently unsupported."
 msgstr ""
 
 #: translations/strings.xml:1233( name="gtasks_GLA_noaccounts") 
@@ -1899,10 +1860,7 @@ msgstr ""
 
 #. Instructions: Gtasks further help
 #: translations/strings.xml:1236( name="gtasks_GLA_further_help") 
-msgid ""
+msgid "To view your tasks with indentation and order preserved, go to the Filters page and select a Google Tasks list. By default, Astrid uses its own sort settings for tasks."
-"To view your tasks with indentation and order preserved, go to the Filters "
-"page and select a Google Tasks list. By default, Astrid uses its own sort "
-"settings for tasks."
 msgstr ""
 
 #. Sign In Button
@@ -1932,23 +1890,17 @@ msgstr ""
 
 #. Error Message when we receive a HTTP 401 Unauthorized
 #: translations/strings.xml:1259( name="gtasks_GLA_errorAuth") 
-msgid ""
+msgid "Error authenticating! Please check your username and password in your phone's account manager"
-"Error authenticating! Please check your username and password in your "
-"phone's account manager"
 msgstr ""
 
 #. Error Message when we receive an IO Exception
 #: translations/strings.xml:1262( name="gtasks_GLA_errorIOAuth") 
-msgid ""
+msgid "Sorry, we had trouble communicating with Google servers. Please try again later."
-"Sorry, we had trouble communicating with Google servers. Please try again "
-"later."
 msgstr ""
 
 #. Error Message when we receive a HTTP 401 Unauthorized multiple times
 #: translations/strings.xml:1265( name="gtasks_GLA_errorAuth_captcha") 
-msgid ""
+msgid "You may have encountered a captcha. Try logging in from the browser, then come back to try again:"
-"You may have encountered a captcha. Try logging in from the browser, then "
-"come back to try again:"
 msgstr ""
 
 #. GTasks Preferences Title
@@ -1963,30 +1915,22 @@ msgstr ""
 
 #. Error Message when we receive a HTTP 503 error
 #: translations/strings.xml:1279( name="gtasks_error_backend") 
-msgid ""
+msgid "Google's Task API is in beta and has encountered an error. The service may be down, please try again later."
-"Google's Task API is in beta and has encountered an error. The service may "
-"be down, please try again later."
 msgstr ""
 
 #. Error for account not found
 #: translations/strings.xml:1282( name="gtasks_error_accountNotFound") 
-msgid ""
+msgid "Account %s not found--please log out and log back in from the Google Tasks settings."
-"Account %s not found--please log out and log back in from the Google Tasks "
-"settings."
 msgstr ""
 
 #. Error when ping after refreshing token fails
 #: translations/strings.xml:1285( name="gtasks_error_authRefresh") 
-msgid ""
+msgid "Unable to authenticate with Google Tasks. Please check your account password or try again later."
-"Unable to authenticate with Google Tasks. Please check your account password "
-"or try again later."
 msgstr ""
 
 #. Error when account manager returns no auth token or throws exception
 #: translations/strings.xml:1288( name="gtasks_error_accountManager") 
-msgid ""
+msgid "Error in your phone's account manager. Please log out and log back in from the Google Tasks settings."
-"Error in your phone's account manager. Please log out and log back in from "
-"the Google Tasks settings."
 msgstr ""
 
 #. Intro Tag or click prompt
@@ -2001,11 +1945,7 @@ msgstr ""
 
 #. Task 1 Note
 #: translations/strings.xml:1307( name="intro_task_1_note") 
-msgid ""
+msgid "Two ways to add a task:\\n 1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\\n 2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone's back button.\\n"
-"Two ways to add a task:\\n 1) Quick Add: Type the task into the quick entry "
-"box at bottom of screen and press the + button on the right.\\n 2) Regular "
-"Add: Press the + button of the quick entry box. Add as much detail as you "
-"want. Then press \"Save\" or use your phone's back button.\\n"
 msgstr ""
 
 #. Task 2 Summary
@@ -2015,10 +1955,7 @@ msgstr ""
 
 #. Task 2 Note
 #: translations/strings.xml:1316( name="intro_task_2_note") 
-msgid ""
+msgid "1) Long Press on your phone's desktop\\n      2) Choose \"Widget\"\\n      3) Choose the Astrid widget\\n      4) Select the list you want and press OK.\\n"
-"1) Long Press on your phone's desktop\\n      2) Choose \"Widget\"\\n "
-"     3) Choose the Astrid widget\\n      4) Select the list you want and "
-"press OK.\\n"
 msgstr ""
 
 #. Task 3 Summary
@@ -2028,9 +1965,7 @@ msgstr ""
 
 #. Task 3 Note
 #: translations/strings.xml:1327( name="intro_task_3_note") 
-msgid ""
+msgid "1) Press your Menu button\\n      2) Choose \"Sync Now\"\\n      3) Select \"Astrid.com\"\\n      4) Log In &amp; Synchronize!\\n"
-"1) Press your Menu button\\n      2) Choose \"Sync Now\"\\n      3) Select "
-"\"Astrid.com\"\\n      4) Log In &amp; Synchronize!\\n"
 msgstr ""
 
 #. Shown the first time a user sees the task list activity
@@ -2100,10 +2035,7 @@ msgid "No thanks"
 msgstr ""
 
 #: translations/strings.xml:1378( name="welcome_login_confirm_later_dialog") 
-msgid ""
+msgid "Sign in to get the most out of Astrid! For free, you get online backup, full synchronization with Astrid.com, the ability to add tasks via email, and you can even share task lists with friends!"
-"Sign in to get the most out of Astrid! For free, you get online backup, full "
-"synchronization with Astrid.com, the ability to add tasks via email, and you "
-"can even share task lists with friends!"
 msgstr ""
 
 #. Locale Alert Editing Window Title
@@ -2113,9 +2045,7 @@ msgstr ""
 
 #. Locale Window Help
 #: translations/strings.xml:1393( name="locale_edit_intro") 
-msgid ""
+msgid "Astrid will send you a reminder when you have any tasks in the following filter:"
-"Astrid will send you a reminder when you have any tasks in the following "
-"filter:"
 msgstr ""
 
 #. Locale Window Filter Picker UI
@@ -2432,8 +2362,7 @@ msgstr ""
 
 #. Instructions: Producteev login
 #: translations/strings.xml:1639( name="producteev_PLA_body") 
-msgid ""
+msgid "Sign in with your existing Producteev account, or create a new account!"
-"Sign in with your existing Producteev account, or create a new account!"
 msgstr ""
 
 #. Producteev Terms Link
@@ -2603,9 +2532,7 @@ msgstr ""
 
 #. Reminder Preference: Quiet Hours Start Description (%s => time set)
 #: translations/strings.xml:1795( name="rmd_EPr_quiet_hours_start_desc") 
-msgid ""
+msgid "Notifications will be silent after %s.\\nNote: vibrations are controlled by the setting below!"
-"Notifications will be silent after %s.\\nNote: vibrations are controlled by "
-"the setting below!"
 msgstr ""
 
 #. Reminder Preference: Quiet Hours Start/End Description (disabled)
@@ -3084,8 +3011,7 @@ msgid "A spot of tea while you work on this?"
 msgstr ""
 
 #: translations/strings.xml:2030(item) 
-msgid ""
+msgid "If only you had already done this, then you could go outside and play."
-"If only you had already done this, then you could go outside and play."
 msgstr ""
 
 #: translations/strings.xml:2031(item) 
@@ -3316,9 +3242,7 @@ msgstr ""
 
 #. Login Error Dialog (%s => message)
 #: translations/strings.xml:2169( name="rmilk_MLA_error") 
-msgid ""
+msgid "Sorry, there was an error verifying your login. Please try again. \\n\\n Error Message: %s"
-"Sorry, there was an error verifying your login. Please try again. \\n\\n "
-"Error Message: %s"
 msgstr ""
 
 #. title for notification tray when synchronizing
@@ -3328,9 +3252,7 @@ msgstr ""
 
 #. Error msg when io exception with rmilk
 #: translations/strings.xml:2181( name="rmilk_ioerror") 
-msgid ""
+msgid "Connection Error! Check your Internet connection, or maybe RTM servers (status.rememberthemilk.com), for possible solutions."
-"Connection Error! Check your Internet connection, or maybe RTM servers "
-"(status.rememberthemilk.com), for possible solutions."
 msgstr ""
 
 #. Tags hint
@@ -3440,13 +3362,7 @@ msgstr ""
 
 #. Tag case migration
 #: translations/strings.xml:2282( name="tag_case_migration_notice") 
-msgid ""
+msgid "We've noticed that you have some lists that have the same name with different capitalizations. We think you may have intended them to be the same list, so we've combined the duplicates. Don't worry though: the original lists are simply renamed with numbers (e.g. Shopping_1, Shopping_2). If you don't want this, you can simply delete the new combined list!"
-"We've noticed that you have some lists that have the same name with "
-"different capitalizations. We think you may have intended them to be the "
-"same list, so we've combined the duplicates. Don't worry though: the "
-"original lists are simply renamed with numbers (e.g. Shopping_1, "
-"Shopping_2). If you don't want this, you can simply delete the new combined "
-"list!"
 msgstr ""
 
 #. Header for tag settings
@@ -3514,23 +3430,17 @@ msgstr ""
 
 #. Preference: Task List recognition-service is not installed, but available
 #: translations/strings.xml:2338( name="EPr_voiceInputInstall_dlg") 
-msgid ""
+msgid "Voice-input is not installed.\\nDo you want to go to the market and install it?"
-"Voice-input is not installed.\\nDo you want to go to the market and install "
-"it?"
 msgstr ""
 
 #. Preference: Task List recognition-service is not available for this system
 #: translations/strings.xml:2340( name="EPr_voiceInputUnavailable_dlg") 
-msgid ""
+msgid "Unfortunately voice-input is not available for your system.\\nIf possible, please update Android to 2.1 or later."
-"Unfortunately voice-input is not available for your system.\\nIf possible, "
-"please update Android to 2.1 or later."
 msgstr ""
 
 #. Preference: Market is not available for this system
 #: translations/strings.xml:2342( name="EPr_marketUnavailable_dlg") 
-msgid ""
+msgid "Unfortunately the market is not available for your system.\\nIf possible, try downloading voice search from another source."
-"Unfortunately the market is not available for your system.\\nIf possible, "
-"try downloading voice search from another source."
 msgstr ""
 
 #. Preference: Task List Show Voice-button if recognition-service is available
@@ -3640,8 +3550,7 @@ msgid "Tap to add notes,\\nset reminders,\\nand much more!"
 msgstr ""
 
 #: translations/strings.xml:2388( name="welcome_body_6") 
-msgid ""
+msgid "Additional features,\\nproductivity tips, and\\nsuggestions from friends"
-"Additional features,\\nproductivity tips, and\\nsuggestions from friends"
 msgstr ""
 
 #: translations/strings.xml:2391( name="welcome_body_7_return") 
@@ -4041,8 +3950,7 @@ msgid "Past Due:"
 msgstr ""
 
 #: translations/strings.xml:2636( name="PPW_old_astrid_notice") 
-msgid ""
+msgid "You need at least version 3.6 of Astrid in order to use this widget. Sorry!"
-"You need at least version 3.6 of Astrid in order to use this widget. Sorry!"
 msgstr ""
 
 #. general encouragements
@@ -4135,3 +4043,4 @@ msgstr ""
 #: translations/strings.xml:2675(item) 
 msgid "Translucent"
 msgstr ""
+