Extract strings from layout files to prepare better for l10n.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@436 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/layout-land/main.xml b/android/res/layout-land/main.xml
index f7521f9e272d7c7eeb35c6fad0fb24110d6fc065..91e7eff3d72842ea34780c375ae20e2dc5da886c 100644 (file)
--- a/android/res/layout-land/main.xml
+++ b/android/res/layout-land/main.xml
@@ -36,13 +36,13 @@
                 android:id="@+id/main_open"\r
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:text="View ork file" />\r
+                android:text="@string/openfilelabel" />\r
 \r
             <Button\r
                 android:id="@+id/main_browse"\r
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:text="View motors" />\r
+                android:text="@string/viewmotorslabel" />\r
         </LinearLayout>\r
     </LinearLayout>\r
 \r

diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
index 701f5cf48173904d144a5885eaceff54fe558970..85550209c567ee55ae9b707083bcfda999446d15 100644 (file)
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -25,18 +25,19 @@
         android:layout_height="wrap_content"\r
         android:layout_weight="1"\r
         android:gravity="center_horizontal" >\r
-\r
+\r\r\r
         <Button\r
             android:id="@+id/main_open"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
-            android:text="View ork file" />\r
-\r
+            android:text="@string/openfilelabel" />\r
+\r\r
         <Button\r
             android:id="@+id/main_browse"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
-            android:text="View motors" />\r
+            android:text="@string/viewmotorslabel" />\r
+\r
     </LinearLayout>\r
 \r
 </LinearLayout>
\ No newline at end of file

diff --git a/android/res/layout/motor_detail_form.xml b/android/res/layout/motor_detail_form.xml
index 551dab580bef4da21db50d56a1c7573c0998890b..ee035fa3e46bdb6eff74608e52acadd1707344b8 100644 (file)
--- a/android/res/layout/motor_detail_form.xml
+++ b/android/res/layout/motor_detail_form.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" >
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
     <TableLayout
         android:id="@+id/motorDetailForm"
@@ -13,7 +15,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Manufacturer" />
+                android:text="@string/motor_manufacturer" />
 
             <EditText
                 android:id="@+id/motorDetailsManufacturer"
@@ -28,7 +30,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Name" />
+                android:text="@string/motor_commonname" />
 
             <EditText
                 android:id="@+id/motorDetailsName"
@@ -43,7 +45,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Delays" />
+                android:text="@string/motor_delays" />
 
             <EditText
                 android:id="@+id/motorDetailsDelays"
@@ -58,7 +60,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Case Info" />
+                android:text="@string/motor_caseinfo" />
 
             <EditText
                 android:id="@+id/motorDetailsCaseInfo"
@@ -73,7 +75,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Impulse Class" />
+                android:text="@string/motor_impulseclass" />
 
             <EditText
                 android:id="@+id/motorDetailsImpuseClass"
@@ -88,7 +90,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Diameter" />
+                android:text="@string/motor_diameter" />
 
             <EditText
                 android:id="@+id/motorDetailsDiameter"
@@ -103,7 +105,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Length" />
+                android:text="@string/motor_length" />
 
             <EditText
                 android:id="@+id/motorDetailsLength"

diff --git a/android/res/layout/rocket_overview.xml b/android/res/layout/rocket_overview.xml
index a9cb3ffa3376e5b0d49adf52d9657f65b45d095f..4ebc0b08db5be254c9dfe9bdb76f2c9b3f8c2c69 100644 (file)
--- a/android/res/layout/rocket_overview.xml
+++ b/android/res/layout/rocket_overview.xml
@@ -8,12 +8,12 @@
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
         android:orientation="vertical" >\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="Designer" />\r
+            android:text="@string/rocket_designer" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r
@@ -21,12 +21,12 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:text="" />\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="Length" />\r
+            android:text="@string/rocket_length" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r
@@ -34,12 +34,12 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:text="" />\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="Empty Mass" />\r
+            android:text="@string/rocket_emptymass" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r
@@ -47,12 +47,12 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:text="" />\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="Stage Count" />\r
+            android:text="@string/rocket_stagecount" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r
@@ -66,12 +66,12 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:prompt="@string/overviewConfigurationSpinnerPrompt" />\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="Lift off weight" />\r
+            android:text="@string/rocket_liftoffweight" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r
@@ -79,12 +79,12 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:text="" />\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="CG" />\r
+            android:text="@string/rocket_cg" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r
@@ -92,12 +92,12 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:text="" />\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="CP" />\r
+            android:text="@string/rocket_cp" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r
@@ -105,12 +105,12 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:text="" />\r
-\r
+\r\r
         <TextView\r
             style="@style/labelTextStyle"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
