aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'CosMars89/master'Bananeweizen2013-07-211-0/+6
|\
| * created the DistanceFilter and CacheDistance classesCosMars892013-06-201-0/+6
| | | | | | | | | | modified the FilterUserInterface class in order to incorporate the new filter added the required information in the strings.xml file
* | new: visually separate the secondary navigation toolBananeweizen2013-07-213-1/+7
| | | | | | | | * was hard to read before * only added a new preference category, no functionality
* | fix #3039: User name settings accepts multi line inputBananeweizen2013-07-211-4/+12
| |
* | few, many for Polish translationMieczyslaw2013-07-211-11/+15
| |
* | Fix #3035: Field note upload "since last export" should be controlled bySammysHP2013-07-212-1/+1
| | | | | | | | c:geo
* | fix wrong resolution of menu iconBananeweizen2013-07-212-0/+0
| | | | | | | | * they were from a 3.0+ Android version * ours are all from lower versions, where the resolution differs
* | fix special characters in translationBananeweizen2013-07-211-7/+6
| |
* | Update to pt-pt localizationRicardo Seromenho2013-07-201-32/+244
| | | | | | Added a lot of strings
* | fix plurals in new translationsBananeweizen2013-07-204-13/+26
| |
* | fix: Polish strings broken from last mergeBananeweizen2013-07-201-1/+0
| |
* | refactoring: reorder contributor listBananeweizen2013-07-201-2/+2
| |
* | Merge pull request #3029 from mieczyslaw/masterBananeweizen2013-07-202-5/+112
|\ \ | | | | | | Update to Polish translation and I added myself to contributors :)
| * | Update strings.xmlMieczyslaw2013-07-191-4/+0
| | | | | | | | | two bugs corrected
| * | Update strings_not_translatable.xmlMieczyslaw2013-07-191-1/+3
| | | | | | | | | After 6 months of supporting Polish translation I added myself to the list :)
| * | Update strings.xmlMieczyslaw2013-07-191-4/+113
| | | | | | | | | Updated Polish translation (based on English version of strings.xml). Particularly, 'status_closeout_warning' was included
* | | Merge pull request #3033 from ray4423/translate_jaBananeweizen2013-07-201-102/+303
|\ \ \ | | | | | | | | Update Japanese
| * | | Update JapaneseRay2013-07-201-102/+303
| | | |
* | | | Merge pull request #3024 from koem/settingsInfoIconBananeweizen2013-07-206-1/+9
|\ \ \ \ | | | | | | | | | | Info-Preferences now with Info Icon
| * | | | InfoPreference now with Info Iconkoem2013-07-206-1/+9
| | | | | | | | | | | | | | | | | | | | http://i.imgur.com/3Z5IaG6.png
* | | | | Merge branch 'release'rsudev2013-07-206-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: main/res/values-cs/strings.xml main/res/values-hu/strings.xml main/res/values-it/strings.xml main/res/values-pl/strings.xml main/res/values-sv/strings.xml
| * | | | Translations for #2915rsudev2013-07-205-0/+5
| | | | |
| * | | | Update changelog_release.xmlLars2013-07-181-0/+1
| | | | | | | | | | | | | | | #3002
* | | | | Fixes #2992 - Settings: show "authorize c:geo again" when appropriatekoem2013-07-194-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a little more complicated than expected ... changing titles of settings is a task for someone who killed his grandmother. When authorization is already done, settings for twitter auth and OCDE auth show "authorize c:geo again".
* | | | | Implements #2234: Hide own/found from Live MapJavaDog2013-07-192-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a button to show/hide own/found caches in the Live Map menu, under the "Map settings" option (renamed from "Map modes"). Refactored boolean "liveChanged" in CGeoMap.java, renamed to "markersInvalidated" as it now has more than that one use.
* | | | | fix conflict from manual merge in strings.xmlBananeweizen2013-07-191-1/+2
| | | | |
* | | | | Proofread strings.xml for American EnglishJavaDog2013-07-191-79/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated main/res/values/strings.xml, fixed errors in English spelling/grammar/phrasing. This commit should contain no other code. I'm bad at git, sorry about that :p
* | | | | Merge pull request #3014 from koem/i2978SettingsNavMenuBananeweizen2013-07-198-22/+33
|\ \ \ \ \ | |_|_|/ / |/| | | | Fixes #2978 - Settings: "System" instead of "More Options"
| * | | | Fixex #2978 - Settings: "System" instead of "More Options"koem2013-07-198-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - moved basic member settings to subscreen in gc-services - new settings screen "Navigation" - renamed "More Option" to "System"
* | | | | Prepare addition of OKAPI for oc.plrsudev2013-07-171-0/+1
| |_|/ / |/| | |
* | | | Fixes #2717 - Compass Speech stops on Rotationkoem2013-07-162-96/+105
|/ / /
* | | Merge pull request #3006 from Lineflyer/masterLars2013-07-151-0/+9
|\ \ \ | | | | | | | | Updating changelog_master.xml
| * | | Update changelog_master.xmlLars2013-07-151-0/+9
| | | | | | | | | | | | Still catching up old changes to the changelog
* | | | Fix lint warning Lars2013-07-151-1/+1
| | | | | | | | | | | | :)
* | | | Removing some limitations Lars2013-07-151-4/+0
| | | | | | | | | | | | Those limitations/known bugs have been fixed
* | | | Merge branch 'release' into upstreamSamuel Tardieu2013-07-141-0/+6
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Update changelog_release.xmlLars2013-07-141-0/+6
| | | | | | | | | #2915
* | | Update changelog_master.xmlLars2013-07-141-2/+39
| | | | | | | | | | | | Catching up the last months. Feel free to comment/correct if I did something wrong.
* | | cleanup: fix ListView predefined idSamuel Tardieu2013-07-141-1/+1
| | |
* | | #2975: move up map category due to expected importanceBananeweizen2013-07-141-56/+56
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2013-07-141-1/+1
|\ \ \ | |/ /
| * | cleanup: fix typo in release notesSamuel Tardieu2013-07-141-1/+1
| | |
* | | cleanup: use sp instead of dipSamuel Tardieu2013-07-141-1/+1
| | |
* | | Test master changelog informationSamuel Tardieu2013-07-141-0/+3
| | |
* | | Merge branch 'release' into upstreamSamuel Tardieu2013-07-144-83/+118
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: main/res/values/strings_not_translatable.xml main/src/cgeo/geocaching/AboutActivity.java
| * | fix #2956: management of release notesSamuel Tardieu2013-07-144-185/+206
| | |
* | | cleanup: remove DOS line terminatorsSamuel Tardieu2013-07-141-177/+177
| | |
* | | cleanup: remove unused button stringsSamuel Tardieu2013-07-141-3/+0
| | |
* | | cleanup: remove unused number picker and string resourcesSamuel Tardieu2013-07-1414-73/+0
| | |
* | | Remove latitude/elevation related settingsSamuel Tardieu2013-07-1415-81/+26
| | |