Merge branch 'dev' into feature/stackview

# Conflicts:
#	uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt

uhabits-android/src/main/res/values/colors.xml

@@ -68,4 +68,6 @@
         <item>@color/black_aa</item>
         <item>@color/black_aa</item>
     </array>
+
+    <color name="ic_launcher_background">#1976D2</color>
 </resources>

uhabits-android/src/main/res/values/constants.xml

@@ -98,6 +98,13 @@
         <item>@string/year</item>
     </string-array>
 
+    <string-array name="strengthIntervalNamesWithoutDay" translatable="false">
+        <item>@string/week</item>
+        <item>@string/month</item>
+        <item>@string/quarter</item>
+        <item>@string/year</item>
+    </string-array>
+
     <string-array name="strenghtIntervalValues" translatable="false">
         <item>1</item>
         <item>7</item>

uhabits-android/src/main/res/values/strings.xml

@@ -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>