-            android:text="Stability margin" />\r
+            android:text="@string/rocket_stabilitymargin" />\r
 \r
         <TextView\r
             style="@style/valueTextStyle"\r

diff --git a/android/res/layout/simulation_graph_activity.xml b/android/res/layout/simulation_graph_activity.xml
index c742b660a26c9aead2def7e843e4ee4869ea3cfb..0b1fbc61b702acd94e8c25ba94cb3b6f8eff3545 100644 (file)
--- a/android/res/layout/simulation_graph_activity.xml
+++ b/android/res/layout/simulation_graph_activity.xml
@@ -3,11 +3,15 @@
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
     android:orientation="vertical" >\r
-    \r
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"/>\r
+\r
+    <TextView\r
+        android:layout_width="wrap_content"\r
+        android:layout_height="wrap_content" />\r
+\r
     <LinearLayout\r
-    android:layout_width="match_parent"\r
-    android:id="@+id/sidepane"\r
-    android:layout_height="match_parent"\r
-    android:orientation="vertical" />\r
+        android:id="@+id/sidepane"\r
+        android:layout_width="match_parent"\r
+        android:layout_height="match_parent"\r
+        android:orientation="vertical" />\r
+\r
 </LinearLayout>
\ No newline at end of file

diff --git a/android/res/layout/tcqueryform.xml b/android/res/layout/tcqueryform.xml
index 77c15e5d97422675b6c8b89d3974b7dba813c742..4295e879babf1e6af52e490ca5ed19971927e4db 100644 (file)
--- a/android/res/layout/tcqueryform.xml
+++ b/android/res/layout/tcqueryform.xml
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormManufacturer" />
+                android:text="@string/motor_manufacturer" />
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormManufacturerField"
@@ -34,8 +34,7 @@
         <TableRow>
 
             <TextView
-                android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormImpulse" />
+                android:text="@string/motor_impulseclass" />
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormImpulseField"
@@ -47,8 +46,7 @@
         <TableRow>
 
             <TextView
-                android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormCommonName" />
+                android:text="@string/motor_commonname" />
 
             <EditText
                 android:id="@+id/TCMotorSearchFormCommonNameField"
@@ -58,8 +56,7 @@
         <TableRow>
 
             <TextView
-                android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormDiameter" />
+                android:text="@string/motor_diameter" />
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormDiameterField"

diff --git a/android/res/menu/motor_browser_option_menu.xml b/android/res/menu/motor_browser_option_menu.xml
index 05b6e96b3ea2f813d0728f8a1bf12fb5f00e024f..93b96922a4b67cc90c1ac2d14851430eff4ce6f7 100644 (file)
--- a/android/res/menu/motor_browser_option_menu.xml
+++ b/android/res/menu/motor_browser_option_menu.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/download_from_thrustcurve_menu_option"
-        android:title="Download from ThrustCurve"/>
+        android:title="@string/Download"/>
     <item
         android:id="@+id/preference_menu_option"
         android:icon="@drawable/ic_menu_preferences"

diff --git a/android/res/menu/rocket_viewer_option_menu.xml b/android/res/menu/rocket_viewer_option_menu.xml
index 8201a6c6d54b5248b330d3bd9d78fb8f50fd5e75..eab9ade07ff09ba73f16c400c9586c9b4bc1a36d 100644 (file)
--- a/android/res/menu/rocket_viewer_option_menu.xml
+++ b/android/res/menu/rocket_viewer_option_menu.xml
@@ -3,7 +3,7 @@
 \r
     <item\r
         android:id="@+id/motor_list_menu_option"\r
-        android:title="Motor List"\r
+        android:title="@string/viewmotorslabel"\r
         android:icon="@drawable/ic_motorbrowser"\r
         android:showAsAction="always"/>\r
     <item\r

diff --git a/android/res/menu/simulation_option_menu.xml b/android/res/menu/simulation_option_menu.xml
index e2474a509076f96e3ed68fb0bbcd5b543ad928d0..122de68cd5fe3e6540980d48676aa729c29d4111 100644 (file)
--- a/android/res/menu/simulation_option_menu.xml
+++ b/android/res/menu/simulation_option_menu.xml
@@ -3,8 +3,8 @@
 
     <item
         android:id="@+id/simulation_select_series_menu_option"
