Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / res / values / pref_strings.xml

diff --git a/android/res/values/pref_strings.xml b/android/res/values/pref_strings.xml
index 5bf182126570eedca325c692783c0a150f0e1dc5..5f3284ac4c7348c3ffcf0ab84120eb0bcbe82a33 100644 (file)
--- a/android/res/values/pref_strings.xml
+++ b/android/res/values/pref_strings.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <resources>\r
 \r
+    <string name="SimulationServiceNotificationID"></string>\r
     <string name="PreferenceMotorBrowserGroupingOption">PreferenceMotorBrowserGroupingOption</string>\r
-\r
     <string name="PreferenceUseInternalFileBrowserOption">PreferenceUseInternalFileBrowserOpion</string>\r
-    \r
+    <string name="PreferenceFileBrowserBaseDirectory">PreferenceFileBrowserBaseDirectory</string>\r
+    <string name="PreferenceShowOnlyOrkFiles">PreferenceShowOnlyOrkFiles</string>\r
+    <string name="PreferenceAutoSaveOption">PreferenceAutoSaveOption</string>\r
+\r
     <string-array name="PreferenceMotorBrowserGroupingValues">\r
         <item>0</item>\r
         <item>1</item>\r
@@ -50,5 +53,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