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

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
#	app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
#	app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
#	uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
#	uhabits-android/src/main/res/values-id/strings.xml
#	uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
This commit is contained in:
Alinson S. Xavier
2017-07-18 22:54:52 -04:00
parent 122b300c50 540a618ba8
commit 2db4c06fe8
21 changed files with 724 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
<string name="edit">Змінити</string>
<string name="delete">Вилучити</string>
<string name="archive">Архівувати</string>
<string name="unarchive">Повернути з архіву</string>
<string name="unarchive">Розархівувати</string>
<string name="add_habit">Додати звичку</string>
<string name="color_picker_default_title">Змінити колір</string>
<string name="toast_habit_created">Звичку створено</string>