Skip to content

Commit 8ab0421

Browse files
arthurbenemannarthurbenemann
committed
CleanUp: Regrouping strings into logical groups
1 parent 7158eec commit 8ab0421

File tree

2 files changed

+89
-68
lines changed

2 files changed

+89
-68
lines changed

‎DroidPlanner/res/values/strings.xml‎

Lines changed: 88 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,56 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4+
<!-- Do not translate the following strings -->
45
<string name="app_title">DroidPlanner</string>
6+
7+
<!-- Generic strings -->
58
<string name="about">About</string>
69
<string name="version">Version</string>
710
<string name="storage_folder">Storage Folder</string>
811
<string name="settings">Settings</string>
912
<string name="help">Help</string>
1013
<string name="menu_drone_setup">Drone Setup</string>
1114
<string name="editor">Editor</string>
15+
<string name="send_mission">Send mission</string>
16+
<string name="load_mission">Load mission</string>
17+
18+
<!-- Drone Setup tabs -->
19+
<string name="screen_tuning">Tuning</string>
20+
<string name="screen_cal">Calibration</string>
21+
<string name="screen_checklist">Checklist</string>
22+
<string name="screen_rc">Radio</string>
23+
<string name="screen_parameters">Parameters</string>
24+
25+
<!-- Connection State -->
1226
<string name="menu_connect">Connect</string>
1327
<string name="menu_disconnect">Disconnect</string>
1428
<string name="connected">Connected</string>
1529
<string name="disconnected">Disconnected</string>
16-
<string name="save">Save</string>
17-
<string name="open">Open</string>
18-
<string name="no_files">No Files</string>
30+
31+
<!-- Failsafe Strings -->
32+
<string name="RCFailsafe">Warning! RC Failsafe – Returning to Launch</string>
33+
34+
<!-- Common Setup Buttons Resource Strings -->
35+
<string name="button_setup_calibrate">Calibrate</string>
36+
<string name="button_setup_cancel">Cancel</string>
37+
<string name="button_setup_send">Send</string>
38+
<string name="button_setup_next">Next</string>
39+
<string name="button_setup_done">Done</string>
40+
<string name="Pause">Pause</string>
41+
<string name="dialog_box_btn_txt_ok">OK</string>
42+
43+
<!-- File operations -->
1944
<string name="select_file_to_open">Select file to open:</string>
45+
<string name="no_files">No Files</string>
2046
<string name="error_when_opening_file">Error when opening file</string>
21-
<string name="waypoint_altitude">Altitude</string>
22-
<string name="distance_between_lines">Lateral</string>
47+
<string name="save">Save</string>
48+
<string name="open">Open</string>
2349
<string name="write">Write</string>
2450
<string name="refresh">Refresh</string>
51+
52+
<!-- Survey/Mapping related strings -->
53+
<string name="distance_between_lines">Lateral</string>
2554
<string name="footprint">Footprint</string>
2655
<string name="ground_resolution">GSD</string>
2756
<string name="distance_between_pictures">Longitudinal</string>
@@ -32,20 +61,30 @@
3261
<string name="flight_altitude">Flight Altitude:</string>
3362
<string name="overlap">Overlap:</string>
3463
<string name="sidelap">Sidelap:</string>
35-
<string name="screen_planning">Planning</string>
36-
<string name="screen_flight_data">Flight Data</string>
37-
<string name="screen_rc">Radio</string>
38-
<string name="screen_parameters">Parameters</string>
39-
<string name="screen_camera">Camera</string>
40-
<string name="screen_gcp">GCP</string>
41-
<string name="screen_chart">Chart</string>
4264
<string name="mission_length">Grid Length</string>
4365
<string name="pictures">Pictures</string>
4466
<string name="number_of_strips">Number Of Strips</string>
45-
<string name="loiter_time">Loiter Time</string>
46-
<string name="waypoint_delay">Delay before next waypoint</string>
47-
<string name="loiter_radius">Loiter Radius</string>
48-
<string name="loiter_ccw">CCW</string>
67+
<string name="exception_draw_polygon">Draw a polygon/WPTs</string>
68+
<string name="exception_draw_2_more_polygon_points">Draw at least 2 more polygon points</string>
69+
<string name="exception_draw_1_more_polygon_points">Draw at least 1 more polygon points</string>
70+
<string name="mission_is_too_lengthy">Mission is too lengthy</string>
71+
72+
<!-- Flight Mode information -->
73+
<string name="mode_acro">Acro allows a pilot to control rate of rotation directly.</string>
74+
<string name="mode_althold">Alt Hold automatically controls throttle and maintains alitude. Does not require GPS.</string>
75+
<string name="mode_auto">Auto follows the scripted mission stored on the vehicle.</string>
76+
<string name="mode_circle">Circle rotates the vehicle around a point of interest. The vehicle will always point toward the center. Requires GPS lock.</string>
77+
<string name="mode_drift">Drift combines roll and yaw to produce a more natural and intuitive flight. Requires GPS lock.</string>
78+
<string name="mode_guided">Guided enables position control from a ground station. Requires GPS lock.</string>
79+
<string name="mode_land">Land at the current location. Requires GPS lock.</string>
80+
<string name="mode_loiter">Loiter allows the pilot to fly completely through GPS. </string>
81+
<string name="mode_ofloiter">Optical Flow enabled Loiter holds position and altitude assisted by the required optical flow sensors. </string>
82+
<string name="mode_position">Position allows the pilot to fly completely through GPS, but with manual throttle control. </string>
83+
<string name="mode_rtl">RTL rises to the minimum altitude, returns to the home location and lands. Requires GPS lock.</string>
84+
<string name="mode_sport">Sport allows a pilot to control rate of rotation directly with the addition of self-leveling.</string>
85+
<string name="mode_stabilize">Stabilize levels the vehicle in flight.</string>
86+
87+
<!-- Waypoint info -->
4988
<string name="waypointInfo_Land">Land vehicle at the current location. You must manually exit Auto mode to disarm motors.</string>
5089
<string name="waypointInfo_Generic">Generic Waypoint</string>
5190
<string name="waypointInfo_Loiter">not used.</string>
@@ -61,6 +100,13 @@
61100
<string name="waypointInfo_SetSpeed">Change speed and/or throttle set points.Set -1 for both Speed and Throttle if no changes is required</string>
62101
<string name="waypointInfo_ROI">Sets a location and altitude to point copter towards and to aim an optional camera.</string>
63102
<string name="waypointInfo_SetJump">Repeat waypoint</string>
103+
104+
<!-- Waypoint editor -->
105+
<string name="loiter_time">Loiter Time</string>
106+
<string name="waypoint_delay">Delay before next waypoint</string>
107+
<string name="loiter_radius">Loiter Radius</string>
108+
<string name="loiter_ccw">CCW</string>
109+
<string name="waypoint_altitude">Altitude</string>
64110
<string name="waypoint_angle">Yaw Angle</string>
65111
<string name="waypoint_finalaltitude">Target Altitude</string>
66112
<string name="waypoint_altrate">Descent / Ascend rate</string>
@@ -80,64 +126,29 @@
80126
<string name="waypoint_coordsrc">Source data :</string>
81127
<string name="waypoint_jumpto">Jump to waypoint :</string>
82128
<string name="waypoint_repeat">Repeat waypoint</string>
129+
<string name="Orbits">Orbits</string>
130+
131+
<!-- Selection of map style -->
83132
<string name="menu_map_type">Map Type</string>
84133
<string name="menu_map_type_satellite">Satellite</string>
85134
<string name="menu_map_type_hybrid">Hybrid</string>
86135
<string name="menu_map_type_normal">Normal</string>
87136
<string name="menu_map_type_terrain">Terrain</string>
88-
<string name="metadata_values">Values:</string>
89-
<string name="metadata_units">Units:</string>
90-
<string name="metadata_range">Range:</string>
91-
<string name="lst_note_hint">To add more rows, just press Enter</string>
92-
<string name="Orbits">Orbits</string>
93-
<string name="mode_acro">Acro allows a pilot to control rate of rotation directly.</string>
94-
<string name="mode_althold">Alt Hold automatically controls throttle and maintains alitude. Does not require GPS.</string>
95-
<string name="mode_auto">Auto follows the scripted mission stored on the vehicle.</string>
96-
<string name="mode_circle">Circle rotates the vehicle around a point of interest. The vehicle will always point toward the center. Requires GPS lock.</string>
97-
<string name="mode_drift">Drift combines roll and yaw to produce a more natural and intuitive flight. Requires GPS lock.</string>
98-
<string name="mode_guided">Guided enables position control from a ground station. Requires GPS lock.</string>
99-
<string name="mode_land">Land at the current location. Requires GPS lock.</string>
100-
<string name="mode_loiter">Loiter allows the pilot to fly completely through GPS. </string>
101-
<string name="mode_ofloiter">Optical Flow enabled Loiter holds position and altitude assisted by the required optical flow sensors. </string>
102-
<string name="mode_position">Position allows the pilot to fly completely through GPS, but with manual throttle control. </string>
103-
<string name="mode_rtl">RTL rises to the minimum altitude, returns to the home location and lands. Requires GPS lock.</string>
104-
<string name="mode_sport">Sport allows a pilot to control rate of rotation directly with the addition of self-leveling.</string>
105-
<string name="mode_stabilize">Stabilize levels the vehicle in flight.</string>
106-
<string name="send_mission">Send mission</string>
107-
<string name="load_mission">Load mission</string>
108-
<string name="tune_roll">Manual adjustment of roll and pitch tuning. Rate_P is the primary value to adjust.</string>
109-
<string name="dialog_box_title_altitude">Altitude</string>
110-
<string name="dialog_box_btn_txt_cancel">Cancel</string>
111-
<string name="dialog_box_btn_txt_ok">OK</string>
112-
<string name="exception_draw_polygon">Draw a polygon/WPTs</string>
113-
<string name="exception_draw_2_more_polygon_points">Draw at least 2 more polygon points</string>
114-
<string name="exception_draw_1_more_polygon_points">Draw at least 1 more polygon points</string>
115-
<string name="mission_is_too_lengthy">Mission is too lengthy</string>
137+
138+
<!-- Parameters screen -->
116139
<string name="params_click_to_refresh">Click to refresh parameters from drone</string>
117-
<string name="metadata_value">Value:</string>
118-
<string name="metadata_custom_value">** Custom value **</string>
119140
<string name="refreshing_parameters">Refreshing Parameters&#8230;</string>
120141
<string name="parameters_saved">Parameters saved</string>
121-
<string name="RCFailsafe">Warning! RC Failsafe – Returning to Launch</string>
122-
<string name="mode_switch">Assign RC channel 5 to a switch on your radio to control flight modes. Move the switch to each position and select the desired flight mode below.</string>
123-
<string name="Pause">Pause</string>
124-
<string name="screen_tuning">Tuning</string>
125-
<string name="screen_cal">Calibration</string>
126-
<string name="screen_checklist">Checklist</string>
127-
<string name="MAVLinkError">MAVLink Error:</string>
128-
<string name="msg_connect_first">Please connect first</string>
129142
<string name="msg_parameters_written_to_drone">"parameters written to drone"</string>
143+
<string name="metadata_value">Value:</string>
144+
<string name="metadata_custom_value">** Custom value **</string>
145+
<string name="metadata_values">Values:</string>
146+
<string name="metadata_units">Units:</string>
147+
<string name="metadata_range">Range:</string>
148+
<string name="lst_note_hint">To add more rows, just press Enter</string>
130149
<string name="set_to_zero_to_disable">(set to zero to disable).</string>
131-
<string name="mode1_throttle_on_right_stick">Mode1: Throttle on RIGHT stick</string>
132-
<string name="mode2_throttle_on_left_stick">Mode2: Throttle on LEFT stick</string>
133-
134-
135-
<!-- Common Setup Buttons Resource Strings -->
136-
<string name="button_setup_calibrate">Calibrate</string>
137-
<string name="button_setup_cancel">Cancel</string>
138-
<string name="button_setup_send">Send</string>
139-
<string name="button_setup_next">Next</string>
140-
<string name="button_setup_done">Done</string>
150+
151+
<!-- Calibration data progress -->
141152
<string name="progress_title_uploading">Uploading calibration data</string>
142153
<string name="progress_desc_uploading">DroidPlanner is uploading calibration data to vehicel</string>
143154
<string name="progress_title_downloading">Downloading calibration data</string>
@@ -153,7 +164,7 @@
153164
<string name="setup_radio_desc_minmax">Move the joystics all the way out several times and toggle the swithces, levers and knobs to all possible positions</string>
154165
<string name="setup_radio_desc_middle">Set throttle stick to the lowest position and other joysticks, switches, levers and knobs to their center position</string>
155166
<string name="setup_radio_desc_complete">RC calibration completed. Press \'Save\' to upload data to vehicle</string>
156-
167+
157168
<!-- Compass Setup Resource Strings -->
158169
<string name="setup_mag_title">Compass Calibration</string>
159170

