diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-01-05 18:25:02 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-01-05 18:25:02 +0100 |
| commit | 774323f85eff52535afcebaf665c55384709614b (patch) | |
| tree | 550839c6f95565a25df7a575ffbd3fbbface6fd1 | |
| parent | 35b3e85ed547bf331b62f5381e80189880b1f619 (diff) | |
| parent | 3f6a394c10583fc4280474f170527cd89d0649c7 (diff) | |
| download | cgeo-774323f85eff52535afcebaf665c55384709614b.zip cgeo-774323f85eff52535afcebaf665c55384709614b.tar.gz cgeo-774323f85eff52535afcebaf665c55384709614b.tar.bz2 | |
Merge remote-tracking branch 'origin/release'
| -rw-r--r-- | main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/AboutActivity.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index a71f81c..927cce0 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -1111,4 +1111,5 @@ <item quantity="other">%s Favoriten</item> </plurals> <string name="percent_favorite_points">% Favoriten</string> + <string name="create_shortcut">Shortcut erstellen</string> </resources> diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java index 66cb027..6cda723 100644 --- a/main/src/cgeo/geocaching/AboutActivity.java +++ b/main/src/cgeo/geocaching/AboutActivity.java @@ -202,7 +202,6 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> scanner = new Scanner(ins, CharEncoding.UTF_8); result = scanner.useDelimiter("\\A").next(); IOUtils.closeQuietly(ins); - IOUtils.closeQuietly(scanner); } finally { if (scanner != null) { scanner.close(); |