From e561cba563b22b8733c1d3dcb998f9a50c25fed3 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 18 Feb 2013 14:14:40 -0800
Subject: [PATCH] Removed the share with friends entry from the beast mode
 list, since it doesn't exist anymore

---
 astrid/res/values-ca/strings.xml                              | 1 -
 astrid/res/values-cs/strings.xml                              | 1 -
 astrid/res/values-de/strings.xml                              | 1 -
 astrid/res/values-es/strings.xml                              | 1 -
 astrid/res/values-fr/strings.xml                              | 1 -
 astrid/res/values-it/strings.xml                              | 1 -
 astrid/res/values-iw/strings.xml                              | 1 -
 astrid/res/values-ja/strings.xml                              | 1 -
 astrid/res/values-ko/strings.xml                              | 1 -
 astrid/res/values-nl/strings.xml                              | 1 -
 astrid/res/values-pl/strings.xml                              | 1 -
 astrid/res/values-pt-rBR/strings.xml                          | 1 -
 astrid/res/values-ru/strings.xml                              | 1 -
 astrid/res/values-sv/strings.xml                              | 1 -
 astrid/res/values-tr/strings.xml                              | 1 -
 astrid/res/values-zh-rCN/strings.xml                          | 1 -
 astrid/res/values-zh-rTW/strings.xml                          | 1 -
 astrid/res/values/keys.xml                                    | 4 +---
 astrid/res/values/strings-core.xml                            | 3 ---
 .../src/com/todoroo/astrid/activity/BeastModePreferences.java | 2 +-
 astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java  | 1 -
 21 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 837a38acc..2905ac086 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -243,7 +243,6 @@
   <string name="TEA_control_files">Fitxers</string>
   <string name="TEA_control_reminders">Recordatoris</string>
   <string name="TEA_control_timer">Controls de temporització</string>
-  <string name="TEA_control_share">Compartiu-ho amb els amics</string>
   <string name="TEA_control_hidden_section">----Oculta-ho sempre----</string>
   <string name="hide_until_prompt">Mostra a la meva llista</string>
   <string name="TEA_no_activity">No hi ha hagut activitat</string>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 32ecdff81..dbb26cf62 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -234,7 +234,6 @@
   <string name="TEA_control_notes">Poznámky</string>
   <string name="TEA_control_files">Soubory</string>
   <string name="TEA_control_reminders">Upomínky</string>
-  <string name="TEA_control_share">Sdílet s přáteli</string>
   <string name="TEA_control_hidden_section">-----Vždy skrývat----</string>
   <string name="hide_until_prompt">Zobrazit v mém seznamu</string>
   <string name="TEA_no_activity">Není co zobrazit</string>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index b2fd73c31..283103bbc 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -268,7 +268,6 @@
   <string name="TEA_control_files">Dateien</string>
   <string name="TEA_control_reminders">Erinnerungen</string>
   <string name="TEA_control_timer">Timer-Einstellungen</string>
-  <string name="TEA_control_share">Freunden zuweisen</string>
   <string name="TEA_control_hidden_section">----Immer Verbergen----</string>
   <string name="hide_until_prompt">Anzeigen in meiner Liste</string>
   <string name="TEA_no_activity">Keine Tätigkeit</string>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 23c1f5ae8..372690343 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -274,7 +274,6 @@
   <string name="TEA_control_files">Archivos</string>
   <string name="TEA_control_reminders">Recordatorios</string>
   <string name="TEA_control_timer">Controles de tiempo</string>
-  <string name="TEA_control_share">Compartir Con Amigos</string>
   <string name="TEA_control_hidden_section">---Ocultar Siempre---</string>
   <string name="hide_until_prompt">Mostrar en mi lista</string>
   <string name="TEA_no_activity">Sin actividad</string>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 9fa19ae2b..96b151d45 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -268,7 +268,6 @@
   <string name="TEA_control_files">Fichiers</string>
   <string name="TEA_control_reminders">Rappels</string>
   <string name="TEA_control_timer">Contrôle de rappel</string>
-  <string name="TEA_control_share">Partager avec des amis</string>
   <string name="TEA_control_hidden_section">---- Toujours masquer ----</string>
   <string name="hide_until_prompt">Montrer dans ma liste</string>
   <string name="TEA_no_activity">Aucune activité</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 18f73fc0c..c686832f3 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -260,7 +260,6 @@
   <string name="TEA_control_files">Files</string>
   <string name="TEA_control_reminders">Promemoria</string>
   <string name="TEA_control_timer">Controlli Tempo</string>
