Merge branch 'release' into upstream

Conflicts:
	main/res/values/strings_not_translatable.xml
	main/src/cgeo/geocaching/AboutActivity.java

5 files changed, 130 insertions, 85 deletions

diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml
index 7d7d0b6..f6ce1b8 100644
--- a/main/res/layout/about_activity.xml
+++ b/main/res/layout/about_activity.xml
@@ -218,14 +218,27 @@
             </RelativeLayout>
 
             <TextView
-                android:id="@+id/changelog"
+                android:id="@+id/changelog_master"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
                 android:layout_margin="7dip"
                 android:linksClickable="true"
                 android:paddingLeft="3dip"
-                android:text="@string/changelog"
+                android:text="@string/changelog_master"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="12dip" />
+
+            <TextView
+                android:id="@+id/changelog_release"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_margin="7dip"
+                android:linksClickable="true"
+                android:paddingLeft="3dip"
+                android:text="@string/changelog_release"
                 android:textColor="?text_color"
                 android:textColorLink="?text_color_link"
                 android:textSize="12sp" />
@@ -254,4 +267,4 @@
         </LinearLayout>
     </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml
new file mode 100644
index 0000000..1e3c3d4
--- /dev/null
+++ b/main/res/values/changelog_master.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- changelog for the master branch -->
+  <string name="changelog_master" translatable="false">
+  </string>
+</resources>
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
new file mode 100644
index 0000000..4f593c9
--- /dev/null
+++ b/main/res/values/changelog_release.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- changelog for the release branch -->
+  <string name="changelog_release" translatable="false">\n
+    <b>2013.06.05</b>\n
+    <b>Bugfixing:</b>\n
+    · Adaption to changes on gc.com (Logging date could be wrong in some cases)\n
+    \n
+    \n
+    <b>2013.05.31</b>\n
+    <b>Bugfixing:</b>\n
+    · Adaption to changes on gc.com (cache and TB log not possible, cache attributes not shown)\n
+    · Pictures in logs are now loaded in standard resolution like on the website to improve performance\n
+    · Corrected missing information and performance issues on nearby search for basic members\n
+    \n
+    \n
+    <b>2013.05.22</b>\n
+    <b>Bugfixing:</b>\n
+    · Fixed and improved nearby search for basic members after gc.com changes\n
+    · Avoid inconsistency of logbook while pictures are loaded in the background\n
+    \n
+    \n
+    <b>2013.05.18</b>\n
+    <b>Bugfixing:</b>\n
+    · Correction for compatability issue with tablet devices\n
+    \n
+    \n
+    <b>2013.05.16</b>\n
+    <b>Bugfixing:</b>\n
+    · Adaption to changes on gc.com (live map)\n
+    \n
+    \n
+    <b>2013.05.13</b>\n
+    <b>Bugfixing:</b>\n
+    · Twitter option was not shown on logging page\n
+    · Disable trail on map did only work after refresh of the map\n
+    · Stability improvements when selecting log pictures to be attached\n
+    · Remove accidentely appended spaces in searches\n
+    · Stability improvements for GPX import and export\n
+    · Do not duplicate waypoints retrieved from the personal note when updating a cache\n
+    · Fixed a possible crash when device is rotated while cache list is shown\n
+    · Fixed a possible crash in \"Any destination\" menu\n
+    · Ignore hide setting when searching for owned caches\n
+    \n
+    \n
+    <b>2013.04.03</b>\n
+    <b>New Features/Functions:</b>\n
+    · Support of attaching pictures to logs\n
+    · Support of opencaching.de online API in live map and nearby search\n
+    · Support for searching opencaching.nl caches\n
+    · Alphabetical sorting of OSM:Offline maps in map selection\n 
+    · Color markers also in trackable logbook\n
+    · Edit cache type filter by clicking on filter bar\n
+    · Inverse sorting of cache lists (hit the same menu again)\n
+    · View pager for trackable activity\n
+    · Menu item to delete past events\n
+    · Settings: Option to ask for list to store caches\n
+    · Change list in cache details\n
+    · Ability to select \"All\" list from main screen\n
+    · Default log type for event caches will be \"Attended\" if \"Will attend\" was logged before\n
+    · Improved and extended cache type detection on live map\n
+    · Waypoints can be marked as visited\n
+    · Possibility to delete offline logs in lists\n
+    · Support of language specific characters in log text equally to the website\n
+    \n
+    <b>Bugfixing:</b>\n
+    · Final flag icon lost when updating cache with self defined final\n
+    · Bad selection in directory chooser\n
+    · Log type \"Retract Listing\" now parsed correctly\n
+    · Active cache detail page now remembered when rotating device\n
+    · Replaced the term \"GC-Code\" by \"Geocode\"\n
+    · Improvements for light theme\n
+    · Share function uses short URL again\n
+    · Offline log marker now shown after autosave of log\n
+    · GPX export no longer exports waypoints without coordinates\n
+    · Corrections for light scheme on Adnroid 2.x devices\n
+    · Avoid crash if logging page is opened while not connected correctly\n
+     \n
+    <a href="https://github.com/cgeo/cgeo/issues?milestone=9&amp;state=closed">Detailed list of all changes</a>\n
+    \n
+    <b>Known Limitations/Bugs:</b>\n
+    · Live map:\n
+      Approximated coords due to limitations on the GC-website\n
+      Be aware: If navigation is started directly from live map it may also use the approximated coords!\n
+      In fast mode the cache type might be wrong in rare cases\n
+      On low zoom owned/found caches may not be hidden anymore\n
+    · Other:\n
+      Log images with huge size cause a long loading time\n
+      After uploading log images they are only shown in the logview after refreshing the cache\n
+      The personal note added to a cache is not synced to geocaching.com but will be overruled by personal notes on geocaching.com\n
+      On devices with HD display resolution OSM maps might not work. Please use Google maps in this case.\n
+      A huge amount of pictures on the image tab of a cache might cause a crash\n
+    <b>Old releases</b>\n
+    · Please refer to the release notes on the <a href="http://www.cgeo.org">c:geo-website</a>.\n
+    \n</string>
+</resources>
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index da925d9..99be801 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -95,84 +95,4 @@
     <!-- cache menu -->
     <string name="cache_menu_sygic" translatable="false">Sygic</string>
 
