isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 01:28:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/stackview

Browse Source 
# Conflicts:
#	uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
This commit is contained in:
Alinson S. Xavier
2018-06-16 18:06:23 -05:00
parent 2654521647 6ca4877f1f
commit 436d19dfea
70 changed files with 1255 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uhabits-android/src/main/res/values/strings.xml
View File

@@ -216,8 +216,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>
@@ -230,4 +229,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>