diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-11-10 09:34:00 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-11-10 09:34:00 +0100 |
| commit | 2fd3060213c74747d76cb104a3ecb693a3352781 (patch) | |
| tree | f4b1b2b1f4b2307cc3788d27ec627b4ce2a44579 /main/res/values | |
| parent | 9ef9950fc27d0099bd4a482a2cf623deea56d4ea (diff) | |
| parent | 653c85552f87a47218330a65642a2a4515255538 (diff) | |
| download | cgeo-2fd3060213c74747d76cb104a3ecb693a3352781.zip cgeo-2fd3060213c74747d76cb104a3ecb693a3352781.tar.gz cgeo-2fd3060213c74747d76cb104a3ecb693a3352781.tar.bz2 | |
Merge remote-tracking branch 'KiwiStone/popularity_filter'
Conflicts:
main/res/values/strings.xml
main/src/cgeo/geocaching/filter/FilterUserInterface.java
Diffstat (limited to 'main/res/values')
| -rw-r--r-- | main/res/values/strings.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 1adabc4..79ba638 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -330,6 +330,7 @@ <string name="caches_filter_origin">Origin</string> <string name="caches_filter_distance">Distance</string> <string name="caches_filter_personal_note">With personal note</string> + <string name="caches_filter_popularity">Popularity</string> <string name="caches_removing_from_history">Removing from History…</string> <string name="caches_clear_offlinelogs">Clear offline logs</string> <string name="caches_clear_offlinelogs_progress">Clearing offline logs</string> @@ -1192,5 +1193,9 @@ <item quantity="one">yesterday</item> <item quantity="other">%d days ago</item> </plurals> + <plurals name="favorite_points"> + <item quantity="one">%s favorite</item> + <item quantity="other">%s favorites</item> + </plurals> </resources> |