eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-08 20:12:23 +00:00
Code Activity

Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3440' into ubilabs--rcapp--develop

Browse Source 
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java

Change-Id: I4e741f66667c9946b0aa36e25ea759cce47b9c9d
This commit is contained in:
Axel Uhl committed 2016-04-18 17:31:09 +02:00
2 parents 0e16d0a9ee dd60bf1fc2
commit 4ef21a5ccb
58 files changed
+600 -236
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+1
View File
@@ -500,6 +500,7 @@
<string name="preference_non_public_events_header">Zeige nicht öffentliche Events</string>
<string name="preference_non_public_events_summary">Lade alle Events, auch die nicht öffentlichen.</string>
<string name="reload_config">Konfiguration vom Server laden</string>
<string name="abort_title">Rennen abbrechen</string>
<string name="abort_hint">Welche laufenden Rennen möchten Sie abbrechen?</string>