merge heads

This commit is contained in:
Jimmy Shih
2011-11-04 14:11:47 -07:00
43 changed files with 601 additions and 281 deletions
+2 -2
View File
@@ -163,7 +163,7 @@ limitations under the License.
<string name="waypointdetails_category_hint">Typ znacznika</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Ustawienia My Tracks</string>
<string name="settings_title">Ustawienia My Tracks</string>
<string name="settings_display">Wyświetlanie</string>
<string name="settings_recording">Rejestrowanie</string>
<string name="settings_sharing">Dzielenie</string>
@@ -395,7 +395,7 @@ limitations under the License.
<string name="bluetooth_pairing_summary">Przejdź do ustawień Bluetooth Androida aby sparować urządzenie</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="ant_options">Opce ANT</string>
<string name="sensor_options">Opcje Czujników</string>
<string name="settings_sensor">Opcje Czujników</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">Połączony z %s</string>