Merge branch 'dev' into feature/stackview

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

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-### 1.7.8 (September 30, 2017)
+### 1.7.8 (April 21, 2018)
+
+* Add support for adaptive icons (Oreo)
+* Add support for notification channels (Oreo)
+* Update translations
+
+### 1.7.7 (September 30, 2017)
 
 * Fix bug that caused reminders to show repeatedly on DST changes
 

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
-        jcenter()
         maven { url 'https://maven.google.com' }
+        jcenter()
     }
 
     dependencies {
@@ -18,8 +18,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         maven { url 'https://maven.google.com' }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        jcenter()
     }
 }

gradle.properties

@@ -2,13 +2,13 @@ VERSION_CODE = 35
 VERSION_NAME = 1.7.8
 
 MIN_SDK_VERSION = 19
-TARGET_SDK_VERSION = 25
-COMPILE_SDK_VERSION = 25
+TARGET_SDK_VERSION = 27
+COMPILE_SDK_VERSION = 27
 
 DAGGER_VERSION = 2.9
-BUILD_TOOLS_VERSION = 26.0.2
-KOTLIN_VERSION = 1.1.2-4
-SUPPORT_LIBRARY_VERSION = 25.3.1
+BUILD_TOOLS_VERSION = 27.0.3
+KOTLIN_VERSION = 1.2.41
+SUPPORT_LIBRARY_VERSION = 27.1.1
 
 org.gradle.parallel=false
 org.gradle.daemon=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

uhabits-android/src/main/AndroidManifest.xml

@@ -19,7 +19,9 @@
 -->
 <manifest
     package="org.isoron.uhabits"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="36"
+    android:versionName="1.7.9">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

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

@@ -42,9 +42,9 @@ class NumberPickerFactory
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(R.layout.number_picker_dialog, null)
 
-        val picker = view.findViewById(R.id.picker) as NumberPicker
-        val picker2 = view.findViewById(R.id.picker2) as NumberPicker
-        val tvUnit = view.findViewById(R.id.tvUnit) as TextView
+        val picker = view.findViewById<NumberPicker>(R.id.picker)
+        val picker2 = view.findViewById<NumberPicker>(R.id.picker2)
+        val tvUnit = view.findViewById<TextView>(R.id.tvUnit)
 
         val intValue = Math.round(value * 100).toInt()
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java

@@ -77,7 +77,6 @@ public class BarChart extends ScrollableChart
 
     private int primaryColor;
 
-    @Deprecated
     private int bucketSize = 7;
 
     private int backgroundColor;
@@ -127,7 +126,6 @@ public class BarChart extends ScrollableChart
         setTarget(0.5);
     }
 
-    @Deprecated
     public void setBucketSize(int bucketSize)
     {
         this.bucketSize = bucketSize;
@@ -298,7 +296,6 @@ public class BarChart extends ScrollableChart
 
         boolean shouldPrintYear = true;
         if (yearText.equals(previousYearText)) shouldPrintYear = false;
-        if (bucketSize >= 365 && (year % 2) != 0) shouldPrintYear = false;
 
         if (skipYear > 0)
         {
@@ -306,6 +303,8 @@ public class BarChart extends ScrollableChart
             shouldPrintYear = false;
         }
 
+        if (bucketSize >= 365) shouldPrintYear = true;
+
         if (shouldPrintYear)
         {
             previousYearText = yearText;
@@ -314,6 +313,8 @@ public class BarChart extends ScrollableChart
             pText.setTextAlign(Paint.Align.CENTER);
             canvas.drawText(yearText, rect.centerX(), rect.bottom + em * 2.2f, pText);
             skipYear = 1;
+
+
         }
 
         if (bucketSize < 365)

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java

@@ -140,11 +140,7 @@ public class ShowHabitRootView extends BaseRootView
         historyCard.setHabit(habit);
         streakCard.setHabit(habit);
         frequencyCard.setHabit(habit);
-
-        if(habit.isNumerical())
         barCard.setHabit(habit);
-        else
-            barCard.setVisibility(GONE);
     }
 
     public interface Controller extends HistoryCard.Controller

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java

@@ -24,6 +24,7 @@ import android.view.*;
 
 import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.preferences.Preferences;
 import org.isoron.uhabits.core.ui.screens.habits.show.*;
 
 import javax.inject.*;
@@ -35,13 +36,26 @@ public class ShowHabitsMenu extends BaseMenu
 {
     @NonNull
     private Lazy<ShowHabitMenuBehavior> behavior;
+    @NonNull
+    private final Preferences prefs;
 
     @Inject
     public ShowHabitsMenu(@NonNull BaseActivity activity,
-                          @NonNull Lazy<ShowHabitMenuBehavior> behavior)
+                          @NonNull Lazy<ShowHabitMenuBehavior> behavior,
+                          @NonNull Preferences prefs)
     {
         super(activity);
         this.behavior = behavior;
+        this.prefs = prefs;
+    }
+
+    @Override
+    public void onCreate(@NonNull Menu menu)
+    {
+        super.onCreate(menu);
+
+        if (prefs.isDeveloper())
+            menu.findItem(R.id.action_randomize).setVisible(true);
     }
 
     @Override
@@ -61,6 +75,10 @@ public class ShowHabitsMenu extends BaseMenu
                 behavior.get().onDeleteHabit();
                 return true;
 
+            case R.id.action_randomize:
+                behavior.get().onRandomize();
+                return true;
+
             default:
                 return false;
         }

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java

@@ -29,15 +29,25 @@ import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.tasks.*;
-import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
 
 import butterknife.*;
 
+import static org.isoron.uhabits.activities.habits.show.views.ScoreCard.getTruncateField;
+
 public class BarCard extends HabitCard
 {
+    public static final int[] NUMERICAL_BUCKET_SIZES = {1, 7, 31, 92, 365};
+    public static final int[] BOOLEAN_BUCKET_SIZES = {7, 31, 92, 365};
+
+    @BindView(R.id.numericalSpinner)
+    Spinner numericalSpinner;
+
+    @BindView(R.id.boolSpinner)
+    Spinner boolSpinner;
+
     @BindView(R.id.barChart)
     BarChart chart;
 
@@ -47,6 +57,8 @@ public class BarCard extends HabitCard
     @Nullable
     private TaskRunner taskRunner;
 
+    private int bucketSize;
+
     public BarCard(Context context)
     {
         super(context);
@@ -59,6 +71,20 @@ public class BarCard extends HabitCard
         init();
     }
 
+    @OnItemSelected(R.id.numericalSpinner)
+    public void onNumericalItemSelected(int position)
+    {
+        bucketSize = NUMERICAL_BUCKET_SIZES[position];
+        refreshData();
+    }
+
+    @OnItemSelected(R.id.boolSpinner)
+    public void onBoolItemSelected(int position)
+    {
+        bucketSize = BOOLEAN_BUCKET_SIZES[position];
+        refreshData();
+    }
+
     @Override
     protected void refreshData()
     {
@@ -71,37 +97,35 @@ public class BarCard extends HabitCard
         inflate(getContext(), R.layout.show_habit_bar, this);
         ButterKnife.bind(this);
 
+        boolSpinner.setSelection(1);
+        numericalSpinner.setSelection(2);
+        bucketSize = 7;
+
         Context appContext = getContext().getApplicationContext();
         if (appContext instanceof HabitsApplication)
         {
             HabitsApplication app = (HabitsApplication) appContext;
             taskRunner = app.getComponent().getTaskRunner();
         }
-
-        if (isInEditMode()) initEditMode();
-    }
-
-    private void initEditMode()
-    {
-        int color = PaletteUtils.getAndroidTestColor(1);
-        title.setTextColor(color);
-        chart.setColor(color);
-        chart.populateWithRandomData();
     }
 
     private class RefreshTask implements Task
     {
         private final Habit habit;
 
-        public RefreshTask(Habit habit) {this.habit = habit;}
+        public RefreshTask(Habit habit)
+        {
+            this.habit = habit;
+        }
 
         @Override
         public void doInBackground()
         {
-            Timestamp today = DateUtils.getToday();
-            List<Checkmark> checkmarks =
-                habit.getCheckmarks().getByInterval(Timestamp.ZERO, today);
+            List<Checkmark> checkmarks;
+            if (bucketSize == 1) checkmarks = habit.getCheckmarks().getAll();
+            else checkmarks = habit.getCheckmarks().groupBy(getTruncateField(bucketSize));
             chart.setCheckmarks(checkmarks);
+            chart.setBucketSize(bucketSize);
         }
 
         @Override
@@ -110,7 +134,16 @@ public class BarCard extends HabitCard
             int color = PaletteUtils.getColor(getContext(), habit.getColor());
             title.setTextColor(color);
             chart.setColor(color);
+            if (habit.isNumerical())
+            {
+                boolSpinner.setVisibility(GONE);
                 chart.setTarget(habit.getTargetValue());
             }
+            else
+            {
+                numericalSpinner.setVisibility(GONE);
+                chart.setTarget(0);
+            }
+        }
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java

@@ -30,20 +30,12 @@ import android.support.v7.preference.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.core.preferences.*;
+import org.isoron.uhabits.core.ui.*;
 import org.isoron.uhabits.notifications.*;
 
-import static android.media.RingtoneManager.ACTION_RINGTONE_PICKER;
-import static android.media.RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI;
-import static android.media.RingtoneManager.EXTRA_RINGTONE_EXISTING_URI;
-import static android.media.RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT;
-import static android.media.RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT;
-import static android.media.RingtoneManager.EXTRA_RINGTONE_TYPE;
-import static android.media.RingtoneManager.TYPE_NOTIFICATION;
-import static org.isoron.uhabits.activities.habits.list.ListHabitsScreenKt.RESULT_BUG_REPORT;
-import static org.isoron.uhabits.activities.habits.list.ListHabitsScreenKt.RESULT_EXPORT_CSV;
-import static org.isoron.uhabits.activities.habits.list.ListHabitsScreenKt.RESULT_EXPORT_DB;
-import static org.isoron.uhabits.activities.habits.list.ListHabitsScreenKt.RESULT_IMPORT_DATA;
-import static org.isoron.uhabits.activities.habits.list.ListHabitsScreenKt.RESULT_REPAIR_DB;
+import static android.media.RingtoneManager.*;
+import static android.os.Build.VERSION.SDK_INT;
+import static org.isoron.uhabits.activities.habits.list.ListHabitsScreenKt.*;
 
 public class SettingsFragment extends PreferenceFragmentCompat
     implements SharedPreferences.OnSharedPreferenceChangeListener
@@ -114,6 +106,16 @@ public class SettingsFragment extends PreferenceFragmentCompat
             showRingtonePicker();
             return true;
         }
+        else if (key.equals("reminderCustomize"))
+        {
+            if (SDK_INT < Build.VERSION_CODES.O) return true;
+            AndroidNotificationTray.Companion.createAndroidNotificationChannel(getContext());
+            Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, getContext().getPackageName());
+            intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationTray.REMINDERS_CHANNEL_ID);
+            startActivity(intent);
+            return true;
+        }
 
         return super.onPreferenceTreeClick(preference);
     }
@@ -135,7 +137,14 @@ public class SettingsFragment extends PreferenceFragmentCompat
             devCategory.setVisible(false);
         }
 
-        updateRingtoneDescription();
+        if (SDK_INT < Build.VERSION_CODES.O)
+            findPreference("reminderCustomize").setVisible(false);
+        else
+        {
+            findPreference("reminderSound").setVisible(false);
+            findPreference("pref_snooze_interval").setVisible(false);
+        }
+
         updateSync();
     }
 

uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt

@@ -69,7 +69,7 @@ class PendingIntentFactory
                     .addNextIntentWithParentStack(
                             intentFactory.startShowHabitActivity(
                                     context, habit))
-                    .getPendingIntent(0, FLAG_UPDATE_CURRENT)
+                    .getPendingIntent(0, FLAG_UPDATE_CURRENT)!!
 
     fun showReminder(habit: Habit,
                      reminderTime: Long?,

uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt

@@ -23,6 +23,8 @@ import android.app.*
 import android.content.*
 import android.graphics.*
 import android.graphics.BitmapFactory.*
+import android.os.*
+import android.os.Build.VERSION.*
 import android.support.annotation.*
 import android.support.v4.app.*
 import android.support.v4.app.NotificationCompat.*
@@ -35,6 +37,9 @@ import org.isoron.uhabits.core.ui.*
 import org.isoron.uhabits.intents.*
 import javax.inject.*
 
+
+
+
 @AppScope
 class AndroidNotificationTray
 @Inject constructor(
@@ -46,6 +51,7 @@ class AndroidNotificationTray
 
     private var active = HashSet<Int>()
 
+
     override fun removeNotification(id: Int) {
         val manager = NotificationManagerCompat.from(context)
         manager.cancel(id)
@@ -64,6 +70,7 @@ class AndroidNotificationTray
         val summary = buildSummary(reminderTime)
         notificationManager.notify(Int.MAX_VALUE, summary)
         val notification = buildNotification(habit, reminderTime, timestamp)
+        createAndroidNotificationChannel(context)
         notificationManager.notify(notificationId, notification)
         active.add(notificationId)
     }
@@ -79,11 +86,6 @@ class AndroidNotificationTray
                 context.getString(R.string.yes),
                 pendingIntents.addCheckmark(habit, timestamp))
 
-        val snoozeAction = Action(
-                R.drawable.ic_action_snooze,
-                context.getString(R.string.snooze),
-                pendingIntents.snoozeNotification(habit))
-
         val removeRepetitionAction = Action(
                 R.drawable.ic_action_cancel,
                 context.getString(R.string.no),
@@ -98,9 +100,8 @@ class AndroidNotificationTray
                 .setBackground(wearableBg)
                 .addAction(addRepetitionAction)
                 .addAction(removeRepetitionAction)
-                .addAction(snoozeAction)
 
-        val builder = NotificationCompat.Builder(context)
+        val builder = NotificationCompat.Builder(context, REMINDERS_CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notification)
                 .setContentTitle(habit.name)
                 .setContentText(habit.description)
@@ -108,9 +109,7 @@ class AndroidNotificationTray
                 .setDeleteIntent(pendingIntents.dismissNotification(habit))
                 .addAction(addRepetitionAction)
                 .addAction(removeRepetitionAction)
-                .addAction(snoozeAction)
                 .setSound(ringtoneManager.getURI())
-                .extend(wearableExtender)
                 .setWhen(reminderTime)
                 .setShowWhen(true)
                 .setOngoing(preferences.shouldMakeNotificationsSticky())
@@ -119,13 +118,22 @@ class AndroidNotificationTray
         if (preferences.shouldMakeNotificationsLed())
             builder.setLights(Color.RED, 1000, 1000)
 
+        if(SDK_INT < Build.VERSION_CODES.O) {
+            val snoozeAction = Action(R.drawable.ic_action_snooze,
+                context.getString(R.string.snooze),
+                pendingIntents.snoozeNotification(habit))
+            wearableExtender.addAction(snoozeAction)
+            builder.addAction(snoozeAction)
+        }
+
+        builder.extend(wearableExtender)
 	    return builder.build()
     }
 
     @NonNull
     private fun buildSummary(@NonNull reminderTime: Long) : Notification
     {
-        return NotificationCompat.Builder(context)
+        return NotificationCompat.Builder(context, REMINDERS_CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notification)
                 .setContentTitle(context.getString(R.string.app_name))
                 .setWhen(reminderTime)
@@ -134,4 +142,20 @@ class AndroidNotificationTray
                 .setGroupSummary(true)
                 .build()
     }
+
+    companion object {
+        private val REMINDERS_CHANNEL_ID = "REMINDERS"
+        fun createAndroidNotificationChannel(context: Context) {
+            val notificationManager = context.getSystemService(Activity.NOTIFICATION_SERVICE)
+                    as NotificationManager
+            if (SDK_INT >= Build.VERSION_CODES.O)
+            {
+                val channel = NotificationChannel(REMINDERS_CHANNEL_ID,
+                        context.resources.getString(R.string.reminder),
+                        NotificationManager.IMPORTANCE_DEFAULT)
+                notificationManager.createNotificationChannel(channel)
+            }
+        }
+    }
+
 }

uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncService.java

@@ -23,7 +23,7 @@ import android.app.*;
 import android.content.*;
 import android.net.*;
 import android.os.*;
-import android.support.v7.app.*;
+import android.support.v4.app.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.preferences.*;

uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt

