Merge changes to english strings files from resource removal branch

pull/14/head
Sam Bosley 13 years ago
commit fa4d0685d1

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:type="radial"
android:startColor="#171717"
android:endColor="#000000"
android:gradientRadius="300"
android:centerX="0.5"
android:centerY="0.5" />
</shape>

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="#ffffff" />
</shape>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dip"/>
<stroke
android:width="2dip"
android:color="#b7b7b7"/>
<solid android:color="@android:color/transparent"/>
</shape>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="false" android:drawable="@drawable/footer_button_normal" />
<item android:state_pressed="true" android:state_enabled="true"
android:drawable="@drawable/footer_button_pressed" />
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="true" android:drawable="@drawable/footer_button_selected" />
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 917 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/drawable/editbox_background.xml
**
** Copyright 2006, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@drawable/footer_comment_edittext_focused" />
<item android:drawable="@drawable/footer_comment_edittext_normal" />
</selector>

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:color="#f28118"
android:width="1dip" />
<gradient
android:startColor="#eeeeee"
android:endColor="#ffffff"
android:angle="270"
android:height="20dp" />
<size android:width="40dip"
android:height="40dip"/>
</shape>

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="#eeeeee"
android:endColor="#ffffff"
android:angle="270"
android:height="20dp" />
<stroke
android:color="#bbbbbf"
android:width="1dip" />
<size android:width="40dip"
android:height="40dip"/>
</shape>

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/drawable/editbox_background.xml
**
** Copyright 2006, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@drawable/footer_edittext_focus" />
<item android:drawable="@drawable/footer_edittext_normal" />
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 795 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1016 B

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/footer_greenbtn_pressed" />
<item android:drawable="@drawable/footer_greenbtn_normal" />
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 849 B

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/footer_redbtn_pressed" />
<item android:drawable="@drawable/footer_redbtn_normal" />
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 876 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 930 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 787 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<fragment
android:name="com.todoroo.astrid.tags.reusable.FeaturedListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:tag="filterlist_fragment">
</fragment>
</FrameLayout>

@ -1,81 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<ImageView
android:id="@+id/main_menu"
android:layout_width="51dip"
android:layout_height="fill_parent"
android:src="?attr/asPeopleMenu"
android:scaleType="fitCenter"/>
<View
android:layout_width="1px"
android:layout_height="fill_parent"
android:layout_marginLeft="-1px"
android:background="?attr/asSeparatorBackground"
android:layout_marginBottom="4dip"
android:layout_marginTop="4dip"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical">
<RelativeLayout
android:id="@+id/lists_nav"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="5dip"
android:paddingRight="5dip"
android:paddingLeft="5dip"
android:gravity="center_vertical">
<TextView
android:id="@+id/list_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/BFE_Active"
android:singleLine="true"
android:layout_weight="1"
android:ellipsize="end"
style="@style/TextAppearance.ActionBar_ListsHeader"/>
<ImageView
android:id="@+id/list_disclosure_arrow"
android:layout_width="12dip"
android:layout_height="12dip"
android:layout_marginLeft="10dip"
android:layout_toRightOf="@id/list_title"
android:layout_alignBottom="@id/list_title"
android:src="?attr/asListsDisclosure"
android:scaleType="fitCenter"/>
</RelativeLayout>
</LinearLayout>
<com.todoroo.astrid.helper.AsyncImageView
android:id="@+id/person_image"
android:layout_width="51dip"
android:layout_height="fill_parent"
android:scaleType="centerCrop"/>
<Button
android:id="@+id/comments"
android:layout_width="51dip"
android:layout_height="fill_parent"
android:background="?attr/asCommentButtonImg"
android:textColor="@android:color/white"
android:paddingBottom="6dip"
android:visibility="gone"/>
</LinearLayout>

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/Content"
android:id="@+id/tasklist_fragment_container">
</FrameLayout>

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<View
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="1dp"
style="@style/TEA_Separator" />

@ -33,7 +33,6 @@
<attr name="asMicButtonImg" format="reference" />
<attr name="asCommentButtonImg" format="reference" />
<attr name="asFilledCommentButtonImg" format="reference" />
<attr name="asTaskEditArrow" format="reference" />
<attr name="asRepeatIcon" format="reference" />
<attr name="asMainMenu" format="reference" />
<attr name="asPeopleMenu" format="reference" />