-        android:title="Select Series"/>
+        android:title="@string/select_series"/>
     <item
         android:id="@+id/simulation_select_events_menu_option"
-        android:title="View Event"/>
+        android:title="@string/view_events"/>
 </menu>
\ No newline at end of file

diff --git a/android/res/values/pref_strings.xml b/android/res/values/pref_strings.xml
index 07eaa47ddf357c5c185adb219901d6c8720ac02d..dcdd42210ab833a4fefa0674dac8aa26800508ab 100644 (file)
--- a/android/res/values/pref_strings.xml
+++ b/android/res/values/pref_strings.xml
@@ -2,11 +2,10 @@
 <resources>\r
 \r
     <string name="PreferenceMotorBrowserGroupingOption">PreferenceMotorBrowserGroupingOption</string>\r
-\r
     <string name="PreferenceUseInternalFileBrowserOption">PreferenceUseInternalFileBrowserOpion</string>\r
     <string name="PreferenceFileBrowserBaseDirectory">PreferenceFileBrowserBaseDirectory</string>\r
     <string name="PreferenceShowOnlyOrkFiles">PreferenceShowOnlyOrkFiles</string>\r
-    \r
+\r
     <string-array name="PreferenceMotorBrowserGroupingValues">\r
         <item>0</item>\r
         <item>1</item>\r
@@ -52,5 +51,68 @@
         <item>mi</item>\r
         <item>nmi</item>\r
     </string-array>\r
+    <string-array name="TCMotorSearchManufacturerList">\r
+        <item></item>\r
+        <item>AeroTech</item>\r
+        <item>Alpha Hybrids</item>\r
+        <item>Animal Motor Works</item>\r
+        <item>Apogee Components</item>\r
+        <item>Cesaroni Technology</item>\r
+        <item>Contrail Rockets</item>\r
+        <item>Ellis Mountain</item>\r
+        <item>Estes Industries</item>\r
+        <item>Gorilla Rocket Motors</item>\r
+        <item>Hypertek</item>\r
+        <item>Kosdon by AeroTech</item>\r
+        <item>Kosdon TRM</item>\r
+        <item>Loki Research</item>\r
+        <item>Propulsion Polymers</item>\r
+        <item>Public Missiles, Ltd.</item>\r
+        <item>Quest Aerospace</item>\r
+        <item>R.A.T.T. Works</item>\r
+        <item>Roadrunner Rocketry</item>\r
+        <item>Rocketvision Flight-Star</item>\r
+        <item>Sky Ripper Systems</item>\r
+        <item>West Coast Hybrids</item>\r
+    </string-array>\r
+    <string-array name="TCMotorSearchImpulseList">\r
+        <item></item>\r
+        <item>A</item>\r
+        <item>B</item>\r
+        <item>C</item>\r
+        <item>D</item>\r
+        <item>E</item>\r
+        <item>F</item>\r
+        <item>G</item>\r
+        <item>H</item>\r
+        <item>I</item>\r
+        <item>J</item>\r
+        <item>K</item>\r
+        <item>L</item>\r
+        <item>M</item>\r
+        <item>N</item>\r
+        <item>O</item>\r
+    </string-array>\r
+    <string-array name="TCMotorSearchDiameterList">\r
+        <item></item>\r
+        <item>6</item>\r
+        <item>10.5</item>\r
+        <item>13</item>\r
+        <item>18</item>\r
+        <item>20</item>\r
+        <item>24</item>\r
+        <item>29</item>\r
+        <item>32</item>\r
+        <item>38</item>\r
+        <item>54</item>\r
+        <item>64</item>\r
+        <item>69</item>\r
+        <item>75</item>\r
+        <item>76</item>\r
+        <item>81</item>\r
+        <item>98</item>\r
+        <item>152</item>\r
+        <item>161</item>\r
+    </string-array>\r
 \r
 </resources>
\ No newline at end of file

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f1202d31aca1bb7d9d36df7ed2e4ac355eef7871..489c2d0c440ec70688374fd38d6335f9cf976f17 100644 (file)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -4,7 +4,10 @@
     <string name="app_name">OpenRocket</string>\r
     <string name="save">Save</string>\r
     <string name="MotorListTitle">Motor List</string>\r
+    <string name="Download">Download</string>\r
     <string name="Preferences">Preferences</string>\r
+    <string name="select_series">Select Series</string>\r
+    <string name="view_events">View Events</string>\r
 \r
     <string-array name="PreferenceMotorBrowserGroupingEntries">\r
         <item>Case</item>\r
