fixed merge

This commit is contained in:
Daniel Dakhno 2022-02-27 11:02:40 +01:00
parent 290edbfd9e
commit 34230a9d26

View File

@ -142,7 +142,6 @@
<string name="pref_title_notifications_pebblemsg">Pebble Messages</string> <string name="pref_title_notifications_pebblemsg">Pebble Messages</string>
<string name="pref_summary_notifications_pebblemsg">Support for apps that send notifications to the Pebble via PebbleKit.</string> <string name="pref_summary_notifications_pebblemsg">Support for apps that send notifications to the Pebble via PebbleKit.</string>
<string name="pref_title_notifications_generic">Generic notification support</string> <string name="pref_title_notifications_generic">Generic notification support</string>
<string name="pref_title_notifications_generic_settings">Android notification settings</string>
<string name="pref_title_whenscreenon">…also when screen is on</string> <string name="pref_title_whenscreenon">…also when screen is on</string>
<string name="pref_title_notification_filter">Do Not Disturb</string> <string name="pref_title_notification_filter">Do Not Disturb</string>
<string name="pref_summary_notification_filter">Block all notifications when Do Not Disturb is enabled on the phone</string> <string name="pref_summary_notification_filter">Block all notifications when Do Not Disturb is enabled on the phone</string>
@ -1496,8 +1495,6 @@
<string name="pref_media_forward">Skip forward</string> <string name="pref_media_forward">Skip forward</string>
<string name="pref_media_rewind">Skip back</string> <string name="pref_media_rewind">Skip back</string>
<string name="pref_device_action_broadcast">Send Broadcast</string> <string name="pref_device_action_broadcast">Send Broadcast</string>
<string name="pref_device_action_fitness_app_control_start">Fitness App Tracking Start</string>
<string name="pref_device_action_fitness_app_control_stop">Fitness App Tracking Stop</string>
<!-- Translators: the ### indicate number of digits, keep intact --> <!-- Translators: the ### indicate number of digits, keep intact -->
<string name="distance_format_meters">###m</string> <string name="distance_format_meters">###m</string>
<!-- Translators: the ### indicate number of digits, keep intact --> <!-- Translators: the ### indicate number of digits, keep intact -->
@ -1519,9 +1516,4 @@
<string name="menuitem_menu">Menu</string> <string name="menuitem_menu">Menu</string>
<string name="fossil_hr_button_config_info">Some buttons cannot be configured because their functions are hard-coded in the watch firmware.\n\nWarning: long-pressing the upper button when a watchface from the official Fossil app is installed will also toggle between showing/hiding widgets.</string> <string name="fossil_hr_button_config_info">Some buttons cannot be configured because their functions are hard-coded in the watch firmware.\n\nWarning: long-pressing the upper button when a watchface from the official Fossil app is installed will also toggle between showing/hiding widgets.</string>
<string name="watchface_dialog_widget_width">Width:</string> <string name="watchface_dialog_widget_width">Width:</string>
<string name="pref_title_opentracks_packagename">OpenTracks package name</string>
<string name="pref_summary_opentracks_packagename">Used for starting/stopping GPS track recording in external fitness app.</string>
<string name="info_no_devices_connected">no devices connected</string>
<string name="info_connected_count">%d devices connected</string>
</resources> </resources>