@ -14,20 +14,6 @@
<color name="task_list_importance_2">#ffcfcfcf</color>
<color name="task_list_importance_3">#ffb8b8b8</color>
<color name="task_list_importance_4">#ffa0a0a0</color>
<color name="task_list_selected">#33ffffff</color>
<color name="taskList_dueDateOverdue">#FFFB6666</color>
<color name="taskList_dueDate">#ffF0E89E</color>
<color name="taskList_remainingTime">#ff88AAFF</color>
<color name="taskList_completedDate">#ff888888</color>
<color name="taskList_details">#ff888888</color>
<color name="view_header_done">#ff44bb66</color>
<color name="view_table_values">#ffbbbbbb</color>
<color name="view_table_overdue">#ffff0000</color>
<color name="task_edit_selected">#438cb6</color>
<color name="task_edit_deadline_gray">#888888</color>

@ -183,16 +183,8 @@
<item>08</item>
</string-array>
<string-array name="EPr_swipe_lists_performance_mode_values">
<item>0</item>
<item>1</item>
<item>3</item>
<item>8</item>
</string-array>
<!-- ======================================================= APPEARANCE == -->
<string name="p_colorize">colorize</string>
<string name="p_fontSize">font_size</string>
<string name="p_taskRowStyle">p_taskRowStyle</string>
<string name="p_showNotes">notesVisible</string>

