diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2011-11-07 10:14:34 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2011-11-07 10:16:33 +0100 |
| commit | 85cee027b05a54895c0ada16fc267f434aa57577 (patch) | |
| tree | 078eea1c71374d8f8388313c8dd93358765567d4 /main/src | |
| parent | 00ded50a3bb5395dffa3a51ace05e198270d1c09 (diff) | |
| parent | 2a68eea94e514eb2f6f887f2913586286d62db77 (diff) | |
| download | cgeo-85cee027b05a54895c0ada16fc267f434aa57577.zip cgeo-85cee027b05a54895c0ada16fc267f434aa57577.tar.gz cgeo-85cee027b05a54895c0ada16fc267f434aa57577.tar.bz2 | |
Partial merge of branch stephanme/c-geo-opensource into upstream
Conflicts:
- main/res/values-fr/strings.xml
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/files/GPXImporter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java index 73cb5b2..68cfe4a 100644 --- a/main/src/cgeo/geocaching/files/GPXImporter.java +++ b/main/src/cgeo/geocaching/files/GPXImporter.java @@ -51,7 +51,7 @@ public class GPXImporter { parseDialog = new ProgressDialog(realActivity); parseDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); parseDialog.setTitle(res.getString(R.string.gpx_import_title_reading_file)); - parseDialog.setMessage(res.getString(R.string.gpx_import_loading)); + parseDialog.setMessage(res.getString(R.string.gpx_import_loading_caches)); parseDialog.setCancelable(false); parseDialog.setMax(-1); parseDialog.show(); |