aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/AndroidManifest.xml10
-rw-r--r--main/res/values-es/strings.xml4
-rw-r--r--main/res/values-hu/strings.xml2
-rw-r--r--main/res/values-nb/strings.xml2
-rw-r--r--main/res/values/strings.xml2
-rw-r--r--main/src/cgeo/geocaching/export/FieldnoteExport.java5
-rw-r--r--main/src/cgeo/geocaching/export/GpxExport.java5
-rw-r--r--main/src/cgeo/geocaching/files/GPXParser.java7
8 files changed, 17 insertions, 20 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 749443a..7d1c09e 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
android:versionName="developer build"
android:versionCode="20120618"
package="cgeo.geocaching"
- name="c:geo"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8" />
<uses-permission android:name="android.permission.INTERNET" />
@@ -21,7 +20,8 @@
android:theme="@style/cgeo"
android:label="@string/app_name"
android:icon="@drawable/cgeo"
- android:backupAgent="cgeo.geocaching.backup.CentralBackupAgent" >
+ android:backupAgent="cgeo.geocaching.backup.CentralBackupAgent"
+ android:allowBackup="true" >
<uses-library android:name="com.google.android.maps" android:required="false" />
<meta-data
android:name="android.app.default_searchable"
@@ -85,12 +85,6 @@
android:configChanges="keyboardHidden|orientation" >
</activity>
<activity
- android:name=".cgeowaypoint"
- android:label="@string/app_name"
- android:windowSoftInputMode="stateHidden"
- android:configChanges="keyboardHidden|orientation" >
- </activity>
- <activity
android:name=".cgeopoint"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden"
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 265eb5d..4fd9a29 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -371,7 +371,7 @@
<string name="init_backup_last">Copia guardada el</string>
<string name="init_backup_last_no">No hay ninguna copia de seguridad.</string>
<string name="init_mapsources">Proveedor de mapas</string>
- <string name="init_mapsources_description">Aquí puedes seleccionar un proveedor de mapas. Como alternativa a Google Maps están disponibles varios estilos de OpenStreetMap e incluso mapas fuera de linea (mira <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> para más información).</string>
+ <string name="init_mapsources_description">Aquí puedes seleccionar un proveedor de mapas. Como alternativa a Google Maps están disponibles varios estilos de OpenStreetMap e incluso mapas fuera de línea (mira <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> para más información).</string>
<string name="init_mapsource_select">Elige proveedor de mapas</string>
<string name="init_trackautovisit">Convertir rastreables automáticamente a \"visita\"</string>
<string name="init_sigautoinsert">Insertar firma automáticamente</string>
@@ -633,7 +633,7 @@
<string name="helper_manual_title">Manual</string>
<string name="helper_manual_description">Sencillo manual de c:geo que contiene todas las capacidades de este programa (incluidas las ocultas).</string>
<string name="helper_locus_title">Locus</string>
- <string name="helper_locus_description">Sencilla aplicación que muestra mapas en linea y permite descargarlos para ser usados sin conexión (sólo mapas no vectoriales). Tambien permite registrar el recorrido, gestionar puntos de interés y más funciones interesantes.</string>
+ <string name="helper_locus_description">Sencilla aplicación que muestra mapas en línea y permite descargarlos para ser usados sin conexión (sólo mapas no vectoriales). También permite registrar el recorrido, gestionar puntos de interés y más funciones interesantes.</string>
<string name="helper_gpsstatus_title">GPS Status</string>
<string name="helper_gpsstatus_description">Puedes usar el radar de esta aplicación con c:geo. Además ofrece un montón de información relacionada con el GPS.</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 6b417d6..3d95471 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -800,7 +800,7 @@
<!-- next things -->
<string name="legal_note">A geocaching.com szolgáltatásainak használatához, el kell fogadnod ezeket a feltételeket:<a href="http://www.geocaching.com/about/termsofuse.aspx">Groundspeak disclaimer</a> </string>
- <string name="quote">Hogy a geocaching könyebb legyen a felhasználók pedig lustábbak.</string>
+ <string name="quote">Hogy a geocaching könnyebb legyen a felhasználók pedig lustábbak.</string>
<string name="powered_by">carnero</string>
<string name="support">Támogatás: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
<string name="website">Weboldal: <a href="http://cgeo.org/">cgeo.org</a></string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index 1f14f65..6e8435c 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -158,7 +158,7 @@
<string name="loc_last">Sist sett</string>
<string name="loc_net">Nettverk</string>
<string name="loc_gps">GPS</string>
- <string name="loc_sat">Satelitt</string>
+ <string name="loc_sat">Sateliett</string>
<string name="loc_trying">Prøver å lokalisere</string>
<string name="loc_no_addr">Ukjent adresse</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index f3f6b0e..f6ff53d 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -662,7 +662,7 @@
<string name="gpx_import_title_caches_imported">Result</string>
<string name="gpx_import_title_caches_import_failed">Import failed</string>
<string name="gpx_import_error_io">Can\'t read file</string>
- <string name="gpx_import_error_parser">File format not ok</string>
+ <string name="gpx_import_error_parser">Bad File format</string>
<string name="gpx_import_error_unexpected">Unexpected error</string>
<string name="gpx_import_confirm">Do you want to import the GPX file into c:geo?</string>
<string name="gpx_import_canceled">GPX import was canceled</string>
diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java
index 41ec44c..465641f 100644
--- a/main/src/cgeo/geocaching/export/FieldnoteExport.java
+++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java
@@ -30,6 +30,7 @@ import java.io.Writer;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
/**
* Exports offline-logs in the Groundspeak Field Note format.<br>
@@ -40,7 +41,7 @@ import java.util.List;
*/
class FieldnoteExport extends AbstractExport {
private static final File exportLocation = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/field-notes");
- private static final SimpleDateFormat fieldNoteDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ private static final SimpleDateFormat fieldNoteDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
protected FieldnoteExport() {
super(getString(R.string.export_fieldnotes));
@@ -161,7 +162,7 @@ class FieldnoteExport extends AbstractExport {
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
exportLocation.mkdirs();
- SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US);
exportFile = new File(exportLocation.toString() + '/' + fileNameDateFormat.format(new Date()) + ".txt");
OutputStream os;
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index a97bf0a..c06f0c6 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -37,9 +37,10 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
class GpxExport extends AbstractExport {
- private static final SimpleDateFormat dateFormatZ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ private static final SimpleDateFormat dateFormatZ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
protected GpxExport() {
super(getString(R.string.export_gpx));
@@ -133,7 +134,7 @@ class GpxExport extends AbstractExport {
final File exportLocation = new File(Settings.getGpxExportDir());
exportLocation.mkdirs();
- final SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ final SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US);
exportFile = new File(Settings.getGpxExportDir() + File.separatorChar + "export_" + fileNameDateFormat.format(new Date()) + ".gpx");
gpx = new BufferedWriter(new FileWriter(exportFile));
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index a6a285f..d8f78fc 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -39,15 +39,16 @@ import java.util.Collection;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public abstract class GPXParser extends FileParser {
- private static final SimpleDateFormat formatSimple = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); // 2010-04-20T07:00:00
- private static final SimpleDateFormat formatSimpleZ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); // 2010-04-20T07:00:00Z
- private static final SimpleDateFormat formatTimezone = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); // 2010-04-20T01:01:03-04:00
+ private static final SimpleDateFormat formatSimple = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US); // 2010-04-20T07:00:00
+ private static final SimpleDateFormat formatSimpleZ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US); // 2010-04-20T07:00:00Z
+ private static final SimpleDateFormat formatTimezone = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US); // 2010-04-20T01:01:03-04:00
/**
* Attention: case sensitive geocode pattern to avoid matching normal words in the name or description of the cache.
generated by cgit v1.1 at 2025-11-10 17:52:07 +0000