@ -9,7 +9,6 @@
<!-- ================================================== general terms == -->
<!-- People Editing Activity -->
<string name="EPE_action">Share</string>
<!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
<string name="actfm_person_hint">Contact or Email</string>
@ -18,10 +17,8 @@
<string name="actfm_person_or_tag_hint">Contact or Shared List</string>
<!-- toast on transmit success -->
<string name="actfm_toast_success">Saved on Server</string>
<!-- can't rename or delete shared tag message -->
<string name="actfm_tag_operation_disabled">Sorry, this operation is not yet supported for shared tags.</string>
<!-- warning before deleting a list you're the owner of -->
<string name="actfm_tag_operation_owner_delete">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?</string>
@ -36,7 +33,6 @@
<string name="actfm_picture_clear">Clear Picture</string>
<!-- filter list activity: refresh tags -->
<string name="actfm_FLA_menu_refresh">Refresh Lists</string>
<!-- Title for prompt after sharing a task -->
<string name="actfm_view_task_title">View Task?</string>
@ -62,7 +58,6 @@
<string name="TVA_add_comment">Add a comment...</string>
<!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
<string name="UAd_title_comment">%1$s re: %2$s</string>
<!-- Tabs for Tag view -->
<string-array name="TVA_tabs">
@ -90,10 +85,8 @@
<string name="actfm_TVA_tag_label">List</string>
<!-- Tag Settings: tag owner label -->
<string name="actfm_TVA_tag_owner_label">List Creator:</string>
<!-- Tag Settings: tag owner value when there is no owner -->
<string name="actfm_TVA_tag_owner_none">none</string>
<!-- slide 26a and 27b: Tag Settings: list collaborators label -->
<string name="actfm_TVA_members_label">Shared With</string>
@ -108,7 +101,6 @@
<string name="actfm_TVA_silence_label">Silence Notifications</string>
<!-- Tag Settings: list icon label -->
<string name="actfm_TVA_list_icon_label">List Icon:</string>
<!-- slide 25b/27d: Tag Settings: list description label -->
<string name="actfm_TVA_tag_description_label">Description</string>
@ -132,13 +124,10 @@
<string name="actfm_EPA_intro">Use Astrid to share shopping lists, party plans, or team projects and instantly see when people get stuff done!</string>
<!-- task sharing dialog: window title -->
<string name="actfm_EPA_title">Share / Assign</string>
<!-- task sharing dialog: save button -->
<string name="actfm_EPA_save">Save &amp; Share</string>
<!-- task sharing dialog: assigned label -->
<string name="actfm_EPA_assign_label">Who</string>
<!-- slide 18a: task sharing dialog: assigned label long version -->
<string name="actfm_EPA_assign_label_long">Who should do this?</string>
@ -156,7 +145,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<!-- task sharing dialog: custom email assignment -->
<string name="actfm_EPA_assign_custom">Custom...</string>
<!-- task sharing dialog: shared with label -->
<string name="actfm_EPA_share_with">Share with:</string>
@ -168,7 +156,6 @@
<string name="actfm_EPA_list">List: %s</string>
<!-- task sharing dialog: assigned hint -->
<string name="actfm_EPA_assigned_hint">Contact Name</string>
<!-- task sharing dialog: message label text -->
<string name="actfm_EPA_message_text">Invitation Message:</string>
@ -183,10 +170,8 @@
<string name="actfm_EPA_assign_header_friends">Astrid Friends</string>
<!-- task sharing dialog: message hint -->
<string name="actfm_EPA_tag_label">Create a shared tag?</string>
<!-- task sharing dialog: message hint -->
<string name="actfm_EPA_tag_hint">(i.e. Silly Hats Club)</string>
<!-- task sharing dialog: share with Facebook -->
<string name="actfm_EPA_facebook">Facebook</string>
@ -195,16 +180,13 @@
<string name="actfm_EPA_twitter">Twitter</string>
<!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
<string name="actfm_EPA_emailed_toast">Task shared with %s</string>
<!-- task sharing dialog: edit people settings saved -->
<string name="actfm_EPA_saved_toast">People Settings Saved</string>
<!-- task sharing dialog: invalid email (%s => email) -->
<string name="actfm_EPA_invalid_email">Invalid E-mail: %s</string>
<!-- task sharing dialog: tag not found (%s => tag) -->
<string name="actfm_EPA_invalid_tag">List Not Found: %s</string>
<!-- task sharing login prompt -->
<string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!</string>
@ -230,19 +212,14 @@
<string name="actfm_ALA_gg_login">Connect with Google</string>
<!-- share login: Sharing Footer Password Label -->
<string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
<!-- share login: Sharing Password Link -->
<string name="actfm_ALA_pw_link">Sign In Here</string>
<!-- share login: Password Are you a New User? -->
<string name="actfm_ALA_pw_new">Create a new account?</string>
<!-- share login: Password Are you a Returning User? -->
<string name="actfm_ALA_pw_returning">Already have an account?</string>
<!-- share login: Name -->
<string name="actfm_ALA_name_label">Name</string>
<!-- share login: Name -->
<string name="actfm_ALA_firstname_label">First Name</string>
@ -254,7 +231,6 @@
<string name="actfm_ALA_email_label">Email</string>
<!-- share login: Username / Email -->
<string name="actfm_ALA_username_email_label">Username / Email</string>
<!-- share login: Password -->
<string name="actfm_ALA_password_label">Password</string>
@ -304,10 +280,8 @@
<string name="actfm_https_disabled">HTTPS disabled (faster)</string>
<!-- title for notification tray after synchronizing -->
<string name="actfm_notification_title">Astrid.com Sync</string>
<!-- text for notification when comments are received -->
<string name="actfm_notification_comments">New comments received / click for more details</string>
<string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks.
Be advised that synchronizing with both services can in some cases lead to unexpected results.
@ -323,7 +297,6 @@
<string name="actfm_account_premium">Premium</string>
<string name="actfm_account_basic">Basic</string>
<string name="actfm_account_none">None</string>
<string name="actfm_inapp_billing">Upgrade to Premium</string>
<string name="actfm_inapp_billing_summary">Attach files, voice backups, premium support &amp; more</string>

@ -36,9 +36,7 @@
<string name="backup_BPr_auto_enabled">Backup will occur daily</string>
<!-- Preference screen restoring Tasks Help -->
<string name="backup_BPr_how_to_restore">How do I restore backups?</string>
<!-- Preference screen Restoring Tasks Help Dialog Text-->
<string name="backup_BPr_how_to_restore_dialog">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.</string>
<string name="backup_BPr_cloud_already_logged_in">You already have cloud backup on Astrid.com!</string>
@ -89,7 +87,6 @@ File %1$s contained %2$s.\n\n
<string name="import_progress_read">Reading task %d...</string>
<!-- Backup: Dialog when unable to open a file -->
<string name="DLG_error_opening">Could not find this item: </string>
<!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
<string name="DLG_error_sdcard">Cannot access folder: %s</string>