@@ -75,8 +75,8 @@ fun View.showMessage(@StringRes stringId: Int) {
     try {
         val snackbar = Snackbar.make(this, stringId, Snackbar.LENGTH_SHORT)
         val tvId = android.support.design.R.id.snackbar_text
-        val tv = snackbar.view.findViewById(tvId)
-        if(tv is TextView) tv.setTextColor(Color.WHITE)
+        val tv = snackbar.view.findViewById<TextView>(tvId)
+        tv?.setTextColor(Color.WHITE)
         snackbar.show()
     } catch (e: IllegalArgumentException) {
         return

uhabits-android/src/main/res/layout/about.xml

@@ -186,6 +186,10 @@
                     style="@style/About.Item"
                     android:text="Can Altas (Deutsch)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Laura Sophie (Deutsch)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Ander Raso Vazquez (Español)"/>
@@ -194,6 +198,10 @@
                     style="@style/About.Item"
                     android:text="Beriain (Euskara)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Osoitz (Euskara)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Andreas Michelakis (Ελληνικά)"/>
@@ -206,6 +214,10 @@
                     style="@style/About.Item"
                     android:text="Saeed Esmaili (Fārsi)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Behnood HRazy (Fārsi)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="François Mahé (Français)"/>
@@ -222,6 +234,10 @@
                     style="@style/About.Item"
                     android:text="Michael Faille (Français)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Tiralka (Français)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Ivan Krušlin (Hrvatski)"/>
@@ -262,6 +278,10 @@
                     style="@style/About.Item"
                     android:text="Andrei Pleș (Română)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Andreea Muscalagiu (Română)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Dušan Strgar (Slovenščina)"/>
@@ -274,6 +294,10 @@
                     style="@style/About.Item"
                     android:text="Robin (Svenska)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Sofia Veijonen (Suomen kieli)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Đorđe Vasiljević (српски)"/>
@@ -282,6 +306,10 @@
                     style="@style/About.Item"
                     android:text="Caner Başaran (Türkçe)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="hodanli (Türkçe)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Yurii Stavytskyi (Українська)"/>
@@ -294,6 +322,10 @@
                     style="@style/About.Item"
                     android:text="Oglaigh Rystard (Українська)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="taras-ko (Українська)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Limin Lu (中文)"/>
@@ -326,6 +358,14 @@
                     style="@style/About.Item"
                     android:text="Al Alloush (العَرَبِية‎)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Boula (العَرَبِية‎)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Israa Z (العَرَبِية‎)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Josh Graham (한국어 )"/>
@@ -350,6 +390,30 @@
                     style="@style/About.Item"
                     android:text="Mahdi Nasiri (فارسی‎)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Mohammed Imthath (தமிழ்‎)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="magimai (தமிழ்‎)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Anshoe (தமிழ்‎)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Trần Thái (Tiếng Việt)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Anh Quân (Tiếng Việt)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="pnhpnh (Tiếng Việt)"/>
+
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

uhabits-android/src/main/res/layout/show_habit_bar.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
   ~
   ~ This file is part of Loop Habit Tracker.
@@ -18,20 +17,46 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clipToPadding="false"
-    android:orientation="vertical"
-    android:paddingBottom="0dp">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.AppCompatSpinner
+            android:id="@+id/numericalSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="22dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:entries="@array/strengthIntervalNames"
+            android:theme="@style/SmallSpinner" />
+
+        <android.support.v7.widget.AppCompatSpinner
+            android:id="@+id/boolSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="22dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:entries="@array/strengthIntervalNamesWithoutDay"
+            android:theme="@style/SmallSpinner" />
+
 
         <TextView
             android:id="@+id/title"
             style="@style/CardHeader"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
             android:text="@string/history" />
 
         <org.isoron.uhabits.activities.common.views.BarChart
             android:id="@+id/barChart"
             android:layout_width="match_parent"
-        android:layout_height="220dp"/>
+            android:layout_height="220dp"
+            android:layout_below="@id/title"/>
+    </RelativeLayout>
 
 </merge>

uhabits-android/src/main/res/menu/show_habit.xml

@@ -37,4 +37,10 @@
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/action_randomize"
+        android:title="Randomize"
+        android:visible="false"
+        app:showAsAction="never"/>
+
 </menu>

uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -19,6 +19,160 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+  <string name="app_name">Trình theo dõi thói quen Loop</string>
+  <string name="main_activity_title">Thói quen</string>
+  <string name="action_settings">Cài đặt</string>
+  <string name="edit">Chỉnh sửa</string>
+  <string name="delete">Xoá</string>
+  <string name="archive">Lưu trữ</string>
+  <string name="unarchive">Hủy lưu trữ</string>
+  <string name="add_habit">Thêm thói quen</string>
+  <string name="color_picker_default_title">Thay đổi màu sắc</string>
+  <string name="toast_habit_created">Thói quen đã được tạo</string>
+  <string name="toast_habit_deleted">Thói quen đã bị xóa</string>
+  <string name="toast_habit_restored">Thói quen đã được phục hồi</string>
+  <string name="toast_nothing_to_undo">Không có gì để hoàn tác</string>
+  <string name="toast_nothing_to_redo">Không có gì để khôi phục</string>
+  <string name="toast_habit_changed">Thói quen đã được thay đổi</string>
+  <string name="toast_habit_changed_back">Thói quen đã huỷ chỉnh sửa</string>
+  <string name="toast_habit_archived">Thói quen đã được lưu trữ</string>
+  <string name="toast_habit_unarchived">Thói quen đã bị huỷ lưu trữ</string>
+  <string name="overview">Tổng quan</string>
+  <string name="habit_strength">Độ mạnh của thói quen</string>
+  <string name="history">Lịch sử</string>
+  <string name="clear">Dọn sạch</string>
+  <string name="description_hint">Câu hỏi (Bạn đã ... hôm nay?)</string>
+  <string name="repeat">Lặp lại</string>
+  <string name="times_every">times in</string>
+  <string name="days">ngày</string>
+  <string name="reminder">Nhắc nhở</string>
+  <string name="discard">Loại bỏ</string>
+  <string name="save">Lưu</string>
+  <string name="streaks">Mức độ</string>
+  <string name="no_habits_found">Bạn có không có thói quen nào đang hoạt động</string>
+  <string name="long_press_to_toggle">Nhấn giữ để đánh dấu hoặc bỏ đánh dấu</string>
+  <string name="reminder_off">Tắt</string>
+  <string name="validation_name_should_not_be_blank">Tên không thể để trống.</string>
+  <string name="validation_number_should_be_positive">Số phải là số dương.</string>
+  <string name="validation_at_most_one_rep_per_day">Bạn có thể có tối đa một lặp lại mỗi ngày</string>
+  <string name="create_habit">Tạo thói quen</string>
+  <string name="edit_habit">Chỉnh sửa thói quen</string>
+  <string name="check">Kiểm tra</string>
+  <string name="snooze">Lúc khác</string>
   <!-- App introduction -->
+  <string name="intro_title_1">Chào mừng</string>
+  <string name="intro_description_1">Theo dõi thói quen Loop giúp bạn tạo ra và duy trì những thói quen tốt.</string>
+  <string name="intro_title_2">Tạo một số thói quen mới</string>
+  <string name="intro_description_2">Mỗi ngày, sau khi thực hiện các thói quen của bạn, hãy đánh dấu vào ứng dụng.</string>
+  <string name="intro_title_3">Hãy duy trì thói quen</string>
+  <string name="intro_description_3">Thói quen thực hiện một cách nhất quán trong một thời gian dài sẽ kiếm được trọn vẹn một ngôi sao.</string>
+  <string name="intro_title_4">Theo dõi quá trình của bạn</string>
+  <string name="intro_description_4">Đồ thị chi tiết cho bạn thấy các thói quen của bạn được cải thiện như thế nào theo thời gian.</string>
+  <string name="interval_15_minutes">15 phút</string>
+  <string name="interval_30_minutes">30 phút</string>
+  <string name="interval_1_hour">1 giờ</string>
+  <string name="interval_2_hour">2 giờ</string>
+  <string name="interval_4_hour">4 giờ</string>
+  <string name="interval_8_hour">8 giờ</string>
+  <string name="interval_24_hour">24 giờ</string>
+  <string name="pref_toggle_title">Bấm nhanh để chuyển trạng thái</string>
+  <string name="pref_toggle_description">Chỉ cần chạm một lần để đánh dấu thay cho việc nhấn giữ. Tiện lợi hơn nhưng có thể đánh dấu sai.</string>
+  <string name="pref_snooze_interval_title">Khoảng thời gian báo lại lời nhắc</string>
+  <string name="pref_rate_this_app">Đánh giá ứng dụng trên Google Play</string>
+  <string name="pref_send_feedback">Gửi phản hồi cho nhà phát triển</string>
+  <string name="pref_view_source_code">Xem mã nguồn trên Github</string>
+  <string name="pref_view_app_introduction">Xem giới thiệu ứng dụng</string>
+  <string name="links">Liên kết</string>
+  <string name="behavior">Hành vi</string>
+  <string name="name">Tên</string>
+  <string name="settings">Cài đặt</string>
+  <string name="snooze_interval">Khoảng thời gian tạm dừng</string>
+  <string name="hint_title">Bạn đã biết?</string>
+  <string name="hint_drag">Để sắp xếp lại các mục, nhấn giữ tên thói quen, sau đó kéo tới vị trí chính xác.</string>
+  <string name="hint_landscape">Bạn có thể xem thêm ngày bằng cách đặt điện thoại ở chế độ ngang.</string>
+  <string name="delete_habits">Xoá bỏ thói quen</string>
+  <string name="delete_habits_message">Thói quen sẽ bị xoá vĩnh viễn. Hành động này không thể khôi phục.</string>
+  <string name="habit_not_found">Thói quen đã bị xoá hoặc không tìm thấy</string>
+  <string name="weekends">Cuối tuần</string>
+  <string name="any_weekday">Thứ 2 đến thứ 6</string>
+  <string name="any_day">Bất kỳ ngày nào trong tuần</string>
+  <string name="select_weekdays">Chọn ngày</string>
+  <string name="export_to_csv">Xuất dưới dạng CSV</string>
+  <string name="done_label">Xong</string>
+  <string name="clear_label">Dọn sạch</string>
+  <string name="select_hours">Chọn giờ</string>
+  <string name="select_minutes">Chọn phút</string>
+  <string name="about">Giới thiệu</string>
+  <string name="translators">Dịch giả</string>
+  <string name="developers">Nhà phát triển</string>
+  <string name="version_n">Phiên bản %s</string>
+  <string name="frequency">Tần suất</string>
+  <string name="checkmark">Đánh dấu</string>
+  <string name="strength">Độ mạnh</string>
+  <string name="best_streaks">Duy trì lâu nhất</string>
+  <string name="current_streaks">Số ngày duy trì hiện tại</string>
+  <string name="number_of_repetitions">Số lần lặp</string>
+  <string name="last_x_days">Đã thực hiện được %d ngày</string>
+  <string name="last_x_weeks">Đã thực hiện được %d tuần</string>
+  <string name="last_x_months">Đã thực hiện được %d tháng</string>
+  <string name="last_x_years">Đã thực hiện được %d năm</string>
+  <string name="all_time">Toàn bộ thời gian</string>
+  <string name="every_day">Hàng ngày</string>
+  <string name="every_week">Hàng tuần</string>
+  <string name="two_times_per_week">2 lần một tuần</string>
+  <string name="five_times_per_week">5 lần một tuần</string>
+  <string name="custom_frequency">Tuỳ chỉnh&#8230;</string>
+  <string name="help">Trợ giúp &amp; Câu hỏi</string>
+  <string name="could_not_export">Xuất dữ liệu thất bại.</string>
+  <string name="could_not_import">Nhập dữ liệu thất bại.</string>
+  <string name="file_not_recognized">Không xác nhận được file.</string>
+  <string name="habits_imported">Thói quen được nhập thành công.</string>
+  <string name="full_backup_success">Xuất bản sao lưu đầy đủ thành công.</string>
+  <string name="import_data">Nhập dữ liệu</string>
+  <string name="export_full_backup">Xuất toàn bộ sao lưu</string>
+  <string name="import_data_summary">Hồ trợ các bản sao lưu đầy đủ được xuất ra bởi ứng dụng, cũng như các file được tạo bởi Tickmate, HabitBull hoặc Rewire. Xem FAQ để biết thêm thông tin.</string>
+  <string name="export_as_csv_summary">Các file tạo ra có thể mở bằng các phần mềm bảng tĩnh như Microsoft Excel hoặc OpenOffice Calc. Nhưng file này không thể nhập lại.</string>
+  <string name="export_full_backup_summary">Tạo ra một tệp chứa tất cả dữ liệu của bạn. Tệp này có thể nhập lại.</string>
+  <string name="bug_report_failed">Tạo báo cáo về lỗi.</string>
+  <string name="generate_bug_report">Tạo báo cáo lỗi</string>
+  <string name="troubleshooting">Xử lí sự cố</string>
+  <string name="help_translate">Giúp dịch ứng dụng</string>
+  <string name="night_mode">Chế độ ban đêm</string>
+  <string name="use_pure_black">Sử dụng màu đen thuần trong chế độ ban đêm</string>
+  <string name="pure_black_description">Thay thế nền màu xám bởi màu đen thuần trong chế độ ban đêm. Giảm thiểu việc sử dụng pin của điện thoại có màn hình AMOLED.</string>
+  <string name="interface_preferences">Giao diện</string>
+  <string name="reverse_days">Đảo ngược thứ tự của ngày</string>
+  <string name="reverse_days_description">Hiển thị ngày ngược trên màn hình chính</string>
+  <string name="day">Ngày</string>
+  <string name="week">Tuần</string>
+  <string name="month">Tháng</string>
+  <string name="quarter">Quý</string>
+  <string name="year">Năm</string>
+  <string name="total">Tổng</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
+  <string name="time_every">lần trong</string>
+  <string name="every_x_days">Mỗi %d ngày</string>
+  <string name="every_x_weeks">Mỗi %d tuần</string>
+  <string name="every_x_months">Mỗi %d tháng</string>
+  <string name="score">Điểm</string>
+  <string name="reminder_sound">Âm báo</string>
+  <string name="none">Không có</string>
+  <string name="filter">Lọc</string>
+  <string name="hide_completed">Ẩn mục đã hoàn thành</string>
+  <string name="hide_archived">Ẩn mục đã lưu trữ</string>
+  <string name="sticky_notifications">Gửi thông báo cố định</string>
+  <string name="sticky_notifications_description">Không cho các thông báo bị vuốt ngang mất.</string>
+  <string name="repair_database">Sửa cơ sở dữ liệu</string>
+  <string name="database_repaired">Cơ sở dữ liệu đã được sửa.</string>
+  <string name="uncheck">Bỏ đánh dấu</string>
+  <string name="toggle">Bật/tắt</string>
+  <string name="action">Hành động</string>
+  <string name="habit">Thói quen</string>
+  <string name="sort">Sắp xếp</string>
+  <string name="manually">Thủ công</string>
+  <string name="by_name">Theo tên</string>
+  <string name="by_color">Theo màu sắc</string>
+  <string name="by_score">Theo điểm số</string>
+  <string name="download">Tải về</string>
+  <string name="export">Xuất dữ liệu ra</string>
 </resources>

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

@@ -19,63 +19,63 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="app_name">لوب  ملاحق العادة </string>
+  <string name="app_name">متعقب العادة لووب</string>
   <string name="main_activity_title">عادات</string>
   <string name="action_settings">إعدادات</string>
   <string name="edit">تعديل</string>
   <string name="delete">حذف</string>
-  <string name="archive">أرشيف</string>
+  <string name="archive">أرشفة</string>
   <string name="unarchive">إزالة من الأرشيف</string>
-  <string name="add_habit">إضافة العادة</string>
-  <string name="color_picker_default_title">غير اللون</string>
-  <string name="toast_habit_created">تم صنع عادة </string>
-  <string name="toast_habit_deleted">تم حذف عادة </string>
-  <string name="toast_habit_restored">تم  ترجيع عادة</string>
-  <string name="toast_nothing_to_undo">لا شيء للتراجع</string>
-  <string name="toast_nothing_to_redo">لا شيء لتكرار</string>
+  <string name="add_habit">إضافة عادة</string>
+  <string name="color_picker_default_title">تغيير اللون</string>
+  <string name="toast_habit_created">تم إنشاء عادة</string>
+  <string name="toast_habit_deleted">تم حذف العادات</string>
+  <string name="toast_habit_restored">تم إستعادة العادات</string>
+  <string name="toast_nothing_to_undo">لا شيء للألغاء</string>
+  <string name="toast_nothing_to_redo">لا شيء للإعادة</string>
   <string name="toast_habit_changed">تم تغيير عادة</string>
-  <string name="toast_habit_changed_back">تم ترجيع العادة إلى أصلها</string>
-  <string name="toast_habit_archived">تم أرشيف العادات</string>
-  <string name="toast_habit_unarchived">تم إزالة العادة من الأرشيف </string>
+  <string name="toast_habit_changed_back">تم أرجاع العادة إلى أصلها</string>
+  <string name="toast_habit_archived">تم أرشفه العادات</string>
+  <string name="toast_habit_unarchived">تم الغاء ارشفه العادات</string>
   <string name="overview">نظرة عامة</string>
   <string name="habit_strength">قوة العادة</string>
-  <string name="history">التاريخ</string>
-  <string name="clear">مسح</string>
+  <string name="history">السجل</string>
+  <string name="clear">إزالة</string>
   <string name="description_hint">السؤال (هل ... اليوم؟)</string>
-  <string name="repeat">كرر</string>
-  <string name="times_every">مرات في</string>
+  <string name="repeat">كرره</string>
+  <string name="times_every">مرات كل</string>
   <string name="days">أيام</string>
-  <string name="reminder">تذكير</string>
-  <string name="discard">حذف</string>
+  <string name="reminder">التذكرة</string>
+  <string name="discard">تجاهل</string>
   <string name="save">حفظ</string>
-  <string name="streaks">تقدم متتالية</string>
-  <string name="no_habits_found"> لا يوجد لديك عادات مفعله</string>
+  <string name="streaks">الانجازات</string>
+  <string name="no_habits_found">لا يوجد لديك عادات مفعلة</string>
   <string name="long_press_to_toggle">أضغط و إستمر لتحقق أو ازل</string>
-  <string name="reminder_off">أوقف</string>
+  <string name="reminder_off">إيقاف</string>
   <string name="validation_name_should_not_be_blank">لا يمكن أن يكون الإسم فارغ</string>
-  <string name="validation_number_should_be_positive">يجب أن يكون الرقم إيجابي</string>
-  <string name="validation_at_most_one_rep_per_day">يمكن أن يكون التكرار واحدة فقط كل يوم </string>
-  <string name="create_habit">اخلق عادة</string>
+  <string name="validation_number_should_be_positive">يجب أن يكون الرقم موجب.</string>
+  <string name="validation_at_most_one_rep_per_day">يجب أن يكون التكرار مرة واحدة فقط كل يوم</string>
+  <string name="create_habit">انشاء العادة</string>
   <string name="edit_habit">تعديل العادة</string>
   <string name="check">حقق</string>
-  <string name="snooze">لاحقا</string>
+  <string name="snooze">لاحقاً</string>
   <!-- App introduction -->
   <string name="intro_title_1">أهلا بك</string>
-  <string name="intro_description_1">لوب يساعدك على خلق والحفاظ على العادات الجيدة.</string>
-  <string name="intro_title_2">إنشاء بعض عادات جديدة</string>
-  <string name="intro_description_2">كل يوم، بعد أداء عادتك، وضع علامة على التطبيق.</string>
+  <string name="intro_description_1">لوب يساعدك في بدأ عادات جيدة والحفاظ عليها.</string>
+  <string name="intro_title_2">إنشاء عادات جديدة</string>
+  <string name="intro_description_2">كل يوم، بعد أداء عادتك، ضع علامة عليها في التطبيق.</string>
   <string name="intro_title_3">حافظ على القيام بذلك</string>
-  <string name="intro_description_3">العادة المستمرة لفترات طويلة تكسب نجمة كامله</string>
-  <string name="intro_title_4">تتبع تقدمك</string>
-  <string name="intro_description_4">رسوم بيانية مفصلة تبين لكم كيف تحسن عاداتك مع مرور الوقت.</string>
+  <string name="intro_description_3">العادة المستمرة لفترة طويلة تكسب نجمة كامله.</string>
+  <string name="intro_title_4">تتبع اداءك</string>
+  <string name="intro_description_4">رسوم بيانية مفصلة تُريك كيف تحسنت عاداتك مع مرور الوقت.</string>
   <string name="interval_15_minutes">15 دقيقة</string>
   <string name="interval_30_minutes">30 دقيقة</string>
   <string name="interval_1_hour">ساعة واحدة</string>
-  <string name="interval_2_hour">ساعتين</string>
-  <string name="interval_4_hour">أربع ساعات</string>
-  <string name="interval_8_hour">ثماني ساعات</string>
-  <string name="interval_24_hour">24 ساعة</string>
-  <string name="pref_toggle_title">تبديل بكبسه</string>
+  <string name="interval_2_hour">ساعتان</string>
+  <string name="interval_4_hour">٤ ساعات</string>
+  <string name="interval_8_hour">8 ساعات</string>
+  <string name="interval_24_hour">٢٤ ساعة</string>
+  <string name="pref_toggle_title">تبديل وضعية العادة بضغطة قصيرة</string>
   <string name="pref_toggle_description">أكثر سهولة، لكنه ممكن يسبب كبسات غير مقصوده</string>
   <string name="pref_snooze_interval_title">فترتي الغفوى على التذكير</string>
   <string name="pref_rate_this_app">تقييم هذا التطبيق على جوجل بلاي</string>
@@ -92,6 +92,7 @@
   <string name="hint_landscape">يمكنك ان ترى المزيد أيام عن طريق وضع الهاتف في وضع أفقي.</string>
   <string name="delete_habits">حذف عادات</string>
   <string name="delete_habits_message">سيتم حذف عادات بشكل دائم. هذا العمل لا يمكن التراجع عنه.</string>
+  <string name="habit_not_found">العادة حذفت/لم يتم العثور عليها</string>
   <string name="weekends">عطلة نهاية الأسبوع</string>
   <string name="any_weekday">أيام الأسبوع</string>
   <string name="any_day">أي يوم</string>
@@ -156,7 +157,22 @@
   <string name="score">النقاط</string>
   <string name="reminder_sound">صوت تذكير</string>
   <string name="none">صامت</string>
+  <string name="filter">تصنيف</string>
+  <string name="hide_completed">إخفاء المكتملة</string>
+  <string name="hide_archived">إخفاء المؤرشفة</string>
+  <string name="sticky_notifications">جعل الإشعارات ثابتة</string>
+  <string name="sticky_notifications_description">منع الإشعارات من تمريرها بعيداً.</string>
+  <string name="repair_database">إصلاح قاعدة البيانات</string>
+  <string name="database_repaired">تم إصلاح قاعدة البيانات.</string>
+  <string name="uncheck">إلغاء تحديد</string>
+  <string name="toggle">تبديل</string>
   <string name="action">عمل</string>
+  <string name="habit">عادة</string>
+  <string name="sort">فرز</string>
+  <string name="manually">يدوياً</string>
+  <string name="by_name">حسب الإسم</string>
+  <string name="by_color">حسب اللون</string>
+  <string name="by_score">حسب النقاط</string>
   <string name="download">تحميل</string>
   <string name="export">استخراج</string>
 </resources>

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

@@ -61,7 +61,7 @@
   <string name="snooze">Später</string>
   <!-- App introduction -->
   <string name="intro_title_1">Willkommen</string>
-  <string name="intro_description_1">Loop Habit Tracker hilft dir gute Gewohnheiten anzueignen.</string>
+  <string name="intro_description_1">Loop Habit Tracker hilft dir dabei, gute Gewohnheiten anzunehmen.</string>
   <string name="intro_title_2">Erstelle neue Gewohnheiten</string>
   <string name="intro_description_2">Hake die Gewohnheit jeden Tag in der App ab, nachdem du sie erledigt hast.</string>
   <string name="intro_title_3">Bleib dran</string>
@@ -75,7 +75,7 @@
   <string name="interval_4_hour">4 Stunden</string>
   <string name="interval_8_hour">8 Stunden</string>
   <string name="interval_24_hour">24 Stunden</string>
-  <string name="pref_toggle_title">Markierung durch kurzes Tippen ändern</string>
+  <string name="pref_toggle_title">Markierung durch kurzes Drücken ändern</string>
   <string name="pref_toggle_description">Markierungen durch einfaches Tippen setzen anstatt durch Tippen und Halten. Bequemer, kann aber versehentlich eine Markierung ändern.</string>
   <string name="pref_snooze_interval_title">\"Später erinnern\"-Intervall bei Erinnerungen</string>
   <string name="pref_rate_this_app">Bewerte diese App auf Google Play</string>
@@ -94,7 +94,7 @@
   <string name="delete_habits_message">Die Gewohnheit wird für immer gelöscht. Dies kann nicht rückgängig gemacht werden.</string>
   <string name="habit_not_found">Gewohnheit gelöscht / nicht gefunden</string>
   <string name="weekends">An Wochenenden</string>
-  <string name="any_weekday">Werktags</string>
+  <string name="any_weekday">Montag bis Freitag</string>
   <string name="any_day">Jeden Tag</string>
   <string name="select_weekdays">Wähle Tage aus</string>
   <string name="export_to_csv">Exportiere als CSV</string>

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

@@ -39,14 +39,14 @@
   <string name="toast_habit_unarchived">Vaner uarkivert</string>
   <string name="overview">Oversikt</string>
   <string name="habit_strength">Vanestyrke</string>
-  <string name="history">Historie</string>
+  <string name="history">Logg</string>
   <string name="clear">Fjern</string>
   <string name="description_hint">Spørsmål (Gjorde du &#8230; i dag?)</string>
   <string name="repeat">Gjenta</string>
   <string name="times_every">ganger på</string>
   <string name="days">dager</string>
   <string name="reminder">Påminnelse</string>
-  <string name="discard">Kast</string>
+  <string name="discard">Forkast</string>
   <string name="save">Lagr</string>
   <string name="streaks">Gjentakelser</string>
   <string name="no_habits_found">Du har ingen aktive vaner</string>
@@ -77,7 +77,7 @@
   <string name="interval_24_hour">1 døgn</string>
   <string name="pref_toggle_title">Veksl med enkelttrykk</string>
   <string name="pref_toggle_description">Sett på haker med et enkelttrykk i stedet for å tykke og holde. Mer praktisk, men kan forårsake utilsiktede vekslinger.</string>
-  <string name="pref_snooze_interval_title">Snooze-intervall på påminnelser</string>
+  <string name="pref_snooze_interval_title">Slumreintervall på påminnelser</string>
   <string name="pref_rate_this_app">Vurdér denne appen på Google Play</string>
   <string name="pref_send_feedback">Send tilbakemelding til utviklerne</string>
   <string name="pref_view_source_code">Vis kildekode på GitHub</string>
@@ -86,7 +86,7 @@
   <string name="behavior">Oppførsel</string>
   <string name="name">Navn</string>
   <string name="settings">Innstillinger</string>
-  <string name="snooze_interval">Snooze-intervall</string>
+  <string name="snooze_interval">Slumreintervall</string>
   <string name="hint_title">Visste du at?</string>
   <string name="hint_drag">For å sortere innleggene, trykk og hold på navnet til vanen, deretter dra den til det korrekte stedet.</string>
   <string name="hint_landscape">Du kan se flere dager ved å sette telefonen din i landskapsmodus.</string>

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

@@ -28,20 +28,20 @@
   <string name="unarchive">Desarchivar</string>
   <string name="add_habit">Agregar hábito</string>
   <string name="color_picker_default_title">Cambiar color</string>
-  <string name="toast_habit_created">Hábito creado.</string>
-  <string name="toast_habit_deleted">Hábitos eliminados.</string>
-  <string name="toast_habit_restored">Hábitos restaurados.</string>
-  <string name="toast_nothing_to_undo">Nada que deshacer.</string>
-  <string name="toast_nothing_to_redo">Nada que rehacer.</string>
-  <string name="toast_habit_changed">Hábito cambiado.</string>
-  <string name="toast_habit_changed_back">Hábito cambiado nuevamente.</string>
-  <string name="toast_habit_archived">Hábitos archivados.</string>
-  <string name="toast_habit_unarchived">Hábitos desarchivados.</string>
+  <string name="toast_habit_created">Hábito creado</string>
+  <string name="toast_habit_deleted">Hábitos eliminados</string>
+  <string name="toast_habit_restored">Hábitos restaurados</string>
+  <string name="toast_nothing_to_undo">Nada que deshacer</string>
+  <string name="toast_nothing_to_redo">Nada que rehacer</string>
+  <string name="toast_habit_changed">Hábito cambiado</string>
+  <string name="toast_habit_changed_back">Cambio en hábito vuelto atrás</string>
+  <string name="toast_habit_archived">Hábitos archivados</string>
+  <string name="toast_habit_unarchived">Hábitos desarchivados</string>
   <string name="overview">Resumen</string>
   <string name="habit_strength">Fuerza del hábito</string>
   <string name="history">Historial</string>
-  <string name="clear">Eliminar</string>
-  <string name="description_hint">Pregunta (Has ___ hoy?)</string>
+  <string name="clear">Borrar</string>
+  <string name="description_hint">Pregunta (Has ... hoy?)</string>
   <string name="repeat">Repetir</string>
   <string name="times_every">veces cada</string>
   <string name="days">días</string>
@@ -64,7 +64,7 @@
   <string name="intro_description_1">Loop Analizador de Hábitos te ayuda a crear y mantener buenos hábitos.</string>
   <string name="intro_title_2">Crea algunos hábitos nuevos</string>
   <string name="intro_description_2">Cada día, después de realizar tu hábito, pon una marca en la aplicación.</string>
-  <string name="intro_title_3">Sigue haciéndolo.</string>
+  <string name="intro_title_3">Sigue haciéndolo</string>
   <string name="intro_description_3">Los hábitos realizados consistentemente por un largo tiempo ganarán una estrella completa.</string>
   <string name="intro_title_4">Haz un seguimiento de tu progreso</string>
   <string name="intro_description_4">Gráficos detallados muestran cómo mejoraron sus hábitos con el tiempo.</string>
@@ -75,9 +75,9 @@
   <string name="interval_4_hour">4 horas</string>
   <string name="interval_8_hour">8 horas</string>
   <string name="interval_24_hour">24 horas</string>
-  <string name="pref_toggle_title">Marca las repeticiones con una pulsación corta.</string>
+  <string name="pref_toggle_title">Marca las repeticiones con una pulsación corta</string>
   <string name="pref_toggle_description">Más cómodo, pero puede causar marcas accidentales.</string>
-  <string name="pref_snooze_interval_title">Tiempo de espera al aplazar recordatorios.</string>
+  <string name="pref_snooze_interval_title">Tiempo de espera al aplazar recordatorios</string>
   <string name="pref_rate_this_app">Valora esta aplicación en Google Play</string>
   <string name="pref_send_feedback">Enviar sugerencias al desarrollador</string>
   <string name="pref_view_source_code">Ver código fuente en GitHub</string>
@@ -88,20 +88,20 @@
   <string name="settings">Configuración</string>
   <string name="snooze_interval">Intervalo de espera</string>
   <string name="hint_title">¿Sabías qué?</string>
-  <string name="hint_drag">Para reordenar las entradas, mantén la pulsación sobre el nombre del hábito, después arrástralo a su posición correcta.</string>
+  <string name="hint_drag">Para reordenar las entradas, mantén la pulsado sobre el nombre del hábito, después arrástralo a su posición correcta.</string>
   <string name="hint_landscape">Puedes ver más días al poner tu teléfono en modo horizontal.</string>
   <string name="delete_habits">Eliminar Hábitos</string>
   <string name="delete_habits_message">Los hábitos serán eliminados permanentemente. Esta acción no se puede deshacer.</string>
   <string name="habit_not_found">Hábito eliminado / no encontrado</string>
   <string name="weekends">Fines de semana</string>
-  <string name="any_weekday">Días laborables</string>
+  <string name="any_weekday">De lunes a viernes</string>
   <string name="any_day">Cada día</string>
   <string name="select_weekdays">Seleccionar días</string>
   <string name="export_to_csv">Exportar datos (CSV)</string>
   <string name="done_label">Hecho</string>
   <string name="clear_label">Quitar</string>
   <string name="select_hours">Seleccionar horas</string>
-  <string name="select_minutes">Seleccionar</string>
+  <string name="select_minutes">Seleccionar minutos</string>
   <string name="about">Acerca de</string>
   <string name="translators">Traductores</string>
   <string name="developers">Desarrolladores</string>

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

@@ -19,24 +19,24 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="app_name">Ohitura Tracker Loop</string>
+  <string name="app_name">Loop Habit Tracker</string>
   <string name="main_activity_title">Ohiturak</string>
   <string name="action_settings">Ezarpenak</string>
   <string name="edit">Editatu</string>
   <string name="delete">Ezabatu</string>
   <string name="archive">Artxibatu</string>
-  <string name="unarchive">Ezartxibatu</string>
-  <string name="add_habit">Ohitura gehitu</string>
+  <string name="unarchive">Desartxibatu</string>
+  <string name="add_habit">Gehitu ohitura</string>
   <string name="color_picker_default_title">Kolorea aldatu</string>
-  <string name="toast_habit_created">Ohitura sortu da.</string>
-  <string name="toast_habit_deleted">Ohiturak ezabatu dira.</string>
-  <string name="toast_habit_restored">Ohiturak berrezarri dira.</string>
-  <string name="toast_nothing_to_undo">Ez dago desegiteko ezer.</string>
-  <string name="toast_nothing_to_redo">Ez dago berregiteko ezer.</string>
-  <string name="toast_habit_changed">Ohitura aldatu da.</string>
-  <string name="toast_habit_changed_back">Ohitura lehengoratu da.</string>
-  <string name="toast_habit_archived">Ohiturak artxibatu dira.</string>
-  <string name="toast_habit_unarchived">Ohiturak ezartxibatu dira.</string>
+  <string name="toast_habit_created">Ohitura sortu da</string>
+  <string name="toast_habit_deleted">Ohiturak ezabatu dira</string>
+  <string name="toast_habit_restored">Ohiturak berrezarri dira</string>
+  <string name="toast_nothing_to_undo">Ez dago ezer desegiteko</string>
+  <string name="toast_nothing_to_redo">Ez dago ezer berregiteko</string>
+  <string name="toast_habit_changed">Ohitura aldatu egin da</string>
+  <string name="toast_habit_changed_back">Ohitura berrezarri da</string>
+  <string name="toast_habit_archived">Ohiturak artxibatu dira</string>
+  <string name="toast_habit_unarchived">Ohiturak desartxibatu dira</string>
   <string name="overview">Ikuspegi orokorra</string>
   <string name="habit_strength">Ohituraren indarra</string>
   <string name="history">Historia</string>
@@ -58,10 +58,10 @@
   <string name="create_habit">Ohitura sortu</string>
   <string name="edit_habit">Ohitura editatu</string>
   <string name="check">Markatu</string>
-  <string name="snooze">Beranduago</string>
+  <string name="snooze">Geroago</string>
   <!-- App introduction -->
   <string name="intro_title_1">Ongi etorri</string>
-  <string name="intro_description_1">Loop Habit Trackerek ohitura onak hartzen eta mantentzen laguntzen dizu.</string>
+  <string name="intro_description_1">Loop Habit Tracker-ek ohitura onak hartzen eta mantentzen laguntzen dizu.</string>
   <string name="intro_title_2">Sor itzazu ohitura berri batzuk</string>
   <string name="intro_description_2">Egunero, zure ohitura egin ostean, jarri ezazu egiaztatze marka bat aplikazioan.</string>
   <string name="intro_title_3">Jarrai ezazu ohitura egiten</string>
@@ -77,7 +77,7 @@
   <string name="interval_24_hour">24 ordu</string>
   <string name="pref_toggle_title">Ukitze laburrarekin markatu</string>
   <string name="pref_toggle_description">Ukitze bakar batekin marka jartzen du ukitu eta mantendu egin beharrean. Erosoagoa, baina nahi gabeko markak ekar litzake.</string>
-  <string name="pref_snooze_interval_title">Atzeratze tartea gogorarazpenetan</string>
+  <string name="pref_snooze_interval_title">Atzeratze tartea oroigarrietan</string>
   <string name="pref_rate_this_app">Aplikazio hau Google Playen puntuatu</string>
   <string name="pref_send_feedback">Zure iritzia garatzaileari bidali</string>
   <string name="pref_view_source_code">Iturburu kodea GitHuben ikusi</string>
@@ -158,7 +158,7 @@
   <string name="reminder_sound">Oroigarriaren soinua</string>
   <string name="none">Bat ere ez</string>
   <string name="filter">Iragazkia</string>
-  <string name="hide_completed">Lortutakoak ezkutatu</string>
+  <string name="hide_completed">Ezkutatu lortutakoak</string>
   <string name="hide_archived">Artxibatutakoak ezkutatu</string>
   <string name="sticky_notifications">Jakinarazpenak itsaskorrak bihurtu</string>
   <string name="sticky_notifications_description">Jakinarazpenak keinu batez ezabatzea sahiesten du.</string>

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

@@ -19,24 +19,24 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="app_name">عادت‌سنج لوپ</string>
+  <string name="app_name">Loop Habit Tracker</string>
   <string name="main_activity_title">عادت‌ها</string>
   <string name="action_settings">تنظیمات</string>
   <string name="edit">ویرایش</string>
-  <string name="delete">حذف کن</string>
+  <string name="delete">حذف</string>
   <string name="archive">بایگانی کن</string>
   <string name="unarchive">خارج کردن از بایگانی</string>
   <string name="add_habit">افزودن عادت</string>
   <string name="color_picker_default_title">تغییر رنگ</string>
-  <string name="toast_habit_created">عادت ساخته شد.</string>
-  <string name="toast_habit_deleted">عادت حذف شد.</string>
-  <string name="toast_habit_restored">عادت بازگردانده شد.</string>
+  <string name="toast_habit_created">عادت ایجاد شد</string>
+  <string name="toast_habit_deleted">عادت حذف شد</string>
+  <string name="toast_habit_restored">عادت بازگردانده شد</string>
   <string name="toast_nothing_to_undo">چیزی برای بازگرداندن به حالت قبلی وجود ندارد</string>
   <string name="toast_nothing_to_redo">چیزی برای انجام مجدد وجود ندارد</string>
   <string name="toast_habit_changed">عادت تغییر کرد.</string>
   <string name="toast_habit_changed_back">عادت به حالت قبل برگشت</string>
-  <string name="toast_habit_archived">عادات بایگانی شدند</string>
-  <string name="toast_habit_unarchived">عادت از بایگانی خارج شدند</string>
+  <string name="toast_habit_archived">عادت‌ها بایگانی شدند</string>
+  <string name="toast_habit_unarchived">عادت‌ها از بایگانی خارج شدند</string>
   <string name="overview">مرور</string>
   <string name="habit_strength">قدرت عادت</string>
   <string name="history">تاریخچه</string>

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

@@ -19,6 +19,65 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+  <string name="app_name">Rutiini - Tracker</string>
+  <string name="main_activity_title">Rutiinit</string>
+  <string name="action_settings">Asetukset</string>
+  <string name="edit">Muokkaa</string>
+  <string name="delete">Poista</string>
+  <string name="archive">Arkistoi</string>
+  <string name="add_habit">Lisää rutiini</string>
+  <string name="color_picker_default_title">Vaihda väriä</string>
+  <string name="toast_habit_created">Rutiini luotu</string>
+  <string name="toast_habit_deleted">Rutiinit poistettu</string>
+  <string name="toast_habit_restored">Rutiinit palautettu</string>
+  <string name="toast_habit_changed">Rutiini muutettu</string>
+  <string name="toast_habit_changed_back">Rutiini muutettu takaisin</string>
+  <string name="overview">Yleiskatsaus</string>
+  <string name="history">Historia</string>
+  <string name="clear">Tyhjennä</string>
+  <string name="description_hint">Kysymys (Teitkö... tänään?)</string>
+  <string name="repeat">Toista</string>
+  <string name="times_every">kertaa</string>
+  <string name="days">päivässä</string>
+  <string name="reminder">Muistutus</string>
+  <string name="discard">Hylkää</string>
+  <string name="save">Tallenna</string>
+  <string name="streaks">Pisimmät toistot</string>
+  <string name="no_habits_found">Ei aktiivisia rutiineja</string>
+  <string name="long_press_to_toggle">Paina pitkään merkitäksesi suoritetuksi tai postaaksesi suorituksen</string>
+  <string name="reminder_off">Pois päältä</string>
+  <string name="validation_name_should_not_be_blank">Nimi ei voi olla tyhjä.</string>
+  <string name="validation_number_should_be_positive">Luvun on oltava positiivinen.</string>
+  <string name="create_habit">Luo rutiini</string>
+  <string name="edit_habit">Muokkaa rutiinia</string>
+  <string name="check">Tehty</string>
+  <string name="snooze">Lykkää</string>
   <!-- App introduction -->
+  <string name="intro_title_1">Tervetuloa</string>
+  <string name="intro_title_2">Merkitse uusia rutiineja</string>
+  <string name="intro_description_2">Joka päivä, suoritettuasi rutiinin, merkitse se sovellukseen.</string>
+  <string name="links">Linkit</string>
+  <string name="behavior">Käyttäytyminen</string>
+  <string name="name">Nimi</string>
+  <string name="settings">Asetukset</string>
+  <string name="hint_title">Tiesitkö?</string>
+  <string name="done_label">Valmis</string>
+  <string name="clear_label">Tyhjennä</string>
+  <string name="translators">Kääntäjät</string>
+  <string name="developers">Kehittäjät</string>
+  <string name="version_n">Versio %s</string>
+  <string name="every_day">Joka päivä</string>
+  <string name="every_week">Joka viikko</string>
+  <string name="two_times_per_week">2 kertaa viikossa</string>
+  <string name="five_times_per_week">5 kertaa viikossa</string>
+  <string name="custom_frequency">Mukautettu&#8230;</string>
+  <string name="night_mode">Yötila</string>
+  <string name="use_pure_black">Käytä puhdasta mustaa yötilassa</string>
+  <string name="day">Päivä</string>
+  <string name="week">Viikko</string>
+  <string name="month">Kuukausi</string>
+  <string name="quarter">Kvartaali</string>
+  <string name="year">Vuosi</string>
+  <string name="total">Yhteensä</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
 </resources>

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

@@ -29,8 +29,8 @@
   <string name="add_habit">Ajouter une habitude</string>
   <string name="color_picker_default_title">Changer la couleur</string>
   <string name="toast_habit_created">Habitude créée</string>
-  <string name="toast_habit_deleted">Habitude supprimée</string>
-  <string name="toast_habit_restored">Habitude rétablie</string>
+  <string name="toast_habit_deleted">Habitudes supprimées</string>
+  <string name="toast_habit_restored">Habitudes rétablies</string>
   <string name="toast_nothing_to_undo">Rien à annuler</string>
   <string name="toast_nothing_to_redo">Rien à refaire</string>
   <string name="toast_habit_changed">Habitude changée</string>
@@ -75,8 +75,8 @@
   <string name="interval_4_hour">4 heures</string>
   <string name="interval_8_hour">8 heures</string>
   <string name="interval_24_hour">24 heures</string>
-  <string name="pref_toggle_title">Activer les répétitions avec un appui court</string>
-  <string name="pref_toggle_description">Pointe l\'habitude avec un appui court plutôt qu\'un appuie long. Plus pratique, mais peut causer des activations accidentelles.</string>
+  <string name="pref_toggle_title">Valider l\'habitude avec un appui court</string>
+  <string name="pref_toggle_description">Valide l\'habitude avec un appui court plutôt qu\'un appuie long. Plus pratique, mais peut causer des activations accidentelles.</string>
   <string name="pref_snooze_interval_title">Intervalle de report des rappels</string>
   <string name="pref_rate_this_app">Notez cette app sur le Google Play Store</string>
   <string name="pref_send_feedback">Envoyez un avis au développeur</string>
@@ -91,10 +91,10 @@
   <string name="hint_drag">Pour réordonner les habitudes, faites un appui long sur le nom de l\'habitude et placez-la à la bonne place.</string>
   <string name="hint_landscape">Vous pouvez voir plus de jours en mettant votre téléphone en mode paysage.</string>
   <string name="delete_habits">Supprimer des habitudes</string>
-  <string name="delete_habits_message">Les habitudes seront supprimées définitivement. Cette action ne peut être annulée.</string>
+  <string name="delete_habits_message">Les habitudes seront supprimées définitivement. Cette action est irréversible.</string>
   <string name="habit_not_found">Habitude supprimée / introuvable</string>
-  <string name="weekends">Fin de semaine</string>
-  <string name="any_weekday">Jours de la semaine</string>
+  <string name="weekends">Weekends</string>
+  <string name="any_weekday">Du lundi au vendredi</string>
   <string name="any_day">N\'importe quel jour</string>
   <string name="select_weekdays">Sélectionner des jours</string>
   <string name="export_to_csv">Exporter les données dans un fichier CSV</string>
@@ -107,7 +107,7 @@
   <string name="developers">Développeurs</string>
   <string name="version_n">Version %s</string>
   <string name="frequency">Fréquence</string>
-  <string name="checkmark">Croix</string>
+  <string name="checkmark">Case à cocher</string>
   <string name="strength">Force</string>
   <string name="best_streaks">Meilleures séries</string>
   <string name="current_streaks">Série actuelle</string>
@@ -131,7 +131,7 @@
   <string name="import_data">Importer des données</string>
   <string name="export_full_backup">Exporter une sauvegarde complète</string>
   <string name="import_data_summary">Supporte les sauvegardes complètes générées par cette application, ainsi que les fichiers Tickmate, HabitBull et Rewire. Voir la FAQ pour plus d\'informations.</string>
-  <string name="export_as_csv_summary">Génère des fichiers pouvant être ouverts par des tableurs comme Microsoft Excel ou LibreOffice Calc. Ces fichiers ne peuvent être réimportés.</string>
+  <string name="export_as_csv_summary">Génère des fichiers pouvant être ouverts par des tableurs comme Microsoft Excel ou LibreOffice Calc. Ce fichier ne peut pas être réimporté.</string>
   <string name="export_full_backup_summary">Génère un fichier contenant toutes vos données. Ce fichier peut être réimporté.</string>
   <string name="bug_report_failed">La génération du rapport de bug a échouée.</string>
   <string name="generate_bug_report">Générer un rapport de bug.</string>
@@ -154,7 +154,7 @@
   <string name="every_x_days">Tous les %d jours</string>
   <string name="every_x_weeks">Toutes les %d semaines</string>
   <string name="every_x_months">Tous les %d mois</string>
-  <string name="score">Pointage</string>
+  <string name="score">Score</string>
   <string name="reminder_sound">Son de rappel</string>
   <string name="none">Aucun</string>
   <string name="filter">Filtre</string>
@@ -162,7 +162,7 @@
   <string name="hide_archived">Cacher les habitudes archivées</string>
   <string name="sticky_notifications">Rendre les notifications persistantes</string>
   <string name="sticky_notifications_description">Évite que les notifications ne soient enlevées.</string>
-  <string name="repair_database">Réparer le base de données</string>
+  <string name="repair_database">Réparer la base de données</string>
   <string name="database_repaired">Base de données réparée.</string>
   <string name="uncheck">Décocher</string>
   <string name="toggle">Basculer</string>

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

@@ -37,7 +37,7 @@
   <string name="toast_habit_changed_back">Kebiasaan telah dikembalikan.</string>
   <string name="toast_habit_archived">Kebiasaan diarsipkan.</string>
   <string name="toast_habit_unarchived">Kebiasaan dikeluarkan dari arsip.</string>
-    <string name="overview">Keseluruhan</string>
+  <string name="overview">Ikhtisar</string>
   <string name="habit_strength">Kekuatan Kebiasaan</string>
   <string name="history">Riwayat</string>
   <string name="clear">Bersihkan</string>
@@ -50,7 +50,7 @@
   <string name="save">Simpan</string>
   <string name="streaks">Rentetan</string>
   <string name="no_habits_found">Anda tidak memiliki Kebiasaan yang aktif</string>
-    <string name="long_press_to_toggle">Tekan dan tahan untuk menambah atau menghapus tanda cek</string>
+  <string name="long_press_to_toggle">Tekan dan tahan untuk menambah atau menghapus centang</string>
   <string name="reminder_off">Mati</string>
   <string name="validation_name_should_not_be_blank">Nama tidak boleh kosong.</string>
   <string name="validation_number_should_be_positive">Angka harus positif.</string>
@@ -66,8 +66,8 @@
   <string name="intro_description_2">Berikan tanda cek setiap kali Anda selesai melakukannya.</string>
   <string name="intro_title_3">Terus lakukan</string>
   <string name="intro_description_3">Kebiasaan yang dilakukan secara konsisten dalam jangka waktu panjang akan mendapatkan tanda bintang penuh.</string>
-    <string name="intro_title_4">Catat perkembangan Anda</string>
-    <string name="intro_description_4">Detail grafik menampilkan perkembangan Kebiasaanmu dari waktu ke waktu.</string>
+  <string name="intro_title_4">Lacak perkembangan Anda</string>
+  <string name="intro_description_4">Grafik terperinci menampilkan perkembangan Kebiasaanmu dari waktu ke waktu.</string>
   <string name="interval_15_minutes">15 menit</string>
   <string name="interval_30_minutes">30 menit</string>
   <string name="interval_1_hour">1 jam</string>
@@ -76,12 +76,12 @@
   <string name="interval_8_hour">8 jam</string>
   <string name="interval_24_hour">24 jam</string>
   <string name="pref_toggle_title">Tandai dengan cepat.</string>
-    <string name="pref_toggle_description">Lebih nyaman namun memungkinkan kesalahan.</string>
+  <string name="pref_toggle_description">Beri tanda cek dengan sekali ketuk bukan tekan-dan-tahan. Lebih nyaman namun memungkinkan kesalahan.</string>
   <string name="pref_snooze_interval_title">Durasi tunda sejenak pada pengingat</string>
   <string name="pref_rate_this_app">Berikan rating aplikasi ini di Google Play</string>
   <string name="pref_send_feedback">Kirimkan umpan balik kepada Developer</string>
   <string name="pref_view_source_code">Lihat kode aplikasi di GitHub</string>
-    <string name="pref_view_app_introduction">Perkenalan aplikasi</string>
+  <string name="pref_view_app_introduction">Tampilkan perkenalan aplikasi</string>
   <string name="links">Tautan</string>
   <string name="behavior">Kebiasaan</string>
   <string name="name">Nama</string>
@@ -127,15 +127,15 @@
   <string name="could_not_import">Gagal mengimpor data.</string>
   <string name="file_not_recognized">File tidak dikenali.</string>
   <string name="habits_imported">Impor data berhasil.</string>
-    <string name="full_backup_success">Ekspor data berhasil.</string>
+  <string name="full_backup_success">Seluruh data berhasil di-ekpor.</string>
   <string name="import_data">Impor data</string>
-    <string name="export_full_backup">Ekspor data</string>
-    <string name="import_data_summary">Mendukung ekspor data dan file dari aplikasi Tickmate, HabitBull atau Rewire. Lihat FAQ untuk informasi lebih lanjut.</string>
-    <string name="export_as_csv_summary">Menghasilkan lembar kerja yang dapat dibuka menggunakan aplikasi seperti Microsoft Excel atau OpenOffice Calc. File ini tidak dapat di-impor kembali.</string>
-    <string name="export_full_backup_summary">Menghasilkan file yang berisikan seluruh data. File ini dapat di-impor kembali.</string>
+  <string name="export_full_backup">Ekspor keseluruhan data</string>
+  <string name="import_data_summary">Mendukung ekspor data dan berkas dari aplikasi Tickmate, HabitBull atau Rewire. Lihat FAQ untuk informasi lebih lanjut.</string>
+  <string name="export_as_csv_summary">Menghasilkan lembar kerja yang dapat dibuka menggunakan aplikasi seperti Microsoft Excel atau OpenOffice Calc. Berkas ini tidak dapat di-impor kembali.</string>
+  <string name="export_full_backup_summary">Menghasilkan berkas yang berisikan seluruh data. Berkas ini dapat di-impor kembali.</string>
   <string name="bug_report_failed">Gagal membuat laporan masalah.</string>
   <string name="generate_bug_report">Membuat laporan masalah</string>
-    <string name="troubleshooting">Troubleshoot</string>
+  <string name="troubleshooting">Penyelesaian masalah</string>
   <string name="help_translate">Bantu menerjemahkan aplikasi ini</string>
   <string name="night_mode">Mode malam</string>
   <string name="use_pure_black">Gunakan warna hitam pada mode malam</string>

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

@@ -26,17 +26,17 @@
   <string name="delete">Elimina</string>
   <string name="archive">Archivia</string>
   <string name="unarchive">Ripristina</string>
-  <string name="add_habit">Aggiungi</string>
+  <string name="add_habit">Aggiungi abitudine</string>
   <string name="color_picker_default_title">Cambia colore</string>
-  <string name="toast_habit_created">Abitudine creata.</string>
-  <string name="toast_habit_deleted">Abitudine rimossa.</string>
-  <string name="toast_habit_restored">Abitudine ripristinata.</string>
-  <string name="toast_nothing_to_undo">Niente da annullare.</string>
-  <string name="toast_nothing_to_redo">Niente da ripetere.</string>
-  <string name="toast_habit_changed">Abitudine modificata.</string>
-  <string name="toast_habit_changed_back">Abitudine ripristinata.</string>
-  <string name="toast_habit_archived">Abitudine archiviata.</string>
-  <string name="toast_habit_unarchived">Abitudine ripristinata.</string>
+  <string name="toast_habit_created">Abitudine creata</string>
+  <string name="toast_habit_deleted">Abitudine rimossa</string>
+  <string name="toast_habit_restored">Abitudine ripristinata</string>
+  <string name="toast_nothing_to_undo">Niente da annullare</string>
+  <string name="toast_nothing_to_redo">Niente da ripetere</string>
+  <string name="toast_habit_changed">Abitudine modificata</string>
+  <string name="toast_habit_changed_back">Abitudine ripristinata</string>
+  <string name="toast_habit_archived">Abitudine archiviata</string>
+  <string name="toast_habit_unarchived">Abitudine ripristinata</string>
   <string name="overview">Panoramica</string>
   <string name="habit_strength">Forza dell\'abitudine</string>
   <string name="history">Cronologia</string>
@@ -65,7 +65,7 @@
   <string name="intro_title_2">Aggiungi qualche nuova abitudine</string>
   <string name="intro_description_2">Ogni giorno, dopo aver portato a termine la tua abitudine, spuntala nell\'app.</string>
   <string name="intro_title_3">Continua così</string>
-  <string name="intro_description_3">Abitudini portate a termine con regolarità per un lungo periodo ti faranno guadagnare una stella intera.</string>
+  <string name="intro_description_3">Le abitudini portate a termine regoalrmente per un lungo periodo riceveranno una stella piena.</string>
   <string name="intro_title_4">Segui i tuoi progressi</string>
   <string name="intro_description_4">Grafici dettagliati ti mostrano come le tue abitudini sono migliorate nel corso del tempo.</string>
   <string name="interval_15_minutes">15 minuti</string>
@@ -76,7 +76,7 @@
   <string name="interval_8_hour">8 ore</string>
   <string name="interval_24_hour">24 ore</string>
   <string name="pref_toggle_title">Spunta le ripetizioni velocemente</string>
-  <string name="pref_toggle_description">Più comodo, ma potrebbe causare delle spunte accidentali.</string>
+  <string name="pref_toggle_description">Metti le spunte con un tocco singolo invece che tenendo premuto. Più comodo, ma potrebbe causare delle spunte accidentali.</string>
   <string name="pref_snooze_interval_title">Intervallo di ritardo dei promemoria</string>
   <string name="pref_rate_this_app">Valuta quest\'app su Google Play</string>
   <string name="pref_send_feedback">Manda un feedback allo sviluppatore</string>
@@ -88,7 +88,7 @@
   <string name="settings">Impostazioni</string>
   <string name="snooze_interval">Snooze</string>
   <string name="hint_title">Lo sapevi?</string>
-  <string name="hint_drag">Per riordinare la lista, premi e mantieni premuta l\'abitudine e spostala nella posizione desiderata.</string>
+  <string name="hint_drag">Per riordinare le voci, tieni premuto sul nome dell\'abitudine, poi spostala nella posizione corretta.</string>
   <string name="hint_landscape">Puoi vedere più giorni mettendo il tuo telefono orizzontale.</string>
   <string name="delete_habits">Elimina abitudine</string>
   <string name="delete_habits_message">L\'abitudine verrà cancellata definitivamente. Non sarà possibile annullare.</string>
@@ -158,8 +158,8 @@
   <string name="reminder_sound">Suono notifica</string>
   <string name="none">Nessuno</string>
   <string name="filter">Filtra</string>
-  <string name="hide_completed">Nascosti</string>
-  <string name="hide_archived">Nascosti</string>
+  <string name="hide_completed">Nascondi completati</string>
+  <string name="hide_archived">Nascondi archiviati</string>
   <string name="sticky_notifications">Notifiche non rimuovibili</string>
   <string name="sticky_notifications_description">Impedisce di poter rimuovere le notifiche.</string>
   <string name="repair_database">Ripara database</string>

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

@@ -74,6 +74,7 @@
   <string name="interval_2_hour">2 時間</string>
   <string name="interval_4_hour">4 時間</string>
   <string name="interval_8_hour">8 時間</string>
+  <string name="interval_24_hour">24時間</string>
   <string name="pref_toggle_title">クリックで繰り返しを切り替え</string>
   <string name="pref_toggle_description">便利になりますが、間違って切り替えが起こる可能性があります。</string>
   <string name="pref_snooze_interval_title">リマインダーのスヌーズ間隔</string>
@@ -146,6 +147,7 @@
   <string name="month">月</string>
   <string name="quarter">四半期</string>
   <string name="year">年</string>
+  <string name="total">合計</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">回 /</string>
   <string name="every_x_days">%d 日ごと</string>
@@ -154,4 +156,7 @@
   <string name="score">スコア</string>
   <string name="reminder_sound">リマインダー サウンド</string>
   <string name="none">なし</string>
+  <string name="filter">フィルター</string>
+  <string name="download">ダウンロード</string>
+  <string name="export">エクスポート</string>
 </resources>

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

@@ -48,7 +48,7 @@
   <string name="reminder">알림</string>
   <string name="discard">취소</string>
   <string name="save">저장</string>
-  <string name="streaks">길게 이은 기록</string>
+  <string name="streaks">연속</string>
   <string name="no_habits_found">활성화된 습관이 없습니다.</string>
   <string name="long_press_to_toggle">체크하거나 해제하려면 길게 누르세요.</string>
   <string name="reminder_off">끔</string>
@@ -57,7 +57,7 @@
   <string name="validation_at_most_one_rep_per_day">하루에 한 번만 반복 가능합니다.</string>
   <string name="create_habit">습관 만들기</string>
   <string name="edit_habit">습관 수정하기</string>
-  <string name="check">선택</string>
+  <string name="check">완료</string>
   <string name="snooze">나중에</string>
   <!-- App introduction -->
   <string name="intro_title_1">환영합니다</string>
@@ -109,7 +109,7 @@
   <string name="frequency">빈도</string>
   <string name="checkmark">체크</string>
   <string name="strength">강도</string>
-  <string name="best_streaks">가장 길게 이은 기록</string>
+  <string name="best_streaks">최고 연속 기록</string>
   <string name="current_streaks">현재 기록</string>
   <string name="number_of_repetitions">반복한 횟수</string>
   <string name="last_x_days">이전 %d일 동안</string>

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

@@ -29,7 +29,7 @@
   <string name="add_habit">Nieuwe gewoonte</string>
   <string name="color_picker_default_title">Verander kleur</string>
   <string name="toast_habit_created">Gewoonte aangemaakt.</string>
-  <string name="toast_habit_deleted">Gewoonte verwijderd.</string>
+  <string name="toast_habit_deleted">Gewoontes verwijderd</string>
   <string name="toast_habit_restored">Gewoontes hersteld</string>
   <string name="toast_nothing_to_undo">Niets om ongedaan te maken.</string>
   <string name="toast_nothing_to_redo">Niets om over te doen.</string>

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

@@ -19,6 +19,76 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+  <string name="main_activity_title">Kutimoj</string>
+  <string name="action_settings">Agordoj</string>
+  <string name="edit">Redakti</string>
+  <string name="delete">Forigi</string>
+  <string name="archive">Arĥivo</string>
+  <string name="unarchive">Elarĥivigi</string>
+  <string name="add_habit">Aldonu kutimon</string>
+  <string name="color_picker_default_title">Ŝanĝi koloron</string>
+  <string name="toast_habit_changed">Kutimo ŝanĝita</string>
+  <string name="toast_habit_archived">Kutimo arĥivita</string>
+  <string name="habit_strength">Kutimo forteco</string>
+  <string name="days">tagoj</string>
+  <string name="reminder">Memorigaĵoj</string>
+  <string name="discard">Nuligi</string>
+  <string name="save">Konservi</string>
+  <string name="streaks">Strioj</string>
+  <string name="reminder_off">Neaktiva</string>
+  <string name="snooze">Poste</string>
   <!-- App introduction -->
+  <string name="intro_title_1">Bonvenon</string>
+  <string name="interval_15_minutes">15 minutoj</string>
+  <string name="interval_30_minutes">30 minutoj</string>
+  <string name="settings">Agordoj</string>
+  <string name="delete_habits">Forigi kutimojn</string>
+  <string name="weekends">Semajnfinoj</string>
+  <string name="any_weekday">Lundo al vendredo</string>
+  <string name="any_day">Io semajntago</string>
+  <string name="select_weekdays">Elekti tagojn</string>
+  <string name="export_to_csv">Eksporti kiel CSV</string>
+  <string name="done_label">Farite</string>
+  <string name="select_hours">Elekti horojn</string>
+  <string name="select_minutes">Elekti minutojn</string>
+  <string name="about">Pri programo</string>
+  <string name="translators">Tradukantoj</string>
+  <string name="developers">Evoluigantoj</string>
+  <string name="version_n">Versio %s</string>
+  <string name="frequency">Frekvenco</string>
+  <string name="strength">Forteco</string>
+  <string name="number_of_repetitions">Nombro de ripetoj</string>
+  <string name="last_x_days">Lastaj %d tagoj</string>
+  <string name="last_x_weeks">Lastaj %d semajnoj</string>
+  <string name="last_x_months">Lastaj %d monatoj</string>
+  <string name="last_x_years">Lastaj %d jaroj</string>
+  <string name="all_time">Ĉiuj tempoj</string>
+  <string name="every_day">Ĉiu tago</string>
+  <string name="every_week">Ĉiu semajno</string>
+  <string name="two_times_per_week">Dufoje en semajno</string>
+  <string name="five_times_per_week">Kvinfoje en semajno</string>
+  <string name="help">Helpo &amp; Ofte Demandite</string>
+  <string name="file_not_recognized">Dosiero ne rekonita.</string>
+  <string name="full_backup_success">Plena savkopio sukcese eksportita.</string>
+  <string name="troubleshooting">Problemserĉado</string>
+  <string name="night_mode">Nokta reĝimo</string>
+  <string name="day">Tago</string>
+  <string name="week">Semajno</string>
+  <string name="month">Monato</string>
+  <string name="quarter">Jarkvarono</string>
+  <string name="year">Jaro</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
+  <string name="none">Nenio</string>
+  <string name="filter">Filtrilo</string>
+  <string name="hide_completed">Kaŝi kompletajn</string>
+  <string name="hide_archived">Kaŝi arĥivitajn</string>
+  <string name="repair_database">Ripari datumbazon</string>
+  <string name="database_repaired">Datumbazon riparita.</string>
+  <string name="action">Ago</string>
+  <string name="habit">Kutimo</string>
+  <string name="sort">Enkursigi</string>
+  <string name="by_name">Laŭ nomo</string>
+  <string name="by_color">Laŭ koloro</string>
+  <string name="download">Elŝuti</string>
+  <string name="export">Eksporti</string>
 </resources>

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

@@ -75,10 +75,10 @@
   <string name="interval_4_hour">4 godziny</string>
   <string name="interval_8_hour">8 godzin</string>
   <string name="interval_24_hour">24 godziny</string>
-  <string name="pref_toggle_title">Przełącz powtarzanie przy krótkim naciśnięciu</string>
-  <string name="pref_toggle_description">Wygodniejsze ale może spowodować przypadkowe przełączenia.</string>
+  <string name="pref_toggle_title">Przełącz powtarzanie krótkim naciśnięciem</string>
+  <string name="pref_toggle_description">Wygodniejsze, ale może spowodować przypadkowe przełączenia.</string>
   <string name="pref_snooze_interval_title">Czas drzemki między przypomnieniami</string>
-  <string name="pref_rate_this_app">Oceń tą aplikację w Google Play</string>
+  <string name="pref_rate_this_app">Oceń tę aplikację w Google Play</string>
   <string name="pref_send_feedback">Prześlij uwagi do programisty</string>
   <string name="pref_view_source_code">Zobacz kod źródłowy na GitHub\'ie</string>
   <string name="pref_view_app_introduction">Zobacz wprowadzenie do aplikacji</string>

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

@@ -47,7 +47,7 @@
   <string name="reminder">Reamintire</string>
   <string name="discard">Renunță</string>
   <string name="save">Salvează</string>
-  <string name="streaks">Serii</string>
+  <string name="streaks">Zile consecutive</string>
   <string name="no_habits_found">Nu ai niciun obicei activ.</string>
   <string name="long_press_to_toggle">Apasă și ține pentru a bifa sau a debifa</string>
   <string name="reminder_off">Dezactivat</string>
@@ -90,6 +90,7 @@
   <string name="hint_landscape">Poți vedea mai multe zile în modul peisaj.</string>
   <string name="delete_habits">Șterge obiceiuri</string>
   <string name="delete_habits_message">Obiceiurile vor fi șterse permanent. Această acțiune nu este reversibilă.</string>
+  <string name="habit_not_found">Obicei şters / negăsit</string>
   <string name="weekends">Weekenduri</string>
   <string name="any_weekday">Zile de lucru</string>
   <string name="any_day">Orice zi</string>
@@ -106,8 +107,8 @@
   <string name="frequency">Frecvență</string>
   <string name="checkmark">Bifă</string>
   <string name="strength">Putere</string>
-  <string name="best_streaks">Cele mai bune serii</string>
-  <string name="current_streaks">Seria curentă</string>
+  <string name="best_streaks">Cele mai multe zile consecutive</string>
+  <string name="current_streaks">Numărul curent de reușite succesive</string>
   <string name="number_of_repetitions">Număr de repetiții</string>
   <string name="last_x_days">Ultimele %d zile</string>
   <string name="last_x_weeks">Ultimele %d săptămâni</string>
@@ -133,5 +134,24 @@
   <string name="bug_report_failed">Generare raport de erori nereușită.</string>
   <string name="generate_bug_report">Generează raport de erori</string>
   <string name="troubleshooting">Depanare</string>
+  <string name="reverse_days">Inversează ordinea zilelor</string>
+  <string name="day">Zi</string>
+  <string name="week">Săptămână</string>
+  <string name="month">Lună</string>
+  <string name="quarter">Trimestru</string>
+  <string name="year">An</string>
+  <string name="total">Total</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
+  <string name="time_every">dată la</string>
+  <string name="every_x_days">La fiecare %d zile</string>
+  <string name="every_x_weeks">La fiecare %d săptămâni</string>
+  <string name="every_x_months">La fiecare %d luni</string>
+  <string name="hide_completed">Ascunde cele completate</string>
+  <string name="hide_archived">Ascunde cele arhivate</string>
+  <string name="uncheck">Debifează</string>
+  <string name="habit">Obicei</string>
+  <string name="sort">Sortează</string>
+  <string name="manually">Manual</string>
+  <string name="by_name">După nume</string>
+  <string name="by_color">După culoare</string>
 </resources>

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

@@ -154,7 +154,7 @@
   <string name="every_x_days">Каждые %d дней</string>
   <string name="every_x_weeks">Каждые %d недель</string>
   <string name="every_x_months">Каждые %d месяцев</string>
-  <string name="score">Стабильность</string>
+  <string name="score">Счет</string>
   <string name="reminder_sound">Звук напоминания</string>
   <string name="none">Без звука</string>
   <string name="filter">Фильтр</string>
@@ -172,7 +172,7 @@
   <string name="manually">Вручную</string>
   <string name="by_name">По названию</string>
   <string name="by_color">По цвету</string>
-  <string name="by_score">По стабильности</string>
+  <string name="by_score">По оценке</string>
   <string name="download">Загрузить</string>
   <string name="export">Экспортировать</string>
 </resources>

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

@@ -19,18 +19,18 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="app_name">Loop Sledilnik Navad</string>
+  <string name="app_name">Loop Navade</string>
   <string name="main_activity_title">Navade</string>
   <string name="action_settings">Nastavitve</string>
-  <string name="edit">Spremeni</string>
+  <string name="edit">Uredi</string>
   <string name="delete">Izbriši</string>
   <string name="archive">Arhiviraj</string>
   <string name="unarchive">Odarhiviraj</string>
   <string name="add_habit">Dodaj navado</string>
   <string name="color_picker_default_title">Spremeni barvo</string>
-  <string name="toast_habit_created">Navada ustvarjana.</string>
-  <string name="toast_habit_deleted">Navada izbrisana.</string>
-  <string name="toast_habit_restored">Navada obnovljena.</string>
+  <string name="toast_habit_created">Navada ustvarjena</string>
+  <string name="toast_habit_deleted">Navada izbrisana</string>
+  <string name="toast_habit_restored">Navada obnovljena</string>
   <string name="toast_nothing_to_undo">Nič za razveljaviti.</string>
   <string name="toast_nothing_to_redo">Nič za ponovno opraviti.</string>
   <string name="toast_habit_changed">Navada spremenjena.</string>

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

@@ -107,7 +107,7 @@
   <string name="developers">Utvecklare</string>
   <string name="version_n">Version %s</string>
   <string name="frequency">Frekvens</string>
-  <string name="checkmark">Avklarat/ej avklarat</string>
+  <string name="checkmark">Kryssruta</string>
   <string name="strength">Styrka</string>
   <string name="best_streaks">Bästa streak</string>
   <string name="current_streaks">Nuvarande streak</string>

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

@@ -19,7 +19,7 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="app_name">Döngü Alışkanlık Takibi</string>
+  <string name="app_name">Loop Alışkanlık Takip</string>
   <string name="main_activity_title">Alışkanlıklar</string>
   <string name="action_settings">Ayarlar</string>
   <string name="edit">Düzenle</string>
@@ -32,25 +32,25 @@
   <string name="toast_habit_deleted">Alışkanlık silindi.</string>
   <string name="toast_habit_restored">Alışkanlıklar geri getirildi</string>
   <string name="toast_nothing_to_undo">Geri alınacak bir şey yok</string>
-  <string name="toast_nothing_to_redo">Tekrar edilecek bir şey yok</string>
-  <string name="toast_habit_changed">Alışkanlık değişti</string>
+  <string name="toast_nothing_to_redo">Tekrar yapılacak birşey yok.</string>
+  <string name="toast_habit_changed">Alışkanlık değiştirildi</string>
   <string name="toast_habit_changed_back">Alışkanlık eski haline getirildi</string>
   <string name="toast_habit_archived">Alışkanlık arşivlendi.</string>
   <string name="toast_habit_unarchived">Alışkanlık arşivden çıkarıldı.</string>
-  <string name="overview">Genel bakış</string>
-  <string name="habit_strength">Alışkanlık dayanımı</string>
+  <string name="overview">Genel Bakış</string>
+  <string name="habit_strength">Alışkanlık gücü</string>
   <string name="history">Geçmiş</string>
   <string name="clear">Temizle</string>
   <string name="description_hint">Soru (Bugün ... yaptın mı?)</string>
   <string name="repeat">Tekrar</string>
-  <string name="times_every">kez</string>
-  <string name="days">günde</string>
+  <string name="times_every">defa /</string>
+  <string name="days">gün</string>
   <string name="reminder">Hatırlatma</string>
-  <string name="discard">İptal</string>
+  <string name="discard">Vazgeç</string>
   <string name="save">Kaydet</string>
-  <string name="streaks">Etkinlikler</string>
+  <string name="streaks">Seriler</string>
   <string name="no_habits_found">Etkin alışkanlığın yok</string>
-  <string name="long_press_to_toggle">Yapıldı veya yapılmadı işareti koymak için uzun basılı tut</string>
+  <string name="long_press_to_toggle">İşaretlemek ya da işaret kaldırmak için basılı tut</string>
   <string name="reminder_off">Kapalı</string>
   <string name="validation_name_should_not_be_blank">Adı boş bırakamazsın.</string>
   <string name="validation_number_should_be_positive">Sayılar sıfırdan büyük olmalı.</string>
@@ -61,13 +61,13 @@
   <string name="snooze">Sonra</string>
   <!-- App introduction -->
   <string name="intro_title_1">Hoşgeldin</string>
-  <string name="intro_description_1">İyi alışkanlıklar edinmek ve devam etmene yardımcı olur.</string>
+  <string name="intro_description_1">Loop Alışkanlık Takibi, iyi alışkanlıklar edinmene ve sürdürmene yardımcı olur.</string>
   <string name="intro_title_2">Yeni alışkanlıklar oluştur</string>
   <string name="intro_description_2">Her gün, alışkanlığını gerçekleştirdikten sonra, uygulamada onay işareti koy.</string>
   <string name="intro_title_3">Yapmaya devam et</string>
-  <string name="intro_description_3">Uzun bir süre ile sürekli yaptığın alışkanlıkların için tam yıldız kazanacaksın.</string>
+  <string name="intro_description_3">Uzun süre düzenli sürdürdüğün alışkanlıkların için bir tam yıldız kazanacaksın.</string>
   <string name="intro_title_4">Gelişimini izle</string>
-  <string name="intro_description_4">Detaylı grafiklerle, zaman içinde alışkanlıklarını nasıl geliştiğini gör.</string>
+  <string name="intro_description_4">Detaylı grafiklerle, zaman içinde alışkanlıklarının nasıl geliştiğini gör.</string>
   <string name="interval_15_minutes">15 dakika</string>
   <string name="interval_30_minutes">30 dakika</string>
   <string name="interval_1_hour">1 saat</string>
@@ -75,26 +75,26 @@
   <string name="interval_4_hour">4 saat</string>
   <string name="interval_8_hour">8 saat</string>
   <string name="interval_24_hour">24 saat</string>
-  <string name="pref_toggle_title">Daha kısa süre basma ile yapıldı/yapılmadı işaretleme</string>
-  <string name="pref_toggle_description">Daha kullanışlı ama kazara istenmeyen işaretlemeler olabilir</string>
+  <string name="pref_toggle_title">Kısa dokunuşla işaretle</string>
+  <string name="pref_toggle_description">Alışkanlıklarını basılı tutmak yerine tek dokunuşla işaretlemeni sağlar. Kullanımı daha rahattır ama kaza eseri işaretleme yapabilirsin.</string>
   <string name="pref_snooze_interval_title">Hatırlatmalardaki erteleme süresi</string>
   <string name="pref_rate_this_app">Google Play\'de uygulamayı oyla</string>
   <string name="pref_send_feedback">Geliştiriciye geri bildirim gönder</string>
-  <string name="pref_view_source_code">Github\'da kaynak kodunu bak</string>
+  <string name="pref_view_source_code">Github\'da kaynak kodunu gör</string>
   <string name="pref_view_app_introduction">Uygulama tanıtımını göster</string>
   <string name="links">Bağlantılar</string>
   <string name="behavior">Davranış</string>
   <string name="name">Ad</string>
   <string name="settings">Ayarlar</string>
   <string name="snooze_interval">Erteleme süresi</string>
-  <string name="hint_title">Biliyor musun?</string>
-  <string name="hint_drag">Girdileri yeniden düzenlemek için, alışkanlık adının üstüne bas ve doğru yere sürükle.</string>
+  <string name="hint_title">Biliyor muydun?</string>
+  <string name="hint_drag">Girdileri sıralamak için, alışkanlık adının üstüne basılı tut ve doğru yere sürükle.</string>
   <string name="hint_landscape">Cihazını yatay tutarak daha fazla gün görebilirsin.</string>
   <string name="delete_habits">Alışkanlıkları Sil</string>
   <string name="delete_habits_message">Alışkanlıklar kalıcı olarak silinecek. Bu eylem geri alınamaz.</string>
   <string name="habit_not_found">Alışkanlık silinmiş ya da bulunamadı</string>
   <string name="weekends">Hafta sonları</string>
-  <string name="any_weekday">Pazartesinden Cumaya</string>
+  <string name="any_weekday">Pazartesi-Cuma</string>
   <string name="any_day">Haftanın herhangi bir günü</string>
   <string name="select_weekdays">Günleri seç</string>
   <string name="export_to_csv">CSV olarak dışa aktar</string>
@@ -107,10 +107,10 @@
   <string name="developers">Geliştiriciler</string>
   <string name="version_n">Sürüm %s</string>
   <string name="frequency">Sıklık</string>
-  <string name="checkmark">Yapıldı işareti</string>
-  <string name="strength">Dayanım</string>
-  <string name="best_streaks">En iyi etkinlik günü</string>
-  <string name="current_streaks">Bugünkü etkinlik</string>
+  <string name="checkmark">İşaret</string>
+  <string name="strength">Güç</string>
+  <string name="best_streaks">En uzun seriler</string>
+  <string name="current_streaks">Şimdiki seri</string>
   <string name="number_of_repetitions">Tekrar sayısı</string>
   <string name="last_x_days">Son %d gün</string>
   <string name="last_x_weeks">Son %d hafta</string>
@@ -126,23 +126,23 @@
   <string name="could_not_export">Dışarı veri aktarımı başarısız.</string>
   <string name="could_not_import">İçeri veri aktarımı başarısız.</string>
   <string name="file_not_recognized">Dosya tanınamadı.</string>
-  <string name="habits_imported">Alışkanlıklar başarılı içeri aktarıldı.</string>
+  <string name="habits_imported">Alışkanlıklar başarıyla içeri aktarıldı.</string>
   <string name="full_backup_success">Tam yedek başarıyla dışarı aktarıldı.</string>
-  <string name="import_data">Veri içeri aktar</string>
+  <string name="import_data">İçeri veri aktar</string>
   <string name="export_full_backup">Tüm yedeği dışarı aktar</string>
-  <string name="import_data_summary">Hem bu uygulama tarafından dışarı aktarılmış tam yedekleri, hem de Tickmate, HabitBull veya Rewire tarafından üretilmiş dosyaları destekler. Daha fazla bilgi için SSS bakın.</string>
+  <string name="import_data_summary">Hem bu uygulama tarafından dışarı aktarılmış tam yedekleri, hem de Tickmate, HabitBull veya Rewire tarafından üretilmiş dosyaları destekler. Daha fazla bilgi için SSS\'a başvurun.</string>
   <string name="export_as_csv_summary">Üretilen dosyalar, Microsoft Excel veya OpenOffice Calc. gibi hesap taplosu uygulamaları ile açılabilir. Bu dosya yeniden içeri aktarılamaz.</string>
-  <string name="export_full_backup_summary">Üretilen dosya, tüm verilerini içerir. Bu dosya yeniden içeri aktarılabilir.</string>
+  <string name="export_full_backup_summary">Tüm verilerini içeren bir dosya üretir. Bu dosya yeniden içeri aktarılabilir.</string>
   <string name="bug_report_failed">Hata raporu oluşturulamadı.</string>
   <string name="generate_bug_report">Hata raporu üret</string>
   <string name="troubleshooting">Sorun Giderme</string>
   <string name="help_translate">Bu uygulamanın çevirisine yardım et</string>
   <string name="night_mode">Gece kipi</string>
   <string name="use_pure_black">Gece kipinde saf siyah kullan</string>
-  <string name="pure_black_description">Gece kipinde gri arkaplanını, saf siyah ile değiştir. AMOLED ekranlı cihazlarda pil kullanımını düşür.</string>
+  <string name="pure_black_description">Gece kipinde gri arkaplanını, saf siyah ile değiştir. AMOLED ekranlı cihazlarda pil kullanımını azaltabilir.</string>
   <string name="interface_preferences">Arayüz</string>
   <string name="reverse_days">Günleri ters sırala</string>
-  <string name="reverse_days_description">Ana ekranda günleri tersen göster</string>
+  <string name="reverse_days_description">Ana ekranda günleri tersten göster</string>
   <string name="day">Gün</string>
   <string name="week">Hafta</string>
   <string name="month">Ay</string>
@@ -150,7 +150,7 @@
   <string name="year">Yıl</string>
   <string name="total">Tümü</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
-  <string name="time_every">kez</string>
+  <string name="time_every">defa /</string>
   <string name="every_x_days">Her %d gün</string>
   <string name="every_x_weeks">Her %d hafta</string>
   <string name="every_x_months">Her %d ay</string>
@@ -161,18 +161,18 @@
   <string name="hide_completed">Tamamlananları gizle</string>
   <string name="hide_archived">Arşivlenenleri gizle</string>
   <string name="sticky_notifications">Bildirimleri kalıcı yap</string>
-  <string name="sticky_notifications_description">Bildirimin kaydırılarak götürülmesini engelle.</string>
-  <string name="repair_database">Verıtabanını onar</string>
-  <string name="database_repaired">Verıtabanı onarıldı.</string>
-  <string name="uncheck">Yapmadım</string>
+  <string name="sticky_notifications_description">Bildirimlerin kaydırılarak temizlenmesini engelle.</string>
+  <string name="repair_database">Veritabanını onar</string>
+  <string name="database_repaired">Veritabanı onarıldı.</string>
+  <string name="uncheck">İşareti kaldır</string>
   <string name="toggle">Değiştir</string>
   <string name="action">Eylem</string>
   <string name="habit">Alışkanlık</string>
   <string name="sort">Sırala</string>
   <string name="manually">Elle</string>
-  <string name="by_name">Ad</string>
-  <string name="by_color">Renk</string>
-  <string name="by_score">Puan</string>
+  <string name="by_name">Ada göre</string>
+  <string name="by_color">Renge göre</string>
+  <string name="by_score">Puana göre</string>
   <string name="download">İndir</string>
   <string name="export">Dışarı aktar</string>
 </resources>

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

@@ -63,11 +63,11 @@
   <string name="intro_title_1">Ласкаво просимо</string>
   <string name="intro_description_1">Трекер звичок Loop допомагає вам розвивати і підтримувати корисні звички.</string>
   <string name="intro_title_2">Додайте нові звички</string>
-  <string name="intro_description_2">Кожного дня, після виконання вашої звички, поставте пташку в програмі.</string>
+  <string name="intro_description_2">Щодня, після виконання вашої звички, ставте пташку в програмі.</string>
   <string name="intro_title_3">Продовжуйте в тому ж дусі</string>
   <string name="intro_description_3">Постійно дотримувані звички буде відзначено повною зірочкою.</string>
   <string name="intro_title_4">Відстежуйте свої успіхи</string>
-  <string name="intro_description_4">Деталізовані хвилеписи (діяграми) демонструють, як ваші звички покращилися з часом.</string>
+  <string name="intro_description_4">Деталізовані хвилеписи демонструють, як ваші звички покращилися з часом.</string>
   <string name="interval_15_minutes">15 хвилин</string>
   <string name="interval_30_minutes">30 хвилин</string>
   <string name="interval_1_hour">1 година</string>

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

@@ -19,6 +19,34 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+  <string name="app_name">Herhaalde Gewoonte Boekhouer</string>
+  <string name="main_activity_title">Gewoontes</string>
+  <string name="action_settings">Instellings</string>
+  <string name="edit">Redigeer</string>
+  <string name="delete">Verwyder</string>
+  <string name="archive">Argiveer</string>
+  <string name="unarchive">Deargiveer</string>
+  <string name="add_habit">Voeg gewoonte by</string>
+  <string name="color_picker_default_title">Verander kleur</string>
+  <string name="toast_habit_created">Gewoonte geskep</string>
+  <string name="toast_habit_deleted">Gewoontes verwyder</string>
+  <string name="toast_habit_restored">Gewoontes herstel</string>
+  <string name="toast_nothing_to_undo">Niks om terug te doen nie</string>
+  <string name="toast_nothing_to_redo">Niks om oor te doen nie</string>
+  <string name="toast_habit_changed">Gewoonte verander</string>
+  <string name="toast_habit_changed_back">Gewoonte terug verander</string>
+  <string name="toast_habit_archived">Gewoontes geargiveer</string>
+  <string name="toast_habit_unarchived">Gewoontes gedeargiveer</string>
+  <string name="overview">Oorsig</string>
   <!-- App introduction -->
+  <string name="intro_title_1">Welkom</string>
+  <string name="interval_15_minutes">15 minute</string>
+  <string name="interval_30_minutes">30 minute</string>
+  <string name="interval_1_hour">1 uur</string>
+  <string name="interval_2_hour">2 ure</string>
+  <string name="interval_4_hour">4 ure</string>
+  <string name="interval_8_hour">8 ure</string>
+  <string name="interval_24_hour">24 ure</string>
+  <string name="settings">Instellings</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
 </resources>

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>

uhabits-android/src/main/res/xml/preferences.xml

@@ -74,6 +74,11 @@
             android:title="@string/led_notifications"
             android:summary="@string/led_notifications_description"/>
 
+        <Preference
+            android:key="reminderCustomize"
+            android:summary="@string/customize_notification_summary"
+            android:title="@string/customize_notification"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory

uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java

@@ -349,6 +349,12 @@ public abstract class CheckmarkList
         add(buildCheckmarksFromIntervals(reps, intervals));
     }
 
+    public List<Checkmark> getAll() {
+        Repetition oldest = habit.getRepetitions().getOldest();
+        if(oldest == null) return new ArrayList<>();
+        return getByInterval(oldest.getTimestamp(), DateUtils.getToday());
+    }
+
     static final class Interval
     {
         final Timestamp begin;
@@ -404,4 +410,35 @@ public abstract class CheckmarkList
                 .toString();
         }
     }
+
+    @NonNull
+    public List<Checkmark> groupBy(DateUtils.TruncateField field)
+    {
+        List<Checkmark> checks = getAll();
+
+        int count = 0;
+        Timestamp truncatedTimestamps[] = new Timestamp[checks.size()];
+        int values[] = new int[checks.size()];
+
+        for (Checkmark rep : checks)
+        {
+            Timestamp tt = rep.getTimestamp().truncate(field);
+            if (count == 0 || !truncatedTimestamps[count - 1].equals(tt))
+                truncatedTimestamps[count++] = tt;
+
+            if(habit.isNumerical())
+                values[count - 1] += rep.getValue();
+            else if(rep.getValue() == Checkmark.CHECKED_EXPLICITLY)
+                values[count - 1] += 1000;
+        }
+
+        ArrayList<Checkmark> groupedCheckmarks = new ArrayList<>();
+        for (int i = 0; i < count; i++)
+        {
+            Checkmark rep = new Checkmark(truncatedTimestamps[i], values[i]);
+            groupedCheckmarks.add(rep);
+        }
+
+        return groupedCheckmarks;
+    }
 }

uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java

@@ -20,6 +20,12 @@
 package org.isoron.uhabits.core.models;
 
 import org.apache.commons.lang3.builder.*;
+import org.isoron.uhabits.core.utils.DateFormats;
+import org.isoron.uhabits.core.utils.DateUtils;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
 
 import static org.isoron.uhabits.core.utils.StringUtils.defaultToStringStyle;
 

uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java

@@ -20,6 +20,8 @@
 package org.isoron.uhabits.core.models;
 
 import org.apache.commons.lang3.builder.*;
+import org.isoron.uhabits.core.utils.DateFormats;
+import org.isoron.uhabits.core.utils.DateUtils;
 
 import java.util.*;
 
@@ -138,13 +140,16 @@ public final class Timestamp
     @Override
     public String toString()
     {
-        return new ToStringBuilder(this, defaultToStringStyle())
-            .append("unixTime", unixTime)
-            .toString();
+        return DateFormats.getCSVDateFormat().format(new Date(unixTime));
     }
 
     public int getWeekday()
     {
         return toCalendar().get(DAY_OF_WEEK) % 7;
     }
+
+    public Timestamp truncate(DateUtils.TruncateField field)
+    {
+        return new Timestamp(DateUtils.truncate(field, unixTime));
+    }
 }

uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java

