From 96fafbf88cb8ae3d9d5332168e035df31c8efd30 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 5 Jun 2009 10:27:07 +0000
Subject: [PATCH]   Trying to fix an issue with SyncLoginActivity going dark,
 and also sync service starting immediately, screwing up your login.

---
 AndroidManifest.xml                           |   4 +-
 res/values-ja/arrays.xml                      |  63 --
 res/values-ja/strings.xml                     | 416 -------------
 res/values-nn/arrays.xml                      |  80 ---
 res/values-nn/strings.xml                     | 555 ------------------
 .../astrid/activities/SyncLoginActivity.java  |   1 -
 .../timsu/astrid/sync/RTMSyncProvider.java    |   7 +-
 .../astrid/sync/SynchronizationService.java   |   7 +
 src/com/timsu/astrid/sync/Synchronizer.java   |   9 +-
 9 files changed, 17 insertions(+), 1125 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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d71700338..3ce77245e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="105"
-      android:versionName="2.8.0">
+      android:versionCode="106"
+      android:versionName="2.8.1">
       
     <!-- ============================ Metadata ============================ -->   
       
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 ba7651a11..000000000
--- a/res/values-ja/strings.xml
+++ /dev/null
@@ -1,416 +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_untagged">-- Not tagged --</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 aa117838c..000000000
--- a/res/values-nn/strings.xml
+++ /dev/null
@@ -1,555 +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>
-  <!--Original value: Don't Show Help Anymore-->
-  <string name="repeat_help_hide">Skjul hjelp</string>
- 
-        <!-- buttons -->
-  <!--Original value: Save-->
-  <string name="save_label">Lagre</string>
-  <!--Original value: Discard-->
-  <string name="discard_label">Forkast</string>
-  <!--Original value: Edit-->
-  <string name="edit_label">Rediger</string>
-  <!--Original value: Delete-->
-  <string name="delete_label">Slett</string>
-  <!--Original value: Click to Set-->
-  <string name="blank_button_title">Klikk for å sette</string>
-  <!--Original value: Start Timer-->
-  <string name="startTimer_label">Start tidtaker</string>
-  <!--Original value: Stop Timer-->
-  <string name="stopTimer_label">Stopp tidtaker</string>
-  
-  <!--Original value: Save-->
-  <string name="taskEdit_menu_save">Lagre</string>
-  <!--Original value: Task Saved: due in %s-->
-  <string name="taskEdit_onTaskSave_Due">Oppgave lagret: utløper om %s</string>
-  <string name="taskEdit_onTaskSave_Overdue">Oppgave lagret: utløp for %s siden</string>
-  <!--Original value: Task Saved-->
-  <string name="taskEdit_onTaskSave_notDue">Oppgave lagret</string>
-  
-      <!-- TaskView  -->
-    <skip />
-  <!--Original value: Astrid says...-->
-  <string name="taskView_notifyTitle">Astrid sier...</string>
-  
-      <!-- Tag List -->
-    <skip />
-  <!--Original value: Astrid: Tag View: -->
-  <string name="tagList_titlePrefix">Astrid: Taggvisning: </string>
-  <!--Original value: Create Task With Tag-->
-  <string name="tagList_context_create">Opprett oppgave med tagg</string>
-  <!--Original value: Edit Tag-->
-  <string name="tagList_context_edit">Rediger tagg</string>
-  <!--Original value: Delete Tag-->
-  <string name="tagList_context_delete">Slett tagg</string>
-  <!--Original value: Show on Home Page-->
-  <string name="tagList_context_showTag">Vis på hovedside</string>
-  <!--Original value: Hide on Home Page-->
-  <string name="tagList_context_hideTag">Skjul på hovedside</string>
-  <!--Original value: Create Shortcut-->
-  <string name="tagList_context_shortcut">Lag snarvei</string>
-  <!--Original value: Shortcut created on your home screen!-->
-  <string name="tagList_shortcut_created">Snarvei opprettet på hovedsiden!</string>
-  <!--Original value: Tag:-->
-  <string name="tagList_shortcut_prefix">Tagg:</string>
-  <!--Original value: [untagged]-->
-  <string name="tagList_untagged">-- Not tagged --</string>
-  
-  <!--Original value: Sort A-Z-->
-  <string name="tagList_menu_sortAlpha">Sorter alfabetisk</string>
-  <!--Original value: Sort by Size-->
-  <string name="tagList_menu_sortSize">Sorter etter størrelse</string>
-  
-      <!-- Synchronization -->  
-    <skip />
-  <!--Original value: Synchronization Services-->
-  <string name="sync_pref_group">Synkroniseringstjenester</string>
-  <!--Original value: Actions-->
-  <string name="sync_pref_group_actions">Handlinger</string>
-  <!--Original value: Options-->
-  <string name="sync_pref_group_options">Valg</string>
-  <!--Original value: sync_rtm-->
-  <string name="p_sync_rtm">sync_rtm</string>
-  <!--Original value: Remember The Milk-->
-  <string name="sync_rtm_title">Remember The Milk</string>
-  <!--Original value: http://www.rememberthemilk.com-->
-  <string name="sync_rtm_desc">http://www.rememberthemilk.com</string>
-  <!--Original value: sync_every-->
-  <string name="p_sync_every_old" />
-  <!--Original value: sync_freq-->
-  <string name="p_sync_interval" />
-  <!--Original value: Auto-Synchronize-->
-  <string name="sync_interval_title">Auto-synkronise</string>
-  <!--Original value: If set, synchronization occurs automatically given interval-->
-  <string name="sync_interval_desc">Dersom dette er satt utføres
-synkronisering automatisk i gitt intervall</string>
-  <!--Original value: sync_button-->
-  <string name="p_sync_button">sync_button</string>
-  <!--Original value: Main Menu Shortcut-->
-  <string name="sync_button_title">Hovedmeny-snarvei</string>
-  <!--Original value: Show \"Synchronize\" in Astrid\'s menu-->
-  <string name="sync_button_desc">Vis \"Synkronisér\" i Astrid\'s meny</string>
-  <!--Original value: sync_dialogs-->
-  <string name="p_sync_quiet">sync_dialogs</string>
-  <!--Original value: Hide Dialogs-->
-  <string name="sync_quiet_title">Skjul dialogvinduer</string>
-  <!--Original value: Hide the Sync Results dialogs-->
-  <string name="sync_quiet_desc">Skjul dialogvindu med synkroniseringsresultat</string>
-  <!--Original value: sync_bgwifi-->
-  <string name="p_sync_bgwifi" />
-  <!--Original value: Auto-Sync Wifi Only-->
-  <string name="sync_bgwifi_title">AutoSynk kun med Wi-Fi</string>
-  <!--Original value: If set, auto-sync only happens when Wifi is active-->
-  <string name="sync_bgwifi_desc">Dersom denne er satt utføres
-synkronisering kun dersom Wi-Fi er aktiv</string>
-  <!--Original value: Sync Error! Sorry for the inconvenience! Error:-->
-  <string name="sync_error">Synkroniseringsfeil! Beklager ulempen. Feilmelding:</string>
-  <!--Original value: 
-In order to synchronize, please log in to your %s account and authorize Astrid to read your data.
-\n\n
-When finished, restart Astrid.
-        -->
-  <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>
-  <!--Original value: 
-Astrid 2.7 now performs synchronization with RTM in the background. You will 
-be directed to the preferences page to configure how often you want this to
-occur (it is a minor drain on battery).
-        -->
-  <string name="sync_upgrade_v99" />
-  <!--Original value: Synchronize Now!-->
-  <string name="sync_now">Synkroniser nå!</string>
-  <!--Original value: Clear Personal Data-->
-  <string name="sync_forget">Slett personlig data</string>
-  <!--Original value: Sync: Up to date!-->
-  <string name="sync_uptodate" />
-  <!--Original value: Clear data for selected services?-->
-  <string name="sync_forget_confirm">Slett data for valgte tjenester?</string>
-  <!--Original value: No Synchronizers Enabled!-->
-  <string name="sync_no_synchronizers">Ingen synkroniserere aktivert!</string>
-  <!--Original value: Last Sync Date: %s-->
-  <string name="sync_last_sync" />
-  <!--Original value: Last AutoSync Attempt: %s-->
-  <string name="sync_last_auto_sync" />
-  <!--Original value: never-->
-  <string name="sync_date_never" />
-  <!--Original value: %s Results-->
-  <string name="sync_result_title">%s Resultater</string>
-  <!--Original value: Summary - Astrid Tasks:-->
-  <string name="sync_result_local">Summary - Astrid-oppgaver:</string>
-  <!--Original value: Summary - Remote Server:-->
-  <string name="sync_result_remote">Summary - Tjener:</string>
-  <!--Original value: Created: %d-->
-  <string name="sync_result_created">Opprettet: %d</string>
-  <!--Original value: Updated: %d-->
-  <string name="sync_result_updated">Oppdatert: %d</string>
-  <!--Original value: Deleted: %d-->
-  <string name="sync_result_deleted">Slettet: %d</string>
-  <!--Original value: Merged: %d-->
-  <string name="sync_result_merged">Sammenslått: %d</string>
-  <!--Original value: Reading Remote Data-->
-  <string name="sync_progress_remote">Leser data fra tjener</string>
-  <!--Original value: Reading List: %s-->
-  <string name="sync_progress_rxlist">Leser liste: %s</string>
-  <!--Original value: Synchronizing Repeating Task-->
-  <string name="sync_progress_repeating">Synkroniserer
-repeterende oppgave</string>
-  <!--Original value: Sending Task: %s-->
-  <string name="sync_progress_localtx">Sender oppgave: %s</string>
-  <!--Original value: Locally Deleted Tasks-->
-  <string name="sync_progress_localdel">Lokalt slettede
-oppgaver</string>
-  <!--Original value: Receiving Task: %s-->
-  <string name="sync_progress_remotetx">Mottar oppgaver: %s</string>
-  
-      <!-- Dialog Boxes -->  
-    <skip />
-  <!--Original value: Loading...-->
-  <string name="loading">Laster...</string>
-  <!--Original value: Updating List...-->
-  <string name="updating">Laster opp liste...</string>
-  <!--Original value: Information-->
-  <string name="information_title">Informasjon</string>
-  <!--Original value: Question-->
-  <string name="question_title">Spørsmål</string>
-  <!--Original value: View Task-->
-  <string name="notify_yes">Vis oppgave</string>
-  <!--Original value: Already Done!-->
-  <string name="notify_done">Allerede utført!</string>
-  <!--Original value: Snooze-->
-  <string name="notify_snooze">Slumre</string>
-  <!--Original value: Quit-->
-  <string name="notify_no">Avslutt</string>
-  <!--Original value: Hours/minutes to snooze?-->
-  <string name="notify_snooze_title">Timer/minutter å slumre?</string>
-  <!--Original value: Delete-->
-  <string name="delete_title">Slett</string>
-  <!--Original value: Delete this task?-->
-  <string name="delete_this_task_title">Slette denne oppgaven?</string>
-  <!--Original value: Remove this tag from all tasks?-->
-  <string name="delete_this_tag_title">Fjerne denne taggen fra alle oppgaver?</string>
-  <!--Original value: Stop the timer?-->
-  <string name="stop_timer_title">Stopp tidtakeren?</string>
-  <!--Original value: 
-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 & 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 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>
-  <!--Original value: Absolute Deadline!-->
-  <string name="notif_definiteDueDate">Absolutt utløpsfrist!</string>
-  <!--Original value: Goal Deadline!-->
-  <string name="notif_preferredDueDate">Målfrist!</string>
-  <!--Original value: Working on:-->
-  <string name="notif_timerStarted">Arbeider med:</string>
-  <!--Original value: Couldn't find this item:-->
-  <string name="error_opening">Kunne ikke finne denne gjenstanden!:</string>
-  <!--Original value: Couldn't save:-->
-  <string name="error_saving">Kunne ikke lagre:</string>
-  
-      <!-- Preference Keys. Strings starting with p_* should not be localized -->  
-    <skip />
-  
-  <!--Original value: Notifications-->
-  <string name="prefs_category_alerts">Notifications</string>
- <!--Original value: Quiet Hours Start-->
-  <string name="prefs_quietStart_title">Start på stilletimer</string>
-  <!--Original value: Starting hour when Astrid should be quiet (e.g. 22)-->
-  <string name="prefs_quietStart_desc">Tidspunkt fra når Astrid skal være stille (f.eks. 22)</string>
-<!--Original value: Quiet Hours End-->
-  <string name="prefs_quietEnd_title">Slutt på stilletimer</string>
-  <!--Original value: Ending hour when Astrid should be quiet (e.g. 08)-->
-  <string name="prefs_quietEnd_desc">Tidspunkt fra når Astrid ikke lenger skal være stille (f.eks. 08)</string>
-  <!--Original value: Default Reminders-->
-  <string name="prefs_defaultRemind_title">Standardpåminnelser</string>
-  <!--Original value: For new tasks, in days (i.e. 7). Blank to disable-->
-  <string name="prefs_defaultRemind_desc">For nye oppgaver, i dager (f.eks. 7). Blank for å slå av.</string>
-  <!--Original value: Alarm Clock Mode-->
-  <string name="prefs_annoy_title">Iherdig-modus</string>
-  <!--Original value: If checked, Astrid will interrupt whatever you are doing until you view the reminder-->
-  <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>
-<!--Original value: Notification Ringtone-->
-  <string name="prefs_notification_title">Ringetone for påminnelser</string>
-  <!--Original value: Choose a ringtone for Astrid\'s alerts-->
-  <string name="prefs_notification_desc">Velg ringetone for Astrid\'s påminnelser</string>
-  <!--Original value: notif_theme-->
-  <string name="p_notif_icon">notif_theme</string>
-  <!--Original value: Notification Icons-->
-  <string name="prefs_notificon_title">Ikon for påminnelser</string>
-  <!--Original value: Choose Astrid\'s notification bar icon-->
-  <string name="prefs_notificon_desc">Choose Astrid\'s notification bar icon</string>
-  <!--Original value: Appearance-->
-  <string name="prefs_category_appearance">Utseende</string>
-  <!--Original value: Colorize Task List-->
-  <string name="prefs_colorize_title">Fargelegg oppgavelisten</string>
-  <!--Original value: Different colors for different priorities-->
-  <string name="prefs_colorize_desc">Ulike farger for ulike prioriteter</string>
-  <!--Original value: font_size-->
-  <string name="prefs_fontSize_title">Font for oppgavelisten</string>
-  <!--Original value: Font on the main listing page (i.e. 22)-->
-  <string name="prefs_fontSize_desc">For på hovedsiden (f.eks. 22)</string>
-  <!--Original value: Other-->
-  <string name="prefs_category_other">Other</string>
-
-  <!--Original value: Nag Messages-->
-  <string name="prefs_nagging_title">Masemeldinger</string>
-  <!--Original value: Show Astrid\'s comments when viewing reminders and postponing tasks?-->
-  <string name="prefs_nagging_desc">Vis Astid\'s kommentarer ved visning av påminnere og ved utsettelse av oppgaver?</string>
-  <!--Original value: Default Deadlines-->
-  <string name="prefs_deadlineTime_title">Standard utløpstidspunkt</string>
-  <!--Original value: # of days from now to set new deadlines-->
-  <string name="prefs_deadlineTime_desc">Utløpstidspunkt blir satt # dager fra nå</string>
-  <!--Original value: Displayed Fields-->
-  <string name="displayedFields_PrefScreen_Title">Feltvisning</string>
-  <!--Original value: Select the fields to show in task list-->
-  <string name="displayedFields_PrefScreen_Desc">Velg feltene som skal vises i oppgavelisten</string>
-  <!--Original value: titleVisible-->
-  <string name="prefs_titleVisible">titleVisible</string>
-  <!--Original value: Task Title-->
-  <string name="prefs_titleVisible_title">Task Title</string>
-  <!--Original value: Task description-->
-  <string name="prefs_titleVisible_desc">Task description</string>
-  <!--Original value: true-->
-  
-  <!-- notification keys (no title, desc, default suffix) should not be localized -->
-  <string name="prefs_titleVisible_default">true</string>
-  <!--Original value: deadlineVisible-->
-  <string name="prefs_deadlineVisible">deadlineVisible</string>
-  <!--Original value: Dates-->
-  <string name="prefs_deadlineVisible_title">Dates</string>
-  <!--Original value: Upcoming deadlines / completed date-->
-  <string name="prefs_deadlineVisible_desc">Upcoming deadlines / completed date</string>
-  <!--Original value: true-->
-  <string name="prefs_deadlineVisible_default">true</string>
-  <!--Original value: timeVisible-->
-  <string name="prefs_timeVisible">timeVisible</string>
-  <!--Original value: Times-->
-  <string name="prefs_timeVisible_title">Times</string>
-  <!--Original value: Estimated & Elapsed Times-->
-  <string name="prefs_timeVisible_desc">Estimated &amp; Elapsed Times</string>
-  <!--Original value: true-->
-  <string name="prefs_timeVisible_default">true</string>
-  <!--Original value: importanceVisible-->
-  <string name="prefs_importanceVisible">importanceVisible</string>
-  <!--Original value: Importance-->
-  <string name="prefs_importanceVisible_title">Importance</string>
-  <!--Original value: Task importance indicator-->
-  <string name="prefs_importanceVisible_desc">Task importance indicator</string>
-  <!--Original value: true-->
-  <string name="prefs_importanceVisible_default">true</string>
-  <!--Original value: tagsVisible-->
-  <string name="prefs_tagsVisible">tagsVisible</string>
-  <!--Original value: Tags-->
-  <string name="prefs_tagsVisible_title">Tags</string>
-  <!--Original value: Tags associated with this task-->
-  <string name="prefs_tagsVisible_desc">Tags associated with this task</string>
-  <!--Original value: true-->
-  <string name="prefs_tagsVisible_default">true</string>
-  <!--Original value: repeatVisible-->
-  <string name="prefs_repeatVisible">repeatVisible</string>
-  <!--Original value: Repeats-->
-  <string name="prefs_repeatVisible_title">Repeats</string>
-  <!--Original value: Task repeat information-->
-  <string name="prefs_repeatVisible_desc">Task repeat information</string>
-  <!--Original value: true-->
-  <string name="prefs_repeatVisible_default">true</string>
-  <!--Original value: reminderVisible-->
-  <string name="prefs_reminderVisible">reminderVisible</string>
-  <!--Original value: Reminders-->
-  <string name="prefs_reminderVisible_title">Reminders</string>
-  <!--Original value: Displayed if this task has reminders-->
-  <string name="prefs_reminderVisible_desc">Displayed if this task has reminders</string>
-  <!--Original value: false-->
-  <string name="prefs_reminderVisible_default">false</string>
-  <!--Original value: notesVisible-->
-  <string name="prefs_notesVisible">notesVisible</string>
-  <!--Original value: Notes-->
-  <string name="prefs_notesVisible_title">Notes</string>
-  <!--Original value: Notes associated with this task-->
-  <string name="prefs_notesVisible_desc">Notes associated with this task</string>
-  <!--Original value: false-->
-  <string name="prefs_notesVisible_default">false</string>
-</resources>
\ No newline at end of file
diff --git a/src/com/timsu/astrid/activities/SyncLoginActivity.java b/src/com/timsu/astrid/activities/SyncLoginActivity.java
index bf78c42ea..78777e0e9 100644
--- a/src/com/timsu/astrid/activities/SyncLoginActivity.java
+++ b/src/com/timsu/astrid/activities/SyncLoginActivity.java
@@ -120,7 +120,6 @@ public class SyncLoginActivity extends Activity {
                     public void run() {
             			final String result = callback.verifyLogin(handler);
 
-            			webView.destroy();
             			if(result == null) {
             				TaskList.synchronizeNow = true;
             				finish();
diff --git a/src/com/timsu/astrid/sync/RTMSyncProvider.java b/src/com/timsu/astrid/sync/RTMSyncProvider.java
index 35c262ff6..51b2cddb4 100644
--- a/src/com/timsu/astrid/sync/RTMSyncProvider.java
+++ b/src/com/timsu/astrid/sync/RTMSyncProvider.java
@@ -112,6 +112,10 @@ public class RTMSyncProvider extends SynchronizationProvider {
                     authToken = null;
             }
 
+            // don't do anything if you're a background service
+            if(authToken == null && isBackgroundService())
+            	return;
+
             if(authToken == null) {
                 // try completing the authorization if it was partial
                 if(rtmService != null) {
@@ -127,9 +131,6 @@ public class RTMSyncProvider extends SynchronizationProvider {
                     }
                 }
 
-                if(isBackgroundService())
-                	return;
-
                 // open up a dialog and have the user go to browser
                 FlurryAgent.onEvent("rtm-login-dialog");
 
diff --git a/src/com/timsu/astrid/sync/SynchronizationService.java b/src/com/timsu/astrid/sync/SynchronizationService.java
index a019ec63b..fcf922b3c 100644
--- a/src/com/timsu/astrid/sync/SynchronizationService.java
+++ b/src/com/timsu/astrid/sync/SynchronizationService.java
@@ -22,6 +22,9 @@ import com.timsu.astrid.utilities.Preferences;
  */
 public class SynchronizationService extends Service {
 
+	/** miniumum time before an auto-sync */
+	private static final long AUTO_SYNC_MIN_OFFSET = 5*60*1000L;
+
     /** Service timer */
     private Timer timer = new Timer();
 
@@ -100,6 +103,10 @@ public class SynchronizationService extends Service {
     		offset = Math.min(offset, Math.max(0, latestSyncMillis + interval -
     				System.currentTimeMillis()));
 
+    	// give a little padding
+    	offset = Math.max(offset, AUTO_SYNC_MIN_OFFSET);
+    	offset = AUTO_SYNC_MIN_OFFSET;
+
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override
 			public void run() {
diff --git a/src/com/timsu/astrid/sync/Synchronizer.java b/src/com/timsu/astrid/sync/Synchronizer.java
index df14fe5d8..8d7777547 100644
--- a/src/com/timsu/astrid/sync/Synchronizer.java
+++ b/src/com/timsu/astrid/sync/Synchronizer.java
@@ -25,7 +25,6 @@ import java.util.Date;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
 import com.flurry.android.FlurryAgent;
@@ -82,11 +81,11 @@ public class Synchronizer {
         // if we're not the autosync service, stop it. also create handler
         if(!isService) {
             SynchronizationService.stop();
-            if(Looper.myLooper() != null)
-                handler = new Handler();
+            handler = new Handler();
         }
 
-        continueSynchronization(context);
+        ServiceWrapper.RTM.service.synchronizeService(context, this);
+        //continueSynchronization(context);
     }
 
 
@@ -175,7 +174,7 @@ public class Synchronizer {
     /** Called to do the next step of synchronization. */
     void continueSynchronization(Context context) {
     	try {
-    		if(currentStep > ServiceWrapper.values().length)
+    		if(currentStep >= ServiceWrapper.values().length)
     			currentStep = ServiceWrapper.values().length - 1;
 
 	        ServiceWrapper serviceWrapper =