Merge remote-tracking branch 'origin/release'

Conflicts:
	main/res/values/changelog_release.xml

1 files changed, 7 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 5553927..6161088 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -951,6 +951,13 @@ public abstract class GPXParser extends FileParser {
         if ("final location".equalsIgnoreCase(sym)) {
             return WaypointType.FINAL;
         }
+        // renamed waypoint types
+        if ("Physical Stage".equalsIgnoreCase(sym)) {
+            return WaypointType.STAGE;
+        }
+        if ("Virtual Stage".equalsIgnoreCase(sym)) {
+            return WaypointType.PUZZLE;
+        }
         // this is not fully correct, but lets also look for localized waypoint types
         for (final WaypointType waypointType : WaypointType.ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL) {
             final String localized = waypointType.getL10n();