@ -43,7 +43,6 @@
few seconds.</string>
<!-- Button for going to Market -->
<string name="DLG_to_market">Go To Market</string>
<!-- Button for accepting EULA -->
<string name="DLG_accept">I Accept</string>
@ -61,7 +60,6 @@
<string name="DLG_loading">Loading...</string>
<!-- Dialog - dismiss -->
<string name="DLG_dismiss">Dismiss</string>
<!-- slide 20d -->
<string name="DLG_ok">OK</string>
@ -80,18 +78,14 @@
<string name="WID_dateButtonUnset">Click To Set</string>
<!-- String formatter for DateButtons ($D => date, $T => time) -->
<string name="WID_dateButtonLabel">$D $T</string>
<!-- String formatter for Disable button -->
<string name="WID_disableButton">Disable</string>
<!-- ============================================================= notes -->
<!-- Note Exposer -->
<string name="ENE_label">Notes</string>
<!-- Note Exposer / Comments -->
<string name="ENE_label_comments">Comments</string>
<!-- EditNoteActivity - no comments -->
<string name="ENA_no_comments">No activity yet</string>
@ -135,7 +129,6 @@
<string name="TLA_menu_suggestions">Suggestions</string>
<!-- Menu: Tutorial -->
<string name="TLA_menu_tutorial">Tutorial</string>
<!-- Menu: Settings -->
<string name="TLA_menu_settings">Account &amp; Settings</string>
@ -144,7 +137,6 @@
<string name="TLA_menu_support">Support</string>
<!-- Search Label-->
<string name="TLA_search_label">Search This List</string>
<!-- Window title for displaying Custom Filter -->
<string name="TLA_custom">Custom</string>
@ -206,7 +198,6 @@
<string name="TAd_deletedFormat">%s [deleted]</string>
<!-- Displayed when adapter is flung (scrolled quickly) -->
<string name="TAd_flingText"></string>
<!-- slide 22b: indicates task was completed. %s => date or time ago -->
<string name="TAd_completed">Finished\n%s</string>
@ -221,7 +212,6 @@
<string name="TAd_contextCopyTask">Copy Task</string>
<!-- Context Item: delete task -->
<string name="TAd_contextHelpTask">Get help</string><string name="TAd_contextDeleteTask">Delete Task</string>
<!-- Context Item: undelete task -->
<string name="TAd_contextUndeleteTask">Undelete Task</string>
@ -279,19 +269,15 @@
<string name="FSA_label">Astrid List or Filter</string>
<!-- Filter List Activity Title -->
<string name="FLA_title">Lists</string>
<!-- Displayed when loading filters -->
<string name="FLA_loading">Loading Filters...</string>
<!-- Context Menu: Create Shortcut -->
<string name="FLA_context_shortcut">Create Shortcut On Desktop</string>
<!-- Menu: Search -->
<string name="FLA_menu_search">Search Tasks...</string>
<!-- Menu: Help -->
<string name="FLA_menu_help">Help</string>
<!-- slide 28c: Create Shortcut Dialog Title -->
<string name="FLA_shortcut_dialog_title">Create Desktop Shortcut</string>
@ -320,13 +306,10 @@
<!-- ================================================= TaskEditActivity == -->
<!-- Title when editing a task (%s => task title) -->
<string name="TEA_view_title">Astrid: Editing \'%s\'</string>
<!-- Title when creating a new task -->
<string name="TEA_view_titleNew">New Task</string>
<!-- Task title label -->
<string name="TEA_title_label">Title</string>
<!-- Task when label -->
<string name="TEA_when_header_label">When</string>
@ -338,7 +321,6 @@
<string name="TEA_importance_label">Importance</string>
<!-- Task urgency label -->
<string name="TEA_urgency_label">Deadline</string>
<!-- Task urgency specific time checkbox -->
<string name="TEA_urgency_specific_time">At specific time?</string>
@ -386,10 +368,8 @@
<string name="TEA_onTaskSave_notDue">Task Saved</string>
<!-- Toast: task was not saved -->
<string name="TEA_onTaskCancel">Task Editing Was Canceled</string>
<!-- Toast: task was deleted -->
<string name="TEA_onTaskDelete">Task deleted!</string>
<!-- slide 15b: Task edit tab: activity -->
<string name="TEA_tab_activity">Activity</string>
@ -424,7 +404,6 @@
</string-array>
<!-- Task edit control set descriptors -->
<string name="TEA_control_title">Task Title</string>
<!-- slide 9b/35i -->
<string name="TEA_control_who">Who</string>
@ -456,13 +435,10 @@
<string name="hide_until_prompt">Show in my list</string>
<!-- Add Ons tab when no add-ons found -->
<string name="TEA_addons_text">Looking for more features?</string>
<!-- Add Ons button -->
<string name="TEA_addons_button">Get the Power Pack!</string>
<!-- More row -->
<string name="TEA_more">More</string>
<!-- slide 15c: Text when no activity to show -->
<string name="TEA_no_activity">No activity</string>
@ -473,7 +449,6 @@
<!-- When controls dialog -->
<string name="TEA_when_dialog_title">When is this due?</string>
<string name="TEA_date_and_time">Date/Time</string>
<string name="TEA_new_task">New Task</string>
@ -486,13 +461,10 @@
<!-- ============================================= IntroductionActivity == -->
<!-- slide 1a: Introduction Window title -->
<string name="InA_title">Welcome to Astrid!</string>
<!-- Button to agree to EULA -->
<string name="InA_agree">I Agree!!</string>
<!-- Button to disagree with EULA -->
<string name="InA_disagree">I Disagree</string>
<!-- ===================================================== MissedCallActivity == -->
@ -550,7 +522,6 @@
<!-- ===================================================== HelpActivity == -->
<!-- Help: Button to get support from our website -->
<string name="HlA_get_support">Get Support</string>
<!-- ==================================================== UpdateService == -->
@ -602,7 +573,6 @@
<string name="EPr_fontSize_desc">Font size on the main listing page</string>
<!-- Preferemce: Show task edit confirmation toasts -->
<string name="EPr_showEditToasts_title">Show task edit confirmations</string>
<!-- slide 34c: Preference: Task List Show Notes -->
<string name="EPr_showNotes_title">Show notes in task</string>
@ -624,9 +594,7 @@
<string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
<!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
<string name="EPr_userLegacyImportance_title">Use legacy importance style</string>
<!-- slide 34k-->
<string name="EPr_userLegacyImportance_desc">Use legacy importance style</string>
<!-- slide 34b: Preferences: Wrap task titles to two lines -->
<string name="EPr_fullTask_title">Show full task title</string>
@ -659,9 +627,7 @@
<string name="EPr_taskRowPrefs_title">Task row appearance</string>
<!-- slide 33b/ 49e: Preference screen: Astrid Labs (experimental features)-->
<string name="EPr_labs_header">Astrid Labs</string>
<!-- slide 33f -->
<string name="EPr_labs_desc">Try and configure experimental features</string>
<!-- slide 49g: Preferences: use the system contact picker for task assignment -->
<string name="EPr_use_contact_picker">Use contact picker</string>
@ -688,13 +654,11 @@
<string name="EPr_show_featured_lists">Show featured lists</string>
<string name="EPr_swipe_lists_restart_alert">You will need to restart Astrid for this change to take effect</string>
<!-- Swipe between lists -->
<!-- Preference: swipe between lists performance -->
<string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
<string name="EPr_swipe_lists_performance_subtitle">Controls the memory performance of swipe between lists</string>
<string-array name="EPr_swipe_lists_performance_mode">
<item>No swipe</item>
@ -716,7 +680,6 @@
<string name="swipe_lists_helper_subtitle">Change settings in Settings -> Appearance</string>
<!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
<string name="EPr_swipe_lists_display">%1$s - %2$s</string>
<string-array name="EPr_default_reminders_mode">
<!-- reminders duration: labels for "Task Defaults" preference item. -->
@ -800,10 +763,8 @@
<string name="AOA_free">Free</string>
<!-- Add-on Activity - menu item to visit add-on website -->
<string name="AOA_visit_website">Visit Website</string>
<!-- Add-on Activity - menu item to visit android market -->
<string name="AOA_visit_market">Android Market</string>
<!-- Add-on Activity - when list is empty -->
<string name="AOA_no_addons">Empty List!</string>
@ -853,7 +814,6 @@ Astrid might not let you know when your tasks are due.\n
<string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
<!-- Astrid's Android Marketplace title. It never appears in the app itself. -->
<string name="marketplace_title">Astrid Task/Todo List</string>
<!-- Astrid's Android Marketplace description. It never appears in the app itself. -->
<string name="marketplace_description">