@@ -13,81 +16,7 @@
         <item>Manufacturer</item>\r
     </string-array>\r
 \r
-    <string name="TCMotorSearchFormImpulse">Impulse</string>\r
-\r
-    <string-array name="TCMotorSearchImpulseList">\r
-        <item>All</item>\r
-        <item>A</item>\r
-        <item>B</item>\r
-        <item>C</item>\r
-        <item>D</item>\r
-        <item>E</item>\r
-        <item>F</item>\r
-        <item>G</item>\r
-        <item>H</item>\r
-        <item>I</item>\r
-        <item>J</item>\r
-        <item>K</item>\r
-        <item>L</item>\r
-        <item>M</item>\r
-        <item>N</item>\r
-        <item>O</item>\r
-    </string-array>\r
-\r
-    <string name="TCMotorSearchFormManufacturer">Manufacturer</string>\r
-\r
-    <string-array name="TCMotorSearchManufacturerList">\r
-        <item>All</item>\r
-        <item>AeroTech</item>\r
-        <item>Alpha Hybrids</item>\r
-        <item>Animal Motor Works</item>\r
-        <item>Apogee Components</item>\r
-        <item>Cesaroni Technology</item>\r
-        <item>Contrail Rockets</item>\r
-        <item>Ellis Mountain</item>\r
-        <item>Estes Industries</item>\r
-        <item>Gorilla Rocket Motors</item>\r
-        <item>Hypertek</item>\r
-        <item>Kosdon by AeroTech</item>\r
-        <item>Kosdon TRM</item>\r
-        <item>Loki Research</item>\r
-        <item>Propulsion Polymers</item>\r
-        <item>Public Missiles, Ltd.</item>\r
-        <item>Quest Aerospace</item>\r
-        <item>R.A.T.T. Works</item>\r
-        <item>Roadrunner Rocketry</item>\r
-        <item>Rocketvision Flight-Star</item>\r
-        <item>Sky Ripper Systems</item>\r
-        <item>West Coast Hybrids</item>\r
-    </string-array>\r
-\r
-    <string name="TCMotorSearchFormCommonName">Common Name</string>\r
-    <string name="TCMotorSearchFormDiameter">Diameter</string>\r
-\r
-    <string-array name="TCMotorSearchDiameterList">\r
-        <item>All</item>\r
-        <item>6</item>\r
-        <item>10.5</item>\r
-        <item>13</item>\r
-        <item>18</item>\r
-        <item>20</item>\r
-        <item>24</item>\r
-        <item>29</item>\r
-        <item>32</item>\r
-        <item>38</item>\r
-        <item>54</item>\r
-        <item>64</item>\r
-        <item>69</item>\r
-        <item>75</item>\r
-        <item>76</item>\r
-        <item>81</item>\r
-        <item>98</item>\r
-        <item>152</item>\r
-        <item>161</item>\r
-    </string-array>\r
-\r
     <string name="TCMotorSearchFormSubmit">Submit</string>\r
-    <string name="tcdownload">Download from ThrustCurve</string>\r
     <string name="overviewConfigurationSpinnerPrompt">Select Configuration</string>\r
     <string name="simulationSeries1Label">Series 1</string>\r
     <string name="simulationSeries2Label">Series 2</string>\r
@@ -127,5 +56,22 @@
         <item>Miles</item>\r
         <item>Nautical Miles</item>\r
     </string-array>\r
+        <string name="rocket_cg">CG</string>\r
+        <string name="rocket_designer">Designer</string>\r
+        <string name="rocket_length">Length</string>\r
+        <string name="rocket_emptymass">Empty Mass</string>\r
+        <string name="rocket_stagecount">Stage Count</string>\r
+        <string name="rocket_liftoffweight">Lift off weight</string>\r
+        <string name="rocket_cp">CP</string>\r
+        <string name="rocket_stabilitymargin">Stability margin</string>\r
+        <string name="openfilelabel">Open ork file</string>\r
+        <string name="viewmotorslabel">View motors</string>\r
+        <string name="motor_manufacturer">Manufacturer</string>\r
+        <string name="motor_commonname">Common Name</string>\r
+        <string name="motor_delays">Delays</string>\r
+        <string name="motor_caseinfo">Case Info</string>\r
+        <string name="motor_impulseclass">Impulse Class</string>\r
+        <string name="motor_diameter">Diameter</string>\r
+        <string name="motor_length">Length</string>\r
 \r
 </resources>
\ No newline at end of file