karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Merge in Rodrigo's changes.

Browse Source
This commit is contained in:
Sandor Dornbush
2011-01-31 20:39:15 -08:00
parent 3e09bd5c60
commit 1aa300f97e
14 changed files with 49 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/.classpath
+1 -1
View File
@@ -4,10 +4,10 @@
<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
<classpathentry kind="lib" path="libs/google-common.jar"/>
<classpathentry kind="lib" path="libs/accounts.jar"/>
<classpathentry kind="lib" path="libs/google-api-client-1.2.2-alpha.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
<classpathentry kind="lib" path="libs/google-api-client-1.2.1-alpha.jar"/>
<classpathentry kind="src" path="MyTracksLib_src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
MyTracks/libs/google-api-client-1.2.1-alpha.jar → MyTracks/libs/google-api-client-1.2.2-alpha.jar
BIN
View File
Binary file not shown.
MyTracks/res/values-ca/strings.xml
+7 -7
View File
@@ -35,7 +35,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">No s\'ha trobat cap gestor d\'ubicacions en aquest dispositiu.</string>
<string name="error_no_gps_location_provider">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
<string name="error_sending_to_mymap">S\'ha produït un error quan s\'enviava la ruta a Google My Map. Proveu més tard.</string>
<string name="error_sending_to_fusiontables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
<string name="error_sending_to_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
<string name="error_unable_to_start_recording">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
<string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
@@ -65,11 +65,11 @@ limitations under the License.
<string name="progress_message">S\'està enviant la ruta a Google.</string>
<string name="progress_message_reading_track">S\'està llegint la ruta...</string>
<string name="progress_message_preparing_track">S\'està preparant la ruta...</string>
<string name="progress_message_authenticating_mymaps">S\'està to Google Maps...</string>
<string name="progress_message_authenticating_fusiontables">S\'està to Google Fusion Tables...</string>
<string name="progress_message_authenticating_docs">S\'està autenticant a Google Docs...</string>
<string name="progress_message_sending_docs">S\'està enviant la ruta a Google Docs...</string>
<string name="progress_message_sending_mymaps">S\'està enviant a Google Maps...</string>
<string name="progress_message_creating_map">S\'està creant un My Map nou...</string>
<string name="progress_message_sending_fusiontables">S\'està enviant a Google Fusion Tables...</string>
<string name="progress_message_creating_fusiontable">S\'està creant un Fusion Table nou...</string>
<string name="import_progress_message">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
<string name="write_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
<string name="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
@@ -114,8 +114,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">Mostra</string>
<string name="tracklist_send_to_mymaps">Envia a Google My Maps</string>
<string name="tracklist_send_to_new_mymap">Envia a un Google My Map nou</string>
<string name="tracklist_send_to_fusiontables">Envia a Google Fusion Tables</string>
<string name="tracklist_send_to_new_fusiontable">Envia a un Google Fusion Table nou</string>
<string name="tracklist_send_to_docs">Envia a Google Docs</string>
<string name="tracklist_send_to_google">Envia a Google...</string>
<string name="tracklist_delete_track">Elimina del telèfon...</string>
@@ -125,7 +125,7 @@ limitations under the License.
<string name="tracklist_save_as_kml">Anomena i desa com un fitxer KML</string>
<string name="tracklist_save_as_csv">Anomena i desa com un fitxer CSV</string>
<string name="tracklist_save_as_tcx">Anomena i desa com un fitxer TCX</string>
<string name="tracklist_btn_send_all_to_mymaps">Envia a Google My Maps</string>
<string name="tracklist_btn_send_all_to_fusiontables">Envia a Google Fusion Tables</string>
<string name="tracklist_btn_delete_all">Elimina totes les rutes</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">Exporta totes les rutes</string>
MyTracks/res/values-es/strings.xml
+1 -1
View File
@@ -32,7 +32,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este aparato! </string>
<string name="error_no_gps_location_provider">Ningún proveedor GPS de ubicación fue hallado en este aparato.</string>
<string name="error_sending_to_mymap">Hubo un error al mandar su recorrido a Google My Map. Por favor inténtelo de nuevo más tarde.</string>
<string name="error_sending_to_fusiontables">Hubo un error al mandar su recorrido a Google Fusion Tables. Por favor inténtelo de nuevo más tarde.</string>
<string name="error_sending_to_docs">Hubo un error al mandar su recorrido a Google Docs. Por favor inténtelo de nuevo más tarde.</string>
<string name="error_unable_to_start_recording">No pude empezar a grabar. Por favor inténtelo de nuevo. </string>
<string name="error_unable_to_stop_recording">No pude dejar de grabar. Por favor inténtelo de nuevo.</string>
MyTracks/res/values-fr/strings.xml
+1 -1
View File
@@ -34,7 +34,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Aucune source de localisation n\'a été trouvée sur ce système !</string>
<string name="error_no_gps_location_provider">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
<string name="error_sending_to_mymap">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Mes cartes. Réessayez plus tard SVP.</string>
<string name="error_sending_to_fusiontables">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP.</string>
<string name="error_sending_to_docs">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP.</string>
<string name="error_unable_to_start_recording">Impossible de débuter l\'enregistrement. Réessayez.</string>
<string name="error_unable_to_stop_recording">Impossible de stopper l\'enregistrement. Réessayez.</string>
MyTracks/res/values-it/strings.xml
+1 -1
View File
@@ -35,7 +35,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Nessuna fonte di posizione trovata su questo dispositivo.</string>
<string name="error_no_gps_location_provider">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
<string name="error_sending_to_mymap">Si è verificato un errore nell\'invio del percorso a «Le mie mappe». Per favore riprova più tardi.</string>
<string name="error_sending_to_fusiontables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
<string name="error_sending_to_docs">Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi.</string>
<string name="error_unable_to_start_recording">Impossibile iniziare la registrazione. Riprova.</string>
<string name="error_unable_to_stop_recording">Impossibile fermare la registrazione. Riprova.</string>
MyTracks/res/values-ja/strings.xml
+1 -1
View File
@@ -33,7 +33,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">この端末でロケーションマネージャを発見できませんでした</string>
<string name="error_no_gps_location_provider">この端末でGPSロケーションプロバイダを発見できました</string>
<string name="error_sending_to_mymap">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="error_sending_to_fusiontables">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="error_sending_to_docs">Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="error_unable_to_start_recording">記録作成開始できません．もう一度試して下さい．</string>
<string name="error_unable_to_stop_recording">記録停止できません．もう一度試して下さい．</string>
MyTracks/res/values-pl/strings.xml
+1 -1
View File
@@ -34,7 +34,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Brak menedżera lokalizacji na urządzeniu!</string>
<string name="error_no_gps_location_provider">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
<string name="error_sending_to_mymap">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
<string name="error_sending_to_fusiontables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
<string name="error_sending_to_docs">Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później.</string>
<string name="error_unable_to_start_recording">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
<string name="error_unable_to_stop_recording">Nie można zakończyć rejestrowania. Spróbuj ponownie.</string>
MyTracks/res/values-pt-rBR/strings.xml
+1 -1
View File
@@ -33,7 +33,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Gerenciador de localização não encontrado neste dispositivo!"</string>
<string name="error_no_gps_location_provider">"Provedor de posição de GPS não encontrado neste dispositivo."</string>
<string name="error_sending_to_mymap">Ocorreu um erro ao enviar seu caminho para o Google Meu Mapa. Por favor tente novamente mais tarde."</string>
<string name="error_sending_to_fusiontables">Ocorreu um erro ao enviar seu caminho para o Google Fusion Tables. Por favor tente novamente mais tarde."</string>
<string name="error_sending_to_docs">Ocorreu um erro ao enviar seu caminho para o Google Docs. Por favor tente novamente mais tarde."</string>
<string name="error_unable_to_start_recording">Impossível iniciar a gravação. Tente novamente.</string>
<string name="error_unable_to_stop_recording">Impossível interromper a gravação. Tente novamente.</string>
MyTracks/res/values-sv/strings.xml
+1 -1
View File
@@ -34,7 +34,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">Ingen platshanterare hittades på denna enhet!</string>
<string name="error_no_gps_location_provider">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
<string name="error_sending_to_mymap">Det uppstod ett fel i sändningen av ditt spår till Google Mina Kartor. Försök igen senare.</string>
<string name="error_sending_to_fusiontables">Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare.</string>
<string name="error_sending_to_docs">Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare.</string>
<string name="error_unable_to_start_recording">Kan inte starta inspelningen. Försök igen.</string>
<string name="error_unable_to_stop_recording">Kan inte stoppa inspelningen. Försök igen.</string>
MyTracks/res/values-zh-rCN/strings.xml
+8 -52
View File
@@ -15,9 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Used by the Menu -->
<string name="start_recording">记录轨迹</string>
<string name="stop_recording">停止记录</string>
@@ -37,7 +34,7 @@ limitations under the License.
<!-- Error messages -->
<string name="error_no_location_manager">此设备上没有位置管理器!</string>
<string name="error_no_gps_location_provider">此设备上没有 GPS 定位装置.</string>
<string name="error_sending_to_mymap">发送你的轨迹到 Google My Map 时发生错误. 请稍后重试.</string>
<string name="error_sending_to_fusiontables">发送你的轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
<string name="error_sending_to_docs">发送你的轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
<string name="error_unable_to_start_recording">无法开始记录. 请重试.</string>
<string name="error_unable_to_stop_recording">无法停止记录. 请重试.</string>
@@ -52,7 +49,7 @@ limitations under the License.
<string name="wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
<string name="status_now_recording">现在开始记录新的轨迹.</string>
<string name="status_stopped_recording">停止记录你的轨迹.</string>
<string name="status_new_mymap_has_been_created">已在 maps.google.com 创建新 Google My Map.</string>
<string name="status_new_fusiontable_has_been_created">已在 maps.google.com 创建新 Google Fusion Table.</string>
<string name="status_tracks_have_been_uploaded">你的轨迹已经发送到 maps.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
<string name="status_tracks_have_been_uploaded_to_docs">你的轨迹已经发送到 docs.google.com.</string>
@@ -67,11 +64,11 @@ limitations under the License.
<string name="progress_message">发送你的轨迹到 Google.</string>
<string name="progress_message_reading_track">读取轨迹中...</string>
<string name="progress_message_preparing_track">准备轨迹中...</string>
<string name="progress_message_authenticating_mymaps">登录 Google Maps 中...</string>
<string name="progress_message_authenticating_fusiontables">登录 Google Fusion Tables 中...</string>
<string name="progress_message_authenticating_docs">登录 Google Docs 中...</string>
<string name="progress_message_sending_docs">发送轨迹到 Google Docs 中...</string>
<string name="progress_message_sending_mymaps">发送轨迹到 Google Maps 中...</string>
<string name="progress_message_creating_map">创建新的 My Map 中...</string>
<string name="progress_message_sending_fusiontables">发送轨迹到 Google Fusion Tables 中...</string>
<string name="progress_message_creating_fusiontable">创建新的 Fusion Table 中...</string>
<string name="import_progress_message">导入 GPS 轨迹中. 请稍候.</string>
<string name="write_progress_message">写入文件到 SD 卡中. 请稍候.</string>
<string name="progress_message_updating_track">更新轨迹统计信息中...</string>
@@ -116,8 +113,8 @@ limitations under the License.
<!-- TrackList -->
<string name="tracklist_show_track">显示</string>
<string name="tracklist_send_to_mymaps">发送到 Google My Maps</string>
<string name="tracklist_send_to_new_mymap">发送到新建 Google My Map</string>
<string name="tracklist_send_to_fusiontables">发送到 Google Fusion Table</string>
<string name="tracklist_send_to_new_fusiontable">发送到新建 Google Fusion Table</string>
<string name="tracklist_send_to_docs">发送到 Google Docs</string>
<string name="tracklist_send_to_google">发送到 Google...</string>
<string name="tracklist_delete_track">从手机上删除...</string>
@@ -127,7 +124,7 @@ limitations under the License.
<string name="tracklist_save_as_kml">保存为 KML 文件</string>
<string name="tracklist_save_as_csv">保存为 CSV 文件</string>
<string name="tracklist_save_as_tcx">保存为 TCX 文件</string>
<string name="tracklist_btn_send_all_to_mymaps">发送到 Google My Maps</string>
<string name="tracklist_btn_send_all_to_fusiontables">发送到 Google Fusion Tables</string>
<string name="tracklist_btn_delete_all">删除所有轨迹</string>
<!-- Export All -->
<string name="tracklist_btn_export_all">导出所有轨迹</string>
@@ -221,9 +218,6 @@ limitations under the License.
<string name="bluetooth_sensor_title">蓝牙感应器</string>
<string name="bluetooth_sensor_summary">要连接到的蓝牙感应器</string>
<string name="settings_backup">备份 (测试版)</string>
<string name="settings_sd_backup">SD 存储卡备份</string>
<string name="settings_backup_to_sd">立即备份</string>
@@ -306,32 +300,16 @@ limitations under the License.
<string name="second">秒</string>
<string name="seconds">秒</string>
<!-- Distance -->
<string name="kilometers_long">千米</string>
<string name="miles_long">英里</string>
<!-- Speed and Pace -->
<string name="kilometer_per_hour_long">千米每小时</string>
<string name="per_kilometer">每千米</string>
<string name="mile_per_hour_long">英里每小时</string>
<string name="per_mile">每英里</string>
<!-- Stats Labels -->
<string name="moving_time_label">移动时间</string>
<string name="total_time_label">总时间</string>
@@ -346,7 +324,6 @@ limitations under the License.
<string name="cadence">节奏</string>
<string name="heart_rate">心率</string>
<string name="max_heart_rate">最大心率</string>
<string name="waiting">请稍候...</string>
<!-- End User License Agreement -->
@@ -362,27 +339,8 @@ limitations under the License.
<string name="about_email">技术支持</string>
<string name="about_support">技术支持:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">发送到...</string>
<string name="sendtogoogle_send_now">立即发送</string>
<string name="sendtogoogle_create_new_map">创建新地图</string>
<string name="sendtogoogle_pick_existing_map">选择已有地图</string>
@@ -435,7 +393,6 @@ limitations under the License.
<string name="bluetooth_options">蓝牙设置</string>
<string name="bluetooth_pairing">设备关联</string>
<string name="bluetooth_pairing_summary">打开 Android 的蓝牙设置关联设备</string>
<string name="sensor_options">感应器选项</string>
<!-- Bluetooth Sensor -->
@@ -447,5 +404,4 @@ limitations under the License.
<string name="sensor_data_time">感应器数据时间</string>
<string name="power_meter_enabled">电源计量器已启用</string>
<string name="heart_rate_monitor_enabled">心率监视器已启用</string>
</resources>
MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class MyTracksList extends ListActivity
SubMenu share = menu.addSubMenu(0, MyTracksConstants.MENU_SHARE, 0,
R.string.tracklist_share_track);
share.add(0, MyTracksConstants.MENU_SHARE_LINK, 0,
R.string.tracklist_share_link);
R.string.tracklist_share_linkfusion);
share.add(0, MyTracksConstants.MENU_SHARE_GPX_FILE, 0,
R.string.tracklist_share_gpx_file);
share.add(0, MyTracksConstants.MENU_SHARE_KML_FILE, 0,
MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class SendToDocs {
}
private void doUpload() {
statusMessage = activity.getString(R.string.error_sending_to_mymap);
statusMessage = activity.getString(R.string.error_sending_to_fusiontables);
success = false;
try {
MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+24 -18
View File
@@ -574,28 +574,34 @@ public class SendToFusionTables implements Runnable {
// same time.
boolean success = true;
Cursor c = null;
c = providerUtils.getWaypointsCursor(
track.getId(), 0,
MyTracksConstants.MAX_LOADED_WAYPOINTS_POINTS);
if (c != null) {
if (c.moveToFirst()) {
// This will skip the 1st waypoint (it carries the stats for the
// last segment).
while (c.moveToNext()) {
Waypoint wpt = providerUtils.createWaypoint(c);
Log.d(MyTracksConstants.TAG, "SendToFusionTables: Creating waypoint.");
success = createNewPoint(wpt.getName(), wpt.getDescription(), wpt.getLocation(),
MARKER_TYPE_WAYPOINT);
if (!success) {
break;
try {
c = providerUtils.getWaypointsCursor(
track.getId(), 0,
MyTracksConstants.MAX_LOADED_WAYPOINTS_POINTS);
if (c != null) {
if (c.moveToFirst()) {
// This will skip the 1st waypoint (it carries the stats for the
// last segment).
while (c.moveToNext()) {
Waypoint wpt = providerUtils.createWaypoint(c);
Log.d(MyTracksConstants.TAG, "SendToFusionTables: Creating waypoint.");
success = createNewPoint(wpt.getName(), wpt.getDescription(), wpt.getLocation(),
MARKER_TYPE_WAYPOINT);
if (!success) {
break;
}
}
}
}
if (!success) {
Log.w(MyTracksConstants.TAG, "SendToFusionTables: upload waypoints failed.");
}
return success;
} finally {
if (c != null) {
c.close();
}
}
if (!success) {
Log.w(MyTracksConstants.TAG, "SendToFusionTables: upload waypoints failed.");
}
return success;
}
/**