Corrected bugs after base repo merge

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt

@@ -108,10 +108,11 @@ class NumberPickerFactory
             .setNegativeButton(android.R.string.cancel) { _, _ ->
                 callback.onNumberPickerDismissed()
             }
-            .setNegativeButton(R.string.skip_button) { _, _ ->
+            .setNegativeButton(R.string.skip_day) { _, _ ->
                 picker.clearFocus()
                 val v = Entry.SKIP.toDouble() / 1000
-                callback.onNumberPicked(v)
+                val note = etNotes.text.toString()
+                callback.onNumberPicked(v, note)
             }
             .setOnDismissListener {
                 callback.onNumberPickerDismissed()

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

@@ -225,6 +225,7 @@
     <string name="increment">Increment</string>
     <string name="decrement">Decrement</string>
     <string name="pref_skip_title">Enable skip days</string>
+    <string name="skip_day">Skip</string>
     <string name="pref_skip_description">Toggle twice to add a skip instead of a checkmark. Skips keep your score unchanged and don\'t break your streak.</string>
     <string name="pref_unknown_title">Show question marks for missing data</string>
     <string name="pref_unknown_description">Differentiate days without data from actual lapses. To enter a lapse, toggle twice.</string>