-  <string name="TEA_control_share">Condividi con gli Amici</string>
   <string name="TEA_control_hidden_section">----Nascondi Sempre----</string>
   <string name="hide_until_prompt">Mostra nella mia lista</string>
   <string name="TEA_no_activity">Nessuna attività</string>
diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml
index a803607b7..5701b73a1 100644
--- a/astrid/res/values-iw/strings.xml
+++ b/astrid/res/values-iw/strings.xml
@@ -260,7 +260,6 @@
   <string name="TEA_control_files">קבצים</string>
   <string name="TEA_control_reminders">תזכורות</string>
   <string name="TEA_control_timer">הערכת זמן</string>
-  <string name="TEA_control_share">שתף עם חברים</string>
   <string name="TEA_control_hidden_section">להסתיר תמיד</string>
   <string name="hide_until_prompt">הצג ברשימה שלי</string>
   <string name="TEA_no_activity">אין פעילות</string>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 8032f004c..e4ecde67c 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -206,7 +206,6 @@
   <string name="TEA_control_lists">リスト</string>
   <string name="TEA_control_notes">メモ</string>
   <string name="TEA_control_reminders">リマインダー</string>
-  <string name="TEA_control_share">ともだちと共有</string>
   <string-array name="MCA_dialog_speech_options">
     <item>It must be nice to be so popular!</item>
     <item>Yay! People like you!</item>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index 0e30b6664..a8c3f7962 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -274,7 +274,6 @@
   <string name="TEA_control_files">파일</string>
   <string name="TEA_control_reminders">일정 알림</string>
   <string name="TEA_control_timer">타이머 조절</string>
-  <string name="TEA_control_share">친구와 공유</string>
   <string name="TEA_control_hidden_section">----항상 숨김----</string>
   <string name="hide_until_prompt">내 목록에 표시</string>
   <string name="TEA_no_activity">활동 내역 없음</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 5325ae112..77e198c3c 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -262,7 +262,6 @@
   <string name="TEA_control_files">Bestanden</string>
   <string name="TEA_control_reminders">Herinneringen</string>
   <string name="TEA_control_timer">Tijd Controlers</string>
-  <string name="TEA_control_share">Deel Met Vrienden</string>
   <string name="TEA_control_hidden_section">----Altijd Verbergen----</string>
   <string name="hide_until_prompt">Laat zien in mijn lijst</string>
   <string name="TEA_no_activity">Geen taken</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index a21d1cec9..acb08fa18 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -262,7 +262,6 @@
   <string name="TEA_control_files">Pliki</string>
   <string name="TEA_control_reminders">Przypomnienia</string>
   <string name="TEA_control_timer">Sterowanie zegara</string>
-  <string name="TEA_control_share">Współdziel ze znajomymi</string>
   <string name="TEA_control_hidden_section">----Zawsze Ukryte----</string>
   <string name="hide_until_prompt">Pokaż na mojej liście</string>
   <string name="TEA_no_activity">Brak wydarzeń</string>
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index 75513adda..a4973bb88 100644
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -270,7 +270,6 @@
   <string name="TEA_control_files">Arquivos</string>
   <string name="TEA_control_reminders">Lembretes</string>
   <string name="TEA_control_timer">Temporizador</string>
-  <string name="TEA_control_share">Compartilhar com amigos</string>
   <string name="TEA_control_hidden_section">----Esconder Sempre---</string>
   <string name="hide_until_prompt">Mostrar na minha lista</string>
   <string name="TEA_no_activity">Sem atividade</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index bf7c4a8e4..78f39c8e7 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -274,7 +274,6 @@
   <string name="TEA_control_files">Файлы</string>
   <string name="TEA_control_reminders">Напоминания</string>
   <string name="TEA_control_timer">Учет времени</string>
-  <string name="TEA_control_share">Опубликовать для друзей</string>
   <string name="TEA_control_hidden_section">Всегда скрывать</string>
   <string name="hide_until_prompt">Показать в моем листе</string>
   <string name="TEA_no_activity">Нет активности</string>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 2ad9866d8..8b79f3a1e 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -252,7 +252,6 @@
   <string name="TEA_control_files">Filer</string>
   <string name="TEA_control_reminders">Påminnelser</string>
   <string name="TEA_control_timer">Inställningar för tidtagarur</string>
