From e93be132aef51244befccf6041c4c98e78309072 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 31 May 2010 01:18:20 -0700
Subject: [PATCH] Moved stuff that shouldn't be translated out of arrays and
 into keys.xml

---
 astrid/res/values/arrays.xml | 96 +-----------------------------------
 astrid/res/values/keys.xml   | 95 +++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 95 deletions(-)

diff --git a/astrid/res/values/arrays.xml b/astrid/res/values/arrays.xml
index dcb8c80d9..8d0f8f85d 100644
--- a/astrid/res/values/arrays.xml
+++ b/astrid/res/values/arrays.xml
@@ -89,13 +89,6 @@
         <item>Astrid</item>
     </string-array>
     
-    <string-array name="notif_icon_values">
-        <!-- Corresponding to the constants in Preferences.java (do not edit) -->
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    
     <string-array name="sync_interval_entries">
         <!-- sync_interval_entries: Synchronization Intervals -->
         <item>disable</item>
@@ -107,17 +100,6 @@
         <item>weekly</item>
     </string-array>
     
-    <string-array name="sync_interval_values">
-        <!-- sync_interval_values: interval in seconds for sync entries (do not edit) -->
-        <item>0</item>
-        <item>1800</item>
-        <item>3600</item>
-        <item>43200</item>
-        <item>86400</item>
-        <item>302400</item>
-        <item>604800</item>
-    </string-array>    
-    
     <string-array name="EPr_quiet_hours_start">
         <!-- quiet_hours_start: options for preference menu -->
         <item>disabled</item>
@@ -147,36 +129,6 @@
         <item>19:00</item>
     </string-array>
     
-    
-    <string-array name="EPr_quiet_hours_start_values">
-        <!-- quiet_hours_start_values: 24-hour representation of quiet_hour_start -->
-        <item></item>
-        <item>20</item>
-        <item>21</item>
-        <item>22</item>
-        <item>23</item>
-        <item>00</item>
-        <item>01</item>
-        <item>02</item>
-        <item>03</item>
-        <item>04</item>
-        <item>05</item>
-        <item>06</item>
-        <item>07</item>
-        <item>08</item>
-        <item>09</item>
-        <item>10</item>
-        <item>11</item>
-        <item>12</item>
-        <item>13</item>
-        <item>14</item>
-        <item>15</item>
-        <item>16</item>
-        <item>17</item>
-        <item>18</item>
-        <item>19</item>
-    </string-array>
-    
     <string-array name="EPr_quiet_hours_end">
         <!-- quiet_hours_end: options for preference menu -->
         <item>09:00</item>
@@ -204,51 +156,5 @@
         <item>07:00</item>
         <item>08:00</item>
     </string-array>
-    
-    
-    
-    <string-array name="EPr_quiet_hours_end_values">
-        <!-- quiet_hours_end_values: 24-hour representation of quiet_hours_end -->
-        <item>09</item>
-        <item>10</item>
-        <item>11</item>
-        <item>12</item>
-        <item>13</item>
-        <item>14</item>
-        <item>15</item>
-        <item>16</item>
-        <item>17</item>
-        <item>18</item>
-        <item>19</item>
-        <item>20</item>
-        <item>21</item>
-        <item>22</item>
-        <item>23</item>
-        <item>00</item>
-        <item>01</item>
-        <item>02</item>
-        <item>03</item>
-        <item>04</item>
-        <item>05</item>
-        <item>06</item>
-        <item>07</item>
-        <item>08</item>
-    </string-array>
-    
-    <string-array name="EPr_font_size">
-        <!-- font_size: options for preference menu -->
-        <item>14</item>
-        <item>16</item>
-        <item>18</item>
-        <item>20</item>
-        <item>22</item>
-        <item>24</item>
-        <item>26</item>
-        <item>28</item>
-        <item>30</item>
-        <item>32</item>
-        <item>36</item>
-        <item>48</item>
-    </string-array>
-    
+        
 </resources>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 8e3d4719b..820f1269c 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -21,6 +21,9 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+        <!-- This file contains preference keys and prefereyce list values.
+             These should not be translated -->
+
         <string name="p_sync_rtm">sync_rtm</string>
         <string name="p_sync_every_old">sync_every</string> <!-- old sync key -->
         <string name="p_sync_interval">sync_freq</string>
@@ -70,4 +73,96 @@
         <string name="prefs_reminderVisible_default">false</string>
 	    <string name="prefs_notesVisible">notesVisible</string>
         <string name="prefs_notesVisible_default">false</string>
+
+    <string-array name="notif_icon_values">
+        <!-- Corresponding to the constants in Preferences.java (do not edit) -->
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+    
+    <string-array name="sync_interval_values">
+        <!-- sync_interval_values: interval in seconds for sync entries (do not edit) -->
+        <item>0</item>
+        <item>1800</item>
+        <item>3600</item>
+        <item>43200</item>
+        <item>86400</item>
+        <item>302400</item>
+        <item>604800</item>
+    </string-array>    
+        
+    <string-array name="EPr_quiet_hours_start_values">
+        <!-- quiet_hours_start_values: 24-hour representation of quiet_hour_start -->
+        <item></item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>00</item>
+        <item>01</item>
+        <item>02</item>
+        <item>03</item>
+        <item>04</item>
+        <item>05</item>
+        <item>06</item>
+        <item>07</item>
+        <item>08</item>
+        <item>09</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+    </string-array>        
+    
+    <string-array name="EPr_quiet_hours_end_values">
+        <!-- quiet_hours_end_values: 24-hour representation of quiet_hours_end -->
+        <item>09</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>00</item>
+        <item>01</item>
+        <item>02</item>
+        <item>03</item>
+        <item>04</item>
+        <item>05</item>
+        <item>06</item>
+        <item>07</item>
+        <item>08</item>
+    </string-array>
+    
+    <string-array name="EPr_font_size">
+        <!-- font_size: options for preference menu -->
+        <item>14</item>
+        <item>16</item>
+        <item>18</item>
+        <item>20</item>
+        <item>22</item>
+        <item>24</item>
+        <item>26</item>
+        <item>28</item>
+        <item>30</item>
+        <item>32</item>
+        <item>36</item>
+        <item>48</item>
+    </string-array>
+
 </resources>