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
+3 -3
View File
@@ -190,12 +190,12 @@ limitations under the License.
<string name="waypointdetails_category_hint">マーカータイプ</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">My Tracks設定</string>
<string name="settings_title">My Tracks設定</string>
<string name="settings_display">表示</string>
<string name="settings_recording">記録</string>
<string name="settings_sharing">共有</string>
<string name="settings_not_available_summary">このAndroidバージョンでは使用できません</string>
<string name="settings_announcement_frequency_not_available">このAndroidバージョンでは使用できません</string>
<string name="settings_announcement_frequency">定期通知</string>
<string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
@@ -446,7 +446,7 @@ limitations under the License.
<string name="bluetooth_pairing_summary">ペアリングを行うには「Bluetooth設定」を開いて下さい</string>
<string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
<string name="ant_options">ANTオプション</string>
<string name="sensor_options">センサーオプション</string>
<string name="settings_sensor">センサーオプション</string>
<!-- Bluetooth Sensor -->
<string name="bluetooth_connected">%sに接続しました</string>