From 85f892a24a1603311e8c5a7059a6cd5c2da583c8 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sun, 17 May 2009 07:57:50 +0000
Subject: [PATCH]   Updated german translation for sync tokens, added
 preposition version of date plurals. Also removed other language localization
 files until we can proofread and get them up to date.

---
 res/values-de/strings.xml                     |  73 ++-
 res/values-ja/arrays.xml                      |  63 ---
 res/values-ja/strings.xml                     | 415 ------------------
 res/values-nn/arrays.xml                      |  80 ----
 res/values-nn/strings.xml                     | 413 -----------------
 res/values-zh/arrays.xml                      |  89 ----
 res/values-zh/strings.xml                     | 414 -----------------
 res/values/strings.xml                        |   4 +
 .../astrid/activities/TaskListAdapter.java    |   6 +-
 .../timsu/astrid/utilities/DateUtilities.java |  13 +-
 10 files changed, 46 insertions(+), 1524 deletions(-)
 delete mode 100644 res/values-ja/arrays.xml
 delete mode 100644 res/values-ja/strings.xml
 delete mode 100644 res/values-nn/arrays.xml
 delete mode 100644 res/values-nn/strings.xml
 delete mode 100644 res/values-zh/arrays.xml
 delete mode 100644 res/values-zh/strings.xml

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fdbcef9cf..dad4e17bc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -51,15 +51,19 @@
         </plurals>
         
         <!-- Time Constants -->
-        <string name="dateFormatter">d. MMMM</string> <!-- used for long due 
+        <string name="dateFormatter">d. MMM.</string> <!-- used for long due 
             dates. c.f. Java's SimpleDateFormat -->
         <string name="daysVertical">T\na\ng\ne</string> <!-- vertical labels
             are used in the number dialogs -->
-        <string name="hoursVertical">U\nh\nr</string>
+        <string name="hoursVertical">S\nt\nd</string>
         <plurals name="Ndays">
             <item quantity="one">1 Tag</item>
             <item quantity="other">%d Tage</item>
         </plurals>
+        <plurals name="NdaysPreposition">
+            <item quantity="one">1 Tag</item>
+            <item quantity="other">%d Tagen</item>
+        </plurals>
         <plurals name="Nhours">
             <item quantity="one">1 Stunde</item>
             <item quantity="other">%d Stunden</item>
@@ -244,37 +248,42 @@ Wenn Du die neue Aufgabe nicht gleich nach der Fertigstellung der alten sehen wi
         <string name="p_sync_rtm">sync_rtm</string>
         <string name="sync_rtm_title">Remember The Milk</string><!-- Proper noun - don't translate ? -->
         <string name="sync_rtm_desc">http://www.rememberthemilk.com</string>
-        <string name="p_sync_every">sync_every</string>
-        <string name="sync_every_title">Häufigkeit der Synchronisation</string>
-        <string name="sync_every_desc">Falls eingestellt, synchronisiere alle # Stunden</string>
-        <string name="p_sync_button">sync_button</string>
+        <string name="sync_interval_title">Auto-Synchronisieren</string>
+        <string name="sync_interval_desc">Synchronisiert automatisch im fix eingestellten Interval falls ausgewählt</string>
         <string name="sync_button_title">Hauptmenu-Verknüpfung</string>
         <string name="sync_button_desc">Zeige \"Synchronisieren\" im Menu von Astrid</string>
-        <string name="p_sync_quiet">sync_dialogs</string>
         <string name="sync_quiet_title">Fenster verstecken</string>
         <string name="sync_quiet_desc">Verstecke das Sychronisationsergebnis-Fenster</string>
-        <string name="p_sync_background">sync_background</string>
-        <string name="sync_background_title">Im Hintergrund</string>
-        <string name="sync_background_desc">Synchronisieren ohne dich zu stören</string>
+        <string name="sync_bgwifi_title">Auto-Sync nur über WLAN</string>
+        <string name="sync_bgwifi_desc">Synchronisiert im Hintergrund nur über WLAN falls ausgewählt</string>
         <string name="sync_error">Synchronisations-Fehler! Entschuldige die Störung! Fehler:</string>
         <string name="sync_auth_request">
 Bitte logge dich in dein %s Konto ein und authorisiere Astrid deine Daten zu lesen, um synchronisieren zu können.
 \n\n
 Nach der Fertigstellung, starte Astrid neu und komm hierher zurück.
-        </string>
-        <string name="sync_rtm_notes">
-Wilkommen zur Sunchronisierung von Astrid!
-\n\n
-Nicht synchronisiert werden:\n
-- Erinnerungen und Wiederholungen\n
-- In RTM: Löschen, Verschieben und Umbennen von Aufgaben\n
-\n
-Wünsch mir Glück!\n
         </string>
         <string name="sync_now">Synchronisiere jetzt!</string>
         <string name="sync_forget">Persönliche Daten löschen</string>
         <string name="sync_forget_confirm">Daten für ausgewähltes Gerät löschen?</string>
         <string name="sync_no_synchronizers">Keine Synchronisiergerät eingestellt!</string>
+	<string name="sync_last_sync">Zuletzt synchronisiert: %s</string>
+        <string name="sync_last_auto_sync">Letzter Sync-Versuch: %s</string>
+        <string name="sync_date_never">noch nie</string>
+        <string name="sync_result_title">%s Ergebnisse</string>
+        <string name="sync_result_local">Zusammenfassung - Astrid:</string>
+        <string name="sync_result_remote">Zusammenfassung - Server:</string>
+        <string name="sync_result_created">Erstellt: %d</string>
+        <string name="sync_result_updated">Aktualisiert: %d</string>
+        <string name="sync_result_deleted">Gelöscht: %d</string>
+        <string name="sync_result_merged">Zusammengeführt: %d</string>
+        
+        <string name="sync_progress_remote">Empfange Daten vom Server</string>
+        <string name="sync_progress_rxlist">Reading List: %s</string>
+        <string name="sync_progress_repeating">Synchronisiere wiederholende Aufgabe</string>
+        <string name="sync_progress_localtx">Sende Aufgabe:: %s</string>
+        <string name="sync_progress_localdel">Lokal gelöschte Aufgaben</string>
+        <string name="sync_progress_remotetx">Empfange Aufgabe: %s</string>
+
        
     <!-- Dialog Boxes -->  
     <skip />
@@ -324,11 +333,9 @@ Danke, dass Du Astrid benutzt!\n
 
         <string name="prefs_category_alerts">Erinnerungen</string>
         
-        <string name="p_notif_quietStart">notif_qstart</string>
         <string name="prefs_quietStart_title">Ruhestunden beginnen</string>
         <string name="prefs_quietStart_desc">Stunde, bei der die Ruhestunden beginnen (z.B. 22)</string>
         
-        <string name="p_notif_quietEnd">notif_qend</string>
         <string name="prefs_quietEnd_title">Ruhestunden beenden</string>
         <string name="prefs_quietEnd_desc">Stunde, bei der Astrid aufhört ruhig zu sein (z.B. 08)</string>
           
@@ -336,72 +343,48 @@ Danke, dass Du Astrid benutzt!\n
         <string name="prefs_defaultRemind_title">Standarderinnerungen</string>
         <string name="prefs_defaultRemind_desc">Für neue Aufgaben, in Tagen (z.B. 7). Zum Deaktiviereen leer lassen</string>
         
-        <string name="p_notif_annoy">notif_annoy</string>
         <string name="prefs_annoy_title">Hartnäckiger Modus</string>
         <string name="prefs_annoy_desc">Wenn eingestellt, musst Du die Erinnerung anschauen, um sie zu entfernen</string>
         
-        <string name="p_notification_ringtone">notification_ringtone</string>
         <string name="prefs_notification_title">Erinnerungsklingelton</string>
         <string name="prefs_notification_desc">Wähle einen Klingelton für Astrids Erinnerungen</string>
 
-        <string name="p_notif_icon">notif_theme</string>
         <string name="prefs_notificon_title">Erinnerungsicon</string>
         <string name="prefs_notificon_desc">Wähle Astrids Icon für die Benachrichtigunsleiste</string>
         
         <string name="prefs_category_appearance">Erscheinungsbild</string>
             
-        <string name="p_colorize">colorize</string>
         <string name="prefs_colorize_title">Färbe die Aufgabenliste</string>
         <string name="prefs_colorize_desc">Unterschiedliche Farben für unterschiedliche Prioritäten</string>
         
-        <string name="p_fontSize">font_size</string>
         <string name="prefs_fontSize_title">Schriftart der Aufgabenliste</string>
         <string name="prefs_fontSize_desc">Schriftart auf der Hautplistenseite (z.B. 22)</string>
 
         <string name="prefs_category_other">Weiteres</string>
         
-        <string name="p_nagging">nagging</string>
         <string name="prefs_nagging_title">Nörgel-Nachrichten</string>
         <string name="prefs_nagging_desc">Astrids Kommentare zeigen, wenn Du Erinnerungen anschaust oder Aufgaben aufschiebst?</string>
 
-        <string name="p_deadlineTime">deadline_time</string>
         <string name="prefs_deadlineTime_title">Standardfrist</string>
         <string name="prefs_deadlineTime_desc"># der Tage ab heute zum Setzten neuer Fristen</string>
         
         <string name="displayedFields_PrefScreen_Title">Angezeigte Felder</string>
         <string name="displayedFields_PrefScreen_Desc">Wähle die in der Aufgabenliste zu zeigenden Felder aus</string>
         
-        <!-- notification keys (no title, desc, default suffix) should not be localized -->
-        <string name="prefs_titleVisible">titleVisible</string> 
         <string name="prefs_titleVisible_title">Task Title</string>
         <string name="prefs_titleVisible_desc">Task description</string>
-        <string name="prefs_titleVisible_default">true</string>
-	    <string name="prefs_deadlineVisible">deadlineVisible</string>
         <string name="prefs_deadlineVisible_title">Dates</string>
         <string name="prefs_deadlineVisible_desc">Upcoming deadlines / completed date</string>
-        <string name="prefs_deadlineVisible_default">true</string>
-    	<string name="prefs_timeVisible">timeVisible</string>
         <string name="prefs_timeVisible_title">Times</string>
         <string name="prefs_timeVisible_desc">Estimated &amp; Elapsed Times</string>
-        <string name="prefs_timeVisible_default">true</string>
-        <string name="prefs_importanceVisible">importanceVisible</string>
         <string name="prefs_importanceVisible_title">Importance</string>
         <string name="prefs_importanceVisible_desc">Task importance indicator</string>
-        <string name="prefs_importanceVisible_default">true</string>
-	    <string name="prefs_tagsVisible">tagsVisible</string>
         <string name="prefs_tagsVisible_title">Tags</string>
         <string name="prefs_tagsVisible_desc">Tags associated with this task</string>