@@ -194,7 +205,7 @@
194205
<string name="setup_ch_CH8_options">"Channel 8 Tuning :"</string>
195206
<string name="setup_ch_tune_low">"Tune Value - Low :"</string>
196207
<string name="setup_ch_tune_high">"Tune Value - High :"</string>
197-
208+
198209
<!-- Servo functions Setup Resource Strings -->
199210
<string name="setup_sf_title">"Servo Function Configuration"</string>
200211
<string name="setup_sf_side_title">"Update Servo Function"</string>
@@ -217,12 +228,22 @@
217228
<string name="air_speed_label">Air speed</string>
218229
<string name="default_angle_value">--°</string>
219230

220-
<!-- Bluetooth device selection strings -->
231+
<!-- Bluetooth device selection strings -->
221232
<string name="select_device">Select device to connect</string>
222233
<string name="none_paired">No devices have been paired</string>
223234
<string name="none_found">No devices found</string>
224235
<string name="title_paired_devices">Paired Devices</string>
225236
<string name="title_other_devices">Other Available Devices</string>
226237
<string name="button_scan">Scan for devices</string>
227238
<string name="scanning">Scanning for devices</string>
239+
240+
<!-- Others (when possible move to a grouping above) -->
241+
<string name="tune_roll">Manual adjustment of roll and pitch tuning. Rate_P is the primary value to adjust.</string>
242+
<string name="dialog_box_title_altitude">Altitude</string>
243+
<string name="mode_switch">Assign RC channel 5 to a switch on your radio to control flight modes. Move the switch to each position and select the desired flight mode below.</string>
244+
<string name="MAVLinkError">MAVLink Error:</string>
245+
<string name="msg_connect_first">Please connect first</string>
246+
<string name="mode1_throttle_on_right_stick">Mode1: Throttle on RIGHT stick</string>
247+
<string name="mode2_throttle_on_left_stick">Mode2: Throttle on LEFT stick</string>
248+
228249
</resources>

‎DroidPlanner/src/org/droidplanner/dialogs/AltitudeDialog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private AlertDialog buildDialog(Context context) {
3737
AlertDialog.Builder builder = new AlertDialog.Builder(context);
3838
builder.setTitle(R.string.dialog_box_title_altitude);
3939
builder.setView(buildAltitudePicker(context));
40-
builder.setNegativeButton(R.string.dialog_box_btn_txt_cancel, this).setPositiveButton(R.string.dialog_box_btn_txt_ok, this);
40+
builder.setNegativeButton(R.string.button_setup_cancel, this).setPositiveButton(R.string.dialog_box_btn_txt_ok, this);
4141
AlertDialog dialog = builder.create();
4242
return dialog;
4343
}

0 commit comments

Comments
 (0)