@ -14,7 +14,6 @@
<string name="BFE_Active">Active Tasks</string>
<!-- Search Filter -->
<string name="BFE_Search">Search...</string>
<!-- slide 10b: Recently Modified -->
<string name="BFE_Recent">Recently Modified</string>
@ -23,10 +22,8 @@
<string name="BFE_Assigned">I\'ve Assigned</string>
<!-- Build Your Own Filter -->
<string name="BFE_Custom">Custom Filter...</string>
<!-- Saved Filters Header -->
<string name="BFE_Saved">Filters</string>
<!-- Saved Filters Context Menu: delete -->
<string name="BFE_Saved_delete">Delete Filter</string>
@ -40,7 +37,6 @@
<string name="CFA_filterName_hint">Name this filter to save it...</string>
<!-- Filter Name default for copied filters (%s => old filter name) -->
<string name="CFA_filterName_copy">Copy of %s</string>
<!-- slide 30a: Filter Starting Universe: all tasks -->
<string name="CFA_universe_all">Active Tasks</string>

@ -14,7 +14,6 @@
<string name="gcal_TEA_error">Error adding task to calendar!</string>
<!-- Label for adding task to calendar -->
<string name="gcal_TEA_calendar_label">Calendar Integration:</string>
<!-- slide 21c: Label for adding task to calendar -->
<string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
@ -23,7 +22,6 @@
<string name="gcal_TEA_showCalendar_label">Open Calendar Event</string>
<!-- Toast when unable to open calendar event -->
<string name="gcal_TEA_calendar_error">Error opening event!</string>
<!-- Toast when calendar event updated because task changed -->
<string name="gcal_TEA_calendar_updated">Calendar event also updated!</string>

