aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/project/eclipse installation/readme.txt4
-rw-r--r--main/res/values-ja/strings.xml2
-rw-r--r--main/res/values/strings_not_translatable.xml2
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java2
-rw-r--r--main/src/cgeo/geocaching/export/GpxExport.java3
5 files changed, 8 insertions, 5 deletions
diff --git a/main/project/eclipse installation/readme.txt b/main/project/eclipse installation/readme.txt
index 102799e..ac64c1e 100644
--- a/main/project/eclipse installation/readme.txt
+++ b/main/project/eclipse installation/readme.txt
@@ -1,4 +1,4 @@
Select File | Import | Install | Install Software Items From File and select a locally downloaded copy of
-https://github.com/cgeo/c-geo-opensource/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f.
+https://github.com/cgeo/cgeo/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f.
-This way you can easily install all necessary plugins for c:geo development. \ No newline at end of file
+This way you can easily install all necessary plugins for c:geo development.
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 9c5636c..b916828 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -236,7 +236,7 @@
<string name="menu_settings">設定</string>
<string name="menu_history">履歴</string>
<string name="menu_filter">フィルター</string>
- <string name="menu_scan_geo">QRコードスキャン</string> <!-- It is more suitable "QRcode" than "Geocode" in Japanese, because "Geocode" is not commonly known. Issue #794 https://github.com/cgeo/c-geo-opensource/issues/794 -->
+ <string name="menu_scan_geo">QRコードスキャン</string> <!-- It is more suitable "QRcode" than "Geocode" in Japanese, because "Geocode" is not commonly known. Issue #794 https://github.com/cgeo/cgeo/issues/794 -->
<!-- main screen -->
<string name="live_map_button">地図</string>
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index 4d08571..233734e 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -149,7 +149,7 @@
· 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/c-geo-opensource/issues?milestone=9&amp;state=closed">Detailed list of all changes</a>\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
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index b670ec9..1662bb6 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -666,6 +666,8 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
}
((TextView) findViewById(R.id.actionbar_title)).setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(cache.getType().markerId), null, null, null);
+ // reset imagesList so Images view page will be redrawn
+ imagesList = null;
reinitializeViewPager();
// rendering done! remove progress popup if any there
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index c2a58b7..b22f80f 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -306,7 +306,8 @@ class GpxExport extends AbstractExport {
"type", log.type.type);
gpx.startTag(PREFIX_GROUNDSPEAK, "finder");
- gpx.attribute("", "id", log.author);
+ gpx.attribute("", "id", "");
+ gpx.text(log.author);
gpx.endTag(PREFIX_GROUNDSPEAK, "finder");
gpx.startTag(PREFIX_GROUNDSPEAK, "text");