fix #2956: management of release notes

4 files changed, 206 insertions, 185 deletions

diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml
index 9325ea0..f6d20da 100644
--- a/main/res/layout/about_activity.xml
+++ b/main/res/layout/about_activity.xml
@@ -216,14 +216,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="12dip" />
@@ -252,4 +265,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 9772403..b2be6b1 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -1,182 +1,88 @@
-<?xml version="1.0" encoding="utf-8"?>

-<resources>

-  <string-array name="waypoint_coordinate_formats" translatable="false">

-    <item>@string/waypoint_coordinate_formats_plain</item>

-    <item>DDD.DDDDD°</item>

-    <item>DDD°MM.MMM\'</item>

-    <item>DDD°MM\'SS.SSS\"</item>

-  </string-array>

-  

-  <!-- distance units -->

-  <string name="unit_m" translatable="false">m</string>

-  <string name="unit_km" translatable="false">km</string>

-  <string name="unit_ft" translatable="false">ft</string>

-  <string name="unit_yd" translatable="false">yd</string>

-  <string name="unit_mi" translatable="false">mi</string>

-  

-  <!-- distance units -->

-  <string-array name="distance_units" translatable="false">

-    <item>@string/unit_m</item>

-    <item>@string/unit_km</item>

-    <item>@string/unit_ft</item>

-    <item>@string/unit_yd</item>

-    <item>@string/unit_mi</item>

-  </string-array>

-  

-  <string name="init_select_themefolder" translatable="false">…</string>

-  <string name="init_select_map_directory" translatable="false">…</string>

-  <string name="init_select_gpx_exportdir" translatable="false">…</string>

-  <string name="init_select_gpx_importdir" translatable="false">…</string>

-  

-  <!-- contributors -->

-  <string name="contributors" translatable="false">\n

-    · <a href="http://carnero.cc/">carnero</a> as the father of c:geo\n

-    \n

-    · 0xErnie (localization DE)\n

-    · <a href="mailto:bazsy@freemail.hu">Balazs Szabo (Bazsy1983)</a> (loc. HU)\n

-    · Bananeweizen (code, loc. DE)\n

-    · blafoo (code, localization DE)\n

-    · Bonemaro (tester)\n

-    · BudBundi (localization DE, tester)\n

-    · campbeb (code)\n

-    · Charles (localization FR)\n

-    · Denny (localization DA)\n

-    · Eisbehr (code)\n

-    · F. Coello (localization ES)\n

-    · Filipe C. (code)\n

-    · <a href="http://www.hunterthornsberry.com">Hunter275</a> (tester)\n

-    · <a href="http://iirojappinen.com/">Iiro Jäppinen</a> (graphic)\n

-    · inkantis (localization PL)\n

-    · <a href="http://www.jaytech.cz/">Jan Žatecký</a> (graphic)\n

-    · <a href="http://joachim-wilke.de/">JoWi24</a> (code)\n

-    · <a href="http://github.com/koem">Karsten Priegnitz</a> (code, artwork computation)\n

-    · <a href="http://www.geocaching.com/email/?guid=d11a3e3d-7db0-4d43-87f2-7893238844a6">Lineflyer</a> (tester, support, localization DE)\n

-    · Ludovic Valente (localization FR)\n

-    · marco-jacob (code, loc. DE)\n

-    · MichielK (code, loc. NL)\n

-    · mucek4 (code, open source project leader)\n

-    · ncorreia (code, localization PT)\n

-    · Pascal (localization NL)\n

-    · Pavol Babinčák (code, loc. SK)\n

-    · Peter (localization HU)\n

-    · <a href="https://github.com/Portree-Kid">Portree Kid</a> (code)\n

-    · Rainer S. (code)\n

-    · Ray (code, loc. JA)\n

-    · <a href="http://seromenho.com/">Ricardo Seromenho</a> (localization PT)\n

-    · RoadRunner- (code, loc. DE)\n

-    · <a href="http://www.blueskysoftware.it/">RomNexus6</a> (localization IT)\n

-    · <a href="http://www.sammyshp.de/">SammysHP</a> (code, localization DE)\n

-    · <a href="http://www.rfc1149.net/sam.html">Samuel Tardieu</a> (code, localization FR)\n

-    · serenity (localization DE)\n

-    · Shan, a.k.a. ShakurNO (localization NO)\n

-    · Shizo87 (tester)\n

-    · stephanme/Geoteufel (code)\n

-    · thiasB (code, loc. DE EN)\n

-    · YraFyra (code, loc. SV)\n

-    · zenobios (code, loc. DE EN)\n

-    \n

-    · <a href="http://code.google.com/p/mapsforge/">Mapsforge</a> (OSM-rendering)\n

-    · <a href="http://thenounproject.com/">The Noun Project</a> (basis for attribute icons)\n

-    · <a href="http://commons.apache.org/">The Apache Commons Project</a>\n

-    · <a href="http://androidicons.com/">Android Icons</a> (<a href="https://creativecommons.org/licenses/by/3.0/">CC-BY 3.0</a>)\n

