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-3570' into ubilabs--rcapp--develop

Browse Source 
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java

Change-Id: Ibc180ab51e659a0c452d64f1756b5d7008ffbfb6
This commit is contained in:
Axel Uhl committed 2016-04-18 17:35:47 +02:00
2 parents 4ef21a5ccb 15312b6e60
commit 86a63366a2
19 files changed
+247 -39
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="options_menu_role">Rolle wechseln</string>
<string name="reload_config">Konfiguration vom Server laden</string>
<string name="abort_title">Rennen abbrechen</string>