Merging to head

2011-03-11 23:55:53 -03:00
parent d52aca1d3d
commit 06fceb07cc
12 changed files with 105 additions and 19 deletions
@@ -50,8 +50,7 @@ limitations under the License.
  <!-- Keys for non-persisted preferences - DO NOT TRANSLATE -->
  <string name="backup_to_sd_key">backupToSd</string>
  <string name="restore_from_sd_key">restoreFromSd</string>
-
-  <!-- Inoperative keys used for the location of preferences items -->
+  <string name="reset_key">resetToDefaults</string>
  <string name="sensor_options_key">sensorOptions</string>
  <string name="ant_options_key">antOptions</string>
 </resources>