@@ -93,6 +93,42 @@ public class HabitFixtures
         return habit;
     }
 
+    public Habit createLongNumericalHabit(Timestamp reference)
+    {
+        Habit habit = modelFactory.buildHabit();
+        habit.setType(Habit.NUMBER_HABIT);
+        habit.setName("Walk");
+        habit.setDescription("How many steps did you walk today?");
+        habit.setUnit("steps");
+        habit.setTargetType(Habit.AT_LEAST);
+        habit.setTargetValue(100);
+        habit.setColor(1);
+        saveIfSQLite(habit);
+
+        int times[] = {0, 5, 9, 15, 17, 21, 23, 27, 28, 35, 41, 45, 47, 53, 56, 62, 70, 73, 78,
+                83, 86, 94, 101, 106, 113, 114, 120, 126, 130, 133, 141, 143, 148, 151, 157, 164,
+                166, 171, 173, 176, 179, 183, 191, 259, 264, 268, 270, 275, 282, 284, 289, 295,
+                302, 306, 310, 315, 323, 325, 328, 335, 343, 349, 351, 353, 357, 359, 360, 367,
+                372, 376, 380, 385, 393, 400, 404, 412, 415, 418, 422, 425, 433, 437, 444, 449,
+                455, 460, 462, 465, 470, 471, 479, 481, 485, 489, 494, 495, 500, 501, 503, 507};
+
+        int values[] = {230, 306, 148, 281, 134, 285, 104, 158, 325, 236, 303, 210, 118, 124,
+                301, 201, 156, 376, 347, 367, 396, 134, 160, 381, 155, 354, 231, 134, 164, 354,
+                236, 398, 199, 221, 208, 397, 253, 276, 214, 341, 299, 221, 353, 250, 341, 168,
+                374, 205, 182, 217, 297, 321, 104, 237, 294, 110, 136, 229, 102, 271, 250, 294,
+                158, 319, 379, 126, 282, 155, 288, 159, 215, 247, 207, 226, 244, 158, 371, 219,
+                272, 228, 350, 153, 356, 279, 394, 202, 213, 214, 112, 248, 139, 245, 165, 256,
+                370, 187, 208, 231, 341, 312};
+
+        for (int i = 0; i < times.length; i++)
+        {
+            Timestamp timestamp = reference.minus(times[i]);
+            habit.getRepetitions().add(new Repetition(timestamp, values[i]));
+        }
+
+        return habit;
+    }
+
     public Habit createShortHabit()
     {
         Habit habit = modelFactory.buildHabit();

uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java

@@ -26,16 +26,18 @@ import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.preferences.*;
 import org.isoron.uhabits.core.tasks.*;
-import org.isoron.uhabits.core.utils.*;
 
 import java.util.*;
 
 import javax.inject.*;
 
+
 @AppScope
 public class NotificationTray
     implements CommandRunner.Listener, Preferences.Listener
 {
+    public static final String REMINDERS_CHANNEL_ID = "REMINDERS";
+
     @NonNull
     private final TaskRunner taskRunner;
 

uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java

@@ -25,12 +25,16 @@ import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.core.ui.callbacks.*;
+import org.isoron.uhabits.core.utils.*;
 
 import java.io.*;
 import java.util.*;
 
 import javax.inject.*;
 
+import static java.lang.Math.*;
+
+
 public class ShowHabitMenuBehavior
 {
     private HabitList habitList;
@@ -95,6 +99,27 @@ public class ShowHabitMenuBehavior
         });
     }
 