@ -12,7 +12,6 @@
<string name="gtasks_FEx_header">Google Tasks</string>
<!-- filter category for GTasks lists -->
<string name="gtasks_FEx_list">By List</string>
<!-- filter title for GTasks lists (%s => list name) -->
<string name="gtasks_FEx_title">Google Tasks: %s</string>
@ -27,7 +26,6 @@
<string name="gtasks_FEx_create_list_error">Error creating new list</string>
<!-- short help title for Gtasks -->
<string name="gtasks_help_title">Welcome to Google Tasks!</string>
<string name="CFC_gtasks_list_text">In List: ?</string>
@ -42,7 +40,6 @@
<!-- ============================================ GtasksLoginActivity == -->
<!-- Activity Title: Gtasks Login -->
<string name="gtasks_GLA_title">Log In to Google Tasks</string>
<!-- Instructions: Gtasks login -->
<string name="gtasks_GLA_body">Please log in to Google Tasks Sync (Beta!). Non-migrated Google Apps
@ -56,22 +53,17 @@
By default, Astrid uses its own sort settings for tasks.</string>
<!-- Sign In Button -->
<string name="gtasks_GLA_signIn">Sign In</string>
<!-- E-mail Address Label -->
<string name="gtasks_GLA_email">E-mail</string>
<!-- Password Label -->
<string name="gtasks_GLA_password">Password</string>
<!-- Authenticating toast -->
<string name="gtasks_GLA_authenticating">Authenticating...</string>
<!-- Google Apps for Domain checkbox -->
<string name="gtasks_GLA_domain">Google Apps for Domain account</string>
<!-- Error Message when fields aren't filled out -->
<string name="gtasks_GLA_errorEmpty">Error: fill out all fields!</string>
<!-- Error Message when we receive a HTTP 401 Unauthorized -->
<string name="gtasks_GLA_errorAuth">Error authenticating! Please check your username and password in your phone\'s account manager</string>
@ -91,7 +83,6 @@
<!-- ================================================ Synchronization == -->
<!-- title for notification tray when synchronizing -->
<string name="gtasks_notification_title">Astrid: Google Tasks</string>
<!-- Error Message when we receive a HTTP 503 error -->
<string name="gtasks_error_backend">Google\'s Task API is in beta and has encountered an error. The service may be down, please try again later.</string>

