Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

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

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 8eb5b45976d550cc373c218a610a1b6331b43c5f..993436e3fd57d2e570f7f6500590ccf2cfc2eda6 100644 (file)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -2,14 +2,33 @@
 <resources>\r
 \r
     <string name="app_name">OpenRocket</string>\r
-    <string name="version">version 12.03</string>\r
+    <string name="version">version 12.07-b8</string>\r
+    <string name="cancel">Cancel</string>\r
+    <string name="ok">OK</string>\r
+    <string name="dismiss">Dismiss</string>\r
+    <string name="load">Load</string>\r
     <string name="save">Save</string>\r
+    <string name="Add">Add</string>\r
     <string name="MotorListTitle">Motor List</string>\r
     <string name="Download">Download</string>\r
     <string name="About">About</string>\r
     <string name="Preferences">Preferences</string>\r
-    <string name="select_series">Select Series</string>\r
+    <string name="missingMotors">Missing Motors</string>\r
+    <string name="missingMotorsMessageStart">The following motors are missing:</string>\r
+    <string name="missingMotorsMessageEnd">Would you like to download them from Thrustcurve?</string>\r
+    <string name="configurePlot">Change Plot</string>\r
     <string name="view_events">View Events</string>\r
+    <string name="simulationPlotDialogTitle">Select Series And Events</string>\r
+    <string name="DeleteConfigTitle">Delete Motor Configuration</string>\r
+    \r
+    <string name="plot">Plot</string>\r
+    <string name="saving">Saving file…</string>\r
+    <string name="loading">Loading file…</string>\r
+    <string name="loadWarnUnsaved">Would you like to save the changes to the current model?</string>\r
+    <string name="no">No</string>\r
+    <string name="yes">Yes</string>\r
+    <string name="autoSaveMessage">Automatically saving rocket</string>\r
+    <string name="loadingErrorMessage">Error Loading File</string>\r
 \r
     <string-array name="PreferenceMotorBrowserGroupingEntries">\r
         <item>Case</item>\r
@@ -19,11 +38,18 @@
     </string-array>\r
 \r
     <string name="TCMotorSearchFormSubmit">Submit</string>\r
+    <string name="TCMotorSearchFormTitle">Search Thrustcurve.org</string>\r
     <string name="overviewConfigurationSpinnerPrompt">Select Configuration</string>\r
     <string name="simulationSeries1Label">Series 1</string>\r
     <string name="simulationSeries2Label">Series 2</string>\r
 \r
+    <string name="autosavetitle">Autosave Rocket</string>\r
+    <string name="autosavesummary">Automatically save the rocket document after simulations</string>\r
+    \r
     <string name="motorbrowsergrouptitle">Motor Browser Grouping</string>\r
+    <string name="motorbrowsergroupsummary">Set the grouping in Motor Browser</string>\r
+    \r
+    <string name="motorbrowsertitle">Motor Browser</string>\r
     \r
     <string name="useinternalfilebrowsertitle">Use Internal File Browser</string>\r
     <string name="useinternalfilebrowsersummary">Check to use built in file browser instead of external file browser</string>\r
@@ -75,5 +101,14 @@
         <string name="motor_impulseclass">Impulse Class</string>\r
         <string name="motor_diameter">Diameter</string>\r
         <string name="motor_length">Length</string>\r
+        <string name="simulationConditionSelectMotors">Select Motors</string>\r
+        <string name="simulationConditionWind">Wind speed</string>\r
+        <string name="simulationConditionsRodLength">Launch Rod Length</string>\r
+        <string name="simulationConditionsLaunchRodAngle">Launch Rod Angle</string>\r
+        <string name="simulationConditionsLaunchRodDirection">Launch Rod Direction</string>\r
+        <string name="select_motor">Select Motor</string>\r
+        <string name="select_delay">Delay</string>\r
+        <string name="Delete">Delete</string>\r
+        <string name="Run">Run</string>\r
 \r
 </resources>
\ No newline at end of file