diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-06-01 20:01:41 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-06-01 20:01:41 +0200 |
| commit | 3a258cdf14b10f8dc5f4f4df54d6ae8ce30eeff8 (patch) | |
| tree | 523221f977e2013647e416793635343c0e673cdd | |
| parent | 5429d2d33e61dc1dc9e9d7673387adfbb1b50a42 (diff) | |
| parent | 32baf729157be6eaee4f50014147d22c46691f52 (diff) | |
| download | cgeo-3a258cdf14b10f8dc5f4f4df54d6ae8ce30eeff8.zip cgeo-3a258cdf14b10f8dc5f4f4df54d6ae8ce30eeff8.tar.gz cgeo-3a258cdf14b10f8dc5f4f4df54d6ae8ce30eeff8.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
| -rw-r--r-- | main/res/values-fr/strings.xml | 3 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/CacheAttribute.java | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index a49ee5b..0df35e0 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -802,6 +802,9 @@ <string name="export_fieldnotes_creating">Création des notes de terrain…</string> <string name="export_gpx">GPX</string> + <!-- attribute unknown --> + <string name="attribute_unknown_yes">Attribut inconnu</string> + <string name="attribute_unknown_no">Attribut inconnu négatif</string> <!-- attributes (permissions -> allowed, not allowed) --> <string name="attribute_dogs_yes">Chiens autorisés</string> <string name="attribute_dogs_no">Chiens interdits</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 28e9c51..5696e74 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -826,6 +826,9 @@ <string name="export_fieldnotes_creating">Creating Field Notes…</string> <string name="export_gpx">GPX</string> + <!-- attribute unknown --> + <string name="attribute_unknown_yes">Unknown attribute present</string> + <string name="attribute_unknown_no">Unknown attribute not present</string> <!-- attributes (permissions -> allowed, not allowed) --> <string name="attribute_dogs_yes">Dogs allowed</string> <string name="attribute_dogs_no">Dogs not allowed</string> diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java index 4a502fb..6456f71 100644 --- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java +++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java @@ -11,7 +11,7 @@ import java.util.Map; public enum CacheAttribute { - UNKNOWN(0, "", R.drawable.attribute__strikethru, 0, 0), + UNKNOWN(0, "unknown", R.drawable.attribute__strikethru, R.string.attribute_unknown_yes, R.string.attribute_unknown_no), DOGS(1, "dogs", R.drawable.attribute_dogs, R.string.attribute_dogs_yes, R.string.attribute_dogs_no), FEE(2, "fee", R.drawable.attribute_fee, R.string.attribute_fee_yes, R.string.attribute_fee_no), RAPPELLING(3, "rappelling", R.drawable.attribute_rappelling, R.string.attribute_rappelling_yes, R.string.attribute_rappelling_no), |