Merge branch 'ubilabs--tracking_app--develop--hotfix--team_photo_menu_item' into ubilabs--tracking_app--develop

This commit is contained in:
Bennet Brunsen committed 2015-03-05 11:22:34 +01:00
commit 457108b015
5 files changed
+35 -9

No files matched your search

@@ -14,4 +14,8 @@
android:title="@string/options_menu_checkout"
app:showAsAction=""/>
<item
android:id="@+id/options_menu_add_team_image"
android:title="@string/options_add_team_photo"
app:showAsAction=""/>
</menu>
@@ -7,6 +7,8 @@
<string name="app_name">SAP Sailing Tracking App</string>
<string name="options_menu_settings">Einstellungen</string>
<string name="options_menu_checkout">Checkout</string>
<string name="options_add_team_photo">Team Foto hinzufügen</string>
<string name="options_replace_team_photo">Team Foto ersetzen</string>
<string name="settings_category_other">Andere Einstellungen</string>
<string name="scan_hint">Der QR-Code befindet sich auf Ihrer Teilnahmebestätigung</string>
<string name="device_identifier">Geräte-ID</string>
@@ -5,6 +5,8 @@
<string name="app_name">SAP Sailing Tracking App</string>
<string name="options_menu_settings">Settings</string>
<string name="options_menu_checkout">Checkout</string>
<string name="options_add_team_photo">Add Team Photo</string>
<string name="options_replace_team_photo">Replace Team Photo</string>
<string name="settings_category_other">Other Settings</string>
<string name="device_identifier">Device Identifier</string>
<string name="tracker_started">SAP Sailing Tracker started</string>