+    public void onRandomize()
+    {
+        Random random = new Random();
+        habit.getRepetitions().removeAll();
+        double strength = 50;
+
+        for (int i = 0; i < 365 * 5; i++)
+        {
+            if (i % 7 == 0) strength = max(0, min(100, strength + 10 * random.nextGaussian()));
+            if (random.nextInt(100) > strength) continue;
+
+            int value = 1;
+            if (habit.isNumerical())
+                value = (int) (1000 + 250 * random.nextGaussian() * strength / 100) * 1000;
+
+            habit.getRepetitions().add(new Repetition(DateUtils.getToday().minus(i), value));
+        }
+
+        habit.invalidateNewerThan(Timestamp.ZERO);
+    }
+
     public enum Message
     {
         COULD_NOT_EXPORT, HABIT_DELETED

uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java

@@ -25,6 +25,7 @@ import org.apache.commons.io.*;
 import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.models.Timestamp;
 import org.isoron.uhabits.core.models.memory.*;
 import org.isoron.uhabits.core.tasks.*;
 import org.isoron.uhabits.core.test.*;
@@ -92,20 +93,24 @@ public class BaseUnitTest
         DateUtils.setFixedLocalTime(null);
     }
 
-    public long timestamp(int year, int month, int day)
+    public long unixTime(int year, int month, int day)
     {
         GregorianCalendar cal = DateUtils.getStartOfTodayCalendar();
         cal.set(year, month, day, 0, 0, 0);
         return cal.getTimeInMillis();
     }
 