-        <string name="prefs_tagsVisible_default">true</string>
-	    <string name="prefs_repeatVisible">repeatVisible</string>
         <string name="prefs_repeatVisible_title">Repeats</string>
         <string name="prefs_repeatVisible_desc">Task repeat information</string>
-        <string name="prefs_repeatVisible_default">true</string>
-	    <string name="prefs_reminderVisible">reminderVisible</string>
         <string name="prefs_reminderVisible_title">Reminders</string>
         <string name="prefs_reminderVisible_desc">Displayed if this task has reminders</string>
-        <string name="prefs_reminderVisible_default">false</string>
-	    <string name="prefs_notesVisible">notesVisible</string>
         <string name="prefs_notesVisible_title">Notes</string>
         <string name="prefs_notesVisible_desc">Notes associated with this task</string>
-        <string name="prefs_notesVisible_default">false</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
deleted file mode 100644
index 592cc4dcc..000000000
--- a/res/values-ja/arrays.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
-     
-     - translate to Japanese by Maimuzo (maimuzo@gmail.com)
--->
-
-<resources>
-    <!-- Make these < 20 chars so the task name is displayed -->
-    <string-array name="reminders">
-        <item>やぁみんな! ちょっといいかな?</item>
-        <item>ちょっと見ていい?</item>
-        <item>ちょっと時間あるかな?</item>
-        <item>忘れちゃった?</item>
-        <item>ごめんよ!</item>
-        <item>ちょっと時間があるとき:</item>
-        <item>予定上:</item>
-        <item>ちょっとヒマある?</item>
-        <item>Astridだよ!</item>
-        <item>やぁ! ちょっといいかな?</item>
-        <item>ちょっと時間ある?</item>
-        <item>ごきげんよう</item>
-    </string-array>
-    
-    <!-- Astrid says...  (user should answer yes or no)-->
-    <string-array name="reminder_responses">
-        <item>私は、あなたのために何かを持っています！</item>
-        <item>過去にこれを設定していいの？</item>
-        <item>なんでコレしないの?</item>
-        <item>それどう? イケてる?</item>
-        <item>準備できてる?</item>
-        <item>これ管理できる?</item>
-        <item>幸せになれるよ! これを終わらすだけで!</item>
-        <item>これを終えたらあなたの気分が良くなることを約束します!</item>
-        <item>今日はコレしないの?</item>
-        <item>これを終えてください、私はそれにうんざりしています！</item>
-        <item>それやっちゃえる? もちろんできるさ!</item>
-        <item>あなたはこうするつもりですか？</item>
-        <item>調子良さそうじゃん! さぁやろっか!</item>
-        <item>やるじゃん! それもやっちゃえ!</item>
-        <item>これ終わらせておやつにしない?</item>
-        <item>このタスクだけ? やっちゃお?</item>
-        <item>ToDoリストを消化する時間だよ!</item>
-    </string-array>
-    
-    <string-array name="notif_icon_entries">
-        <item>ピンク</item>
-        <item>ボーリング</item>
-        <item>Astrid</item>
-    </string-array>
-       
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
deleted file mode 100644
index f7abe62a9..000000000
--- a/res/values-ja/strings.xml
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ASTRID: Android's Simple Task Recording Dashboard
- 
-  Copyright (c) 2009 Tim Su
- 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-  for more details.
- 
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-  - translate to Japanese by Maimuzo (maimuzo@gmail.com)
- 
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- application -->
-    <string name="app_name">Astrid</string>
-    
-    <!-- General String Constants -->
-    <skip />
-    
-        <!-- Importance Labels -->
-        <string name="importance_1">!!!!</string>
-        <string name="importance_2">!!!</string>
-        <string name="importance_3">!!</string>
-        <string name="importance_4">!</string>
-        
-        <!-- Repeat Interval Labels -->
-        <string name="repeat_days">毎日</string>
-        <string name="repeat_weeks">毎週</string>
-        <string name="repeat_months">毎月</string>
-        <string name="repeat_hours">毎時</string>
-        
-        <!-- Plurals -->
-        <plurals name="Ntasks">
-            <item quantity="one">1 タスク</item>
-            <item quantity="other">%d タスク</item>
-        </plurals>
-        <plurals name="NactiveTasks">
-            <item quantity="one">%d / %d 有効</item>
-            <item quantity="other">%d / %d 有効</item>
-        </plurals>
-        <plurals name="Nalarms">
-            <item quantity="one">1 アラーム</item>
-            <item quantity="two">2 アラーム</item>
-            <item quantity="other">%d アラーム</item>
-        </plurals>
-        <plurals name="Ntags">
-            <item quantity="one">1 タグ</item>
-            <item quantity="other">%d タグ</item>
-        </plurals>
-        
-        <!-- Time Constants -->
-        <string name="dateFormatter">MMM d</string> <!-- used for long due 
-            dates. c.f. Java's SimpleDateFormat -->
-        <string name="daysVertical">日</string> <!-- vertical labels
-            are used in the number dialogs -->
-        <string name="hoursVertical">時</string>
-        <plurals name="Ndays">
-            <item quantity="one">1 日</item>
-            <item quantity="other">%d 日</item>
-        </plurals>
-        <plurals name="Nhours">
-            <item quantity="one">1 時</item>
-            <item quantity="other">%d 時</item>
-        </plurals>
-        <plurals name="Nminutes">
-            <item quantity="one">1 分</item>
-            <item quantity="other">%d 分</item>
-        </plurals>
-        <plurals name="Nseconds">
-            <item quantity="one">1 秒</item>
-            <item quantity="other">%d 秒</item>
-        </plurals>
-        <plurals name="NhoursShort">
-            <item quantity="one">1 時</item>
-            <item quantity="other">%d 時</item>
-        </plurals>
-        <plurals name="NminutesShort">
-            <item quantity="one">1 分</item>
-            <item quantity="other">%d 分</item>
-        </plurals>
-        <plurals name="NsecondsShort">
-            <item quantity="one">1 秒</item>
-            <item quantity="other">%d 秒</item>
-        </plurals>
-        <string name="ago_suffix">前</string><!-- appended after time
-            constants to show time in past -->
-        
-    <!-- TaskList -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskList_titlePrefix">Astrid: </string>
-        <string name="taskList_titleTagPrefix">Tagged \"%s\": </string>
-        <string name="taskList_hiddenSuffix"> 非表示</string>
-        <string name="addtask_label">新規タスク</string>
-        <string name="missing_tag">Could Not Find Requested Tag!</string>
-        
-        <!-- text in the actual list -->
-        <string name="taskList_hiddenPrefix">隠</string><!-- prefix to show that a task is hidden -->
-        <string name="taskList_dueRelativeTime">予定日まで</string><!-- i.e. Due in 4 days -->
-        <string name="taskList_dueAbsoluteDate">予定日 </string><!-- i.e. Due on Jan 2 -->
-        <string name="taskList_goalPrefix">目標</string><!-- prefix to deadline -->
-        <string name="taskList_overdueBy">遅延</string>
-        <string name="taskList_completedPrefix">完了</string><!-- i.e. Finished 4 days ago -->
-		<string name="taskList_estimatedTimePrefix">概要:</string>
-        <string name="taskList_elapsedTimePrefix">経過:</string>
-        <string name="taskList_periodicReminderPrefix">通知周期</string>
-        <string name="taskList_repeatPrefix">繰り返し周期</string>
-        <string name="taskList_alarmPrefix">次のアラーム:</string>
-        <string name="taskList_tagsPrefix">タグ:</string>
-        <string name="taskList_notesPrefix">メモ:</string>
-        <string name="taskList_createdPrefix">登録:</string>
-        
-        <!-- menu items -->
-        <string name="taskList_menu_insert">追加</string>
-        <string name="taskList_menu_tags">タグ</string>
-        <string name="taskList_menu_filters">表示</string>
-        <string name="taskList_menu_syncshortcut">同期</string>
-        <string name="taskList_menu_more">More</string>
-        <string name="taskList_menu_sync">同期</string>
-        <string name="taskList_menu_settings">設定</string>
-        <string name="taskList_menu_help">ヘルプ (ブラウザで開く)</string>
-        <string name="taskList_menu_survey">Astridの概要!</string>
-        <string name="taskList_menu_tips">ヒント</string>
-        <string name="taskList_menu_cleanup">Clean Up Old Tasks</string>
-        
-        <string name="taskList_context_edit">タスク編集</string>
-        <string name="taskList_context_delete">タスク削除</string>
-        <string name="taskList_context_startTimer">タイマースタート</string>
-        <string name="taskList_context_stopTimer">タイマーストップ</string>
-        <string name="taskList_context_postpone">延期</string>
-        
-        <!-- filter menu -->
-        <string name="taskList_filter_title">ソート/フィルター</string>
-        <string name="taskList_filter_hidden">隠し/処理待ちタスク</string>
-        <string name="taskList_filter_done">完了したタスク</string>
-        <string name="taskList_filter_tagged">タグ \'%s\'</string>
-        <string name="taskList_sort_auto">オートソート</string>
-        <string name="taskList_sort_alpha">名前順</string>
-        <string name="taskList_sort_duedate">予定日順</string>
-        <string name="taskList_sort_reverse">逆順</string>
-        
-        <string name="taskList_nonag_reminder">Select an Action:</string>
-        <string name="taskList_postpone_count">Times You\'ve Postponed: %d</string>
-        <string name="taskList_postpone_dialog">どの程度の期間延期しますか?</string>
-        <string name="taskList_cleanup_dialog">"Delete completed tasks older than # days:"</string>
-
-
-    <!-- TaskEdit -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskEdit_titleGeneric">Astrid: タスク編集中</string>
-        <string name="taskEdit_titlePrefix">Astrid: 編集中 </string>
-        <string name="taskEdit_label">Astrid: 新規タスク</string>
-        
-        <!-- tabs -->
-        <string name="taskEdit_tab_basic">基本情報</string>
-        <string name="taskEdit_tab_dates">日付</string>
-        <string name="taskEdit_tab_alerts">アラート</string>
-        
-        <!-- labels -->
-        <string name="name_label">概要</string>
-        <string name="name_hint">タスクの説明</string>
-        <string name="importance_label">どれくらい重要?</string>
-        <string name="tags_label">タグ:</string>
-        
-        <string name="estimatedDuration_label">所要時間は?</string>
-        <string name="elapsedDuration_label">既にタスクに費やした時間</string>
-        <string name="definiteDueDate_label">期限</string>
-        <string name="preferredDueDate_label">目標日時</string>
-        <string name="addToCalendar_label">カレンダーにタスクを追加</string>
-        <string name="showCalendar_label">カレンダーのイベントを開く</string>
-        <string name="hiddenUntil_label">この日時まで隠す</string>
-        <string name="repeat_label">繰り返し周期</string>
-        <string name="repeat_value_unset">繰り返しはしない</string>
-        <string name="blockingOn_label">このタスクが処理されるまで隠す</string>
-        <string name="notes_label">メモ</string>
-        <string name="notes_hint">メモをここに入力します...</string>
-        
-        <string name="notification_label">リマインダー</string>
-        <string name="notification_prefix">周期</string>
-        <string name="flags_label">以下の場合通知する...</string>
-        <string name="flag_before">期限が近づいたとき</string>
-        <string name="flag_during">期限になったとき</string>
-        <string name="flag_after">期限を過ぎた後</string>
-        <string name="flag_nonstop">タスクを確認するまで停止しない</string>
-        <string name="alerts_label">日時指定リマインダー</string>
-        <string name="add_alert">リマインダーの追加</string>
-        
-        <!-- dialog boxes -->
-        <string name="hour_minutes_dialog">時間 (時:分)</string>
-        <string name="notification_dialog">リマインダーの周期</string>
-        <string name="repeat_picker_title">繰り返し周期 (0で無効化)</string>
-        <string name="repeat_help_dialog_title">ヘルプ: Astridの繰り返しについて</string>
-        <string name="repeat_help_dialog">
-繰り返しを使うために、上記の期限のうちの少なくとも1つを決めてください。あなたがこのタスクを完了したタイミングで、期限は自動的に繰り越されます。
-\n\n
-もしあなたが現在のタスクを消化し終えるまで次回のタスクを見たくないならば、「〜まで隠す」の項目を使って自動的に繰り越すべきです。
-\n
-        </string>
-        <string name="repeat_help_hide">もうヘルプを表示しない</string>
-        
-        <!-- buttons -->
-        <string name="save_label">保存</string>
-        <string name="discard_label">破棄</string>
-        <string name="edit_label">編集</string>
-        <string name="delete_label">削除</string>
-        <string name="blank_button_title">指定する</string>
-        <string name="startTimer_label">タイマースタート</string>
-        <string name="stopTimer_label">タイマーストップ</string>
-        
-        <string name="taskEdit_menu_save">保存</string>
-        <string name="taskEdit_onTaskSave_Due">Task Saved: due in %s</string>
-        <string name="taskEdit_onTaskSave_notDue">Task Saved</string>
-      
-    <!-- TaskView  -->
-    <skip />
-    
-        <string name="taskView_notifyTitle">Astridより...</string>
-        
-    <!-- Tag List -->
-    <skip />
-        <string name="tagList_titlePrefix">Astrid: タグビュー: </string>
-        <string name="tagList_context_create">タグを使ってタスク生成</string>
-        <string name="tagList_context_edit">タグ編集</string>
-        <string name="tagList_context_delete">タグ削除</string>
-        <string name="tagList_context_showTag">ホームページを表示</string>
-        <string name="tagList_context_hideTag">ホームページを隠す</string>
-        <string name="tagList_context_shortcut">Create Shortcut</string>
-        <string name="tagList_shortcut_created">Shortcut created on your home screen!</string>
-        <string name="tagList_shortcut_prefix">Tag:</string>
-        
-        <string name="tagList_menu_sortAlpha">A-Z順</string>
-        <string name="tagList_menu_sortSize">サイズ順</string>
-    
-    
-    <!-- Synchronization -->  
-    <skip />
-        <string name="sync_pref_group">同期サービス</string>
-        <string name="sync_pref_group_actions">アクション</string>
-        <string name="sync_pref_group_options">オプション</string>
-        <string name="p_sync_rtm">sync_rtm</string>
-        <string name="sync_rtm_title">Remember The Milk</string>
-        <string name="sync_rtm_desc">http://www.rememberthemilk.com</string>
-        <string name="p_sync_every">sync_every</string>
-        <string name="sync_every_title">同期する頻度</string>
-        <string name="sync_every_desc">指定した場合、#時間毎に同期処理を実行します</string>
-        <string name="p_sync_button">sync_button</string>
-        <string name="sync_button_title">メインメニューへのショートカット</string>
-        <string name="sync_button_desc">Astridのメニューの中に\"Synchronize\"を表示します</string>
-        <string name="p_sync_quiet">sync_dialogs</string>
-        <string name="sync_quiet_title">ダイアログの非表示</string>
-        <string name="sync_quiet_desc">同期処理の結果ダイアログを表示しない</string>
-        <string name="p_sync_background">sync_background</string>
-        <string name="sync_background_title">バッググラウンドで</string>
-        <string name="sync_background_desc">簡易同期</string>
-        <string name="sync_error">同期エラー発生! ご迷惑をおかけします! エラー内容:</string>
-        <string name="sync_auth_request">
-同期処理を行うため、あなたの%sアカウントを使ってログインし、Astridにあなたのデータの読み込み許可を与えてください。
-\n\n
-終了したら、Astridを再起動してからこの画面に戻ってきてください。
-        </string>
-        <string name="sync_rtm_notes">
-AstridのRTM同期機能へようこそ!
-\n\n
-同期しないもの：\n
-- 通知と繰り返し\n
-- RTMで、消した、またはリネームして移動したタスク\n
-\n
-幸運を!\n
-        </string>
-        <string name="sync_now">今すぐ同期する!</string>
-        <string name="sync_forget">個人データをクリアする</string>
-        <string name="sync_forget_confirm">選択されたサービスのデータをクリアしますか?</string>
-        <string name="sync_no_synchronizers">同期機能が有効になっていません!</string>
-       
-    <!-- Dialog Boxes -->  
-    <skip />
-        <string name="loading">Loading...</string>
-        <string name="updating">Updating List...</string>
-        <string name="information_title">インフォメーション</string>
-        <string name="question_title">質問</string>
-        <string name="notify_yes">タスク確認</string>
-        <string name="notify_done">既に完了しています!</string>
-        <string name="notify_snooze">スヌーズ</string>
-        <string name="notify_no">終了</string>
-        <string name="notify_snooze_title">スヌーズのための時/分は?</string>
-        
-        <string name="delete_title">削除</string>        
-        <string name="delete_this_task_title">このタスクを削除しますか?</string>
-        <string name="delete_this_tag_title">すべてのタスクからこのタグを削除しますか?</string>
-        
-        <string name="stop_timer_title">タイマーをストップしますか?</string>
-        
-        <string name="quick_tips">
-Astridについて知らないかもしれないいくつかのこと：\n
-\n
-－タスクをつくるためには、ちょっと入力するだけです！\n
-－タスクを編集している時は、戻るボタンを押すことで保存できます。\n
-－素早く優先順位を変えるには、1から4のキーを押してタスクを選択してください。\n
-－タスクに期限があるならば、それを延長するために、長押ししてください。\n
-\n
-Astridを利用してくれてありがとう！\n
-        </string>
-
-     
-    <!-- Notification -->  
-    <skip />
-        
-        <string name="notif_definiteDueDate">期限!</string>
-        <string name="notif_preferredDueDate">目標日時!</string>
-        <string name="notif_timerStarted">タイマー実行中:</string>
-        
-    <!-- Error Messages -->  
-    <skip />
-    
-        <string name="error_opening">この項目が見つかりませんでした:</string>
-        <string name="error_saving">保存できませんでした:</string>
-    
-    <!-- Preference Keys. Strings starting with p_* should not be localized -->  
-    <skip />
-
-        <string name="prefs_category_alerts">通知</string>
-        
-        <string name="p_notif_quietStart">notif_qstart</string>
-        <string name="prefs_quietStart_title">静かにする時間の始まり</string>
-        <string name="prefs_quietStart_desc">Astridが静かにすべき時間の始まり (例:22時)</string>
-        
-        <string name="p_notif_quietEnd">notif_qend</string>
-        <string name="prefs_quietEnd_title">静かにする時間の終わり</string>
-        <string name="prefs_quietEnd_desc">Astridが静かにすべき時間の終わり (例:08時)</string>
-          
-        <string name="p_notif_defaultRemind">notif_default_reminder</string>
-        <string name="prefs_defaultRemind_title">標準リマインダー</string>
-        <string name="prefs_defaultRemind_desc">For new tasks, in days (i.e. 7). Blank to disable</string>
-        
-        <string name="p_notif_annoy">notif_annoy</string>
-        <string name="prefs_annoy_title">継続モード</string>
-        <string name="prefs_annoy_desc">チェックしたなら、それをクリアする前にリマインダーを見なければなりません。(LEDもね)</string>
-        
-        <string name="p_notification_ringtone">notification_ringtone</string>
-        <string name="prefs_notification_title">通知音</string>
-        <string name="prefs_notification_desc">Astridのアラート音を選択</string>
-
-        <string name="p_notif_icon">notif_theme</string>
-        <string name="prefs_notificon_title">通知アイコン</string>
-        <string name="prefs_notificon_desc">Astridの通知用アイコンを選択</string>
-        
-        <string name="prefs_category_appearance">外観</string>
-            
-        <string name="p_colorize">色分け</string>
-        <string name="prefs_colorize_title">色分けしたタスクリスト</string>
-        <string name="prefs_colorize_desc">優先順位毎に色分け</string>
-        
-        <string name="p_fontSize">font_size</string>
-        <string name="prefs_fontSize_title">タスクリストのフォントサイズ</string>
-        <string name="prefs_fontSize_desc">メイン画面のフォントサイズ (例:サイズ22)</string>
-
-        <string name="prefs_category_other">その他</string>
-        <string name="p_nagging">nagging</string>
-        <string name="prefs_nagging_title">Nag Messages</string>
-        <string name="prefs_nagging_desc">Show Astrid\'s comments when viewing reminders and postponing tasks?</string>
-
-
-        <string name="p_deadlineTime">deadline_time</string>
-        <string name="prefs_deadlineTime_title">期限の初期値</string>
-        <string name="prefs_deadlineTime_desc">新しい期限を設定するための現在からの日数  #</string>
-        
-        <string name="displayedFields_PrefScreen_Title">表示する項目</string>
-        <string name="displayedFields_PrefScreen_Desc">タスクリストの内表示する項目を選択</string>
-        
-        <!-- notification keys (no title, desc, default suffix) should not be localized -->
-        <string name="prefs_titleVisible">titleVisible</string> 
-        <string name="prefs_titleVisible_title">タスク名</string>
-        <string name="prefs_titleVisible_desc">タスクの説明</string>
-        <string name="prefs_titleVisible_default">true</string>
-	    <string name="prefs_deadlineVisible">deadlineVisible</string>
-        <string name="prefs_deadlineVisible_title">日付</string>
-        <string name="prefs_deadlineVisible_desc">次の期限 / 完了日</string>
-        <string name="prefs_deadlineVisible_default">true</string>
-    	<string name="prefs_timeVisible">timeVisible</string>
-        <string name="prefs_timeVisible_title">時間</string>
-        <string name="prefs_timeVisible_desc">予定日と経過時間</string>
-        <string name="prefs_timeVisible_default">true</string>
-        <string name="prefs_importanceVisible">importanceVisible</string>
-        <string name="prefs_importanceVisible_title">重要性</string>
-        <string name="prefs_importanceVisible_desc">タスクの重要度</string>
-        <string name="prefs_importanceVisible_default">true</string>
-	    <string name="prefs_tagsVisible">tagsVisible</string>
-        <string name="prefs_tagsVisible_title">タグ</string>
-        <string name="prefs_tagsVisible_desc">このタスクの関連タグ</string>
-        <string name="prefs_tagsVisible_default">true</string>
-	    <string name="prefs_repeatVisible">repeatVisible</string>
-        <string name="prefs_repeatVisible_title">繰り返し</string>
-        <string name="prefs_repeatVisible_desc">タスクの繰り返し情報</string>
-        <string name="prefs_repeatVisible_default">true</string>
-	    <string name="prefs_reminderVisible">reminderVisible</string>
-        <string name="prefs_reminderVisible_title">リマインダー</string>
-        <string name="prefs_reminderVisible_desc">このタスクにリマインダーが設定されていれば表示される</string>
-        <string name="prefs_reminderVisible_default">false</string>
-	    <string name="prefs_notesVisible">notesVisible</string>
-        <string name="prefs_notesVisible_title">メモ</string>
-        <string name="prefs_notesVisible_desc">このタスクの関連メモ</string>
-        <string name="prefs_notesVisible_default">false</string>
-</resources>
diff --git a/res/values-nn/arrays.xml b/res/values-nn/arrays.xml
deleted file mode 100644
index e6c29ca71..000000000
--- a/res/values-nn/arrays.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<resources>
-    <!-- Make these < 20 chars so the task name is displayed -->
-    <string-array name="reminders">
-        <item>Hei! har du et øyeblikk?</item>
-        <item>Kan jeg forstyrre deg noen sekunder?</item>
-        <item>Har du litt tid?</item>
-        <item>Glemte du?</item>
-        <item>Unnskyld meg!</item>
-        <item>Når du har tid:</item>
-        <item>På agendaen:</item>
-        <item>Ledig et øyeblikk?</item>
-        <item>Astrid her!</item>
-        <item>Hei! Kan jeg plage deg litt?</item>
-        <item>Et minutt av din tid?</item>
-        <item>Det er en flott dag for å</item>
-    </string-array>
-    
-    <!-- Astrid says...  (user should answer yes or no)-->
-    <string-array name="reminder_responses">
-        <item>Jeg har noe til deg!</item>
-        <item>Klar for å legge dette til fortiden?</item>
-        <item>Hvorfor gjør du ikke dette?</item>
-        <item>Så, er du klar?</item>
-        <item>Klar for å gjøre dette?</item>
-        <item>Takler du dette?</item>
-        <item>Du kan bli lykkelig! Bare gjør ferdig dette!</item>
-        <item>Jeg lover at du vil føle deg bedre om du fullfører dette!</item>
-        <item>Hvorfor ikke gjøre dette i dag?</item>
-        <item>Vær så snill å fullfør oppgaven, jeg er lei den!</item>
-        <item>Kan du noensinne fullføre dette? Ja, det kan du!</item>
-        <item>Kommer du noensinne til å fullføre dette?</item>
-        <item>Føl deg bra. Kom igjen!</item>
-        <item>Jeg er stolt av deg! La oss få det gjort!</item>
-        <item>Litt snop etter at du har fullført dette?</item>
-        <item>Bare denne ene oppgaven. Vær så snill?</item>
-        <item>På tide å korte ned gjøremålslisten!</item>
-    </string-array>
-    
-    <!-- Astrid's nagging when user clicks postpone -->
-    <string-array name="postpone_nags">
-        <item>Ikke fortell meg at det ikke er sant at du er en prokrastinerer!</item>
-        <item>Blir det ikke kjedelig å være lat?</item>
-        <item>Et eller annet sted er noen avhengig av at du fullfører dette!</item>
-        <item>Når du sier slumre mener du egentlig "Jeg gjør dette!", ikke sant?</item>
-        <item>Dette er siste gang du utsetter dette, ikke sant?</item>
-        <item>Bare fullfør dette i dag, jeg lover å ikke si det til noen!</item>
-        <item>Hvorfor utsette noe du kan.. velge å ikke utsette!</item>
-        <item>Du kommer til å fullføre dette etterhvert, antar jeg?</item>
-        <item>Jeg synes du er kjempebra! Hva med å ikke utsette dette?</item>
-        <item>Oppnår du målene dine om du gjør det?</item>
-        <item>Utsett, utsett, utsett. Når skal du forbedre deg?</item>
-        <item>Jeg har fått nok av unnskyldningene dine! Bare gjør det!</item>
-        <item>Brukte du ikke den unnskyldningen sist?</item>
-        <item>Jeg kan ikke hjelpe deg med å organisere livet ditt hvis du holder på sånn...</item>
-    </string-array>
-    
-    <!-- Icons for notification tray -->
-    <string-array name="notif_icon_entries">
-        <item>Rosa</item>
-        <item>Kjedelig</item>
-        <item>Astrid</item>
-    </string-array>
-    
-</resources>
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
deleted file mode 100644
index bbfded6fb..000000000
--- a/res/values-nn/strings.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ASTRID: Android's Simple Task Recording Dashboard
- 
-  Copyright (c) 2009 Tim Su
- 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-  for more details.
- 
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- application -->
-    <string name="app_name">Astrid</string>
-    
-    <!-- General String Constants -->
-    <skip />
-    
-        <!-- Importance Labels -->
-        <string name="importance_1">!!!!</string>
-        <string name="importance_2">!!!</string>
-        <string name="importance_3">!!</string>
-        <string name="importance_4">!</string>
-        
-        <!-- Repeat Interval Labels -->
-        <string name="repeat_days">Dag(er)</string>
-        <string name="repeat_weeks">Uke(r)</string>
-        <string name="repeat_months">Månede(r)</string>
-        <string name="repeat_hours">Time(r)</string>
-        
-        <!-- Plurals -->
-        <plurals name="Ntasks">
-            <item quantity="one">1 oppgave</item>
-            <item quantity="other">%d oppgaver</item>
-        </plurals>
-        <plurals name="NactiveTasks">
-            <item quantity="one">%d / %d aktive</item>
-            <item quantity="other">%d / %d aktive</item>
-        </plurals>
-        <plurals name="Nalarms">
-            <item quantity="one">En alarm</item>
-            <item quantity="two">To alarmer</item>
-            <item quantity="other">%d alarmer</item>
-        </plurals>
-        <plurals name="Ntags">
-            <item quantity="one">1 tagg</item>
-            <item quantity="other">%d tagger</item>
-        </plurals>
-        
-        <!-- Time Constants -->
-        <string name="dateFormatter">d. MMM</string> <!-- used for long due 
-            dates. c.f. Java's SimpleDateFormat -->
-        <string name="daysVertical">D\na\ny\ns</string> <!-- vertical labels
-            are used in the number dialogs -->
-        <string name="hoursVertical">H\no\nu\nr\ns</string>
-        <plurals name="Ndays">
-            <item quantity="one">1 dag</item>
-            <item quantity="other">%d dager</item>
-        </plurals>
-        <plurals name="Nhours">
-            <item quantity="one">1 time</item>
-            <item quantity="other">%d timer</item>
-        </plurals>
-        <plurals name="Nminutes">
-            <item quantity="one">1 minutt</item>
-            <item quantity="other">%d minutter</item>
-        </plurals>
-        <plurals name="Nseconds">
-            <item quantity="one">1 sekund</item>
-            <item quantity="other">%d sekunder</item>
-        </plurals>
-        <plurals name="NhoursShort">
-            <item quantity="one">1t</item>
-            <item quantity="other">%dt</item>
-        </plurals>
-        <plurals name="NminutesShort">
-            <item quantity="one">1m</item>
-            <item quantity="other">%dm</item>
-        </plurals>
-        <plurals name="NsecondsShort">
-            <item quantity="one">1s</item>
-            <item quantity="other">%ds</item>
-        </plurals>
-        <string name="ago_suffix">siden</string><!-- appended after time
-            constants to show time in past -->
-        
-    <!-- TaskList -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskList_titlePrefix">Astrid: </string>
-        <string name="taskList_titleTagPrefix">Tagget \"%s\": </string>
-        <string name="taskList_hiddenSuffix"> skjult</string>
-        <string name="addtask_label">Ny oppgave</string>
-        <string name="missing_tag">Fant ikke forespurt tagg!</string>
-        
-        <!-- text in the actual list -->
-        <string name="taskList_hiddenPrefix">S</string><!-- prefix to show that a task is hidden -->
-        <string name="taskList_dueRelativeTime">Utløper</string><!-- i.e. Due in 4 days -->
-        <string name="taskList_dueAbsoluteDate">Utløper på</string><!-- i.e. Due on Jan 2 -->
-        <string name="taskList_goalPrefix">Mål</string><!-- prefix to deadline -->
-        <string name="taskList_overdueBy">Forfaller ved</string>
-        <string name="taskList_completedPrefix">Fullført</string><!-- i.e. Finished 4 days ago -->
-		<string name="taskList_estimatedTimePrefix">Estimert:</string>
-        <string name="taskList_elapsedTimePrefix">Tid brukt:</string>
-        <string name="taskList_periodicReminderPrefix">Påminnelse hver</string>
-        <string name="taskList_repeatPrefix">Gjentas Hver</string>
-        <string name="taskList_alarmPrefix">Neste Alarm:</string>
-        <string name="taskList_tagsPrefix">Tagger:</string>
-        <string name="taskList_notesPrefix">Notater:</string>
-        <string name="taskList_createdPrefix">Opprettet:</string>
-        <string name="taskList_deleted">Slettet</string>
-        
-        <!-- menu items -->
-        <string name="taskList_menu_insert">Legg Til</string>
-        <string name="taskList_menu_tags">Tagger</string>
-        <string name="taskList_menu_filters">Visning</string>
-        <string name="taskList_menu_syncshortcut">Synk</string>
-        <string name="taskList_menu_more">Mer</string>
-        <string name="taskList_menu_sync">Synkronisering</string>
-        <string name="taskList_menu_settings">Instillinger</string>
-        <string name="taskList_menu_help">Hjelp (åpner i nettleser)</string>
-        <string name="taskList_menu_survey">Ta Astrid\'s brukerundersøkelse!</string>
-        <string name="taskList_menu_tips">Småtips</string>
-        <string name="taskList_menu_cleanup">Rydd opp gamle oppgaver</string>
-        
-        <string name="taskList_context_edit">Rediger Oppgave</string>
-        <string name="taskList_context_delete">Slett Oppgave</string>
-        <string name="taskList_context_startTimer">Start Tidtaker</string>
-        <string name="taskList_context_stopTimer">Stopp Tidtaker</string>
-        <string name="taskList_context_postpone">Utsett</string>
-        
-        <!-- filter menu -->
-        <string name="taskList_filter_title">Sortering/filtre</string>
-        <string name="taskList_filter_hidden">Skjulte/blokkerte oppgaver</string>
-        <string name="taskList_filter_done">Fullførte oppgaver</string>
-        <string name="taskList_filter_tagged">Taggede \'%s\'</string>
-        <string name="taskList_sort_auto">Sorter automatisk</string>
-        <string name="taskList_sort_alpha">Sorter på navn</string>
-        <string name="taskList_sort_duedate">Sorter på utløpsdato</string>
-        <string name="taskList_sort_reverse">Reversert sortering</string>
-        
-        <string name="taskList_nonag_reminder">Velg en handling:</string>
-        <string name="taskList_postpone_count">Antall ganger du har utsatt: %d</string>
-        <string name="taskList_postpone_dialog">Hvor lenge vil du utsette?</string>
-        <string name="taskList_cleanup_dialog">"Slett fullførte oppgaver som er eldre enn # dager:"</string>
-
-    <!-- TaskEdit -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskEdit_titleGeneric">Astrid: Redigerer oppgave</string>
-        <string name="taskEdit_titlePrefix">Astrid: Redigerer </string>
-        <string name="taskEdit_label">Astrid: Ny oppgave</string>
-        
-        <!-- tabs -->
-        <string name="taskEdit_tab_basic">Grunndata</string>
-        <string name="taskEdit_tab_dates">Datoer</string>
-        <string name="taskEdit_tab_alerts">Alarmer</string>
-        
-        <!-- labels -->
-        <string name="name_label">Oppsummering</string>
-        <string name="name_hint">Oppgavebeskrivelse</string>
-        <string name="importance_label">Hvor viktig er det?</string>
-        <string name="tags_label">Tagger:</string>
-        
-        <string name="estimatedDuration_label">Hvor lang tid vil det ta?</string>
-        <string name="elapsedDuration_label">Tid allerede brukt på oppgaven</string>
-        <string name="definiteDueDate_label">Absolutt frist</string>
-        <string name="preferredDueDate_label">Målfrist</string>
-        <string name="addToCalendar_label">Legg oppgave til kalender</string>
-        <string name="showCalendar_label">Åpne kalenderhendelse</string>
-        <string name="hiddenUntil_label">Gjem til denne datoen</string>
-        <string name="repeat_label">Gjenta hver</string>
-        <string name="repeat_value_unset">Ikke spesifisert</string>
-        <string name="blockingOn_label">Gjem til denne oppgaven er ferdig</string>
-        <string name="notes_label">Notater</string>
-        <string name="notes_hint">Legg inn oppgavenotater</string>
-        
-        <string name="notification_label">Periodiske påminnelser</string>
-        <string name="notification_prefix">Hver</string>
-        <string name="flags_label">Varsle meg...</string>
-        <string name="flag_before">Når utløpstidspunkt nærmer seg</string>
-        <string name="flag_during">Ved utløpstidspunkt</string>
-        <string name="flag_after">Etter at utløpstidspunkt har passert</string>
-        <string name="flag_nonstop">Uten stopp til jeg ser på oppgaven</string>
-        <string name="alerts_label">Faste påminnelser</string>
-        <string name="add_alert">Legg til ny påminnelse</string>
-        
-        <!-- dialog boxes -->
-        <string name="hour_minutes_dialog">Tid (timer : minutter)</string>
-        <string name="notification_dialog">Varsle meg hvert</string>
-        <string name="repeat_picker_title">Gjenta hvert (0 for å deaktivere)</string>
-        <string name="repeat_help_dialog_title">Hjelp: Astrid-gjentakelser</string>
-        <string name="repeat_help_dialog">
-For å bruke gjentakelser må du sette minst ett av utløpstidspunktene over. Når du fullfører denne oppgaven, vil utløpstidspunktet automatisk bli flyttet.
-\n\n
-Hvis du ikke ønsker å se den nye oppgaven rett etter at du fullfører den gamle, bør du bruke "Gjem Til"-feltet, som også vil bli flyttet automatisk.
-\n
-        </string>
-        <string name="repeat_help_hide">Skjul hjelp</string>
-        
-        <!-- buttons -->
-        <string name="save_label">Lagre</string>
-        <string name="discard_label">Forkast</string>
-        <string name="edit_label">Rediger</string>
-        <string name="delete_label">Slett</string>
-        <string name="blank_button_title">Klikk for å sette</string>
-        <string name="startTimer_label">Start tidtaker</string>
-        <string name="stopTimer_label">Stopp tidtaker</string>
-        
-        <string name="taskEdit_menu_save">Lagre</string>
-        <string name="taskEdit_onTaskSave_Due">Oppgave lagret: utløper om %s</string>
-        <string name="taskEdit_onTaskSave_notDue">Oppgave lagret</string>
-      
-    <!-- TaskView  -->
-    <skip />
-    
-        <string name="taskView_notifyTitle">Astrid sier...</string>
-        
-    <!-- Tag List -->
-    <skip />
-        <string name="tagList_titlePrefix">Astrid: Taggvisning: </string>
-        <string name="tagList_context_create">Opprett oppgave med tagg</string>
-        <string name="tagList_context_edit">Rediger tagg</string>
-        <string name="tagList_context_delete">Slett tagg</string>
-        <string name="tagList_context_showTag">Vis på hovedside</string>
-        <string name="tagList_context_hideTag">Skjul på hovedside</string>
-        <string name="tagList_context_shortcut">Lag snarvei</string>
-        <string name="tagList_shortcut_created">Snarvei opprettet på hovedsiden!</string>
-        <string name="tagList_shortcut_prefix">Tagg:</string>
-        
-        <string name="tagList_menu_sortAlpha">Sorter alfabetisk</string>
-        <string name="tagList_menu_sortSize">Sorter etter størrelse</string>
-    
-    
-    <!-- Synchronization -->  
-    <skip />
-        <string name="sync_pref_group">Synkroniseringstjenester</string>
-        <string name="sync_pref_group_actions">Handlinger</string>
-        <string name="sync_pref_group_options">Valg</string>
-        <string name="p_sync_rtm">sync_rtm</string>
-        <string name="sync_rtm_title">Remember The Milk</string>
-        <string name="sync_rtm_desc">http://www.rememberthemilk.com</string>
-        <string name="p_sync_every">sync_every</string>
-        <string name="sync_every_title">Synkroniseringsfrekvens</string>
-        <string name="sync_every_desc">Hvis satt, utfør synkronisering hver # time(r)</string>
-        <string name="p_sync_button">sync_button</string>
-        <string name="sync_button_title">Hovedmeny-snarvei</string>
-        <string name="sync_button_desc">Vis \"Synkronisér\" i Astrid\'s meny</string>
-        <string name="p_sync_quiet">sync_dialogs</string>
-        <string name="sync_quiet_title">Skjul dialogvinduer</string>
-        <string name="sync_quiet_desc">Skjul dialogvindu med synkroniseringsresultat</string>
-        <string name="p_sync_background">sync_background</string>
-        <string name="sync_background_title">I bakgrunnen</string>
-        <string name="sync_background_desc">Synkroniser uten å mase på deg</string>
-        <string name="sync_error">Synkroniseringsfeil! Beklager ulempen. Feilmelding:</string>
-        <string name="sync_auth_request">
-For å kunne synkronisere må du logge deg inn på din %s-konto og autorisere Astrid til å lese dine data.
-\n\n
-Når dette er fullført kan du starte Astrid å komme tilbake hit.
-        </string>
-        <string name="sync_rtm_notes">
-Velkommen til Astrid\'s RTM-synkronisering!
-\n\n
-Gjenstander som ikke vil bli synkronisert:
-- Påminnelser og repetisjoner
-- Sletting eller omdøping av oppgaver i RTM
-\n
-Ønsk meg lykke til!\n
-        </string>
-        <string name="sync_now">Synkroniser nå!</string>
-        <string name="sync_forget">Slett personlig data</string>
-        <string name="sync_forget_confirm">Slett data for valgte tjenester?</string>
-        <string name="sync_no_synchronizers">Ingen synkroniserere aktivert!</string>
-       
-    <!-- Dialog Boxes -->  
-    <skip />
-        <string name="loading">Laster...</string>
-        <string name="updating">Laster opp liste...</string>
-        <string name="information_title">Informasjon</string>
-        <string name="question_title">Spørsmål</string>
-        <string name="notify_yes">Vis oppgave</string>
-        <string name="notify_done">Allerede utført!</string>
-        <string name="notify_snooze">Slumre</string>
-        <string name="notify_no">Avslutt</string>
-        <string name="notify_snooze_title">Timer/minutter å slumre?</string>
-        
-        <string name="delete_title">Slett</string>        
-        <string name="delete_this_task_title">Slette denne oppgaven?</string>
-        <string name="delete_this_tag_title">Fjerne denne taggen fra alle oppgaver?</string>
-        
-        <string name="stop_timer_title">Stopp tidtakeren?</string>
-        
-        <string name="quick_tips">
-Noen ting du kanskje ikke visste om Astrid:\n
-\n
-- For å opprette en oppgave, bare begynn å skrive!\n
-- Mens du redigerer en oppgave, trykk \'tilbake'\ for å lagre den\n
-- Velg en oppgave og trykk 1-4 for å raskt endre dens prioritet\n
-- Dersom en oppgave har en utløpsfrist, trykk på den lenge for å utsette\n
-\n
-Takk for at du bruker Astrid!\n
-        </string>
-
-     
-    <!-- Notification -->  
-    <skip />
-        
-        <string name="notif_definiteDueDate">Absolutt utløpsfrist!</string>
-        <string name="notif_preferredDueDate">Målfrist!</string>
-        <string name="notif_timerStarted">Arbeider med:</string>
-        
-    <!-- Error Messages -->  
-    <skip />
-    
-        <string name="error_opening">Kunne ikke finne denne gjenstanden!:</string>
-        <string name="error_saving">Kunne ikke lagre:</string>
-    
-    <!-- Preference Keys. Strings starting with p_* should not be localized -->  
-    <skip />
-
-        <string name="prefs_category_alerts">Notifications</string>
-        
-        <string name="p_notif_quietStart">notif_qstart</string>
-        <string name="prefs_quietStart_title">Start på stilletimer</string>
-        <string name="prefs_quietStart_desc">Tidspunkt fra når Astrid skal være stille (f.eks. 22)</string>
-        
-        <string name="p_notif_quietEnd">notif_qend</string>
-        <string name="prefs_quietEnd_title">Slutt på stilletimer</string>
-        <string name="prefs_quietEnd_desc">Tidspunkt fra når Astrid ikke lenger skal være stille (f.eks. 08)</string>
-          
-        <string name="p_notif_defaultRemind">notif_default_reminder</string>
-        <string name="prefs_defaultRemind_title">Standardpåminnelser</string>
-        <string name="prefs_defaultRemind_desc">For nye oppgaver, i dager (f.eks. 7). Blank for å slå av.</string>
-        
-        <string name="p_notif_annoy">notif_annoy</string>
-        <string name="prefs_annoy_title">Iherdig-modus</string>
-        <string name="prefs_annoy_desc">Dersom denne er avkryssen må du se påminnelser før du kan fjerne dem (gjelder også LED-lampen)</string>
-        
-        <string name="p_notification_ringtone">notification_ringtone</string>
-        <string name="prefs_notification_title">Ringetone for påminnelser</string>
-        <string name="prefs_notification_desc">Velg ringetone for Astrid\'s påminnelser</string>
-
-        <string name="p_notif_icon">notif_theme</string>
-        <string name="prefs_notificon_title">Ikon for påminnelser</string>
-        <string name="prefs_notificon_desc">Choose Astrid\'s notification bar icon</string> <!-- TODO: Translate -->
-        
-        <string name="prefs_category_appearance">Utseende</string>
-            
-        <string name="p_colorize">colorize</string>
-        <string name="prefs_colorize_title">Fargelegg oppgavelisten</string>
-        <string name="prefs_colorize_desc">Ulike farger for ulike prioriteter</string>
-        
-        <string name="p_fontSize">font_size</string>
-        <string name="prefs_fontSize_title">Font for oppgavelisten</string>
-        <string name="prefs_fontSize_desc">For på hovedsiden (f.eks. 22)</string>
-
-        <string name="prefs_category_other">Other</string>
-        
-        <string name="p_nagging">nagging</string>
-        <string name="prefs_nagging_title">Masemeldinger</string>
-        <string name="prefs_nagging_desc">Vis Astid\'s kommentarer ved visning av påminnere og ved utsettelse av oppgaver?</string>
-
-        <string name="p_deadlineTime">deadline_time</string>
-        <string name="prefs_deadlineTime_title">Standard utløpstidspunkt</string>
-        <string name="prefs_deadlineTime_desc">Utløpstidspunkt blir satt # dager fra nå</string>
-        
-        <string name="displayedFields_PrefScreen_Title">Feltvisning</string>
-        <string name="displayedFields_PrefScreen_Desc">Velg feltene som skal vises i oppgavelisten</string>
-        
-        <!-- notification keys (no title, desc, default suffix) should not be localized -->
-        <string name="prefs_titleVisible">titleVisible</string> 
-        <string name="prefs_titleVisible_title">Task Title</string>
-        <string name="prefs_titleVisible_desc">Task description</string>
-        <string name="prefs_titleVisible_default">true</string>
-	    <string name="prefs_deadlineVisible">deadlineVisible</string>
-        <string name="prefs_deadlineVisible_title">Dates</string>
-        <string name="prefs_deadlineVisible_desc">Upcoming deadlines / completed date</string>
-        <string name="prefs_deadlineVisible_default">true</string>
-    	<string name="prefs_timeVisible">timeVisible</string>
-        <string name="prefs_timeVisible_title">Times</string>
-        <string name="prefs_timeVisible_desc">Estimated &amp; Elapsed Times</string>
-        <string name="prefs_timeVisible_default">true</string>
-        <string name="prefs_importanceVisible">importanceVisible</string>
-        <string name="prefs_importanceVisible_title">Importance</string>
-        <string name="prefs_importanceVisible_desc">Task importance indicator</string>
-        <string name="prefs_importanceVisible_default">true</string>
-	    <string name="prefs_tagsVisible">tagsVisible</string>
-        <string name="prefs_tagsVisible_title">Tags</string>
-        <string name="prefs_tagsVisible_desc">Tags associated with this task</string>
-        <string name="prefs_tagsVisible_default">true</string>
-	    <string name="prefs_repeatVisible">repeatVisible</string>
-        <string name="prefs_repeatVisible_title">Repeats</string>
-        <string name="prefs_repeatVisible_desc">Task repeat information</string>
-        <string name="prefs_repeatVisible_default">true</string>
-	    <string name="prefs_reminderVisible">reminderVisible</string>
-        <string name="prefs_reminderVisible_title">Reminders</string>
-        <string name="prefs_reminderVisible_desc">Displayed if this task has reminders</string>
-        <string name="prefs_reminderVisible_default">false</string>
-	    <string name="prefs_notesVisible">notesVisible</string>
-        <string name="prefs_notesVisible_title">Notes</string>
-        <string name="prefs_notesVisible_desc">Notes associated with this task</string>
-        <string name="prefs_notesVisible_default">false</string>
-</resources>
diff --git a/res/values-zh/arrays.xml b/res/values-zh/arrays.xml
deleted file mode 100644
index 7ff885c77..000000000
--- a/res/values-zh/arrays.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<!-- Translation Note: 
-           Guidelines to those translating the resurces
-            1) Quality over Quantity: the quality of the phrases is important not the number of phrases used in any given 
-            languages.
-            2) Dynamic Equivolence not necessary literal translation but capture the idea and create the same desired effect
--->
-
-
-<resources>
-    <!-- Make these < 20 chars so the task name is displayed 
-            Goal:  Maximize the chance that they will perform the task while minimizing the annoyance.-->
-    <string-array name="reminders">
-        <item>Hi there! Have a sec?</item>
-        <item>Can I see you for a sec?</item>
-        <item>Have a few minutes?</item>
-        <item>Did you forget?</item>
-        <item>Excuse me!</item>
-        <item>When you have a minute:</item>
-        <item>On your agenda:</item>
-        <item>Free for a moment?</item>
-        <item>Astrid here!</item>
-        <item>Hi! Can I bug you?</item>
-        <item>A minute of your time?</item>
-        <item>It\'s a great day to</item>
-    </string-array>
-    
-    <!-- Astrid says...  (user should answer yes or no)  -->
-    <string-array name="reminder_responses">
-        <item>I\'ve got something for you!</item>
-        <item>Ready to put this in the past?</item>
-        <item>Why don\'t you get this done?</item>
-        <item>How about it? Ready tiger?</item>
-        <item>Ready to do this?</item>
-        <item>Can you handle this?</item>
-        <item>You can be happy! Just finish this!</item>
-        <item>I promise you\'ll feel better if you finish this!</item>
-        <item>Won\'t you do this today?</item>
-        <item>Please finish this, I\'m sick of it!</item>
-        <item>Can you finish this? Yes you can!</item>
-        <item>Are you ever going to do this?</item>
-        <item>Feel good about yourself! Let\'s go!</item>
-        <item>I'm so proud of you! Lets get it done!</item>
-        <item>A little snack after you finish this?</item>
-        <item>Just this one task? Please?</item>
-        <item>Time to shorten your todo list!</item>
-    </string-array>
-    
-    <!-- Astrid's nagging when user clicks postpone -->
-    <string-array name="postpone_nags">
-        <item>Please tell me it isn\'t true that you're a procrastinator!</item>
-        <item>Doesn\'t being lazy get old sometimes?</item>
-        <item>Somewhere, someone is depending on you to finish this!</item>
-        <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
-        <item>This is the last time you postpone this, right?</item>
-        <item>Just finish this today, I won\'t tell anyone!</item>
-        <item>Why postpone when you can um... not postpone!</item>
-        <item>You\'ll finish this eventually, I presume?</item>
-        <item>I think you\'re really great! How about not putting this off?</item>
-        <item>Will you be able to achieve your goals if you do that?</item>
-        <item>Postpone, postpone, postpone. When will you change!</item>
-        <item>I\'ve had enough with your excuses! Just do it already!</item>
-        <item>Didn\'t you make that excuse last time?</item>
-        <item>I can\'t help you organize your life if you do that...</item>
-    </string-array>
-    
-    <!-- Icons for notification tray -->
-    <string-array name="notif_icon_entries">
-        <item>Pink</item>
-        <item>Boring</item>
-        <item>Astrid</item>
-    </string-array>
-    
-</resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
deleted file mode 100644
index 9cc6e3fc4..000000000
--- a/res/values-zh/strings.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ASTRID: Android's Simple Task Recording Dashboard
- 
-  Copyright (c) 2009 Tim Su
- 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-  for more details.
- 
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- application -->
-    <string name="app_name">Astrid</string>
-    
-    <!-- General String Constants -->
-    <skip />
-    
-        <!-- Importance Labels -->
-        <string name="importance_1">!!!!</string>
-        <string name="importance_2">!!!</string>
-        <string name="importance_3">!!</string>
-        <string name="importance_4">!</string>
-        
-        <!-- Repeat Interval Labels -->
-        <string name="repeat_days">天</string>
-        <string name="repeat_weeks">星期</string>
-        <string name="repeat_months">月</string>
-        <string name="repeat_hours">小时</string>
-        
-        <!-- Plurals -->
-        <plurals name="Ntasks">
-            <item quantity="one">一个任务</item>
-            <item quantity="two">两个任务</item>
-            <item quantity="other">%d个任务</item>
-        </plurals>
-        <plurals name="NactiveTasks">
-            <item quantity="one">%d / %d 需要作</item>
-            <item quantity="other">%d / %d 需要作</item>
-        </plurals>
-        <plurals name="Nalarms">
-            <item quantity="one">一个闹钟</item>
-            <item quantity="two">两个闹钟</item>
-            <item quantity="other">%d个闹钟</item>
-        </plurals>
-        <plurals name="Ntags">
-            <item quantity="one">一个标签</item>
-            <item quantity="two">两个标签</item>
-            <item quantity="other">%d个标签</item>
-        </plurals>
-        
-        <!-- Time Constants -->
-        <string name="dateFormatter">MMM d</string> <!-- used for long due 
-            dates. c.f. Java's SimpleDateFormat -->
-        <string name="daysVertical">天</string> <!-- vertical labels
-            are used in the number dialogs -->
-        <string name="hoursVertical">小\n时</string>
-        <plurals name="Ndays">
-            <item quantity="one">一天</item>
-            <item quantity="other">%d天</item>
-        </plurals>
-        <plurals name="Nhours">
-            <item quantity="one">一小时</item>
-            <item quantity="other">%d小时</item>
-        </plurals>
-        <plurals name="Nminutes">
-            <item quantity="one">一分钟</item>
-            <item quantity="other">%d分钟</item>
-        </plurals>
-        <plurals name="Nseconds">
-            <item quantity="one">一秒钟</item>
-            <item quantity="other">%d秒钟</item>
-        </plurals>
-        <plurals name="NhoursShort">
-            <item quantity="one">一小时</item>
-            <item quantity="other">%d小时</item>
-        </plurals>
-        <plurals name="NminutesShort">
-            <item quantity="one">一分钟</item>
-            <item quantity="other">%d分钟</item>
-        </plurals>
-        <plurals name="NsecondsShort">
-            <item quantity="one">一秒钟</item>
-            <item quantity="other">%d秒钟</item>
-        </plurals>
-        <string name="ago_suffix">以前</string><!-- appended after time
-            constants to show time in past -->
-        
-    <!-- TaskList -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskList_titlePrefix">Astrid: </string>
-        <string name="taskList_titleTagPrefix">\"%s\"标签: </string>
-        <string name="taskList_hiddenSuffix">藏</string>
-        <string name="addtask_label">新任务</string>
-        <string name="missing_tag">没有这个标签!</string>
-        
-        <!-- text in the actual list -->
-        <string name="taskList_hiddenPrefix">藏</string><!-- prefix to show that a task is hidden -->
-        <string name="taskList_dueRelativeTime">到期还有</string><!-- i.e. Due in 4 days -->
-        <string name="taskList_dueAbsoluteDate">到期在</string><!-- i.e. Due on Jan 2 -->
-        <string name="taskList_goalPrefix">希望</string><!-- prefix to deadline -->
-        <string name="taskList_overdueBy">过期</string>
-        <string name="taskList_completedPrefix">完成了</string><!-- i.e. Finished 4 days ago -->
-		<string name="taskList_estimatedTimePrefix">估计:</string><!-- i.e.  Estimated 4: hours -->
-        <string name="taskList_elapsedTimePrefix">花了:</string><!-- i.e. Spent  88 minutes on tax. -->
-        <string name="taskList_periodicReminderPrefix">Poke Every</string><!-- time interval to set frequency to remind user -->
-        <string name="taskList_repeatPrefix">Repeats Every</string><!-- time interval to set repeated tasks-->
-        <string name="taskList_alarmPrefix">Next Alarm:</string>
-        <string name="taskList_tagsPrefix">标签:</string>
-        <string name="taskList_notesPrefix">笔记:</string>
-        <string name="taskList_createdPrefix">造时:</string><!-- Created: MM/DD/YY -->
-        <string name="taskList_deleted">删时：</string><!-- Deleted: MM/DD/YY -->
-        
-        <!-- menu items -->
-        <string name="taskList_menu_insert">加</string><!-- Add or Insert -->
-        <string name="taskList_menu_tags">标签</string>
-        <string name="taskList_menu_filters">Display</string>
-        <string name="taskList_menu_syncshortcut">同步</string>
-        <string name="taskList_menu_more">。。。</string>
-        <string name="taskList_menu_sync">同步</string>
-        <string name="taskList_menu_settings">设定</string>
-        <string name="taskList_menu_help">帮助</string>
-        <string name="taskList_menu_tips">忠告</string>
-        <string name="taskList_menu_cleanup">打扫老任务</string>
-        
-        <string name="taskList_context_edit">编辑</string>
-        <string name="taskList_context_delete">删除</string>
-        <string name="taskList_context_startTimer">计时</string>
-        <string name="taskList_context_stopTimer">停计时</string>
-        <string name="taskList_context_postpone">延期</string>
-        
-        <!-- filter menu -->
-        <string name="taskList_filter_title">分类</string>
-        <string name="taskList_filter_hidden">Hidden/Blocked Tasks</string>
-        <string name="taskList_filter_done">Completed Tasks</string>
-        <string name="taskList_filter_tagged">Tagged \'%s\'</string>
-        <string name="taskList_sort_auto">Auto Sort</string>
-        <string name="taskList_sort_alpha">Sort By Name</string>
-        <string name="taskList_sort_duedate">Sort By Due Date</string>
-        <string name="taskList_sort_reverse">Sort Reverse</string>
-        
-        <string name="taskList_nonag_reminder">Select an Action:</string>
-        <string name="taskList_postpone_count">延期了%d次</string>
-        <string name="taskList_postpone_dialog">延期多少时间？</string>
-        <string name="taskList_cleanup_dialog">"Delete completed tasks older than # days:"</string>
-
-    <!-- TaskEdit -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskEdit_titleGeneric">Astrid: 编辑任务</string>
-        <string name="taskEdit_titlePrefix">Astrid: 编辑</string>
-        <string name="taskEdit_label">Astrid: 新任务</string>
-        
-        <!-- tabs -->
-        <string name="taskEdit_tab_basic">细目</string>
-        <string name="taskEdit_tab_dates">时</string>
-        <string name="taskEdit_tab_alerts">闹钟</string>
-        
-        <!-- labels -->
-        <string name="name_label">总结</string>
-        <string name="name_hint">任务总结</string>
-        <string name="importance_label">多少要紧</string>
-        <string name="tags_label">标签:</string>
-        
-        <string name="estimatedDuration_label">需要多少时间?</string>
-        <string name="elapsedDuration_label">已经花了多少时间？</string>
-        <string name="definiteDueDate_label">Absolute Deadline</string>
-        <string name="preferredDueDate_label">Goal Deadline</string>
-        <string name="addToCalendar_label">Add Task To Calendar</string>
-        <string name="showCalendar_label">Open Calendar Event</string>
-        <string name="hiddenUntil_label">Hide Until This Date</string>
-        <string name="repeat_label">Repeat Every</string>
-        <string name="repeat_value_unset">No Repeat Set</string>
-        <string name="blockingOn_label">Hide Until This Task is Done</string>
-        <string name="notes_label">Notes</string>
-        <string name="notes_hint">Enter Task Notes</string>
-        
-        <string name="notification_label">Periodic Reminders</string>
-        <string name="notification_prefix">Every</string>
-        <string name="flags_label">Notify me...</string>
-        <string name="flag_before">As Deadlines Approach</string>
-        <string name="flag_during">At Deadlines</string>
-        <string name="flag_after">After Absolute Deadline Passes</string>
-        <string name="flag_nonstop">Nonstop Until I View the Task</string>
-        <string name="alerts_label">Fixed Reminders</string>
-        <string name="add_alert">Add New Reminder</string>
-        
-        <!-- dialog boxes -->
-        <string name="hour_minutes_dialog">Time (hours : minutes)</string>
-        <string name="notification_dialog">Remind Me Every</string>
-        <string name="repeat_picker_title">Repeat Every (0 to disable)</string>
-        <string name="repeat_help_dialog_title">Help: Astrid Repeats</string>
-        <string name="repeat_help_dialog">
-To use repeats, set at least one of the deadlines above. When you complete this task, the deadline will be automatically advanced.
-\n\n
-If you don\'t want to see the new task right after you complete the old one, you should use the "Hide Until" field, which will also be advanced automatically.
-\n
-        </string>
-        <string name="repeat_help_hide">Don't Show Help Anymore</string>
-        
-        <!-- buttons -->
-        <string name="save_label">Save</string>
-        <string name="discard_label">Discard</string>
-        <string name="edit_label">Edit</string>
-        <string name="delete_label">Delete</string>
-        <string name="blank_button_title">Click to Set</string>
-        <string name="startTimer_label">Start Timer</string>
-        <string name="stopTimer_label">Stop Timer</string>
-        
-        <string name="taskEdit_menu_save">Save</string>
-        <string name="taskEdit_onTaskSave_Due">Task Saved: due in %s</string>
-        <string name="taskEdit_onTaskSave_notDue">Task Saved</string>
-      
-    <!-- TaskView  -->
-    <skip />
-    
-        <string name="taskView_notifyTitle">Astrid says...</string>
-        
-    <!-- Tag List -->
-    <skip />
-        <string name="tagList_titlePrefix">Astrid: Tag View: </string>
-        <string name="tagList_context_create">Create Task With Tag</string>
-        <string name="tagList_context_edit">Edit Tag</string>
-        <string name="tagList_context_delete">Delete Tag</string>
-        <string name="tagList_context_showTag">Show on Home Page</string>
-        <string name="tagList_context_hideTag">Hide on Home Page</string>
-        <string name="tagList_context_shortcut">Create Shortcut</string>
-        <string name="tagList_shortcut_created">Shortcut created on your home screen!</string>
-        <string name="tagList_shortcut_prefix">Tag:</string>
-        
-        <string name="tagList_menu_sortAlpha">Sort A-Z</string>
-        <string name="tagList_menu_sortSize">Sort by Size</string>
-    
-    
-    <!-- Synchronization -->  
-    <skip />
-        <string name="sync_pref_group">Synchronization Services</string>
-        <string name="sync_pref_group_actions">Actions</string>
-        <string name="sync_pref_group_options">Options</string>
-        <string name="p_sync_rtm">sync_rtm</string>
-        <string name="sync_rtm_title">Remember The Milk</string><!-- Proper noun - don't translate ? -->
-        <string name="sync_rtm_desc">http://www.rememberthemilk.com</string>
-        <string name="p_sync_every">sync_every</string>
-        <string name="sync_every_title">Synchronize Frequency</string>
-        <string name="sync_every_desc">If set, perform sync every # hours</string>
-        <string name="p_sync_button">sync_button</string>
-        <string name="sync_button_title">Main Menu Shortcut</string>
-        <string name="sync_button_desc">Show \"Synchronize\" in Astrid\'s menu</string>
-        <string name="p_sync_quiet">sync_dialogs</string>
-        <string name="sync_quiet_title">Hide Dialogs</string>
-        <string name="sync_quiet_desc">Hide the Sync Results dialogs</string>
-        <string name="p_sync_background">sync_background</string>
-        <string name="sync_background_title">In Background</string>
-        <string name="sync_background_desc">Synchronize without bothering you</string>
-        <string name="sync_error">Sync Error! Sorry for the inconvenience! Error:</string>
-        <string name="sync_auth_request">
-In order to synchronize, please log in to your %s account and authorize Astrid to read your data.
-\n\n
-When finished, restart Astrid and come back here.
-        </string>
-        <string name="sync_rtm_notes">
-Welcome to Astrid\'s RTM sync!
-\n\n
-Things that don\'t sync:\n
-- Notifications and repeats\n
-- In RTM, deleting, or moving+renaming tasks\n
-\n
-Wish me luck!\n
-        </string>
-        <string name="sync_now">Synchronize Now!</string>
-        <string name="sync_forget">Clear Personal Data</string>
-        <string name="sync_forget_confirm">Clear data for selected services?</string>
-        <string name="sync_no_synchronizers">No Synchronizers Enabled!</string>
-       
-    <!-- Dialog Boxes -->  
-    <skip />
-        <string name="loading">Loading...</string>
-        <string name="updating">Updating List...</string>
-        <string name="information_title">Information</string>
-        <string name="question_title">Question</string>
-        <string name="notify_yes">View Task</string>
-        <string name="notify_done">Already Done!</string>
-        <string name="notify_snooze">Snooze</string>
-        <string name="notify_no">Quit</string>
-        <string name="notify_snooze_title">Hours/minutes to snooze?</string>
-        
-        <string name="delete_title">Delete</string>        
-        <string name="delete_this_task_title">Delete this task?</string>
-        <string name="delete_this_tag_title">Remove this tag from all tasks?</string>
-        
-        <string name="stop_timer_title">Stop the timer?</string>
-        
-        <string name="quick_tips">
-Some things you may not know about Astrid:\n
-\n
-- To create a task, just start typing!\n
-- While editing a task, hit \'back\' to save it\n
-- Select a task &amp; press 1-4 to quickly change it\'s priority\n
-- If a task has a deadline, long-press to postpone it\n
-\n
-Thanks for using Astrid!\n
-        </string>
-
-     
-    <!-- Notification -->  
-    <skip />
-        
-        <string name="notif_definiteDueDate">Absolute Deadline!</string>
-        <string name="notif_preferredDueDate">Goal Deadline!</string>
-        <string name="notif_timerStarted">Working on:</string>
-        
-    <!-- Error Messages -->  
-    <skip />
-    
-        <string name="error_opening">Couldn't find this item:</string>
-        <string name="error_saving">Couldn't save:</string>
-    
-    <!-- Preference Keys. Strings starting with p_* should not be localized -->  
-    <skip />
-
-        <string name="prefs_category_alerts">Notifications</string>
-        
-        <string name="p_notif_quietStart">notif_qstart</string>
-        <string name="prefs_quietStart_title">Quiet Hours Start</string>
-        <string name="prefs_quietStart_desc">Starting hour when Astrid should be quiet (e.g. 22)</string>
-        
-        <string name="p_notif_quietEnd">notif_qend</string>
-        <string name="prefs_quietEnd_title">Quiet Hours End</string>
-        <string name="prefs_quietEnd_desc">Ending hour when Astrid should be quiet (e.g. 08)</string>
-          
-        <string name="p_notif_defaultRemind">notif_default_reminder</string>
-        <string name="prefs_defaultRemind_title">Default Reminders</string>
-        <string name="prefs_defaultRemind_desc">For new tasks, in days (i.e. 7). Blank to disable</string>
-        
-        <string name="p_notif_annoy">notif_annoy</string>
-        <string name="prefs_annoy_title">Persistent Mode</string>
-        <string name="prefs_annoy_desc">If checked, you must view reminders before clearing them (also LED)</string>
-        
-        <string name="p_notification_ringtone">notification_ringtone</string>
-        <string name="prefs_notification_title">Notification Ringtone</string>
-        <string name="prefs_notification_desc">Choose a ringtone for Astrid\'s alerts</string>
-
-        <string name="p_notif_icon">notif_theme</string>
-        <string name="prefs_notificon_title">Notification Icons</string>
-        <string name="prefs_notificon_desc">Choose Astrid\'s notification bar icon</string>
-        
-        <string name="prefs_category_appearance">Appearance</string>
-            
-        <string name="p_colorize">colorize</string>
-        <string name="prefs_colorize_title">Colorize Task List</string>
-        <string name="prefs_colorize_desc">Different colors for different priorities</string>
-        
-        <string name="p_fontSize">font_size</string>
-        <string name="prefs_fontSize_title">Task List Font</string>
-        <string name="prefs_fontSize_desc">Font on the main listing page (i.e. 22)</string>
-
-        <string name="prefs_category_other">Other</string>
-        
-        <string name="p_nagging">nagging</string>
-        <string name="prefs_nagging_title">Nag Messages</string>
-        <string name="prefs_nagging_desc">Show Astrid\'s comments when viewing reminders and postponing tasks?</string>
-
-        <string name="p_deadlineTime">deadline_time</string>
-        <string name="prefs_deadlineTime_title">Default Deadlines</string>
-        <string name="prefs_deadlineTime_desc"># of days from now to set new deadlines</string>
-        
-        <string name="displayedFields_PrefScreen_Title">Displayed Fields</string>
-        <string name="displayedFields_PrefScreen_Desc">Select the fields to show in task list</string>
-        
-        <!-- notification keys (no title, desc, default suffix) should not be localized -->
-        <string name="prefs_titleVisible">titleVisible</string> 
-        <string name="prefs_titleVisible_title">Task Title</string>
-        <string name="prefs_titleVisible_desc">Task description</string>
-        <string name="prefs_titleVisible_default">true</string>
-	    <string name="prefs_deadlineVisible">deadlineVisible</string>
-        <string name="prefs_deadlineVisible_title">Dates</string>
-        <string name="prefs_deadlineVisible_desc">Upcoming deadlines / completed date</string>
-        <string name="prefs_deadlineVisible_default">true</string>
-    	<string name="prefs_timeVisible">timeVisible</string>
-        <string name="prefs_timeVisible_title">Times</string>
-        <string name="prefs_timeVisible_desc">Estimated &amp; Elapsed Times</string>
-        <string name="prefs_timeVisible_default">true</string>
-        <string name="prefs_importanceVisible">importanceVisible</string>
-        <string name="prefs_importanceVisible_title">Importance</string>
-        <string name="prefs_importanceVisible_desc">Task importance indicator</string>
-        <string name="prefs_importanceVisible_default">true</string>
-	    <string name="prefs_tagsVisible">tagsVisible</string>
-        <string name="prefs_tagsVisible_title">Tags</string>
-        <string name="prefs_tagsVisible_desc">Tags associated with this task</string>
-        <string name="prefs_tagsVisible_default">true</string>
-	    <string name="prefs_repeatVisible">repeatVisible</string>
-        <string name="prefs_repeatVisible_title">Repeats</string>
-        <string name="prefs_repeatVisible_desc">Task repeat information</string>
-        <string name="prefs_repeatVisible_default">true</string>
-	    <string name="prefs_reminderVisible">reminderVisible</string>
-        <string name="prefs_reminderVisible_title">Reminders</string>
-        <string name="prefs_reminderVisible_desc">Displayed if this task has reminders</string>
-        <string name="prefs_reminderVisible_default">false</string>
-	    <string name="prefs_notesVisible">notesVisible</string>
-        <string name="prefs_notesVisible_title">Notes</string>
-        <string name="prefs_notesVisible_desc">Notes associated with this task</string>
-        <string name="prefs_notesVisible_default">false</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8387628a0..2cce166c0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -68,6 +68,10 @@
             <item quantity="one">1 Day</item>
             <item quantity="other">%d Days</item>
         </plurals>
