diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
index 266939988..b42964e87 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
@@ -37,7 +37,6 @@ import org.isoron.uhabits.core.commands.*
import org.isoron.uhabits.core.models.*
import org.isoron.uhabits.databinding.*
import org.isoron.uhabits.utils.*
-import kotlin.math.*
class EditHabitActivity : AppCompatActivity() {
@@ -233,16 +232,16 @@ class EditHabitActivity : AppCompatActivity() {
private fun validate(): Boolean {
var isValid = true
if (nameInput.text.isEmpty()) {
- nameInput.error = getString(R.string.validation_should_not_be_blank)
+ nameInput.error = getString(R.string.validation_cannot_be_blank)
isValid = false
}
if (habitType == Habit.NUMBER_HABIT) {
if(unitInput.text.isEmpty()) {
- unitInput.error = getString(R.string.validation_should_not_be_blank)
+ unitInput.error = getString(R.string.validation_cannot_be_blank)
isValid = false
}
if(targetInput.text.isEmpty()) {
- targetInput.error = getString(R.string.validation_should_not_be_blank)
+ targetInput.error = getString(R.string.validation_cannot_be_blank)
isValid = false
}
}
diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml
index f786f742d..5cd4e7300 100644
--- a/android/uhabits-android/src/main/res/values/strings.xml
+++ b/android/uhabits-android/src/main/res/values/strings.xml
@@ -28,13 +28,11 @@
Unarchive
Add habit
Change color
-
Habit created
Habits deleted
Habit changed
Habits archived
Habits unarchived
-
Overview
Habit strength
@@ -52,17 +50,12 @@
Edit habit
Check
Later
-
-
Welcome
Loop Habit Tracker helps you create and maintain good habits.
-
Create some new habits
Every day, after performing your habit, put a checkmark on the app.
-
Track your progress
Detailed graphs show you how your habits improved over time.
-
15 minutes
30 minutes
1 hour
@@ -83,7 +76,6 @@
Settings
Snooze interval
Select snooze delay
-
Did you know?
To rearrange the entries, press-and-hold on the name of the habit, then drag it to the correct place.
You can see more days by putting your phone in landscape mode.
@@ -95,36 +87,28 @@
Any day of the week
Select days
Export as CSV
-
Done
Clear
Select hours
Select minutes
-
- @string/hint_drag
- @string/hint_landscape
-
About
Translators
Developers
Version %s
Frequency
Checkmark
-
Checkmark Stack Widget
Frequency Stack Widget
Score Stack Widget
History Stack Widget
Streaks Stack Widget
-
-
Best streaks
-
Every day
Every week
-
Help & FAQ
Failed to export data.
Failed to import data.
@@ -138,7 +122,6 @@
Failed to generate bug report.
Generate bug report
Troubleshooting
-
Help translate this app
Dark theme
Use pure black in dark theme
@@ -146,20 +129,13 @@
Interface
Reverse order of days
Show days in reverse order on the main screen.
-
Day
Week
Month
Quarter
Year
-
Total
-
-
Yes or No
-
-
-
Every %d days
Every %d weeks
Score
@@ -168,19 +144,16 @@
Filter
Hide completed
Hide archived
-
Make notifications sticky
Prevents notifications from being swiped away.
Notification light
Shows a blinking light for reminders. Only available in phones with LED notification lights.
Repair database
Database repaired.
-
Uncheck
Toggle
Action
Habit
-
Sort
Manually
By name
@@ -207,7 +180,6 @@
Have you completed this habit today?
Notes
(Optional)
-
e.g. Did you wake up early today? Did you exercise? Did you play chess?
Measurable
e.g. How many miles did you run today? How many pages did you read? How many calories did you eat?
@@ -220,8 +192,6 @@
e.g. How many miles did you run today?
e.g. miles
Every month
- Cannot be blank
+ Cannot be blank
Today
-
-
\ No newline at end of file