-    public long timestamp(int year, int month, int day, int hour, int minute)
+    public long unixTime(int year, int month, int day, int hour, int minute)
     {
         GregorianCalendar cal = DateUtils.getStartOfTodayCalendar();
         cal.set(year, month, day, hour, minute);
         return cal.getTimeInMillis();
     }
 
+    public Timestamp timestamp(int year, int month, int day) {
+        return new Timestamp(unixTime(year, month, day));
+    }
+
     @Test
     public void nothing()
     {

uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java

@@ -28,9 +28,15 @@ import java.util.*;
 
 import nl.jqno.equalsverifier.*;
 
+import static java.util.Calendar.JANUARY;
+import static java.util.Calendar.JULY;
+import static java.util.Calendar.JUNE;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
 import static org.isoron.uhabits.core.models.Checkmark.*;
+import static org.isoron.uhabits.core.utils.DateUtils.TruncateField.MONTH;
+import static org.isoron.uhabits.core.utils.DateUtils.TruncateField.QUARTER;
+import static org.isoron.uhabits.core.utils.DateUtils.TruncateField.YEAR;
 
 public class CheckmarkListTest extends BaseUnitTest
 {
@@ -360,13 +366,12 @@ public class CheckmarkListTest extends BaseUnitTest
         Timestamp t = Timestamp.ZERO.plus(100);
         Checkmark checkmark = new Checkmark(t, 2);
         assertThat(checkmark.toString(),
-            equalTo("{timestamp: {unixTime: 8640000000}, value: 2}"));
+            equalTo("{timestamp: 1970-04-11, value: 2}"));
 
         CheckmarkList.Interval interval =
             new CheckmarkList.Interval(t, t.plus(1), t.plus(2));
         assertThat(interval.toString(), equalTo(
-            "{begin: {unixTime: 8640000000}, center: {unixTime: 8726400000}," +
-            " end: {unixTime: 8812800000}}"));
+            "{begin: 1970-04-11, center: 1970-04-12, end: 1970-04-13}"));
     }
 
     @Test