+        <plurals name="NdaysPreposition">
+            <item quantity="one">1 Day</item>
+            <item quantity="other">%d Days</item>
+        </plurals>
         <plurals name="Nhours">
             <item quantity="one">1 Hour</item>
             <item quantity="other">%d Hours</item>
diff --git a/src/com/timsu/astrid/activities/TaskListAdapter.java b/src/com/timsu/astrid/activities/TaskListAdapter.java
index 65b8150b0..c0b0edaf5 100644
--- a/src/com/timsu/astrid/activities/TaskListAdapter.java
+++ b/src/com/timsu/astrid/activities/TaskListAdapter.java
@@ -352,7 +352,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
                         if(timeLeft < FULL_DATE_THRESHOLD)
                             label.append(DateUtilities.getDurationString(r,
-                                (int)Math.abs(timeLeft), 1));
+                                (int)Math.abs(timeLeft), 1, true));
                         else
                             label.append(DateUtilities.getFormattedDate(r,
                                     task.getDefiniteDueDate()));
@@ -375,7 +375,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
                         if(timeLeft < FULL_DATE_THRESHOLD)
                             label.append(DateUtilities.getDurationString(r,
-                                (int)Math.abs(timeLeft), 1));
+                                (int)Math.abs(timeLeft), 1, true));
                         else
                             label.append(DateUtilities.getFormattedDate(r,
                                     task.getPreferredDueDate()));
