Merge branch 'master' into dev

This commit is contained in:
2018-06-04 19:56:09 -05:00
50 changed files with 1017 additions and 365 deletions

View File

@@ -208,8 +208,7 @@
<string name="by_score">By score</string>
<string name="download">Download</string>
<string name="export">Export</string>
<string name="long_press_to_edit">Press-and-hold to change the
value</string>
<string name="long_press_to_edit">Press-and-hold to change the value</string>
<string name="change_value">Change value</string>
<string name="calendar">Calendar</string>
<string name="unit">Unit</string>
@@ -222,4 +221,6 @@
<string name="target">Target</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="customize_notification_summary">Change sound, vibration, light and other notification settings</string>
<string name="customize_notification">Customize notifications</string>
</resources>