@@ -376,4 +381,30 @@ public class CheckmarkListTest extends BaseUnitTest
         EqualsVerifier.forClass(Timestamp.class).verify();
         EqualsVerifier.forClass(CheckmarkList.Interval.class).verify();
     }
+
+    @Test
+    public void testGroupBy() throws Exception
+    {
+        Habit habit = fixtures.createLongNumericalHabit(timestamp(2014, JUNE, 1));
+        CheckmarkList checkmarks = habit.getCheckmarks();
+
+        List<Checkmark> byMonth = checkmarks.groupBy(MONTH);
+        assertThat(byMonth.size(), equalTo(25)); // from 2013-01-01 to 2015-01-01
+        assertThat(byMonth.get(0), equalTo(new Checkmark(timestamp(2015, JANUARY, 1), 0)));
+        assertThat(byMonth.get(6), equalTo(new Checkmark(timestamp(2014, JULY, 1), 0)));
+        assertThat(byMonth.get(12), equalTo(new Checkmark(timestamp(2014, JANUARY, 1), 1706)));
+        assertThat(byMonth.get(18), equalTo(new Checkmark(timestamp(2013, JULY, 1), 1379)));
+
+        List<Checkmark> byQuarter = checkmarks.groupBy(QUARTER);
+        assertThat(byQuarter.size(), equalTo(9)); // from 2013-Q1 to 2015-Q1
+        assertThat(byQuarter.get(0), equalTo(new Checkmark(timestamp(2015, JANUARY, 1), 0)));
+        assertThat(byQuarter.get(4), equalTo(new Checkmark(timestamp(2014, JANUARY, 1), 4964)));
+        assertThat(byQuarter.get(8), equalTo(new Checkmark(timestamp(2013, JANUARY, 1), 4975)));
+
+        List<Checkmark> byYear = checkmarks.groupBy(YEAR);
+        assertThat(byYear.size(), equalTo(3)); // from 2013 to 2015
+        assertThat(byYear.get(0), equalTo(new Checkmark(timestamp(2015, JANUARY, 1), 0)));
+        assertThat(byYear.get(1), equalTo(new Checkmark(timestamp(2014, JANUARY, 1), 8227)));
+        assertThat(byYear.get(2), equalTo(new Checkmark(timestamp(2013, JANUARY, 1), 16172)));
+    }
 }

uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java

@@ -189,6 +189,6 @@ public class RepetitionListTest extends BaseUnitTest
     public void testToString() throws Exception
     {
         Repetition rep = new Repetition(Timestamp.ZERO.plus(100), 20);
-        assertThat(rep.toString(), equalTo("{timestamp: {unixTime: 8640000000}, value: 20}"));
+        assertThat(rep.toString(), equalTo("{timestamp: 1970-04-11, value: 20}"));
     }
 }

uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java

@@ -74,6 +74,6 @@ public class ScoreTest extends BaseUnitTest
     public void testToString() throws Exception
     {
         Score score = new Score(Timestamp.ZERO.plus(100), 150.0);
-        assertThat(score.toString(), equalTo( "{timestamp: {unixTime: 8640000000}, value: 150.0}"));
+        assertThat(score.toString(), equalTo( "{timestamp: 1970-04-11, value: 150.0}"));
     }
 }

uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java

@@ -124,6 +124,6 @@ public class StreakListTest extends BaseUnitTest
         Timestamp time = Timestamp.ZERO.plus(100);
         Streak streak = new Streak(time, time.plus(10));
         assertThat(streak.toString(), equalTo(
-            "{start: {unixTime: 8640000000}, end: {unixTime: 9504000000}}"));
+            "{start: 1970-04-11, end: 1970-04-21}"));
     }
 }

uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java