@@ -435,7 +435,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
                 StringBuilder label = new StringBuilder();
                 if(notifyEvery != null && notifyEvery > 0) {
                     label.append(r.getString(R.string.taskList_periodicReminderPrefix)).
-                	    append(" ").append(DateUtilities.getDurationString(r, notifyEvery, 1));
+                	    append(" ").append(DateUtilities.getDurationString(r, notifyEvery, 1, true));
                 }
 
                 try {
diff --git a/src/com/timsu/astrid/utilities/DateUtilities.java b/src/com/timsu/astrid/utilities/DateUtilities.java
index 215c2d895..c8af6fb19 100644
--- a/src/com/timsu/astrid/utilities/DateUtilities.java
+++ b/src/com/timsu/astrid/utilities/DateUtilities.java
@@ -37,6 +37,13 @@ public class DateUtilities {
         return format.format(date);
     }
 
+    /**
+     * Convenience method for dropping the preopsition argument.
+     */
+    public static String getDurationString(Resources r, int timeInSeconds,
+            int unitsToShow) {
+        return getDurationString(r, timeInSeconds, unitsToShow, false);
+    }
 
     /**
      * Format a time into the format: 5 days, 3 hours, 2 minutes
@@ -45,10 +52,11 @@ public class DateUtilities {
      * @param timeInSeconds
      * @param unitsToShow number of units to show (i.e. if 2, then 5 hours
      *        3 minutes 2 seconds is truncated to 5 hours 3 minutes)
+     * @param withPreposition whether there is a preceeding preposition
      * @return
      */
     public static String getDurationString(Resources r, int timeInSeconds,
-            int unitsToShow) {
+            int unitsToShow, boolean withPreposition) {
         short days, hours, minutes, seconds;
         short unitsDisplayed = 0;
 
@@ -65,7 +73,8 @@ public class DateUtilities {
 
         StringBuilder result = new StringBuilder();
         if(days > 0) {
-            result.append(r.getQuantityString(R.plurals.Ndays, days, days)).
+            int daysPlural = withPreposition ? R.plurals.NdaysPreposition : R.plurals.Ndays;
+            result.append(r.getQuantityString(daysPlural, days, days)).
                 append(" ");
             unitsDisplayed++;
         }