@ -27,14 +27,10 @@
<!-- Shown after a user adds a task on phones -->
<string name="help_popover_switch_lists">Tap to add a list or switch between lists</string>
<string name="help_popover_when_shortcut">Tap this shortcut to quick select date and time</string>
<string name="help_popover_when_row">Tap anywhere on this row to access options like repeat</string>
<!-- Login activity -->
<string name="welcome_login_title">Welcome to Astrid!</string>
<string name="welcome_login_intro"></string>
<!-- slide 7b -->
<string name="welcome_login_tos_base">By using Astrid you agree to the</string>

@ -16,7 +16,6 @@
when you have any tasks in the following filter:</string>
<!-- Locale Window Filter Picker UI -->
<string name="locale_pick_filter">Filter:</string>
<!-- Locale Window Interval Label -->
<string name="locale_interval_label">Limit notifications to:</string>

@ -83,7 +83,6 @@
<string name="producteev_PLA_timezone">Timezone</string>
<!-- Confirm Password Label -->
<string name="producteev_PLA_confirmPassword">Confirm Password</string>
<!-- First Name Label -->
<string name="producteev_PLA_firstName">First Name</string>
@ -95,7 +94,6 @@
<string name="producteev_PLA_errorEmpty">Error: fill out all fields!</string>
<!-- Error Message when passwords don't match -->
<string name="producteev_PLA_errorMatch">Error: passwords don\'t match!</string>
<!-- Error Message when we receive a HTTP 401 Unauthorized -->
<string name="producteev_PLA_errorAuth">Error: e-mail or password incorrect!</string>
@ -106,16 +104,12 @@
<string name="producteev_notification_title">Producteev</string>
<!-- text for notification tray when synchronizing -->
<string name="producteev_notification_text">%s tasks updated / click for more details</string>
<!-- Error msg when io exception -->
<string name="producteev_ioerror">Connection Error! Check your Internet connection.</string>
<!-- Prod Login email not specified-->
<string name="producteev_MLA_email_empty">E-Mail was not specified!</string>
<!-- Prod Login password not specified-->
<string name="producteev_MLA_password_empty">Password was not specified!</string>
<!-- ================================================ labels for layout-elements == -->
@ -126,13 +120,11 @@
<string name="producteev_TEA_task_assign_label">Assign this task to this person:</string>
<!-- Spinner-item for unassigned tasks on taskeditactivity -->
<string name="producteev_TEA_task_unassigned">&lt;Unassigned&gt;</string>
<!-- label for dashboard-assignment spinner on taskeditactivity -->
<string name="producteev_TEA_dashboard_assign_label">Assign this task to this workspace:</string>
<!-- Spinner-item for default dashboard on taskeditactivity -->
<string name="producteev_TEA_dashboard_default">&lt;Default&gt;</string>
<string name="CFC_producteev_in_workspace_text">In workspace: ?</string>

@ -77,7 +77,6 @@
<string name="rmd_reengage_name_default">you</string>
<string name="rmd_reengage_snooze">Snooze all</string>
<string name="rmd_reengage_add_tasks">Add a task</string>
@ -148,9 +147,7 @@
<string name="rmd_EPr_persistent_desc_false">Notifications can be cleared with \"Clear All\" button</string>
<!-- Reminder Preference: Notification Icon Title -->
<string name="rmd_EPr_notificon_title">Notification icon set</string>
<!-- Reminder Preference: Notification Icon Description -->
<string name="rmd_Epr_notificon_desc">Choose Astrid\'s notification bar icon</string>
<!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
<string name="rmd_EPr_multiple_maxvolume_title">Max volume for multiple-ring reminders</string>
@ -188,7 +185,6 @@
<string name="rmd_EPr_defaultRemind_desc">New tasks will remind randomly: %s</string>
<!-- slide 39a: Defaults Title -->
<string name="rmd_EPr_defaults_header">New task defaults</string>
<string-array name="EPr_reminder_random">
<!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->