-  <!-- changelog -->
-  <string name="changelog" translatable="false">\n
-    <b>2013.06.05</b>\n
-    <b>Bugfixing:</b>\n
-    · Adaption to changes on gc.com (Logging date could be wrong in some cases)\n
-    \n
-    \n
-    <b>2013.05.31</b>\n
-    <b>Bugfixing:</b>\n
-    · Adaption to changes on gc.com (cache and TB log not possible, cache attributes not shown)\n
-    · Pictures in logs are now loaded in standard resolution like on the website to improve performance\n
-    · Corrected missing information and performance issues on nearby search for basic members\n
-    \n
-    \n
<b>2013.05.22</b>\n
<b>Bugfixing:</b>\n
-    · Fixed and improved nearby search for basic members after gc.com changes\n
-    · Avoid inconsistency of logbook while pictures are loaded in the background\n
-    \n
-    \n
<b>2013.05.18</b>\n
<b>Bugfixing:</b>\n
-    · Correction for compatibility issue with tablet devices\n
-    \n
-    \n
<b>2013.05.16</b>\n
<b>Bugfixing:</b>\n
-    · Adaption to changes on gc.com (live map)\n
-    \n
-    \n
<b>2013.05.13</b>\n
<b>Bugfixing:</b>\n
-    · Twitter option was not shown on logging page\n
-    · Disable trail on map did only work after refresh of the map\n
-    · Stability improvements when selecting log pictures to be attached\n
-    · Remove accidentely appended spaces in searches\n
-    · Stability improvements for GPX import and export\n
-    · Do not duplicate waypoints retrieved from the personal note when updating a cache\n
-    · Fixed a possible crash when device is rotated while cache list is shown\n
-    · Fixed a possible crash in \"Any destination\" menu\n
-    · Ignore hide setting when searching for owned caches\n
-    \n
-    \n
<b>2013.04.03</b>\n
<b>New Features/Functions:</b>\n
-    · Support of attaching pictures to logs\n
-    · Support of opencaching.de online API in live map and nearby search\n
-    · Support for searching opencaching.nl caches\n
-    · Alphabetical sorting of OSM:Offline maps in map selection\n 
-    · Color markers also in trackable logbook\n
-    · Edit cache type filter by clicking on filter bar\n
-    · Inverse sorting of cache lists (hit the same menu again)\n
-    · View pager for trackable activity\n
-    · Menu item to delete past events\n
-    · Settings: Option to ask for list to store caches\n
-    · Change list in cache details\n
-    · Ability to select \"All\" list from main screen\n
-    · Default log type for event caches will be \"Attended\" if \"Will attend\" was logged before\n
-    · Improved and extended cache type detection on live map\n
-    · Waypoints can be marked as visited\n
-    · Possibility to delete offline logs in lists\n
-    · Support of language specific characters in log text equally to the website\n
-    \n
<b>Bugfixing:</b>\n
-    · Final flag icon lost when updating cache with self defined final\n
-    · Bad selection in directory chooser\n
-    · Log type \"Retract Listing\" now parsed correctly\n
-    · Active cache detail page now remembered when rotating device\n
-    · Replaced the term \"GC-Code\" by \"Geocode\"\n
-    · Improvements for light theme\n
-    · Share function uses short URL again\n
-    · Offline log marker now shown after autosave of log\n
-    · GPX export no longer exports waypoints without coordinates\n
-    · Corrections for light scheme on Adnroid 2.x devices\n
-    · Avoid crash if logging page is opened while not connected correctly\n
-     \n
<a href="https://github.com/cgeo/cgeo/issues?milestone=9&amp;state=closed">Detailed list of all changes</a>\n
-    \n
<b>Known Limitations/Bugs:</b>\n
-    · Live map:\n
-      Approximated coords due to limitations on the GC-website\n
-      Be aware: If navigation is started directly from live map it may also use the approximated coords!\n
-      In fast mode the cache type might be wrong in rare cases\n
-      On low zoom owned/found caches may not be hidden anymore\n
-    · Other:\n
-      Log images with huge size cause a long loading time\n
-      After uploading log images they are only shown in the logview after refreshing the cache\n
-      The personal note added to a cache is not synced to geocaching.com but will be overruled by personal notes on geocaching.com\n
-      On devices with HD display resolution OSM maps might not work. Please use Google maps in this case.\n
-      A huge amount of pictures on the image tab of a cache might cause a crash\n
<b>Old releases</b>\n
-    · Please refer to the release notes on the <a href="http://www.cgeo.org">c:geo-website</a>.\n
-    \n</string>
-
 </resources>
diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java
index f947655..ef59cee 100644
--- a/main/src/cgeo/geocaching/AboutActivity.java
+++ b/main/src/cgeo/geocaching/AboutActivity.java
@@ -9,16 +9,20 @@ import com.googlecode.androidannotations.annotations.Click;
 import com.googlecode.androidannotations.annotations.EActivity;
 import com.googlecode.androidannotations.annotations.ViewById;
 
+import org.apache.commons.lang3.StringUtils;
+
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.TextView;
 
 @EActivity
 public class AboutActivity extends AbstractActivity {
     @ViewById(R.id.about_version_string) protected TextView version;
     @ViewById(R.id.contributors) protected TextView contributors;
-    @ViewById(R.id.changelog) protected TextView changeLog;
+    @ViewById(R.id.changelog_master) protected TextView changeLogMaster;
+    @ViewById(R.id.changelog_release) protected TextView changeLogRelease;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -30,7 +34,13 @@ public class AboutActivity extends AbstractActivity {
     void initializeViews() {
         version.setText(Version.getVersionName(this));
         contributors.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
-        changeLog.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
+        changeLogRelease.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
+        final String changeLogMasterString = getString(R.string.changelog_master);
+        if (StringUtils.isBlank(changeLogMasterString)) {
+            changeLogMaster.setVisibility(View.GONE);
+        } else {
+            changeLogMaster.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
+        }
     }
 
     @Click(R.id.donate)