@@ -57,7 +57,7 @@ public class ReminderSchedulerTest extends BaseUnitTest
     @Test
     public void testScheduleAll()
     {
-        long now = timestamp(2015, 1, 26, 13, 0);
+        long now = unixTime(2015, 1, 26, 13, 0);
         DateUtils.setFixedLocalTime(now);
 
         Habit h1 = fixtures.createEmptyHabit();
@@ -72,9 +72,9 @@ public class ReminderSchedulerTest extends BaseUnitTest
 
         reminderScheduler.scheduleAll();
 
-        verify(sys).scheduleShowReminder(eq(timestamp(2015, 1, 27, 12, 30)),
+        verify(sys).scheduleShowReminder(eq(unixTime(2015, 1, 27, 12, 30)),
             eq(h1), anyLong());
-        verify(sys).scheduleShowReminder(eq(timestamp(2015, 1, 26, 22, 30)),
+        verify(sys).scheduleShowReminder(eq(unixTime(2015, 1, 26, 22, 30)),
             eq(h2), anyLong());
         Mockito.verifyNoMoreInteractions(sys);
     }
@@ -82,8 +82,8 @@ public class ReminderSchedulerTest extends BaseUnitTest
     @Test
     public void testSchedule_atSpecificTime()
     {
-        long atTime = timestamp(2015, 1, 30, 11, 30);
-        long expectedCheckmarkTime = timestamp(2015, 1, 30, 0, 0);
+        long atTime = unixTime(2015, 1, 30, 11, 30);
+        long expectedCheckmarkTime = unixTime(2015, 1, 30, 0, 0);
 
         habit.setReminder(new Reminder(8, 30, WeekdayList.EVERY_DAY));
         scheduleAndVerify(atTime, expectedCheckmarkTime, atTime);
@@ -92,11 +92,11 @@ public class ReminderSchedulerTest extends BaseUnitTest
     @Test
     public void testSchedule_laterToday()
     {
-        long now = timestamp(2015, 1, 26, 6, 30);
+        long now = unixTime(2015, 1, 26, 6, 30);
         DateUtils.setFixedLocalTime(now);
 
-        long expectedCheckmarkTime = timestamp(2015, 1, 26, 0, 0);
-        long expectedReminderTime = timestamp(2015, 1, 26, 12, 30);
+        long expectedCheckmarkTime = unixTime(2015, 1, 26, 0, 0);
+        long expectedReminderTime = unixTime(2015, 1, 26, 12, 30);
 
         habit.setReminder(new Reminder(8, 30, WeekdayList.EVERY_DAY));
         scheduleAndVerify(null, expectedCheckmarkTime, expectedReminderTime);
@@ -105,11 +105,11 @@ public class ReminderSchedulerTest extends BaseUnitTest
     @Test
     public void testSchedule_tomorrow()
     {
-        long now = timestamp(2015, 1, 26, 13, 0);
+        long now = unixTime(2015, 1, 26, 13, 0);
         DateUtils.setFixedLocalTime(now);
 
-        long expectedCheckmarkTime = timestamp(2015, 1, 27, 0, 0);
-        long expectedReminderTime = timestamp(2015, 1, 27, 12, 30);
+        long expectedCheckmarkTime = unixTime(2015, 1, 27, 0, 0);
+        long expectedReminderTime = unixTime(2015, 1, 27, 12, 30);
 
         habit.setReminder(new Reminder(8, 30, WeekdayList.EVERY_DAY));
         scheduleAndVerify(null, expectedCheckmarkTime, expectedReminderTime);
@@ -122,7 +122,7 @@ public class ReminderSchedulerTest extends BaseUnitTest
         Mockito.verifyZeroInteractions(sys);
     }
 
-    public long timestamp(int year, int month, int day, int hour, int minute)
+    public long unixTime(int year, int month, int day, int hour, int minute)
     {
         Calendar cal = DateUtils.getStartOfTodayCalendar();
         cal.set(year, month, day, hour, minute);

uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java

@@ -45,7 +45,7 @@ public class DateUtilsTest extends BaseUnitTest
     @Test
     public void testFormatHeaderDate()
     {
-        long timestamp = timestamp(2015, DECEMBER, 31);
+        long timestamp = unixTime(2015, DECEMBER, 31);
         GregorianCalendar date = new Timestamp(timestamp).toCalendar();
         String formatted = DateUtils.formatHeaderDate(date);
         assertThat(formatted, equalTo("Thu\n31"));
@@ -56,19 +56,19 @@ public class DateUtilsTest extends BaseUnitTest
     {
         DateUtils.TruncateField field = DateUtils.TruncateField.WEEK_NUMBER;
 
-        long expected = timestamp(2015, Calendar.JANUARY, 11);
-        long t0 = timestamp(2015, Calendar.JANUARY, 11);
-        long t1 = timestamp(2015, Calendar.JANUARY, 16);
-        long t2 = timestamp(2015, Calendar.JANUARY, 17);
+        long expected = unixTime(2015, Calendar.JANUARY, 11);
+        long t0 = unixTime(2015, Calendar.JANUARY, 11);
+        long t1 = unixTime(2015, Calendar.JANUARY, 16);
+        long t2 = unixTime(2015, Calendar.JANUARY, 17);
 
         assertThat(DateUtils.truncate(field, t0), equalTo(expected));
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
         assertThat(DateUtils.truncate(field, t2), equalTo(expected));
 
-        expected = timestamp(2015, Calendar.JANUARY, 18);
-        t0 = timestamp(2015, Calendar.JANUARY, 18);
-        t1 = timestamp(2015, Calendar.JANUARY, 19);
-        t2 = timestamp(2015, Calendar.JANUARY, 24);
+        expected = unixTime(2015, Calendar.JANUARY, 18);
+        t0 = unixTime(2015, Calendar.JANUARY, 18);
+        t1 = unixTime(2015, Calendar.JANUARY, 19);
+        t2 = unixTime(2015, Calendar.JANUARY, 24);
 
         assertThat(DateUtils.truncate(field, t0), equalTo(expected));
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
@@ -78,10 +78,10 @@ public class DateUtilsTest extends BaseUnitTest
     @Test
     public void testTruncate_month()
     {
-        long expected = timestamp(2016, Calendar.JUNE, 1);
-        long t0 = timestamp(2016, Calendar.JUNE, 1);
-        long t1 = timestamp(2016, Calendar.JUNE, 15);
-        long t2 = timestamp(2016, Calendar.JUNE, 20);
+        long expected = unixTime(2016, Calendar.JUNE, 1);
+        long t0 = unixTime(2016, Calendar.JUNE, 1);
+        long t1 = unixTime(2016, Calendar.JUNE, 15);
+        long t2 = unixTime(2016, Calendar.JUNE, 20);
 
         DateUtils.TruncateField field = DateUtils.TruncateField.MONTH;
 
@@ -89,10 +89,10 @@ public class DateUtilsTest extends BaseUnitTest
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
         assertThat(DateUtils.truncate(field, t2), equalTo(expected));
 
-        expected = timestamp(2016, DECEMBER, 1);
-        t0 = timestamp(2016, DECEMBER, 1);
-        t1 = timestamp(2016, DECEMBER, 15);
-        t2 = timestamp(2016, DECEMBER, 31);
+        expected = unixTime(2016, DECEMBER, 1);
+        t0 = unixTime(2016, DECEMBER, 1);
+        t1 = unixTime(2016, DECEMBER, 15);
+        t2 = unixTime(2016, DECEMBER, 31);
 
         assertThat(DateUtils.truncate(field, t0), equalTo(expected));
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
@@ -104,19 +104,19 @@ public class DateUtilsTest extends BaseUnitTest
     {
         DateUtils.TruncateField field = DateUtils.TruncateField.QUARTER;
 
-        long expected = timestamp(2016, JANUARY, 1);
-        long t0 = timestamp(2016, JANUARY, 20);
-        long t1 = timestamp(2016, FEBRUARY, 15);
-        long t2 = timestamp(2016, MARCH, 30);
+        long expected = unixTime(2016, JANUARY, 1);
+        long t0 = unixTime(2016, JANUARY, 20);
+        long t1 = unixTime(2016, FEBRUARY, 15);
+        long t2 = unixTime(2016, MARCH, 30);
 
         assertThat(DateUtils.truncate(field, t0), equalTo(expected));
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
         assertThat(DateUtils.truncate(field, t2), equalTo(expected));
 
-        expected = timestamp(2016, APRIL, 1);
-        t0 = timestamp(2016, APRIL, 1);
-        t1 = timestamp(2016, MAY, 30);
-        t2 = timestamp(2016, JUNE, 20);
+        expected = unixTime(2016, APRIL, 1);
+        t0 = unixTime(2016, APRIL, 1);
+        t1 = unixTime(2016, MAY, 30);
+        t2 = unixTime(2016, JUNE, 20);
 
         assertThat(DateUtils.truncate(field, t0), equalTo(expected));
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
@@ -128,19 +128,19 @@ public class DateUtilsTest extends BaseUnitTest
     {
         DateUtils.TruncateField field = DateUtils.TruncateField.YEAR;
 
-        long expected = timestamp(2016, JANUARY, 1);
-        long t0 = timestamp(2016, JANUARY, 1);
-        long t1 = timestamp(2016, FEBRUARY, 25);
-        long t2 = timestamp(2016, DECEMBER, 31);
+        long expected = unixTime(2016, JANUARY, 1);
+        long t0 = unixTime(2016, JANUARY, 1);
+        long t1 = unixTime(2016, FEBRUARY, 25);
+        long t2 = unixTime(2016, DECEMBER, 31);
 
         assertThat(DateUtils.truncate(field, t0), equalTo(expected));
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
         assertThat(DateUtils.truncate(field, t2), equalTo(expected));
 
-        expected = timestamp(2017, JANUARY, 1);
-        t0 = timestamp(2017, JANUARY, 1);
-        t1 = timestamp(2017, MAY, 30);
-        t2 = timestamp(2017, DECEMBER, 31);
+        expected = unixTime(2017, JANUARY, 1);
+        t0 = unixTime(2017, JANUARY, 1);
+        t1 = unixTime(2017, MAY, 30);
+        t2 = unixTime(2017, DECEMBER, 31);
 
         assertThat(DateUtils.truncate(field, t0), equalTo(expected));
         assertThat(DateUtils.truncate(field, t1), equalTo(expected));
@@ -150,10 +150,10 @@ public class DateUtilsTest extends BaseUnitTest
     @Test
     public void testMillisecondsUntilTomorrow() throws Exception
     {
-        DateUtils.setFixedLocalTime(timestamp(2017, JANUARY, 1, 2, 59));
+        DateUtils.setFixedLocalTime(unixTime(2017, JANUARY, 1, 2, 59));
         assertThat(DateUtils.millisecondsUntilTomorrow(), equalTo(60000L));
 
-        DateUtils.setFixedLocalTime(timestamp(2017, JANUARY, 1, 23, 0));
+        DateUtils.setFixedLocalTime(unixTime(2017, JANUARY, 1, 23, 0));
         assertThat(DateUtils.millisecondsUntilTomorrow(), equalTo(14400000L));
 
     }
@@ -162,81 +162,81 @@ public class DateUtilsTest extends BaseUnitTest
     public void test_applyTimezone()
     {
         DateUtils.setFixedTimeZone(TimeZone.getTimeZone("Australia/Sydney"));
-        assertEquals(applyTimezone(timestamp(2017, JULY, 30, 18, 0)), (timestamp(2017, JULY, 30, 8, 0)));
-        assertEquals(applyTimezone(timestamp(2017, SEPTEMBER, 30,  0, 0)), (timestamp(2017, SEPTEMBER, 29, 14, 0)));
-        assertEquals(applyTimezone(timestamp(2017, SEPTEMBER, 30, 10, 0)), (timestamp(2017, SEPTEMBER, 30,  0, 0)));
-        assertEquals(applyTimezone(timestamp(2017, SEPTEMBER, 30, 11, 0)), (timestamp(2017, SEPTEMBER, 30,  1, 0)));
-        assertEquals(applyTimezone(timestamp(2017, SEPTEMBER, 30, 12, 0)), (timestamp(2017, SEPTEMBER, 30,  2, 0)));
-        assertEquals(applyTimezone(timestamp(2017, SEPTEMBER, 30, 13, 0)), (timestamp(2017, SEPTEMBER, 30,  3, 0)));
-        assertEquals(applyTimezone(timestamp(2017, SEPTEMBER, 30, 22, 0)), (timestamp(2017, SEPTEMBER, 30, 12, 0)));
-        assertEquals(applyTimezone(timestamp(2017, SEPTEMBER, 30, 23, 0)), (timestamp(2017, SEPTEMBER, 30, 13, 0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1,  0,  0)), (timestamp(2017, SEPTEMBER, 30, 14,  0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1,  1,  0)), (timestamp(2017, SEPTEMBER, 30, 15,  0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1,  1, 59)), (timestamp(2017, SEPTEMBER, 30, 15, 59)));
+        assertEquals(applyTimezone(unixTime(2017, JULY, 30, 18, 0)), (unixTime(2017, JULY, 30, 8, 0)));
+        assertEquals(applyTimezone(unixTime(2017, SEPTEMBER, 30,  0, 0)), (unixTime(2017, SEPTEMBER, 29, 14, 0)));
+        assertEquals(applyTimezone(unixTime(2017, SEPTEMBER, 30, 10, 0)), (unixTime(2017, SEPTEMBER, 30,  0, 0)));
+        assertEquals(applyTimezone(unixTime(2017, SEPTEMBER, 30, 11, 0)), (unixTime(2017, SEPTEMBER, 30,  1, 0)));
+        assertEquals(applyTimezone(unixTime(2017, SEPTEMBER, 30, 12, 0)), (unixTime(2017, SEPTEMBER, 30,  2, 0)));
+        assertEquals(applyTimezone(unixTime(2017, SEPTEMBER, 30, 13, 0)), (unixTime(2017, SEPTEMBER, 30,  3, 0)));
+        assertEquals(applyTimezone(unixTime(2017, SEPTEMBER, 30, 22, 0)), (unixTime(2017, SEPTEMBER, 30, 12, 0)));
+        assertEquals(applyTimezone(unixTime(2017, SEPTEMBER, 30, 23, 0)), (unixTime(2017, SEPTEMBER, 30, 13, 0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1,  0,  0)), (unixTime(2017, SEPTEMBER, 30, 14,  0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1,  1,  0)), (unixTime(2017, SEPTEMBER, 30, 15,  0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1,  1, 59)), (unixTime(2017, SEPTEMBER, 30, 15, 59)));
         // DST begins
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1,  3,  0)), (timestamp(2017, SEPTEMBER, 30, 16,  0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1,  4,  0)), (timestamp(2017, SEPTEMBER, 30, 17,  0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1,  5,  0)), (timestamp(2017, SEPTEMBER, 30, 18,  0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1, 11,  0)), (timestamp(2017, OCTOBER, 1, 0, 0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1, 12,  0)), (timestamp(2017, OCTOBER, 1, 1, 0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1, 13,  0)), (timestamp(2017, OCTOBER, 1, 2, 0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1, 14,  0)), (timestamp(2017, OCTOBER, 1, 3, 0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1, 15,  0)), (timestamp(2017, OCTOBER, 1, 4, 0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 1, 19,  0)), (timestamp(2017, OCTOBER, 1, 8, 0)));
-        assertEquals(applyTimezone(timestamp(2017, OCTOBER, 2, 19, 0)), (timestamp(2017, OCTOBER, 2, 8, 0)));
-        assertEquals(applyTimezone(timestamp(2017, NOVEMBER, 30, 19, 0)), (timestamp(2017, NOVEMBER, 30, 8, 0)));
-        assertEquals(applyTimezone(timestamp(2018, MARCH, 31,  0,  0)), (timestamp(2018, MARCH, 30, 13,  0)));
-        assertEquals(applyTimezone(timestamp(2018, MARCH, 31, 12,  0)), (timestamp(2018, MARCH, 31,  1,  0)));
-        assertEquals(applyTimezone(timestamp(2018, MARCH, 31, 18,  0)), (timestamp(2018, MARCH, 31,  7,  0)));
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1,  0,  0)), (timestamp(2018, MARCH, 31, 13,  0)));
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1,  1,  0)), (timestamp(2018, MARCH, 31, 14,  0)));
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1,  1, 59)), (timestamp(2018, MARCH, 31, 14, 59)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1,  3,  0)), (unixTime(2017, SEPTEMBER, 30, 16,  0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1,  4,  0)), (unixTime(2017, SEPTEMBER, 30, 17,  0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1,  5,  0)), (unixTime(2017, SEPTEMBER, 30, 18,  0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1, 11,  0)), (unixTime(2017, OCTOBER, 1, 0, 0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1, 12,  0)), (unixTime(2017, OCTOBER, 1, 1, 0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1, 13,  0)), (unixTime(2017, OCTOBER, 1, 2, 0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1, 14,  0)), (unixTime(2017, OCTOBER, 1, 3, 0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1, 15,  0)), (unixTime(2017, OCTOBER, 1, 4, 0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 1, 19,  0)), (unixTime(2017, OCTOBER, 1, 8, 0)));
+        assertEquals(applyTimezone(unixTime(2017, OCTOBER, 2, 19, 0)), (unixTime(2017, OCTOBER, 2, 8, 0)));
+        assertEquals(applyTimezone(unixTime(2017, NOVEMBER, 30, 19, 0)), (unixTime(2017, NOVEMBER, 30, 8, 0)));
+        assertEquals(applyTimezone(unixTime(2018, MARCH, 31,  0,  0)), (unixTime(2018, MARCH, 30, 13,  0)));
+        assertEquals(applyTimezone(unixTime(2018, MARCH, 31, 12,  0)), (unixTime(2018, MARCH, 31,  1,  0)));
+        assertEquals(applyTimezone(unixTime(2018, MARCH, 31, 18,  0)), (unixTime(2018, MARCH, 31,  7,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1,  0,  0)), (unixTime(2018, MARCH, 31, 13,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1,  1,  0)), (unixTime(2018, MARCH, 31, 14,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1,  1, 59)), (unixTime(2018, MARCH, 31, 14, 59)));
         // DST ends
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1,  2,  0)), (timestamp(2018, MARCH, 31, 16,  0)));
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1,  3,  0)), (timestamp(2018, MARCH, 31, 17,  0)));
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1,  4,  0)), (timestamp(2018, MARCH, 31, 18,  0)));
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1, 10,  0)), (timestamp(2018, APRIL,  1,  0,  0)));
-        assertEquals(applyTimezone(timestamp(2018, APRIL,  1, 18,  0)), (timestamp(2018, APRIL,  1,  8,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1,  2,  0)), (unixTime(2018, MARCH, 31, 16,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1,  3,  0)), (unixTime(2018, MARCH, 31, 17,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1,  4,  0)), (unixTime(2018, MARCH, 31, 18,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1, 10,  0)), (unixTime(2018, APRIL,  1,  0,  0)));
+        assertEquals(applyTimezone(unixTime(2018, APRIL,  1, 18,  0)), (unixTime(2018, APRIL,  1,  8,  0)));
     }
 
     @Test
     public void test_removeTimezone()
     {
         DateUtils.setFixedTimeZone(TimeZone.getTimeZone("Australia/Sydney"));
-        assertEquals(removeTimezone(timestamp(2017, JULY, 30, 8, 0)), (timestamp(2017, JULY, 30, 18, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 29, 14, 0)), (timestamp(2017, SEPTEMBER, 30,  0, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30,  0, 0)), (timestamp(2017, SEPTEMBER, 30, 10, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30,  1, 0)), (timestamp(2017, SEPTEMBER, 30, 11, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30,  2, 0)), (timestamp(2017, SEPTEMBER, 30, 12, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30,  3, 0)), (timestamp(2017, SEPTEMBER, 30, 13, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 12, 0)), (timestamp(2017, SEPTEMBER, 30, 22, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 13, 0)), (timestamp(2017, SEPTEMBER, 30, 23, 0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 14,  0)), (timestamp(2017, OCTOBER, 1,  0,  0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 15,  0)), (timestamp(2017, OCTOBER, 1,  1,  0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 15, 59)), (timestamp(2017, OCTOBER, 1,  1, 59)));
+        assertEquals(removeTimezone(unixTime(2017, JULY, 30, 8, 0)), (unixTime(2017, JULY, 30, 18, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 29, 14, 0)), (unixTime(2017, SEPTEMBER, 30,  0, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30,  0, 0)), (unixTime(2017, SEPTEMBER, 30, 10, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30,  1, 0)), (unixTime(2017, SEPTEMBER, 30, 11, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30,  2, 0)), (unixTime(2017, SEPTEMBER, 30, 12, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30,  3, 0)), (unixTime(2017, SEPTEMBER, 30, 13, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 12, 0)), (unixTime(2017, SEPTEMBER, 30, 22, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 13, 0)), (unixTime(2017, SEPTEMBER, 30, 23, 0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 14,  0)), (unixTime(2017, OCTOBER, 1,  0,  0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 15,  0)), (unixTime(2017, OCTOBER, 1,  1,  0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 15, 59)), (unixTime(2017, OCTOBER, 1,  1, 59)));
         // DST begins
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 16,  0)), (timestamp(2017, OCTOBER, 1,  3,  0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 17,  0)), (timestamp(2017, OCTOBER, 1,  4,  0)));
-        assertEquals(removeTimezone(timestamp(2017, SEPTEMBER, 30, 18,  0)), (timestamp(2017, OCTOBER, 1,  5,  0)));
-        assertEquals(removeTimezone(timestamp(2017, OCTOBER, 1, 0, 0)), (timestamp(2017, OCTOBER, 1, 11,  0)));
-        assertEquals(removeTimezone(timestamp(2017, OCTOBER, 1, 1, 0)), (timestamp(2017, OCTOBER, 1, 12,  0)));
-        assertEquals(removeTimezone(timestamp(2017, OCTOBER, 1, 2, 0)), (timestamp(2017, OCTOBER, 1, 13,  0)));
-        assertEquals(removeTimezone(timestamp(2017, OCTOBER, 1, 3, 0)), (timestamp(2017, OCTOBER, 1, 14,  0)));
-        assertEquals(removeTimezone(timestamp(2017, OCTOBER, 1, 4, 0)), (timestamp(2017, OCTOBER, 1, 15,  0)));
-        assertEquals(removeTimezone(timestamp(2017, OCTOBER, 1, 8, 0)), (timestamp(2017, OCTOBER, 1, 19,  0)));
-        assertEquals(removeTimezone(timestamp(2017, OCTOBER, 2, 8, 0)), (timestamp(2017, OCTOBER, 2, 19, 0)));
-        assertEquals(removeTimezone(timestamp(2017, NOVEMBER, 30, 8, 0)), (timestamp(2017, NOVEMBER, 30, 19, 0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 30, 13,  0)), (timestamp(2018, MARCH, 31,  0,  0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31,  1,  0)), (timestamp(2018, MARCH, 31, 12,  0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31,  7,  0)), (timestamp(2018, MARCH, 31, 18,  0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31, 13,  0)), (timestamp(2018, APRIL,  1,  0,  0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31, 14,  0)), (timestamp(2018, APRIL,  1,  1,  0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31, 14, 59)), (timestamp(2018, APRIL,  1,  1, 59)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 16,  0)), (unixTime(2017, OCTOBER, 1,  3,  0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 17,  0)), (unixTime(2017, OCTOBER, 1,  4,  0)));
+        assertEquals(removeTimezone(unixTime(2017, SEPTEMBER, 30, 18,  0)), (unixTime(2017, OCTOBER, 1,  5,  0)));
+        assertEquals(removeTimezone(unixTime(2017, OCTOBER, 1, 0, 0)), (unixTime(2017, OCTOBER, 1, 11,  0)));
+        assertEquals(removeTimezone(unixTime(2017, OCTOBER, 1, 1, 0)), (unixTime(2017, OCTOBER, 1, 12,  0)));
+        assertEquals(removeTimezone(unixTime(2017, OCTOBER, 1, 2, 0)), (unixTime(2017, OCTOBER, 1, 13,  0)));
+        assertEquals(removeTimezone(unixTime(2017, OCTOBER, 1, 3, 0)), (unixTime(2017, OCTOBER, 1, 14,  0)));
+        assertEquals(removeTimezone(unixTime(2017, OCTOBER, 1, 4, 0)), (unixTime(2017, OCTOBER, 1, 15,  0)));
+        assertEquals(removeTimezone(unixTime(2017, OCTOBER, 1, 8, 0)), (unixTime(2017, OCTOBER, 1, 19,  0)));
+        assertEquals(removeTimezone(unixTime(2017, OCTOBER, 2, 8, 0)), (unixTime(2017, OCTOBER, 2, 19, 0)));
+        assertEquals(removeTimezone(unixTime(2017, NOVEMBER, 30, 8, 0)), (unixTime(2017, NOVEMBER, 30, 19, 0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 30, 13,  0)), (unixTime(2018, MARCH, 31,  0,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31,  1,  0)), (unixTime(2018, MARCH, 31, 12,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31,  7,  0)), (unixTime(2018, MARCH, 31, 18,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31, 13,  0)), (unixTime(2018, APRIL,  1,  0,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31, 14,  0)), (unixTime(2018, APRIL,  1,  1,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31, 14, 59)), (unixTime(2018, APRIL,  1,  1, 59)));
         // DST ends
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31, 16,  0)), (timestamp(2018, APRIL,  1,  2,  0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31, 17,  0)), (timestamp(2018, APRIL,  1,  3,  0)));
-        assertEquals(removeTimezone(timestamp(2018, MARCH, 31, 18,  0)), (timestamp(2018, APRIL,  1,  4,  0)));
-        assertEquals(removeTimezone(timestamp(2018, APRIL,  1,  0,  0)), (timestamp(2018, APRIL,  1, 10,  0)));
-        assertEquals(removeTimezone(timestamp(2018, APRIL,  1,  8,  0)), (timestamp(2018, APRIL,  1, 18,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31, 16,  0)), (unixTime(2018, APRIL,  1,  2,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31, 17,  0)), (unixTime(2018, APRIL,  1,  3,  0)));
+        assertEquals(removeTimezone(unixTime(2018, MARCH, 31, 18,  0)), (unixTime(2018, APRIL,  1,  4,  0)));
+        assertEquals(removeTimezone(unixTime(2018, APRIL,  1,  0,  0)), (unixTime(2018, APRIL,  1, 10,  0)));
+        assertEquals(removeTimezone(unixTime(2018, APRIL,  1,  8,  0)), (unixTime(2018, APRIL,  1, 18,  0)));
     }
 }