Merge branch 'release'

4 files changed, 10 insertions, 7 deletions

diff --git a/cgeo-contacts/proguard-project.txt b/cgeo-contacts/proguard-project.txt
index 453d1a6..c4cb930 100644
--- a/cgeo-contacts/proguard-project.txt
+++ b/cgeo-contacts/proguard-project.txt
@@ -29,4 +29,7 @@
     public <init>(android.content.Context, android.util.AttributeSet);
     public <init>(android.content.Context, android.util.AttributeSet, int);
     public void set*(...);
-}
\ No newline at end of file
+}
+
+# Null analysis annotations of Eclipse JDT are just used by the Eclipse compiler, so ignore them here
+-dontwarn org.eclipse.jdt.annotation.**
diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index f132290..5f4a061 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -1154,7 +1154,7 @@
   <string name="cgeo_shortcut">c:geo genvej</string>
   <string name="create_shortcut">Opret genvej</string>
   <string name="send">Send</string>
-  <string name="showcase_logcache_title">Sender logbesked</string>
+  <string name="showcase_logcache_title">Afsendelse af logbesked</string>
   <string name="showcase_logcache_text">Husk, at mange funktioner nu er i titellinien, hvor du også kan finde knappen til at sende den færdige logbesked.</string>
   <string name="showcase_main_title">Nye menuer</string>
   <string name="showcase_main_text">Som i andre moderne apps er menupunkter i c:geo nu placeret i titellinien. Nogle menupunkter er skjult og bliver først vist når du trykker på knappen med tre prikker. Et langt tryk på et menupunkt åbner en beskrivelse af menupunktet.</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 76d0e79..9c44df8 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -350,7 +350,7 @@
   <string name="settings_activate_ox">Activar</string>
   <string name="settings_gc_legal_note">Quando você usa do serviço do geocaching.com, você aceita os termos de uso da Groundspeak.</string>
   <string name="settings_info_facebook_login_title">Facebook Login</string>
-  <string name="settings_info_facebook_login">Não consegue que c:geo faça o login em geocaching.com com a sua conta do Facebook. Mas existe uma solução simples…</string>
+  <string name="settings_info_facebook_login" tools:ignore="Typos">Não consegue que c:geo faça o login em geocaching.com com a sua conta do Facebook. Mas existe uma solução simples…</string>
   <string name="settings_authorize">Autorizar c:geo</string>
   <string name="settings_reauthorize">Reautorizar c:geo</string>
   <string name="init_oc">Opencaching.de</string>
diff --git a/main/src/cgeo/geocaching/connector/ox/OXGPXParser.java b/main/src/cgeo/geocaching/connector/ox/OXGPXParser.java
index 5f11a11..7896826 100644
--- a/main/src/cgeo/geocaching/connector/ox/OXGPXParser.java
+++ b/main/src/cgeo/geocaching/connector/ox/OXGPXParser.java
@@ -10,13 +10,13 @@ public class OXGPXParser extends GPX10Parser {
 
     private final boolean isDetailed;
 
-    public OXGPXParser(int listIdIn, boolean isDetailed) {
+    public OXGPXParser(final int listIdIn, final boolean isDetailed) {
         super(listIdIn);
         this.isDetailed = isDetailed;
     }
 
     @Override
-    protected void afterParsing(Geocache cache) {
+    protected void afterParsing(final Geocache cache) {
         cache.setUpdated(System.currentTimeMillis());
         if (isDetailed) {
             cache.setDetailedUpdate(cache.getUpdated());
@@ -27,11 +27,11 @@ public class OXGPXParser extends GPX10Parser {
 
     /**
      * The short description of OX caches contains "title by owner, type(T/D/Awesomeness)". That is a lot of
-     * duplication.
+     * duplication. Additionally a space between type and (T/D/Awesomeness) is introduced.
      *
      * @param cache
      */
     private static void removeTitleFromShortDescription(final @NonNull Geocache cache) {
-        cache.setShortDescription(StringUtils.trim(StringUtils.substringAfterLast(cache.getShortDescription(), ",")));
+        cache.setShortDescription(StringUtils.replace(StringUtils.trim(StringUtils.substringAfterLast(cache.getShortDescription(), ",")), "(", " ("));
     }
 }