-    · <a href="http://rrze-icon-set.berlios.de/index.html">RRZE Icon set</a> (<a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA 3.0</a>)\n

-  </string>

-  

-  <!-- 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 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>

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string-array name="waypoint_coordinate_formats" translatable="false">
+    <item>@string/waypoint_coordinate_formats_plain</item>
+    <item>DDD.DDDDD°</item>
+    <item>DDD°MM.MMM\'</item>
+    <item>DDD°MM\'SS.SSS\"</item>
+  </string-array>
+  
+  <!-- distance units -->
+  <string name="unit_m" translatable="false">m</string>
+  <string name="unit_km" translatable="false">km</string>
+  <string name="unit_ft" translatable="false">ft</string>
+  <string name="unit_yd" translatable="false">yd</string>
+  <string name="unit_mi" translatable="false">mi</string>
+  
+  <!-- distance units -->
+  <string-array name="distance_units" translatable="false">
+    <item>@string/unit_m</item>
+    <item>@string/unit_km</item>
+    <item>@string/unit_ft</item>
+    <item>@string/unit_yd</item>
+    <item>@string/unit_mi</item>
+  </string-array>
+  
+  <string name="init_select_themefolder" translatable="false">…</string>
+  <string name="init_select_map_directory" translatable="false">…</string>
+  <string name="init_select_gpx_exportdir" translatable="false">…</string>
+  <string name="init_select_gpx_importdir" translatable="false">…</string>
+  
+  <!-- contributors -->
+  <string name="contributors" translatable="false">\n
+    · <a href="http://carnero.cc/">carnero</a> as the father of c:geo\n
+    \n
+    · 0xErnie (localization DE)\n
+    · <a href="mailto:bazsy@freemail.hu">Balazs Szabo (Bazsy1983)</a> (loc. HU)\n
+    · Bananeweizen (code, loc. DE)\n
+    · blafoo (code, localization DE)\n
+    · Bonemaro (tester)\n
+    · BudBundi (localization DE, tester)\n
+    · campbeb (code)\n
+    · Charles (localization FR)\n
+    · Denny (localization DA)\n
+    · Eisbehr (code)\n
+    · F. Coello (localization ES)\n
+    · Filipe C. (code)\n
+    · <a href="http://www.hunterthornsberry.com">Hunter275</a> (tester)\n
+    · <a href="http://iirojappinen.com/">Iiro Jäppinen</a> (graphic)\n
+    · inkantis (localization PL)\n
+    · <a href="http://www.jaytech.cz/">Jan Žatecký</a> (graphic)\n
+    · <a href="http://joachim-wilke.de/">JoWi24</a> (code)\n
+    · <a href="http://github.com/koem">Karsten Priegnitz</a> (code, artwork computation)\n
+    · <a href="http://www.geocaching.com/email/?guid=d11a3e3d-7db0-4d43-87f2-7893238844a6">Lineflyer</a> (tester, support, localization DE)\n
+    · Ludovic Valente (localization FR)\n
+    · marco-jacob (code, loc. DE)\n
+    · MichielK (code, loc. NL)\n
+    · mucek4 (code, open source project leader)\n
+    · ncorreia (code, localization PT)\n
+    · Pascal (localization NL)\n
+    · Pavol Babinčák (code, loc. SK)\n
+    · Peter (localization HU)\n
+    · <a href="https://github.com/Portree-Kid">Portree Kid</a> (code)\n
+    · Rainer S. (code)\n
+    · Ray (code, loc. JA)\n
+    · <a href="http://seromenho.com/">Ricardo Seromenho</a> (localization PT)\n
+    · RoadRunner- (code, loc. DE)\n
+    · <a href="http://www.blueskysoftware.it/">RomNexus6</a> (localization IT)\n
+    · <a href="http://www.sammyshp.de/">SammysHP</a> (code, localization DE)\n
+    · <a href="http://www.rfc1149.net/sam.html">Samuel Tardieu</a> (code, localization FR)\n
+    · serenity (localization DE)\n
+    · Shan, a.k.a. ShakurNO (localization NO)\n
+    · Shizo87 (tester)\n
+    · stephanme/Geoteufel (code)\n
+    · thiasB (code, loc. DE EN)\n
+    · YraFyra (code, loc. SV)\n
+    · zenobios (code, loc. DE EN)\n
+    \n
+    · <a href="http://code.google.com/p/mapsforge/">Mapsforge</a> (OSM-rendering)\n
+    · <a href="http://thenounproject.com/">The Noun Project</a> (basis for attribute icons)\n
+    · <a href="http://commons.apache.org/">The Apache Commons Project</a>\n
+    · <a href="http://androidicons.com/">Android Icons</a> (<a href="https://creativecommons.org/licenses/by/3.0/">CC-BY 3.0</a>)\n
+    · <a href="http://rrze-icon-set.berlios.de/index.html">RRZE Icon set</a> (<a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA 3.0</a>)\n
+  </string>
+  
+  <!-- cache menu -->
+  <string name="cache_menu_sygic" translatable="false">Sygic</string>
+
+</resources>