diff --git a/scripts/catxml b/scripts/catxml
deleted file mode 100755
index fbf7aee2b..000000000
--- a/scripts/catxml
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# combine multiple android resource xml's to one
-
-cat $1 | sed 's/<\/resources.*//'
-shift
-if [ "$*" != "" ]; then
- cat $* | sed 's/<\/resources.*//;s/'
-
-
diff --git a/scripts/getloc.rb b/scripts/getloc.rb
index 8b101b80f..506e28df9 100755
--- a/scripts/getloc.rb
+++ b/scripts/getloc.rb
@@ -114,8 +114,7 @@ class Android
def self.src_files(cmd, type)
if cmd == :export && type == "master"
- %x[./scripts/catxml src/main/res/values/strings*.xml > #{self.tmp_files[0]}]
- lambda { |l| ["translations/strings.xml"] }
+ lambda { |l| ["src/main/res/values/strings.xml"] }
else
lambda { |l| ["src/main/res/values-#{l}/strings.xml"] }
end
diff --git a/src/main/res/values/strings-actfm.xml b/src/main/res/values/strings-actfm.xml
deleted file mode 100644
index 8fd2b0c70..000000000
--- a/src/main/res/values/strings-actfm.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
- Clear Picture
-
-
-
-
- Add a comment...
-
- Name
-
- Enter tag name
- Enter filter name
-
-
-
- Choose Google Account
-
-
-
diff --git a/src/main/res/values/strings-backup.xml b/src/main/res/values/strings-backup.xml
deleted file mode 100644
index 4b841b907..000000000
--- a/src/main/res/values/strings-backup.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
- Backups
-
-
- Import tasks
-
-
- Export tasks
-
-
-
- Backed up %1$s to %2$s.
-
- No tasks to export.
-
-
- Restore summary
-
-
-
-File %1$s contained %2$s.\n\n
-%3$s imported,\n
-%4$s already exist\n
-%5$s had errors\n
-
-
-
- Reading task %d...
-
-
-
-
- Cannot access folder: %s
-
-
- Cannot access your SD card!
-
-
- Select a file to restore
-
-
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
deleted file mode 100644
index 9e08b5881..000000000
--- a/src/main/res/values/strings-core.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-
-
-
-
-
-
- Tasks Permission
-
-
- Tasks Permission
-
-
-
-
- Delete this task?
-
-
- Upgrading your tasks...
-
-
- Time (hours : minutes)
-
-
-
- Undo
-
-
-
-
- Click to set
-
-
-
-
- You have no tasks! \n Want to add something?
-
-
- Sort
-
-
- Search
-
-
- Settings
-
-
-
-
- %s [hidden]
-
-
- %s [deleted]
-
-
- Finished\n%s
-
-
- Edit
-
-
- Copy Task
-
-
- Delete Task
-
-
- Undelete Task
-
-
- Purge Task
-
-
-
-
- Manual order with subtasks
-
-
- Smart sort
-
-
- By title
-
-
- By due date
-
-
- By priority
-
-
- By last modified
-
-
-
-
- Matching \'%s\'
-
-
- New Filter
-
-
- No filter selected! Please select a filter or list.
-
-
-
-
- Task name
-
-
- Priority
-
- No date
-
-
- Hide until
-
-
- Hide until %s
-
-
- Description
-
-
- How long will it take?
-
-
- Time already spent
-
-
- Save Changes
-
- Save
-
-
- Discard changes
-
-
- Activity
-
- Est. %s
-
- Elapsed %s
-
- No time
-
-
-
- - Never
- - Due date
- - Due time
- - Day before due
- - Week before due
- - Specific day/time
-
-
-
-
-
- When
- Repeat
- Calendar
-
- Priority
-
- Description
-
- Files
-
-
- Reminders
-
-
- Timer Controls
-
- ----Hide Always----
-
- Show in my list
-
-
- Load more...
-
-
-
- Missed call from %s
-
-
- Call now
-
-
- Call later
-
-
- Ignore
-
- Missed Calls
-
-
- Call %1$s back at %2$s
-
-
- Call %s back
-
-
-
-
- Ignore
-
-
- Need a meeting list?
-
-
- You\'ve ignored several calendar events. Should Tasks stop asking you about them?
-
-
- Ignore all events
-
-
- Ignore this event only
-
-
- Looks like %s is starting soon. Want to create a list for action items?
-
-
- Looks like you just finished with %s. Want to create a list for action items?
-
-
- Create list
-
-
- Maybe afterwards
-
-
- A list named %s already exists. Do you want to use the existing list or create a new one for this event?
-
-
- Create new
-
-
- Use existing
-
-
- I created a list %s.
-
-
- %s is attending.
-
-
- %1$s and %2$s are attending.
-
-
- %1$s, %2$s, and %3$d others are attending.
-
-
- Want to invite them?
-
-
- Calendar assistant
-
-
- Tasks will remind you about upcoming calendar events and prompt you to prepare for them
-
-
- Share the list?
-
- Invite attendees
-
- More options
-
- No thank you
-
-
- List created!
-
-
- Action Items: %s
-
-
-
- None
-
-
- Appearance
-
-
- Filters to show
-
-
- Edit screen options
-
- Show timer shortcut
-
-
- Customize the layout of the task edit screen
-
- Reset to defaults
-
- Customize your task edit screen by dragging the left handle on each row
-
-
- Show full task title
-
-
- Show comments in task edit
-
- Task list options
-
-
- Calendar event time
- End calendar events at due time
- Start calendar events at due time
-
-
-
-
- Manage old tasks
-
- Delete completed tasks
- Do you really want to delete all your completed tasks?
-
- Deleted %d tasks!
-
- Purge deleted tasks
- Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!
- Purged %d tasks!
-
- Reset preferences
- Preferences will be reset to default values
- Delete task data
- All tasks will be permanently deleted
-
-
- Delete calendar events for completed tasks
- Do you really want to delete all your events for completed tasks?
- Deleted %d calendar events!
-
-
- Delete all calendar events for tasks
- Do you really want to delete all your events for tasks?
- Deleted %d calendar events!
-
-
-
-
- Loading...
-
-
- Select tasks to view...
-
-
-
-
- Uh oh! It looks like you may have a corrupted database.
- If you see this error regularly, we suggest you clear all
- data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
- your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Tasks.
-
-
diff --git a/src/main/res/values/strings-defaults.xml b/src/main/res/values/strings-defaults.xml
deleted file mode 100644
index 587cf0f44..000000000
--- a/src/main/res/values/strings-defaults.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- Task defaults
-
- Default deadline
-
-
- Default priority
-
-
- Default hide until
-
-
- Default reminders
-
-
- Default add to calendar
-
-
- Default ring/vibrate type
-
-
-
-
- - !!! (Highest)
- - !!
- - !
-
- - o (Lowest)
-
-
-
-
-
- - No deadline
-
- - Today
-
- - Tomorrow
-
- - Day after tomorrow
-
- - Next week
-
-
-
-
-
- - Don\'t hide
-
- - Task is due
-
- - Day before due
-
- - Week before due
-
-
-
-
- - No deadline reminders
- - At deadline
- - When overdue
- - At deadline or overdue
-
-
-
diff --git a/src/main/res/values/strings-filters.xml b/src/main/res/values/strings-filters.xml
deleted file mode 100644
index 41402471a..000000000
--- a/src/main/res/values/strings-filters.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
- My Tasks
-
-
- Recently Modified
-
-
-
-
- Active Tasks
-
-
- or
-
-
- not
-
-
- also
-
-
- %s has criteria
-
-
- Delete Row
-
-
- Long press on items for additional options
-
-
- Add Criteria
-
-
-
-
- Due By: ?
-
- Due By...
-
-
- - No Due Date
- - Yesterday
- - Today
- - Tomorrow
- - Day After Tomorrow
- - Next Week
- - Next Month
-
-
-
- Priority at least ?
-
- Priority...
-
-
- Tag: ?
-
- Tag...
-
-
- Tag name contains...
-
- Tag name contains: ?
-
-
- Title contains...
-
- Title contains: ?
-
-
diff --git a/src/main/res/values/strings-gcal.xml b/src/main/res/values/strings-gcal.xml
deleted file mode 100644
index 58c9d9d4d..000000000
--- a/src/main/res/values/strings-gcal.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
- Error adding task to calendar!
-
-
-
-
- Add to Calendar
-
- Choose Calendar
-
-
- Open Calendar Event
-
-
-
-
- %s (completed)
-
-
diff --git a/src/main/res/values/strings-gtasks.xml b/src/main/res/values/strings-gtasks.xml
deleted file mode 100644
index 88f9ef770..000000000
--- a/src/main/res/values/strings-gtasks.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
- In List: ?
-
- In GTasks List...
-
-
- Clearing completed tasks...
-
-
- Clear Completed
-
-
-
-
-
- No available Google accounts to sync with.
-
-
-
-
-
-
-
-
- Authenticating...
-
-
-
-
-
-
- Sorry, we had trouble communicating with Google servers. Please try again later.
-
-
-
-
- Google Tasks
-
-
-
-
- Account %s not found--please log out and log back in from the Google Tasks settings.
-
-
diff --git a/src/main/res/values/strings-premium.xml b/src/main/res/values/strings-premium.xml
deleted file mode 100644
index 97f26f97f..000000000
--- a/src/main/res/values/strings-premium.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- Record a note
- Are you sure? Cannot be undone
-
- Recording Audio
- Stop Recording
-
- Sorry! No application was found to handle this file type.
-
- Back
- Choose a file
- Choose a directory
- Permissions error! Please make sure you have not blocked Tasks from accessing the SD card.
- Error copying file for attachment
-
- Use this directory
- Reset to default
-
-
-
- Order one year and save 25%!
-
-
diff --git a/src/main/res/values/strings-reminders.xml b/src/main/res/values/strings-reminders.xml
deleted file mode 100644
index 8d90e733f..000000000
--- a/src/main/res/values/strings-reminders.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- Ring once
-
-
- Ring five times
-
-
- Ring nonstop
-
-
-
- - an hour
- - a day
- - a week
- - in two weeks
- - a month
- - in two months
-
-
-
-
-
- Complete
-
-
- Snooze
-
-
-
-
- Quiet hours start
-
-
- Quiet hours end
-
-
- Default reminder
-
- Notifications for tasks without due times will appear at %s
-
-
- Persistent notifications
-
- Persistent notifications cannot be cleared
-
-
- Max volume for multiple-ring reminders
-
- Tasks will max out the volume for multiple-ring reminders
-
-
- Random reminders
-
-
-
-
-
- - disabled
-
- - hourly
-
- - daily
-
- - weekly
-
- - bi-weekly
-
- - monthly
- - bi-monthly
-
-
-
diff --git a/src/main/res/values/strings-repeat.xml b/src/main/res/values/strings-repeat.xml
deleted file mode 100644
index 3f5f7b7e5..000000000
--- a/src/main/res/values/strings-repeat.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
- Repeats
-
-
- Every %d
-
-
- Repeat interval
-
-
- Not repeating
-
- Don\'t repeat
-
-
-
- - Day(s)
- - Week(s)
- - Month(s)
- - Hour(s)
- - Minute(s)
- - Year(s)
-
-
-
-
- - from due date
-
- - from completion date
-
-
-
- Every %s
-
-
- Every %1$s\nuntil %2$s
-
-
- Repeat forever
-
-
- Repeat until %s
-
- %1$s rescheduled for %2$s
-
-
diff --git a/src/main/res/values/strings-tags.xml b/src/main/res/values/strings-tags.xml
deleted file mode 100644
index 7a88ef41c..000000000
--- a/src/main/res/values/strings-tags.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
- Add to lists
-
-
-
- New Tag
-
-
- Please enter a name for this list first!
-
-
-
-
- Uncategorized
-
- Delete %s?
-
-
diff --git a/src/main/res/values/strings-timers.xml b/src/main/res/values/strings-timers.xml
deleted file mode 100644
index 0124c2296..000000000
--- a/src/main/res/values/strings-timers.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- Timers Active for %s!
-
-
- Tasks Being Timed
-
-
- Timer
-
-
- started this task:
-
-
- stopped doing this task:
-
-
- Time spent:
-
-
diff --git a/src/main/res/values/strings-voice.xml b/src/main/res/values/strings-voice.xml
deleted file mode 100644
index dead9b37a..000000000
--- a/src/main/res/values/strings-voice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Speak to create a task
-
- Voice input
-
- Voice reminders
-
- Tasks will speak task names during task reminders
-
-
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b914a9844..04da22bd8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,5 +1,821 @@
+
+
+
+
+ Clear Picture
+
+
+
+
+ Add a comment...
+
+ Name
+
+ Enter tag name
+ Enter filter name
+
+
+
+ Choose Google Account
+
+
+
+
+
+
+
+ Backups
+
+
+ Import tasks
+
+
+ Export tasks
+
+
+
+ Backed up %1$s to %2$s.
+
+ No tasks to export.
+
+
+ Restore summary
+
+
+
+File %1$s contained %2$s.\n\n
+%3$s imported,\n
+%4$s already exist\n
+%5$s had errors\n
+
+
+
+ Reading task %d...
+
+
+
+
+ Cannot access folder: %s
+
+
+ Cannot access your SD card!
+
+
+ Select a file to restore
+
+
+
+
+
+ Tasks Permission
+
+
+ Tasks Permission
+
+
+
+
+ Delete this task?
+
+
+ Upgrading your tasks...
+
+
+ Time (hours : minutes)
+
+
+
+ Undo
+
+
+
+
+ Click to set
+
+
+
+
+ You have no tasks! \n Want to add something?
+
+
+ Sort
+
+
+ Search
+
+
+ Settings
+
+
+
+
+ %s [hidden]
+
+
+ %s [deleted]
+
+
+ Finished\n%s
+
+
+ Edit
+
+
+ Copy Task
+
+
+ Delete Task
+
+
+ Undelete Task
+
+
+ Purge Task
+
+
+
+
+ Manual order with subtasks
+
+
+ Smart sort
+
+
+ By title
+
+
+ By due date
+
+
+ By priority
+
+
+ By last modified
+
+
+
+
+ Matching \'%s\'
+
+
+ New Filter
+
+
+ No filter selected! Please select a filter or list.
+
+
+
+
+ Task name
+
+
+ Priority
+
+ No date
+
+
+ Hide until
+
+
+ Hide until %s
+
+
+ Description
+
+
+ How long will it take?
+
+
+ Time already spent
+
+
+ Save Changes
+
+ Save
+
+
+ Discard changes
+
+
+ Activity
+
+ Est. %s
+
+ Elapsed %s
+
+ No time
+
+
+
+ - Never
+ - Due date
+ - Due time
+ - Day before due
+ - Week before due
+ - Specific day/time
+
+
+
+
+
+ When
+ Repeat
+ Calendar
+
+ Priority
+
+ Description
+
+ Files
+
+
+ Reminders
+
+
+ Timer Controls
+
+ ----Hide Always----
+
+ Show in my list
+
+
+ Load more...
+
+
+
+ Missed call from %s
+
+
+ Call now
+
+
+ Call later
+
+
+ Ignore
+
+ Missed Calls
+
+
+ Call %1$s back at %2$s
+
+
+ Call %s back
+
+
+
+
+ Ignore
+
+
+ Need a meeting list?
+
+
+ You\'ve ignored several calendar events. Should Tasks stop asking you about them?
+
+
+ Ignore all events
+
+
+ Ignore this event only
+
+
+ Looks like %s is starting soon. Want to create a list for action items?
+
+
+ Looks like you just finished with %s. Want to create a list for action items?
+
+
+ Create list
+
+
+ Maybe afterwards
+
+
+ A list named %s already exists. Do you want to use the existing list or create a new one for this event?
+
+
+ Create new
+
+
+ Use existing
+
+
+ I created a list %s.
+
+
+ %s is attending.
+
+
+ %1$s and %2$s are attending.
+
+
+ %1$s, %2$s, and %3$d others are attending.
+
+
+ Want to invite them?
+
+
+ Calendar assistant
+
+
+ Tasks will remind you about upcoming calendar events and prompt you to prepare for them
+
+
+ Share the list?
+
+ Invite attendees
+
+ More options
+
+ No thank you
+
+
+ List created!
+
+
+ Action Items: %s
+
+
+
+ None
+
+
+ Appearance
+
+
+ Filters to show
+
+
+ Edit screen options
+
+ Show timer shortcut
+
+
+ Customize the layout of the task edit screen
+
+ Reset to defaults
+
+ Customize your task edit screen by dragging the left handle on each row
+
+
+ Show full task title
+
+
+ Show comments in task edit
+
+ Task list options
+
+
+ Calendar event time
+ End calendar events at due time
+ Start calendar events at due time
+
+
+
+
+ Manage old tasks
+
+ Delete completed tasks
+ Do you really want to delete all your completed tasks?
+
+ Deleted %d tasks!
+
+ Purge deleted tasks
+ Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!
+ Purged %d tasks!
+
+ Reset preferences
+ Preferences will be reset to default values
+ Delete task data
+ All tasks will be permanently deleted
+
+
+ Delete calendar events for completed tasks
+ Do you really want to delete all your events for completed tasks?
+ Deleted %d calendar events!
+
+
+ Delete all calendar events for tasks
+ Do you really want to delete all your events for tasks?
+ Deleted %d calendar events!
+
+
+
+
+ Loading...
+
+
+ Select tasks to view...
+
+
+
+
+ Uh oh! It looks like you may have a corrupted database.
+ If you see this error regularly, we suggest you clear all
+ data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
+ your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Tasks.
+
+
+ Task defaults
+
+ Default deadline
+
+
+ Default priority
+
+
+ Default hide until
+
+
+ Default reminders
+
+
+ Default add to calendar
+
+
+ Default ring/vibrate type
+
+
+
+
+ - !!! (Highest)
+ - !!
+ - !
+
+ - o (Lowest)
+
+
+
+
+
+ - No deadline
+
+ - Today
+
+ - Tomorrow
+
+ - Day after tomorrow
+
+ - Next week
+
+
+
+
+
+ - Don\'t hide
+
+ - Task is due
+
+ - Day before due
+
+ - Week before due
+
+
+
+
+ - No deadline reminders
+ - At deadline
+ - When overdue
+ - At deadline or overdue
+
+
+
+
+
+
+ My Tasks
+
+
+ Recently Modified
+
+
+
+
+ Active Tasks
+
+
+ or
+
+
+ not
+
+
+ also
+
+
+ %s has criteria
+
+
+ Delete Row
+
+
+ Long press on items for additional options
+
+
+ Add Criteria
+
+
+
+
+ Due By: ?
+
+ Due By...
+
+
+ - No Due Date
+ - Yesterday
+ - Today
+ - Tomorrow
+ - Day After Tomorrow
+ - Next Week
+ - Next Month
+
+
+
+ Priority at least ?
+
+ Priority...
+
+
+ Tag: ?
+
+ Tag...
+
+
+ Tag name contains...
+
+ Tag name contains: ?
+
+
+ Title contains...
+
+ Title contains: ?
+
+
+
+
+
+
+
+ Error adding task to calendar!
+
+
+
+
+ Add to Calendar
+
+ Choose Calendar
+
+
+ Open Calendar Event
+
+
+
+
+ %s (completed)
+
+
+
+
+
+
+ In List: ?
+
+ In GTasks List...
+
+
+ Clearing completed tasks...
+
+
+ Clear Completed
+
+
+
+
+
+ No available Google accounts to sync with.
+
+
+
+
+
+
+
+
+ Authenticating...
+
+
+
+
+
+
+ Sorry, we had trouble communicating with Google servers. Please try again later.
+
+
+
+
+ Google Tasks
+
+
+
+
+ Account %s not found--please log out and log back in from the Google Tasks settings.
+
+
+ Record a note
+ Are you sure? Cannot be undone
+
+ Recording Audio
+ Stop Recording
+
+ Sorry! No application was found to handle this file type.
+
+ Back
+ Choose a file
+ Choose a directory
+ Permissions error! Please make sure you have not blocked Tasks from accessing the SD card.
+ Error copying file for attachment
+
+ Use this directory
+ Reset to default
+
+
+
+ Order one year and save 25%!
+
+
+
+ Ring once
+
+
+ Ring five times
+
+
+ Ring nonstop
+
+
+
+ - an hour
+ - a day
+ - a week
+ - in two weeks
+ - a month
+ - in two months
+
+
+
+
+
+ Complete
+
+
+ Snooze
+
+
+
+
+ Quiet hours start
+
+
+ Quiet hours end
+
+
+ Default reminder
+
+ Notifications for tasks without due times will appear at %s
+
+
+ Persistent notifications
+
+ Persistent notifications cannot be cleared
+
+
+ Max volume for multiple-ring reminders
+
+ Tasks will max out the volume for multiple-ring reminders
+
+
+ Random reminders
+
+
+
+
+
+ - disabled
+
+ - hourly
+
+ - daily
+
+ - weekly
+
+ - bi-weekly
+
+ - monthly
+ - bi-monthly
+
+
+
+
+
+
+ Repeats
+
+
+ Every %d
+
+
+ Repeat interval
+
+
+ Not repeating
+
+ Don\'t repeat
+
+
+
+ - Day(s)
+ - Week(s)
+ - Month(s)
+ - Hour(s)
+ - Minute(s)
+ - Year(s)
+
+
+
+
+ - from due date
+
+ - from completion date
+
+
+
+ Every %s
+
+
+ Every %1$s\nuntil %2$s
+
+
+ Repeat forever
+
+
+ Repeat until %s
+
+ %1$s rescheduled for %2$s
+
+
+
+
+
+ Add to lists
+
+
+
+ New Tag
+
+
+ Please enter a name for this list first!
+
+
+
+
+ Uncategorized
+
+ Delete %s?
+
+
+
+ Timers Active for %s!
+
+
+ Tasks Being Timed
+
+
+ Timer
+
+
+ started this task:
+
+
+ stopped doing this task:
+
+
+ Time spent:
+
+
+
+ Speak to create a task
+
+ Voice input
+
+ Voice reminders
+
+ Tasks will speak task names during task reminders
+
+
Dark theme
Delete task
Added task