From 3e22941484685caa28ccb7ca6ed8c10decde8460 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 27 Oct 2011 18:35:25 -0700
Subject: [PATCH] fix comments on  425100d373ad

---
 MyTracks/res/layout/send_to_google_result.xml |  2 +-
 MyTracks/res/values-ca/strings.xml            |  2 +-
 MyTracks/res/values-de/strings.xml            |  2 +-
 MyTracks/res/values-es/strings.xml            |  2 +-
 MyTracks/res/values/strings.xml               | 29 +++++++++----------
 .../apps/mytracks/ExportAllTracks.java        |  2 +-
 .../apps/mytracks/io/file/ImportActivity.java |  4 +--
 .../mytracks/io/file/TrackWriterImpl.java     |  2 +-
 8 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/MyTracks/res/layout/send_to_google_result.xml b/MyTracks/res/layout/send_to_google_result.xml
index 1dd366769..63ca43088 100644
--- a/MyTracks/res/layout/send_to_google_result.xml
+++ b/MyTracks/res/layout/send_to_google_result.xml
@@ -59,7 +59,7 @@ services.
       android:id="@+id/send_to_google_result_error"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/error_sending_generic"
+      android:text="@string/error_generic"
       android:visibility="gone"
       style="?android:attr/textAppearanceLarge"/>
 </LinearLayout>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index d9aa6c205..75bf6e613 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -41,7 +41,7 @@ limitations under the License.
   <string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
   <string name="error_import_unable_to_read_file">No es pot llegir des del fitxer.</string>
   <string name="error_import_invalid_gpx_format">El fitxer no conté un format GPX vàlid.</string>
-  <string name="error_import_generic">S\'ha produït un error. Proveu de nou.</string>
+  <string name="error_generic">S\'ha produït un error. Proveu de nou.</string>
   <string name="error_export_track_does_not_exist">No existeix la ruta.</string>
   <string name="error_import_out_of_memory">Aquest fitxer és massa gran (ha d\'ésser inferior a 500KB. S\'està cancel·lant.</string>
   <string name="error_unable_to_insert_marker">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 0efef9819..690e8b78b 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -41,7 +41,7 @@ limitations under the License.
   <string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuche es noch einmal.</string>
   <string name="error_import_unable_to_read_file">Konnte Datei nicht lesen.</string>
   <string name="error_import_invalid_gpx_format">Datei ist nicht im GPX-Format.</string>
-  <string name="error_import_generic">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
+  <string name="error_generic">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
   <string name="error_export_track_does_not_exist">Track existiert nicht.</string>
   <string name="error_import_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
   <string name="error_unable_to_insert_marker">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 49e561a8e..57d496707 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -43,7 +43,7 @@ limitations under the License.
   <string name="error_unable_to_stop_recording">No se puede detener la grabación. Inténtelo de nuevo.</string>
   <string name="error_import_unable_to_read_file">No pude leer del archivo.</string>
   <string name="error_import_invalid_gpx_format">El archivo no tiene un format GPX válido.</string>
-  <string name="error_import_generic">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
+  <string name="error_generic">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
   <string name="error_export_track_does_not_exist">El recorrido no existe.</string>
   <string name="error_export_operation_canceled">La operación fue cancelada.</string>
   <string name="error_import_out_of_memory">El archivo es demasiado grande (tiene que ser menor a 500 KB). Abortando.</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 22dd8bdca..f35a2ee92 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -85,13 +85,15 @@ limitations under the License.
       location and asking the user to try again.">
     Unable to insert marker. No GPS location. Try again.
   </string>  
-  
-  <!-- Error messages when sending to Google. -->
-  <string name="error_sending_generic"
-    translation_description="When sending a track to Google, a generic error message asking the user
-      to try again.">
-    Please try again later.
+
+  <!-- A generic error message. -->
+  <string name="error_generic"
+    translation_description="In an alert dialog, a generic error message indicating that an error
+      has occurred and asking the user to try again.">
+    An error occurred. Please try again.
   </string>
+      
+  <!-- Error messages when sending to Google. -->
   <string name="error_sending_to_my_maps"
     translation_description="When sending a track to Google My Maps, a message indicating that an
       error has occured.">
@@ -109,11 +111,6 @@ limitations under the License.
   </string>
   
   <!-- Error messages when importing a track. -->
-  <string name="error_import_generic"
-    translation_description="When importing a track from the SD card, a generic error message 
-      indicating that an error has occurred and asking the user to try again.">
-    An error occurred. Please try again.
-  </string>
   <string name="error_import_unable_to_read_file"
     translation_description="When importing a track from the SD card, a messsage indicating that
       MyTracks is unable to read the file.">
@@ -124,6 +121,8 @@ limitations under the License.
       the file does not have a valid GPX format.">
     File does not have a valid GPX format.
   </string>
+  
+  <!-- TODO(jshih@google.com) confirm if the file size limit is still 500 KB. -->
   <string name="error_import_out_of_memory"
     translation_description="When importing a track from the SD card, a message indicating that
       the file is too big, must be less than 500 KB, and aborting.">
@@ -131,10 +130,10 @@ limitations under the License.
   </string>
   
   <!--  Error messages when exporting a track. -->
-  <string name="error_export_track_does_not_exist"
-    translation_description="When exporting a track to the SD card, a message indicating that the
-      track does not exist.">
-    Track does not exist.
+  <string name="error_export_generic"
+    translation_description="When exporting a track to the SD card, a generic error message
+      indicating unable to export.">
+    Unable to export.
   </string>
   <string name="error_export_operation_canceled"
     translation_description="When exporting a track to the SD card, a message indicating that the
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
index a5e7e5afc..a78674bf0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
@@ -183,7 +183,7 @@ public class ExportAllTracks {
         TrackWriter writer =
             TrackWriterFactory.newWriter(activity, providerUtils, id, format);
         if (writer == null) {
-          showToast(R.string.error_export_track_does_not_exist, Toast.LENGTH_LONG);
+          showToast(R.string.error_export_generic, Toast.LENGTH_LONG);
           return;
         }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
index 7ad03ad89..d107b582f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
@@ -172,10 +172,10 @@ public class ImportActivity extends Activity {
             importedTrackIds = GpxImporter.importGPXFile(is, providerUtils);
           } catch (SAXException e) {
             Log.e(TAG, "Caught an unexpected exception.", e);
-            resultMessage = R.string.error_import_generic;
+            resultMessage = R.string.error_generic;
           } catch (ParserConfigurationException e) {
             Log.e(TAG, "Caught an unexpected exception.", e);
-            resultMessage = R.string.error_import_generic;
+            resultMessage = R.string.error_generic;
           } catch (IOException e) {
             Log.e(TAG, "Caught an unexpected exception.", e);
             resultMessage = R.string.error_import_unable_to_read_file;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index ab83ba079..84abd201f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -114,7 +114,7 @@ class TrackWriterImpl implements TrackWriter {
   private void doWriteTrack() {
     // Open the input and output
     success = false;
-    errorMessage = R.string.error_export_track_does_not_exist;
+    errorMessage = R.string.error_export_generic;
     if (track != null) {
       if (openFile()) {
         try {