@ -23,23 +23,19 @@
<string name="TEA_tag_hint">New list</string>
<!-- Tags dropdown -->
<string name="TEA_tag_dropdown">Select a list</string>
<!-- =============================================== Task List Controls == -->
<!-- menu item for tags -->
<string name="tag_TLA_menu">Lists</string>
<!-- ========================================================== Extras == -->
<!-- Context Item: show tag -->
<string name="TAd_contextFilterByTag">Show List</string>
<!-- slide 25a: Dialog: new list -->
<string name="tag_new_list">New List</string>
<!-- Dialog: list saved -->
<string name="tag_list_saved">List Saved</string>
<!-- Dialog: task created without title -->
<string name="tag_no_title_error">Please enter a name for this list first!</string>
@ -53,13 +49,10 @@
<string name="tag_FEx_header">Lists</string>
<!-- filter header for tags user created -->
<string name="tag_FEx_category_mine">My Lists</string>
<!-- filter header for tags, shared with user -->
<string name="tag_FEx_category_shared">Shared With Me</string>
<!-- filter header for tags which have no active tasks -->
<string name="tag_FEx_category_inactive">Inactive</string>
<!-- slide 10d: filter for untagged tasks -->
<string name="tag_FEx_untagged">Not in any List</string>
@ -68,7 +61,6 @@
<string name="tag_FEx_untagged_w_astrid">Not in an Astrid List</string>
<!-- slide 27a: %s => tag name -->
<string name="tag_FEx_name">List: %s</string>
<!-- context menu option to rename a tag -->
<string name="tag_cm_rename">Rename List</string>

@ -9,16 +9,13 @@
<!-- Resources for built-in timers plug-in -->
<!-- Task List: Start Timer button -->
<string name="TAE_startTimer">Timer</string>
<!-- Task List: Stop Timer button -->
<string name="TAE_stopTimer">Stop</string>
<!-- Android Notification Title (%s => # tasks) -->
<string name="TPl_notification">Timers Active for %s!</string>
<!-- Filter Header for Timer plugin -->
<string name="TFE_category">Timer Filters</string>
<!-- Filter for Timed Tasks -->
<string name="TFE_workingOn">Tasks Being Timed</string>

@ -6,7 +6,6 @@
-->
<resources>
<string name="welcome_show_eula">Accept EULA to get started!</string>
<!-- slide 30a-->
<string name="welcome_setting">Show tutorial</string>
@ -53,7 +52,6 @@
<string name="welcome_body_7_return">Tap Astrid to return.</string>
<string name="welcome_back">Back</string>
<!-- slide 1c -->
<string name="welcome_next">Next</string>

@ -37,7 +37,6 @@
<item name="asListsDisclosure">@drawable/lists_disclosure_blue</item>
<item name="asAbBackgroundColor">#000000</item>
<item name="asQuickaddBackgroundColor">?attr/asAbBackgroundColor</item>
<item name="asTaskEditArrow">@drawable/taskedit_arrow_up_white</item>
<item name="asRepeatIcon">@drawable/icn_edit_repeats_blue</item>
<item name="asListPopoverBg">@drawable/list_popover_bg_white</item>
<item name="asListArrowUp">@drawable/list_arrow_up_white</item>
@ -88,7 +87,6 @@
<item name="asPeopleMenu">@drawable/people_menu_button_red</item>
<item name="asThemeTextColor">@color/red_theme_color</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
<item name="asTaskEditArrow">@drawable/taskedit_arrow_up_white</item>
<item name="asRepeatIcon">@drawable/icn_edit_repeats_red</item>
<item name="asAbBackgroundColor">#ffffff</item>
<item name="asListPopoverBg">@drawable/list_popover_bg</item>

@ -227,7 +227,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
tlfPager.setOnPageChangeListener(this);
}
protected int getHeaderView() {
private int getHeaderView() {
return R.layout.header_nav_views;
}

@ -793,16 +793,18 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
new HashMap<Integer, Drawable>(3);
@SuppressWarnings("nls")
public Drawable getDrawable(String source) {
int drawable = 0;
if(source.equals("silk_clock"))
source = "details_alarm";
drawable = R.drawable.details_alarm;
else if(source.equals("silk_tag_pink"))
source = "details_tag";
drawable = R.drawable.details_tag;
else if(source.equals("silk_date"))
source = "details_repeat";
drawable = R.drawable.details_repeat;
else if(source.equals("silk_note"))
source = "details_note";
drawable = R.drawable.details_note;
int drawable = resources.getIdentifier("drawable/" + source, null, Constants.PACKAGE);
if (drawable == 0)
drawable = resources.getIdentifier("drawable/" + source, null, Constants.PACKAGE);
if(drawable == 0)
return null;
Drawable d;

Loading…
Cancel
Save