-  <string name="TEA_control_share">Dela med vänner</string>
   <string name="TEA_control_hidden_section">----Göm alltid----</string>
   <string name="hide_until_prompt">Visa i min lista</string>
   <string name="TEA_no_activity">Ingen aktivitet att visa.</string>
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index 67d9ff427..c80dfd8fc 100644
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -272,7 +272,6 @@
   <string name="TEA_control_files">Dosyalar</string>
   <string name="TEA_control_reminders">Hatırlatmalar</string>
   <string name="TEA_control_timer">Geri Sayım Denetimleri</string>
-  <string name="TEA_control_share">Arkadaşlarla Paylaş</string>
   <string name="TEA_control_hidden_section">----Her Zaman Gizle----</string>
   <string name="hide_until_prompt">Listemde göster</string>
   <string name="TEA_no_activity">Etkinlik yok</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 1eb342115..769622e61 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -266,7 +266,6 @@
   <string name="TEA_control_files">文件</string>
   <string name="TEA_control_reminders">提醒</string>
   <string name="TEA_control_timer">定时器控件</string>
-  <string name="TEA_control_share">和朋友们分享</string>
   <string name="TEA_control_hidden_section">----始终隐藏----</string>
   <string name="hide_until_prompt">在我的列表中显示</string>
   <string name="TEA_no_activity">无活动</string>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index b5b4b8adf..d3d9794cd 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -266,7 +266,6 @@
   <string name="TEA_control_files">文件</string>
   <string name="TEA_control_reminders">提醒</string>
   <string name="TEA_control_timer">定時器控件</string>
-  <string name="TEA_control_share">和朋友們分享</string>
   <string name="TEA_control_hidden_section">----始終隱藏----</string>
   <string name="hide_until_prompt">在我的列表中顯示</string>
   <string name="TEA_no_activity">無活動</string>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 4d8dd2b70..bd80961ab 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -466,7 +466,6 @@
       <item >@string/TEA_control_more_section</item>
       <item >@string/TEA_control_reminders</item>
       <item >@string/TEA_control_timer</item>
-      <item >@string/TEA_control_share</item>
       <item >@string/TEA_control_hidden_section</item>
   </string-array>
   
@@ -482,7 +481,7 @@
   <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
   <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
   <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
-  <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string>
+  <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string> <!-- Deprecated -->
       
   <string-array name="TEA_control_sets_prefs">
       <item>@string/TEA_ctrl_who_pref</item>
@@ -494,7 +493,6 @@
       <item>@string/TEA_ctrl_more_pref</item>
       <item>@string/TEA_ctrl_reminders_pref</item>
       <item>@string/TEA_ctrl_timer_pref</item>
-      <item>@string/TEA_ctrl_share_pref</item>
       <item>@string/TEA_ctrl_hide_section_pref</item>
   </string-array>
   
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index d7eeb5282..bdf0495e4 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -429,9 +429,6 @@
 
   <!-- slide 16f -->
   <string name="TEA_control_timer">Timer Controls</string>
-
-  <!-- slide 16g -->
-  <string name="TEA_control_share">Share With Friends</string>
   
   <string name="TEA_control_hidden_section">----Hide Always----</string>
   
diff --git a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
index f0da1e0f9..93328b11f 100644
--- a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
@@ -213,7 +213,7 @@ public class BeastModePreferences extends ListActivity {
         }
 
         for (String s : itemsArray) {
-            if (!s.equals(context.getResources().getString(R.string.TEA_ctrl_title_pref))){
+            if (!s.equals(context.getString(R.string.TEA_ctrl_title_pref)) && !s.equals(context.getString(R.string.TEA_ctrl_share_pref))) {
                 list.add(s);
             }
         }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 4354742c4..749c5f026 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -665,7 +665,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         String moreSectionTrigger = getString(R.string.TEA_ctrl_more_pref);
         String hideAlwaysTrigger = getString(R.string.TEA_ctrl_hide_section_pref);
-        String shareViewDescriptor = getString(R.string.TEA_ctrl_share_pref);
         LinearLayout section = basicControls;
 
         moreSectionHasControls = false;