diff --git a/CHANGELOG.md b/CHANGELOG.md
index e30699b10..33d769281 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+### 1.6.0 (Oct 10, 2016)
+
+* Add option to make notifications sticky
+* Add option to hide completed habits
+* Display total number of repetitions for each habit
+* Pebble integration: check/snooze habits from the watch
+* Tasker/Locale integration: allow third-party apps to add checkmarks
+* Export an unified CSV file, with checkmarks for all the habits
+* Increase width of name column according to screen size
+* Stop showing reminders for archived habits
+* Add Danish, Dutch, Greek, Hindi and Portuguese (PT) translations
+* Other minor fixes and enhancements
+
+### 1.5.6 (Jun 19, 2016)
+
+* Fix bug that prevented checkmark widget from working
+
+### 1.5.5 (Jun 19, 2016)
+
+* Fix bug that prevented check button on notification to work sometimes
+* Fix bug that caused back button to apparently erase some checkmarks
+* Complete French translation
+* Add Croatian and Slovenian translations
+
 ### 1.5.4 (May 29, 2016)
 
 * Fix crash upon opening settings screen in some phones
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1a958f1c1..d3443abd2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="22"
-    android:versionName="1.5.6">
+    android:versionCode="23"
+    android:versionName="1.6.0">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 
diff --git a/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
index f36ad2780..8f22206f4 100644
--- a/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
+++ b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
@@ -24,13 +24,14 @@ import org.isoron.uhabits.R;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
+import android.app.*;
+import android.app.ActionBar;
 import android.app.ActionBar.LayoutParams;
-import android.app.DialogFragment;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialogFragment;
+import android.support.v7.app.*;
 import android.util.Log;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
@@ -193,10 +194,16 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState)
+    {
+        return new AppCompatDialog(getActivity(), R.style.TimePickerDialog);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
 
         View view = inflater.inflate(R.layout.time_picker_dialog, null);
         KeyboardListener keyboardListener = new KeyboardListener();
diff --git a/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java b/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
index 2a92a0ff0..311749159 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
@@ -27,6 +27,8 @@ import android.view.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.*;
+import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.models.sqlite.*;
 
 import static android.R.anim.*;
 
@@ -125,6 +127,14 @@ abstract public class BaseActivity extends AppCompatActivity
             // ignored
         }
 
+        if (ex.getCause() instanceof InconsistentDatabaseException)
+        {
+            HabitsApplication app = (HabitsApplication) getApplication();
+            HabitList habits = app.getComponent().getHabitList();
+            habits.repair();
+            System.exit(0);
+        }
+
         if (androidExceptionHandler != null)
             androidExceptionHandler.uncaughtException(thread, ex);
         else System.exit(1);
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
index 1b6b74163..af89c14ff 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
@@ -27,7 +27,6 @@ import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
@@ -160,19 +159,7 @@ public class ListHabitsController
     public void onRepairDB()
     {
         taskRunner.execute(() -> {
-            for(Habit h : habitList)
-            {
-                h.getCheckmarks().invalidateNewerThan(0);
-                h.getStreaks().invalidateNewerThan(0);
-                h.getScores().invalidateNewerThan(0);
-            }
-
-            if(habitList instanceof SQLiteHabitList)
-            {
-                SQLiteHabitList sqlList = (SQLiteHabitList) habitList;
-                sqlList.rebuildOrder();
-            }
-
+            habitList.repair();
             screen.showMessage(R.string.database_repaired);
         });
     }
diff --git a/app/src/main/java/org/isoron/uhabits/models/HabitList.java b/app/src/main/java/org/isoron/uhabits/models/HabitList.java
index b63cd33e8..dd2b81f23 100644
--- a/app/src/main/java/org/isoron/uhabits/models/HabitList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/HabitList.java
@@ -147,6 +147,16 @@ public abstract class HabitList implements Iterable<Habit>
      */
     public abstract void reorder(Habit from, Habit to);
 
+    public void repair()
+    {
+        for(Habit h : this)
+        {
+            h.getCheckmarks().invalidateNewerThan(0);
+            h.getStreaks().invalidateNewerThan(0);
+            h.getScores().invalidateNewerThan(0);
+        }
+    }
+
     /**
      * Returns the number of habits in this list.
      *
diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
index 50b3ef4aa..6541a81d3 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
@@ -282,4 +282,11 @@ public class SQLiteHabitList extends HabitList
         appendOrderBy(query);
         return query.toString();
     }
+
+    @Override
+    public void repair()
+    {
+        super.repair();
+        rebuildOrder();
+    }
 }
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 8d2903ebe..0d391a70c 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -109,6 +109,15 @@
                 <TextView
                     style="@style/About.Item"
                     android:text="Денис (sciamano)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Joseph Tran"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Nikhil (regularcoder)"/>
+
             </LinearLayout>
 
             <LinearLayout
@@ -172,6 +181,14 @@
                     style="@style/About.Item"
                     android:text="Marco Cavazza (Italiano)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Mark Macaré (Nederlands)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Jelle den Butter (Nederlands)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Adam Jurkiewicz (Polski)"/>
@@ -180,6 +197,10 @@
                     style="@style/About.Item"
                     android:text="Álinson Xavier (Português)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Bernardo Lopes (Português)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Dmitriy Bogdanov (Русский)"/>
@@ -208,6 +229,10 @@
                     style="@style/About.Item"
                     android:text="Yurii Stavytskyi (Українська)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Rystard (Українська)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Limin Lu (中文)"/>
@@ -220,6 +245,10 @@
                     style="@style/About.Item"
                     android:text="Ting-Hua (中文)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Bowie Chen (中文)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Lee (中文)"/>
@@ -239,6 +268,14 @@
                 <TextView
                     style="@style/About.Item"
                     android:text="Josh Graham (한국어 )"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Aman Satnami (हिन्दी)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Andreas Michelakis (Ελληνικά)"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
new file mode 100644
index 000000000..6e725d336
--- /dev/null
+++ b/app/src/main/res/values-da/strings.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">"Loop Vane Tracker"</string>
+    <string name="main_activity_title">"Vaner"</string>
+    <string name="action_settings">"Indstillinger"</string>
+    <string name="edit">"Rediger"</string>
+    <string name="delete">"Slet"</string>
+    <string name="archive">"Arkiver"</string>
+    <string name="unarchive">"Fjern fra arkiv"</string>
+    <string name="add_habit">"Tilføj vane"</string>
+    <string name="color_picker_default_title">"Skift farve"</string>
+    <string name="toast_habit_created">"Vanen er skabt."</string>
+    <string name="toast_habit_deleted">"Vanen er slettet."</string>
+    <string name="toast_habit_restored">"Vanen er genskabt."</string>
+    <string name="toast_nothing_to_undo">"Intet at fortryde."</string>
+    <string name="toast_nothing_to_redo">"Intet at gengøre."</string>
+    <string name="toast_habit_changed">"Vanen er ændret"</string>
+
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+    <string name="toast_habit_changed_back">"Vanen er ændret tilbage."</string>
+    <string name="toast_habit_archived">"Vanerne er arkiveret."</string>
+    <string name="toast_habit_unarchived">"Vanerne er fjernet fra arkivet."</string>
+    <string name="overview">"Overblik"</string>
+    <string name="habit_strength">"Vanestyrke"</string>
+    <string name="history">"Historie"</string>
+    <string name="clear">"Rens"</string>
+    <string name="description_hint">"Spørgsmål (Fik du … i dag)"</string>
+
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"Gentag"</string>
+    <string name="times_every">"gange på"</string>
+    <string name="days">"dage"</string>
+    <string name="reminder">"Påmindelse"</string>
+    <string name="discard">"Forkast"</string>
+    <string name="save">"Gem"</string>
+
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+    <string name="streaks">"i træk"</string>
+    <string name="no_habits_found">"Du har ingen aktive vaner"</string>
+    <string name="long_press_to_toggle">"Tryk og hold nede for at afkrydse"</string>
+    <string name="reminder_off">"Slukket"</string>
+    <string name="validation_name_should_not_be_blank">"Navn skal udfyldes."</string>
+    <string name="validation_number_should_be_positive">"Tallet skal være positivt."</string>
+    <string name="validation_at_most_one_rep_per_day">"Du kan højst have én gentagelse per dag"</string>
+    <string name="create_habit">"Skab en vane"</string>
+    <string name="edit_habit">"Rediger vane"</string>
+    <string name="check">"Tjek"</string>
+    <string name="snooze">"Senere"</string>
+
+    <!-- App introduction -->
+    <string name="intro_title_1">"Velkommen"</string>
+    <string name="intro_description_1">"Loop Habit Tracker hjælper dig med at holde gode vaner."</string>
+    <string name="intro_title_2">"Skab nogle nye vaner"</string>
+    <string name="intro_description_2">"Hver dag, efter at have udført din vane, skal du sætte et flueben i app'en."</string>
+    <string name="intro_title_3">"Fortsæt"</string>
+    <string name="intro_description_3">"Vaner fulgt regelmæssigt gennem langtid modtager en stjerne."</string>
+    <string name="intro_title_4">"Følg dine fremskridt"</string>
+    <string name="intro_description_4">"Detaljerede grafer viser dig hvordan dine vaner udvikler sig over tid."</string>
+    <string name="interval_15_minutes">"15 minutter"</string>
+    <string name="interval_30_minutes">"30 minutter"</string>
+    <string name="interval_1_hour">"1 time"</string>
+    <string name="interval_2_hour">"2 timer"</string>
+    <string name="interval_4_hour">"4 timer"</string>
+    <string name="interval_8_hour">"8 timer"</string>
+    <string name="pref_toggle_title">"Vælg gentagelser med kort tryk"</string>
+    <string name="pref_toggle_description">"Mere bekvemmeligt, men kan forårsage uhensigtede tryk."</string>
+    <string name="pref_snooze_interval_title">"Snooze interval på påmindelserne"</string>
+    <string name="pref_rate_this_app">"Bedøm denne app på Google Play"</string>
+    <string name="pref_send_feedback">"Send feedback til udvikleren"</string>
+    <string name="pref_view_source_code">"Se kildekoden på GitHub"</string>
+    <string name="pref_view_app_introduction">"Se app introduktion"</string>
+    <string name="links">"Henvisninger"</string>
+    <string name="behavior">"Opførelse"</string>
+    <string name="name">"Navn"</string>
+    <string name="show_archived">"Vis arkiverede"</string>
+    <string name="settings">"Indstillinger"</string>
+    <string name="snooze_interval">"Snooze interval"</string>
+    <string name="hint_title">"Vidste du?"</string>
+    <string name="hint_drag">"For at omarrangere poster, tryk og hold på navnet på den vane, og træk den til det korrekte sted."</string>
+    <string name="hint_landscape">"Du kan se flere dage ved at sætte telefonen i liggende tilstand."</string>
+    <string name="delete_habits">"Slet vaner"</string>
+    <string name="delete_habits_message">"Vanerne vil blive slettet permanent. Denne handling kan ikke fortrydes."</string>
+    <string name="weekends">"Weekender"</string>
+    <string name="any_weekday">"Mandag til Fredag"</string>
+    <string name="any_day">"En hvilken som helst dag i ugen"</string>
+    <string name="select_weekdays">"Vælg dage"</string>
+    <string name="export_to_csv">"Eksporter som CSV"</string>
+    <string name="done_label">"Færdig"</string>
+    <string name="clear_label">"Fjern"</string>
+    <string name="select_hours">"Vælg timer"</string>
+    <string name="select_minutes">"Vælg minutter"</string>
+
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Opret gode vaner og spore deres fremskridt over tid (reklamefri)"</string>
+    <string name="store_description_1">"Loop hjælper dig med at oprette og vedligeholde gode vaner, så du kan nå dine langsigtede mål. Detaljerede grafer og statistikker viser dig, hvordan dine vaner har forbedret over tid. Det er helt reklamefri og open source."</string>
+<string name="store_feature_interface">"&lt;B&gt; Enkel, smuk og moderne grænseflade &lt;/ b&gt;
+Loop har en minimalistisk brugerflade, der er nem at bruge og følger Google's retningslinjer for materielle design."</string>
+<string name="store_feature_score">"&lt;B&gt; Habit score &lt;/ b&gt;
+Ud over at vise din nuværende stribe, har Loop en avanceret algoritme til at beregne styrken af dine vaner. Hver gentagelse gør din vane stærkere, og hver misset dag gør det svagere. Et par misset dage efter en lang stribe, vil dog ikke helt ødelægge hele din fremgang."</string>
+<string name="store_feature_statistics">"&lt;B&gt; Detaljerede grafer og statistikker &lt;/ b&gt;
+Se, hvordan dine vaner har forbedret over tid med smukke og detaljerede grafer. Rul tilbage for at se den komplette oversigt over dine vaner."</string>
+<string name="store_feature_schedules">"&lt;B&gt; Fleksible skemaer &lt;/ b&gt;
+Understøtter både daglige vaner og vaner med mere komplekse skemaer, såsom 3 gange hver uge; én gang hver anden uge; eller hver anden dag."</string>
+<string name="store_feature_reminders">"&lt;B&gt; Påmindelser &lt;/ b&gt;
+Opret en individuel påmindelse for hver vane, på et valgt tidspunkt af dagen. Nemt kontrollere, afskedige eller udsætte din vane direkte fra notifikationen, uden at åbne applikationen."</string>
+<string name="store_feature_opensource">"&lt;B&gt; Helt reklamefri og open source &lt;/ b&gt;
+Der er absolut ingen reklamer, irriterende meddelelser eller indgribende tilladelser i denne app, og det vil der aldrig være. Den komplette kildekode er tilgængelig under GPLv3."</string>
+<string name="store_feature_wear">"&lt;B&gt; Optimeret til smartwatches &lt;/ b&gt;
+Påmindelser kan kontrolleres, udsæt eller afvise direkte fra din Android Wear ur."</string>
+    <string name="about">"Om"</string>
+    <string name="translators">"Oversættere"</string>
+    <string name="developers">"Udviklere"</string>
+
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"Version %s"</string>
+    <string name="frequency">"Hyppighed"</string>
+    <string name="checkmark">"Afkrydsning"</string>
+
+    <!-- This is a shorter version of "Habit Strength" -->
+    <string name="strength">"Styrke"</string>
+    <string name="best_streaks">"Bedste striber"</string>
+    <string name="current_streaks">"Aktuel stribe"</string>
+    <string name="number_of_repetitions">"Antal gentagelser"</string>
+    <string name="last_x_days">"Sidste % dage"</string>
+    <string name="last_x_weeks">"Sidste %d uger"</string>
+    <string name="last_x_months">"Sidste %d måneder"</string>
+    <string name="last_x_years">"Sidste %d år"</string>
+
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"All time"</string>
+    <string name="every_day">"Hver dag"</string>
+    <string name="every_week">"Hver uge"</string>
+    <string name="two_times_per_week">"2 gange om ugen"</string>
+    <string name="five_times_per_week">"5 gange om ugen"</string>
+    <string name="custom_frequency">"Brugerdefinerede"</string>
+    <string name="help">"Hjælp &amp; FAQ"</string>
+    <string name="could_not_export">"Kunne ikke eksportere data"</string>
+    <string name="could_not_import">"Kunne ikke importere data"</string>
+
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"Fil ikke genkendt."</string>
+    <string name="habits_imported">"Vaner importeret."</string>
+    <string name="full_backup_success">"Fuld backup eksporteret."</string>
+    <string name="import_data">"Importer data"</string>
+    <string name="export_full_backup">"Eksporter fuld backup."</string>
+    <string name="import_data_summary">"Understøtter fuld backup eksporteret af denne app, samt filer genereret af Tickmate, HabitBull eller Rewire. Se FAQ for mere information."</string>
+    <string name="export_as_csv_summary">"Opretter filer, der kan åbnes af regneark fra Microsoft Excel eller OpenOffice Calc. Denne fil kan ikke importeres tilbage."</string>
+    <string name="export_full_backup_summary">"Opretter en fil, der indeholder alle dine data. Denne fil kan importeres tilbage."</string>
+    <string name="bug_report_failed">"Kunne ikke generere fejlrapport."</string>
+    <string name="generate_bug_report">"Generer fejlrapport"</string>
+    <string name="troubleshooting">"Fejlfinding"</string>
+    <string name="help_translate">"Hjælpe med at oversætte denne app"</string>
+    <string name="night_mode">"Nat-tilstand"</string>
+    <string name="use_pure_black">"Brug ren sort i nat-tilstand"</string>
+    <string name="pure_black_description">"Erstatter grå baggrunde med ren sort i nat-tilstand. Reducerer batteriforbruget i telefoner med AMOLED skærm."</string>
+    <string name="interface_preferences">"Grænseflade"</string>
+    <string name="reverse_days">"Omvendt rækkefølge af dage"</string>
+    <string name="reverse_days_description">"Vis dag i omvendt rækkefølge på hovedskærmen"</string>
+    <string name="day">"Dag"</string>
+    <string name="week">"Uge"</string>
+    <string name="month">"Måned"</string>
+
+    <!-- Three-month period -->
+    <string name="quarter">"Kvartal"</string>
+    <string name="year">"År"</string>
+
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"Tid til"</string>
+    <string name="every_x_days">"Hver %d dage"</string>
+    <string name="every_x_weeks">"Hver %d uger"</string>
+    <string name="every_x_months">"Hver %d måneder"</string>
+
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"Point"</string>
+    <string name="reminder_sound">"Påmindelse lyd"</string>
+
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+    <string name="none">"Ingen"</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
new file mode 100644
index 000000000..73cc39800
--- /dev/null
+++ b/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">"Loop - Καταγραφή Συνηθειών"</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="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="toast_habit_changed">"Η συνήθεια άλλαξε"</string>
+
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+    <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="description_hint">"Ερώτηση (Κάνατε...σήμερα;)"</string>
+
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"Επανέλαβε"</string>
+    <string name="times_every">"φορές την"</string>
+    <string name="days">"ημέρες"</string>
+    <string name="reminder">"Υπενθύμιση"</string>
+    <string name="discard">"Απόρριψη"</string>
+    <string name="save">"Αποθήκευση"</string>
+
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+    <string name="streaks">"Σερί"</string>
+    <string name="no_habits_found">"Δεν έχετε ενεργές συνήθειες"</string>
+    <string name="long_press_to_toggle">"Πατήστε παρατεταμένα για επιλογή η αποεπιλογή"</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="edit_habit">"Επεξεργασία συνήθειας"</string>
+    <string name="check">"Επιλογή"</string>
+    <string name="snooze">"Αργότερα"</string>
+
+    <!-- App introduction -->
+    <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_title_3">"Συνεχίστε να το κάνετε"</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">"1 ώρα"</string>
+    <string name="interval_2_hour">"2 ώρες"</string>
+    <string name="interval_4_hour">"4 ώρες"</string>
+    <string name="interval_8_hour">"8 ώρες"</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">"Βαθμολογήστε αυτή την εφαρμογή στο Google Play"</string>
+    <string name="pref_send_feedback">"Στείλετε σχόλια"</string>
+    <string name="pref_view_source_code">"Δείτε τον πηγαίο κώδικα στο GitHub"</string>
+    <string name="pref_view_app_introduction">"Δείτε την εισαγωγή"</string>
+    <string name="links">"Σύνδεσμοι"</string>
+    <string name="behavior">"Συμπεριφορά"</string>
+    <string name="name">"Όνομα"</string>
+    <string name="show_archived">"Αρχειοθετημένα"</string>
+    <string name="settings">"Ρυθμίσεις"</string>
+    <string name="snooze_interval">"Διάστημα αναβολής"</string>
+    <string name="hint_title">"Γνωρίζατε;"</string>
+    <string name="hint_drag">"Αναδιατάξετε τις συνήθειες πατώντας παρατεταμένα στο όνομα και σύροντας στην σωστή θέση."</string>
+    <string name="hint_landscape">"Μπορείτε να δείτε περισσότερες ημέρες στην οριζόντια προβολή."</string>
+    <string name="delete_habits">"Διαγραφή συνηθειών"</string>
+    <string name="delete_habits_message">"Οι συνήθειες θα διαγραφτούν οριστικά. Αυτό δεν μπορεί να αναιρεθεί."</string>
+    <string name="weekends">"Σαββατοκύριακα"</string>
+    <string name="any_weekday">"Δευτέρα μέχρι Παρασκευή"</string>
+    <string name="any_day">"Οποιαδήποτε μέρα της εβδομάδας"</string>
+    <string name="select_weekdays">"Επιλογή ημερών"</string>
+    <string name="export_to_csv">"Εξαγωγή σαν CSV"</string>
+    <string name="done_label">"Έγινε"</string>
+    <string name="clear_label">"Εκκαθάριση"</string>
+    <string name="select_hours">"Επιλογή ωρών"</string>
+    <string name="select_minutes">"Επιλογή λεπτών"</string>
+
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Δημιουργήστε καλές συνήθειες και δείτε την πρόοδο τους(ad-free)"</string>
+    <string name="store_description_1">"Το Loop συμβάλλει στην δημιουργία και διατήρηση καλών συνηθειών, επιτρέποντας την επίτευξη των στόχων σας. Λεπτομερή διαγράμματα και στατιστικά για την πρόοδο των συνηθειών σας. Χωρίς διαφημίσεις, ανοικτού κώδικα."</string>
+<string name="store_feature_interface">"&lt;b&gt;Απλή, κομψή και μοντέρνα διεπαφή χρήστη&lt;/b&gt;
+Το Loop έχει μια μινιμαλιστική διεπαφή χρήστη που το καθιστά εύκολο στην χρήση ενώ ακολουθεί τις κατευθυντήριες γραμμές του ματεριαλιστικού σχεδιασμού."</string>
+<string name="store_feature_score">"&lt;b&gt;Σκόρ συνήθειας&lt;b&gt;
+Εκτώς της προβολής του τρέχοντος σερί, το Loop χρησιμοποιεί έναν προηγμένο αλγόριθμο για τον υπολογισμό της δύναμης των συνηθειών σας. Κάθε επανάληψη κάνει την συνήθεια δυνατότερη ενώ κάθε παράλειψη ασθενέστερη. Ωστόσο μερικές χαμένες μέρες μετά από ένα μεγάλο σερί δεν θα καταστρέψουν την συνολική σας πρόοδο."</string>
+<string name="store_feature_statistics">"&lt;b&gt;Λεπτομερή διαγράμματα και στατιστικά&lt;/b&gt;
+Δείτε καθαρά την πρόοδο των συνηθειών σας σε βάθος χρόνου με όμορφα και λεπτομερή διαγράμματα. Ανατρέξτε στο πλήρες ιστορικό των συνηθειών σας."</string>
+<string name="store_feature_schedules">"&lt;b&gt;Ευέλικτα προγράμματα&lt;/b&gt;
+Υποστηρίζει εξίσου καθημερινές συνήθειες και συνήθειες με περίπλοκα προγράμματα, όπως 3 φορές κάθε εβδομάδα, μια φορά κάθε δεύτερη εβδομάδα ή ημέρα."</string>
+<string name="store_feature_reminders">"&lt;b&gt;Υπενθυμίσεις&lt;/b&gt;
+Δημιουργήστε μία εξατομικευμένη υπενθύμιση για την κάθε συνήθεια, σε μια επιλεγμένη ώρα της ημέρας. Τσεκάρετε, απορρίψτε ή αναβάλλετε εύκολα την συνήθεια απευθείας από την υπενθύμιση χωρίς να ανοίξετε την εφαρμογή."</string>
+<string name="store_feature_opensource">"&lt;b&gt;Χωρίς διαφημίσεις και ανοικτού κώδικα&lt;/b&gt;
+Χωρίς καθόλου διαφημίσεις, ενοχλητικές ειδοποιήσεις ή παρεμβατικές άδειες για την εφαρμογή και δεν θα υπάρξουν ποτέ. Το σύνολο του κώδικα είναι διαθέσιμο υπό το GPLv3."</string>
+<string name="store_feature_wear">"&lt;b&gt;Κατασκευασμένο για smartwatch&lt;/b&gt;
+Οι υπενθυμίσεις μπορούν να επιλεχθούν, να αναβληθούν ή να απορριφθούν απευθείας από το Android Wear ρολόι σας."</string>
+    <string name="about">"Σχετικά με"</string>
+    <string name="translators">"Μεταφραστές"</string>
+    <string name="developers">"Προγραμματιστές"</string>
+
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"Έκδοση %s"</string>
+    <string name="frequency">"Συχνότητα"</string>
+    <string name="checkmark">"Σημάδι επιλογής"</string>
+
+    <!-- This is a shorter version of "Habit Strength" -->
+    <string name="strength">"Δύναμη"</string>
+    <string name="best_streaks">"Καλύτερα σερί"</string>
+    <string name="current_streaks">"Τρέχον σερί"</string>
+    <string name="number_of_repetitions">"Αριθμός επαναλήψεων"</string>
+    <string name="last_x_days">"Τελευταίες %d ημέρες"</string>
+    <string name="last_x_weeks">"Τελευταίες %d εβδομάδες"</string>
+    <string name="last_x_months">"Τελευταίους %d μήνες"</string>
+    <string name="last_x_years">"Τελευταία %d χρόνια"</string>
+
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"Όλα"</string>
+    <string name="every_day">"Κάθε μέρα"</string>
+    <string name="every_week">"Κάθε εβδομάδα"</string>
+    <string name="two_times_per_week">"2 φορές την εβδομάδα"</string>
+    <string name="five_times_per_week">"5 φορές την εβδομάδα"</string>
+    <string name="custom_frequency">"Προσαρμογή"</string>
+    <string name="help">"Βοήθεια &amp; FAQ"</string>
+    <string name="could_not_export">"Αποτυχία εξαγωγής."</string>
+    <string name="could_not_import">"Αποτυχία εισαγωγής."</string>
+
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"Άγνωστο αρχείο."</string>
+    <string name="habits_imported">"Οι συνήθειες εισάχθηκαν επιτυχώς."</string>
+    <string name="full_backup_success">"Το πλήρες αντίγραφο εξάχθηκε επιτυχώς."</string>
+    <string name="import_data">"Εισαγωγή δεδομένων"</string>
+    <string name="export_full_backup">"Εξαγωγή πλήρους αντιγ. ασφαλείας"</string>
+    <string name="import_data_summary">"Υποστηρίζει πλήρως αντίγραφα ασφαλείας που έχουν εξαχθεί από την ίδια την εφαρμογή καθώς και από τα Tickmate, HabitBull και Rewire. Δείτε τις FAQ για περισσότερες πληροφορίες."</string>
+    <string name="export_as_csv_summary">"Παράγει αρχεία τα οποία μπορούν να ανοιχτούν από προγράμματα υπολογιστικών φύλλων όπως το Microsoft Edge ή το OpenOffice Calc. Δεν γίνεται επανεισαγωγή του αρχείου."</string>
+    <string name="export_full_backup_summary">"Παράγει ένα αρχείο το οποίο περιέχει όλα τα δεδομένα σας. Είναι δυνατή η επανεισαγωγή του αρχείου."</string>
+    <string name="bug_report_failed">"Απέτυχε ή παραγωγή αναφοράς bug."</string>
+    <string name="generate_bug_report">"Παραγωγή αναφοράς bug."</string>
+    <string name="troubleshooting">"Αντιμετ.Προβλημάτων"</string>
+    <string name="help_translate">"Βοηθήστε στην μετάφραση"</string>
+    <string name="night_mode">"Νυχτ.Λειτ."</string>
+    <string name="use_pure_black">"Χρήση απόλυτου μαύρου στη νυχτ.λειτουργία"</string>
+    <string name="pure_black_description">"Αντικαθιστά τα γκρί υπόβαθρα με απόλυτα μαύρα σε νυχτ.λειτουργία. Μειώνει την κατανάλωση μπαταρίας σε συσκευές με οθόνη AMOLED."</string>
+    <string name="interface_preferences">"Διεπιφάνεια"</string>
+    <string name="reverse_days">"Αναστροφή σειράς των ημερών."</string>
+    <string name="reverse_days_description">"Προβολή των ημερών σε αντίστροφη σειρά στην κυρία οθόνη."</string>
+    <string name="day">"Ημέρα"</string>
+    <string name="week">"Εβδομάδα"</string>
+    <string name="month">"Μήνας"</string>
+
+    <!-- Three-month period -->
+    <string name="quarter">"Τρίμηνο"</string>
+    <string name="year">"Χρόνος"</string>
+
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"φορά σε"</string>
+    <string name="every_x_days">"Κάθε %d ημέρες"</string>
+    <string name="every_x_weeks">"Κάθε %d εβδομάδες"</string>
+    <string name="every_x_months">"Κάθε %d μήνες"</string>
+
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"Σκόρ"</string>
+    <string name="reminder_sound">"Ήχος υπενθύμισης"</string>
+
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+    <string name="none">"Σιωπηλό"</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5bec3c873..84adfd698 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,106 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="app_name">"Loop - Suivi d'habitudes"</string>
-<string name="main_activity_title">"Habitudes"</string>
-<string name="action_settings">"Paramètres"</string>
-<string name="edit">"Modifier"</string>
-<string name="delete">"Supprimer"</string>
-<string name="archive">"Archiver"</string>
-<string name="unarchive">"Désarchiver"</string>
-<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_nothing_to_undo">"Rien à annuler."</string>
-<string name="toast_nothing_to_redo">"Rien à refaire."</string>
-<string name="toast_habit_changed">"Habitude changée."</string>
-
-<!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
-<string name="toast_habit_changed_back">"Habitude restaurée."</string>
-<string name="toast_habit_archived">"Habitudes archivées."</string>
-<string name="toast_habit_unarchived">"Habitudes désarchivées."</string>
-<string name="overview">"Vue d'ensemble"</string>
-<string name="habit_strength">"Force de l'habitude"</string>
-<string name="history">"Historique"</string>
-<string name="clear">"Supprimer"</string>
-<string name="description_hint">"Question (As-tu ... aujourd'hui?)"</string>
-
-<!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
-<string name="repeat">"Répéter"</string>
-<string name="times_every">"fois en"</string>
-<string name="days">"jours"</string>
-<string name="reminder">"Rappel"</string>
-<string name="discard">"Annuler"</string>
-<string name="save">"Sauvegarder"</string>
-
-<!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
-<string name="streaks">"Séries"</string>
-<string name="no_habits_found">"Vous n'avez pas d'habitudes actives"</string>
-<string name="long_press_to_toggle">"Appuyez longtemps pour cocher ou décocher"</string>
-<string name="reminder_off">"Off"</string>
-<string name="validation_name_should_not_be_blank">"Le nom ne peut être vide."</string>
-<string name="validation_number_should_be_positive">"Le nombre doit être positif."</string>
-<string name="validation_at_most_one_rep_per_day">"Vous pouvez avoir au plus une répétition par jour"</string>
-<string name="create_habit">"Créer une habitude"</string>
-<string name="edit_habit">"Modifier l'habitude"</string>
-<string name="check">"Cocher"</string>
-<string name="snooze">"Plus tard"</string>
-
-<!-- App introduction -->
-<string name="intro_title_1">"Bienvenue"</string>
-<string name="intro_description_1">"Loop - Suivi d'habitudes vous aide à créer et maintenir de bonnes habitudes."</string>
-<string name="intro_title_2">"Créez de nouvelles habitudes"</string>
-<string name="intro_description_2">"Chaque jour, après avoir réalisé votre habitude, cochez-la sur l'application."</string>
-<string name="intro_title_3">"Continuez à le faire"</string>
-<string name="intro_description_3">"Les habitudes régulières pendant une période de temps étendue gagneront une étoile complète."</string>
-<string name="intro_title_4">"Suivez votre progrès"</string>
-<string name="intro_description_4">"Des graphiques détaillés vous montrent comment vos habitudes évoluent au fil du temps."</string>
-<string name="interval_15_minutes">"15 minutes"</string>
-<string name="interval_30_minutes">"30 minutes"</string>
-<string name="interval_1_hour">"1 heure"</string>
-<string name="interval_2_hour">"2 heures"</string>
-<string name="interval_4_hour">"4 heures"</string>
-<string name="interval_8_hour">"8 heures"</string>
-<string name="pref_toggle_title">"Activer les répétitions avec un appui court"</string>
-<string name="pref_toggle_description">"Plus pratique, mais peut causer des activations accidentelles."</string>
-
-<!-- Je pense qu'en français, on parle plutôt d'intervalle de report/temporisation des répétitions/rappels. -->
-<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>
-<string name="pref_view_source_code">"Voir le code source sur GitHub"</string>
-<string name="pref_view_app_introduction">"Voir l'intro de l'app"</string>
-<string name="links">"Liens"</string>
-<string name="behavior">"Comportement"</string>
-<string name="name">"Nom"</string>
-<string name="show_archived">"Montrer les archives"</string>
-<string name="settings">"Paramètres"</string>
-<string name="snooze_interval">"Intervalle de report"</string>
-<string name="hint_title">"Le saviez-vous ?"</string>
-<string name="hint_drag">"Pour réarranger 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="weekends">"Fin de semaine"</string>
-
-<!-- Fuzzy -->
-<string name="any_weekday">"Jours de la semaine"</string>
-
-<!-- Fuzzy -->
-<string name="any_day">"N'importe quel jour"</string>
-<string name="select_weekdays">"Sélectionner des jours"</string>
-
-<!-- Fuzzy -->
-<string name="export_to_csv">"Exporter les données dans un fichier CSV"</string>
-<string name="done_label">"Fait"</string>
-<string name="clear_label">"Supprimer"</string>
-<string name="select_hours">"Sélectionner les heures"</string>
-<string name="select_minutes">"Sélectionner les minutes"</string>
-
-<!-- Short description used on the Google Play store. There is an 80-character limit. -->
-<string name="store_short_description">"Créez de bonnes habitudes et suivez leur progrès au fil du temps (sans pub)"</string>
-<string name="store_description_1">"Loop vous aide à créer et maintenir de bonnes habitudes, permettant de réussir vos objectifs à long terme. Des graphiques détaillés et des statistiques vous montrent comment vos habitudes s’améliorent au fil du temps. C'est totalement sans pub et c'est un logiciel libre."</string>
+
+    <!-- Fuzzy -->
+    <string name="app_name">"Loop - Suivi d'habitudes"</string>
+
+    <!-- Fuzzy -->
+    <string name="main_activity_title">"Habitudes"</string>
+
+    <!-- Fuzzy -->
+    <string name="action_settings">"Paramètres"</string>
+
+    <!-- Fuzzy -->
+    <string name="edit">"Modifier"</string>
+    <string name="delete">"Supprimer"</string>
+    <string name="archive">"Archiver"</string>
+    <string name="unarchive">"Désarchiver"</string>
+    <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_nothing_to_undo">"Rien à annuler."</string>
+    <string name="toast_nothing_to_redo">"Rien à refaire."</string>
+    <string name="toast_habit_changed">"Habitude changée."</string>
+
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+    <string name="toast_habit_changed_back">"Habitude restaurée."</string>
+    <string name="toast_habit_archived">"Habitudes archivées."</string>
+    <string name="toast_habit_unarchived">"Habitudes désarchivées."</string>
+    <string name="overview">"Vue d'ensemble"</string>
+    <string name="habit_strength">"Force de l'habitude"</string>
+    <string name="history">"Historique"</string>
+    <string name="clear">"Supprimer"</string>
+    <string name="description_hint">"Question (As-tu ... aujourd'hui?)"</string>
+
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"Répéter"</string>
+    <string name="times_every">"fois en"</string>
+    <string name="days">"jours"</string>
+    <string name="reminder">"Rappel"</string>
+    <string name="discard">"Annuler"</string>
+    <string name="save">"Sauvegarder"</string>
+
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+    <string name="streaks">"Séries"</string>
+    <string name="no_habits_found">"Vous n'avez pas d'habitudes actives"</string>
+    <string name="long_press_to_toggle">"Appuyez longtemps pour cocher ou décocher"</string>
+    <string name="reminder_off">"Off"</string>
+    <string name="validation_name_should_not_be_blank">"Le nom ne peut être vide."</string>
+    <string name="validation_number_should_be_positive">"Le nombre doit être positif."</string>
+    <string name="validation_at_most_one_rep_per_day">"Vous pouvez avoir au plus une répétition par jour"</string>
+    <string name="create_habit">"Créer une habitude"</string>
+    <string name="edit_habit">"Modifier l'habitude"</string>
+    <string name="check">"Cocher"</string>
+    <string name="snooze">"Plus tard"</string>
+
+    <!-- App introduction -->
+    <string name="intro_title_1">"Bienvenue"</string>
+    <string name="intro_description_1">"Loop - Suivi d'habitudes vous aide à créer et maintenir de bonnes habitudes."</string>
+    <string name="intro_title_2">"Créez de nouvelles habitudes"</string>
+    <string name="intro_description_2">"Chaque jour, après avoir réalisé votre habitude, cochez-la sur l'application."</string>
+    <string name="intro_title_3">"Continuez à le faire"</string>
+    <string name="intro_description_3">"Les habitudes régulières pendant une période de temps étendue gagneront une étoile complète."</string>
+    <string name="intro_title_4">"Suivez votre progrès"</string>
+    <string name="intro_description_4">"Des graphiques détaillés vous montrent comment vos habitudes évoluent au fil du temps."</string>
+    <string name="interval_15_minutes">"15 minutes"</string>
+    <string name="interval_30_minutes">"30 minutes"</string>
+    <string name="interval_1_hour">"1 heure"</string>
+    <string name="interval_2_hour">"2 heures"</string>
+    <string name="interval_4_hour">"4 heures"</string>
+    <string name="interval_8_hour">"8 heures"</string>
+    <string name="pref_toggle_title">"Activer les répétitions avec un appui court"</string>
+    <string name="pref_toggle_description">"Plus pratique, mais peut causer des activations accidentelles."</string>
+
+    <!-- Je pense qu'en français, on parle plutôt d'intervalle de report/temporisation des répétitions/rappels. -->
+    <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>
+    <string name="pref_view_source_code">"Voir le code source sur GitHub"</string>
+    <string name="pref_view_app_introduction">"Voir l'intro de l'app"</string>
+    <string name="links">"Liens"</string>
+    <string name="behavior">"Comportement"</string>
+    <string name="name">"Nom"</string>
+    <string name="show_archived">"Montrer les archives"</string>
+    <string name="settings">"Paramètres"</string>
+    <string name="snooze_interval">"Intervalle de report"</string>
+    <string name="hint_title">"Le saviez-vous ?"</string>
+    <string name="hint_drag">"Pour réarranger 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="weekends">"Fin de semaine"</string>
+
+    <!-- Sorry I made a mistake so I restore the previous version -->
+    <string name="any_weekday">"Jours de la semaine"</string>
+
+    <!-- Fuzzy -->
+    <string name="any_day">"N'importe quel jour"</string>
+    <string name="select_weekdays">"Sélectionner des jours"</string>
+
+    <!-- Fuzzy -->
+    <string name="export_to_csv">"Exporter les données dans un fichier CSV"</string>
+    <string name="done_label">"Fait"</string>
+    <string name="clear_label">"Supprimer"</string>
+    <string name="select_hours">"Sélectionner les heures"</string>
+    <string name="select_minutes">"Sélectionner les minutes"</string>
+
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Créez de bonnes habitudes et suivez leur progrès au fil du temps (sans pub)"</string>
+    <string name="store_description_1">"Loop vous aide à créer et maintenir de bonnes habitudes, permettant de réussir vos objectifs à long terme. Des graphiques détaillés et des statistiques vous montrent comment vos habitudes s’améliorent au fil du temps. C'est totalement sans pub et c'est un logiciel libre."</string>
 <string name="store_feature_interface">"&lt;b&gt;Simple, beau avec une interface moderne&lt;/b&gt;
 Loop a une interface minimaliste, facile à utiliser et qui suit les règles de material design."</string>
 <string name="store_feature_score">"&lt;b&gt;Score d'habitude&lt;/b&gt;
@@ -115,81 +123,81 @@ Créez un rappel propre pour chaque habitude, à une heure choisie de la journé
 Il n'y a absolument aucune publicité ni notification embêtante ni permission intrusive avec cette application, et il n'y en aura jamais. L'ensemble du code source est disponible sous GPLv3."</string>
 <string name="store_feature_wear">"&lt;b&gt;Optimisée pour les montres android&lt;/b&gt;
 Les rappels peuvent être cochés, reportés ou supprimés directement à partir de votre montre Android"</string>
-<string name="about">"À propos"</string>
-<string name="translators">"Traducteurs"</string>
-<string name="developers">"Développeurs"</string>
-
-<!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
-<string name="version_n">"Version %s"</string>
-<string name="frequency">"Fréquence"</string>
-
-<!-- Fuzzy -->
-<string name="checkmark">"Croix"</string>
-
-<!-- This is a shorter version of "Habit Strength" -->
-<!-- Fuzzy -->
-<string name="strength">"Force"</string>
-
-<!-- Fuzzy -->
-<string name="best_streaks">"Meilleures séries"</string>
-<string name="current_streaks">"Série actuelle"</string>
-<string name="number_of_repetitions">"Nombre de répétitions"</string>
-<string name="last_x_days">"%d derniers jours"</string>
-<string name="last_x_weeks">"%d dernières semaines"</string>
-<string name="last_x_months">"%d derniers mois"</string>
-<string name="last_x_years">"%d dernières années"</string>
-
-<!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
-<string name="all_time">"Depuis le début"</string>
-<string name="every_day">"Tous les jours"</string>
-<string name="every_week">"Toutes les semaines"</string>
-<string name="two_times_per_week">"2 fois par semaine"</string>
-<string name="five_times_per_week">"5 fois par semaine"</string>
-
-<!-- Fuzzy -->
-<string name="custom_frequency">"Personnalisée ..."</string>
-<string name="help">"Aide &amp; FAQ"</string>
-<string name="could_not_export">"Export des données échoué."</string>
-<string name="could_not_import">"Import des données échoué."</string>
-
-<!-- Appears when the user tries to import a file which we do not support or recognize. -->
-<string name="file_not_recognized">"Fichier non reconnu"</string>
-<string name="habits_imported">"Habitudes importées avec succès"</string>
-<string name="full_backup_success">"Sauvegarde complète exportée avec succès"</string>
-<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_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>
-<string name="troubleshooting">"Résolution de problèmes"</string>
-<string name="help_translate">"Aider à traduire cette application"</string>
-<string name="night_mode">"Mode Nuit"</string>
-<string name="use_pure_black">"Utiliser un noir pure dans le mode nuit."</string>
-<string name="pure_black_description">"Remplacer le fond gris par un noir pure dans le mode nuit; ça réduit l’usage de la batterie d'un appareil ayant un écran AMOLED."</string>
-<string name="interface_preferences">"Interface"</string>
-<string name="reverse_days">"Inverser l'ordre des jours"</string>
-<string name="reverse_days_description">"Montrer les jours dans l'ordre inversé sur l'écran principal"</string>
-<string name="day">"Jour"</string>
-<string name="week">"Semaine"</string>
-<string name="month">"Mois"</string>
-
-<!-- Three-month period -->
-<string name="quarter">"Trimestre"</string>
-<string name="year">"Année"</string>
-
-<!-- Middle part of the sentence '1 time in xx days' -->
-<!-- Middle part of the sentence '1 time in xx days' -->
-<string name="time_every">"fois tous les"</string>
-<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>
-
-<!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
-<string name="score">"Pointage"</string>
-<string name="reminder_sound">"Son de rappel"</string>
-
-<!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
-<string name="none">"Aucun"</string>
+    <string name="about">"À propos"</string>
+    <string name="translators">"Traducteurs"</string>
+    <string name="developers">"Développeurs"</string>
+
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"Version %s"</string>
+    <string name="frequency">"Fréquence"</string>
+
+    <!-- Fuzzy -->
+    <string name="checkmark">"Croix"</string>
+
+    <!-- This is a shorter version of "Habit Strength" -->
+    <!-- Fuzzy -->
+    <string name="strength">"Force"</string>
+
+    <!-- Fuzzy -->
+    <string name="best_streaks">"Meilleures séries"</string>
+    <string name="current_streaks">"Série actuelle"</string>
+    <string name="number_of_repetitions">"Nombre de répétitions"</string>
+    <string name="last_x_days">"%d derniers jours"</string>
+    <string name="last_x_weeks">"%d dernières semaines"</string>
+    <string name="last_x_months">"%d derniers mois"</string>
+    <string name="last_x_years">"%d dernières années"</string>
+
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"Depuis le début"</string>
+    <string name="every_day">"Tous les jours"</string>
+    <string name="every_week">"Toutes les semaines"</string>
+    <string name="two_times_per_week">"2 fois par semaine"</string>
+    <string name="five_times_per_week">"5 fois par semaine"</string>
+
+    <!-- Fuzzy -->
+    <string name="custom_frequency">"Personnalisée ..."</string>
+    <string name="help">"Aide &amp; FAQ"</string>
+    <string name="could_not_export">"Export des données échoué."</string>
+    <string name="could_not_import">"Import des données échoué."</string>
+
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"Fichier non reconnu"</string>
+    <string name="habits_imported">"Habitudes importées avec succès"</string>
+    <string name="full_backup_success">"Sauvegarde complète exportée avec succès"</string>
+    <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_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>
+    <string name="troubleshooting">"Résolution de problèmes"</string>
+    <string name="help_translate">"Aider à traduire cette application"</string>
+    <string name="night_mode">"Mode Nuit"</string>
+    <string name="use_pure_black">"Utiliser un noir pure dans le mode nuit."</string>
+    <string name="pure_black_description">"Remplacer le fond gris par un noir pure dans le mode nuit; ça réduit l’usage de la batterie d'un appareil ayant un écran AMOLED."</string>
+    <string name="interface_preferences">"Interface"</string>
+    <string name="reverse_days">"Inverser l'ordre des jours"</string>
+    <string name="reverse_days_description">"Montrer les jours dans l'ordre inversé sur l'écran principal"</string>
+    <string name="day">"Jour"</string>
+    <string name="week">"Semaine"</string>
+    <string name="month">"Mois"</string>
+
+    <!-- Three-month period -->
+    <string name="quarter">"Trimestre"</string>
+    <string name="year">"Année"</string>
+
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"fois tous les"</string>
+    <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>
+
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"Pointage"</string>
+    <string name="reminder_sound">"Son de rappel"</string>
+
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+    <string name="none">"Aucun"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 000000000..192e3fd7b
--- /dev/null
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">"Loop आदत पर नजर"</string>
+    <string name="main_activity_title">"आदतें"</string>
+    <string name="action_settings">"सेटिंग्स"</string>
+
+    <!-- This is not a common Hindi Word but the closest I could get -->
+    <string name="edit">"संपादन"</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_nothing_to_undo">"कुछ भी नहीं पूर्ववत करने के लिए"</string>
+    <string name="toast_nothing_to_redo">"कुछ भी नही फिर से करने के लिए"</string>
+    <string name="toast_habit_changed">"आदत मे बदलाव"</string>
+
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+<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="description_hint">"सवाल (क्या आज .......किया?)"</string>
+
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"दोहराए"</string>
+    <string name="times_every">"बार"</string>
+    <string name="days">"दिन"</string>
+<string name="reminder">"
+अनुस्मारक"</string>
+<string name="discard">"
+हटाना"</string>
+<string name="save">"
+सुरक्षित "</string>
+
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+<string name="streaks">"
+लहर"</string>
+<string name="no_habits_found">"आपकी कोई सक्रिय आदत नही है
+"</string>
+    <string name="long_press_to_toggle">"चेक या अनचेक करने के लिए दबाएँ व दबाएँ रखें "</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="edit_habit">"आदत संपादित करें"</string>
+<string name="check">"
+चेक"</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_title_3">"इसे करते रहें"</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">"1 घंटा"</string>
+    <string name="interval_2_hour">"2 घंटा"</string>
+    <string name="interval_4_hour">"4 घंटा"</string>
+    <string name="interval_8_hour">"8 घंटा"</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>
+    <string name="pref_send_feedback">"डेवेलपर को प्रतिक्रिया भेजें "</string>
+    <string name="pref_view_source_code">"Github मे सोर्स कोड देखें"</string>
+    <string name="pref_view_app_introduction">"अप्प्प का परिचय देखें"</string>
+    <string name="links">"लिंक"</string>
+<string name="behavior">"
+व्यवहार"</string>
+    <string name="name">"नाम"</string>
+    <string name="show_archived">"संग्रह देखें"</string>
+    <string name="settings">"सेटिंग्स"</string>
+<string name="snooze_interval">"
+झपकी का अंतराल"</string>
+    <string name="hint_title">"क्या आप जानते .?"</string>
+<string name="hint_drag">"
+प्रविष्टियों को पुनर्व्यवस्थित करने के लिए, आदत के नाम पर प्रेस करें और सही जगह पर खींचें।"</string>
+<string name="hint_landscape">"
+ अपने फोन को लांडसकपे मोड मे रख कर आप अधिक दिनों से देख सकते हैं"</string>
+    <string name="delete_habits">"आदत हटाएँ"</string>
+<string name="delete_habits_message">"
+आदतों को स्थायी रूप से हटा दिया जाएगा। इस क्रिया को पूर्ववत नहीं किया जा सकता है।"</string>
+<string name="weekends">"
+सप्ताहांत"</string>
+<string name="any_weekday">"
+सोमवार से शुक्रवार"</string>
+<string name="any_day">"
+सप्ताह का कोई भी दिन"</string>
+    <string name="select_weekdays">"दिन चुनें"</string>
+    <string name="export_to_csv">"CSV में निर्यात करें"</string>
+<string name="done_label">"
+पूर्ण"</string>
+<string name="clear_label">"
+साफ़"</string>
+    <string name="select_hours">"घंटे चुनें"</string>
+    <string name="select_minutes">"मिनट चुनें"</string>
+
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+<string name="store_short_description">"
+अच्छी आदतें बनाएं और समय के साथ अपनी प्रगति को ट्रैक (विज्ञापन मुक्त )"</string>
+    <string name="store_description_1">"लूप अच्छी आदतों को बनाए रखने के लिए, वा लंबी अवधि के लक्ष्यों को प्राप्त करने में आपकी मदद करता है । विस्तृत रेखांकन और आँकड़े आपको बताएंगे कि कैसे अपनी आदतों में समय के साथ सुधार होगा। यह पूरी तरह से विज्ञापन मुक्त और ओपन सोर्स है"</string>
+<string name="store_feature_interface">"
+&lt;b&gt;सरल, सुंदर और आधुनिक इंटरफ़ेस&lt;/b&gt;
+लूप मे न्यूनतर इंटरफ़ेस है जो उपयोग करने के लिए आसान है मेटीरियल डिजाइन दिशा निर्देशों का पालन करता है"</string>
+<string name="store_feature_score">"आदत स्कोर
+अपने वर्तमान स्ट्रीक दिखाने के अलावा , लूप मे अपनी आदतों की ताकत की गणना के लिए एक उन्नत एल्गोरिथ्म है। हर पुनरावृत्ति अपनी आदत को मजबूत बनाता है , और हर चूक दिन यह कमजोर बना देता है। हालांकि कुछ चूक दिन एक लंबी स्ट्रीक के बाद , पूरी तरह से आपके पूरे प्रगति को नष्ट नहीं होगा ।"</string>
+<string name="store_feature_statistics">"
+विस्तृत रेखांकन और आँकड़े
+स्पष्ट रूप से सुंदर और विस्तृत रेखांकन के साथ देखें कि कैसे आपकी आदतों मे साथ समय के साथ सुधार हुआ है। अपनी आदतों का पूरा इतिहास देखने के लिए वापस स्क्रॉल करें।"</string>
+<string name="store_feature_schedules">"
+लचीला कार्यक्रम
+ दैनिक आदतों और अधिक जटिल कार्यक्रम दोनो को सपोर्ट  ,इस तरह के रूप में 3 बार हर सप्ताह समर्थन करता है; एक बार हर दूसरे सप्ताह ; या हर दूसरे दिन ।"</string>
+<string name="store_feature_reminders">"रिमाइंडर
+प्रत्येक आदत के लिए एक रिमाइंडर बनाएं , दिन के एक चुने हुए घंटे में । आसानी से , जांच को खारिज या अधिसूचना से सीधे अपने नोटिफिकेशन से, एप्लिकेशन को खोले बिना"</string>
+<string name="store_feature_opensource">"पूर्ण रूप से मुफ़्त और ओपन सोर्स
+यहाँ बिल्कुल भी कोई विज्ञापन , कष्टप्रद सूचनाएं या फ़िज़ूल पर्मिशन नही है और  कभी नहीं होगा।
+पूरा सोर्स कोड GPLv3 के तहत उपलब्ध है।"</string>
+<string name="store_feature_wear">"Smartwatches के लिए अनुकूल
+रिमाइंडर को चेक कर सकते हैं, स्नूज़ या हटा सकते हैं सीधे अपनी स्मार्ट वॉच से"</string>
+<string name="about">"
+बारे में"</string>
+<string name="translators">"
+अनुवादक"</string>
+<string name="developers">"
+डिवेलपर"</string>
+
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"वर्ज़न %s"</string>
+    <string name="frequency">"आवृत्ति"</string>
+    <string name="checkmark">"सही का चिह्न"</string>
+
+    <!-- This is a shorter version of "Habit Strength" -->
+<string name="strength">"
+ताक़त"</string>
+    <string name="best_streaks">"बेस्ट स्ट्रीक्स"</string>
+<string name="current_streaks">"
+वर्तमान स्ट्रीक्स"</string>
+<string name="number_of_repetitions">"
+repetitions की संख्या"</string>
+    <string name="last_x_days">"अंतिम %d दिवस"</string>
+    <string name="last_x_weeks">"पिछले %d सप्ताह"</string>
+    <string name="last_x_months">"पिछले %d माह"</string>
+<string name="last_x_years">"
+पिछले %d साल"</string>
+
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"पूरा समय"</string>
+<string name="every_day">"
+हर दिन"</string>
+<string name="every_week">"
+प्रति सप्ताह"</string>
+<string name="two_times_per_week">"
+प्रति सप्ताह 2 बार"</string>
+<string name="five_times_per_week">"
+प्रति सप्ताह 5 बार"</string>
+    <string name="custom_frequency">"अन्य"</string>
+<string name="help">"
+मदद और बार-बार सवाल पूछने वाले सवाल"</string>
+<string name="could_not_export">"
+डेटा निर्यात करने में विफल"</string>
+    <string name="could_not_import">"डेटा आयात करने में विफल रहा है"</string>
+
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"फाइल की पहचान नही "</string>
+<string name="habits_imported">"
+आदतों को सफलतापूर्वक आयात"</string>
+<string name="full_backup_success">"
+पूर्ण बैकअप सफलतापूर्वक निर्यात किया।"</string>
+<string name="import_data">"
+डेटा आयात"</string>
+<string name="export_full_backup">"
+निर्यात पूर्ण बैकअप"</string>
+    <string name="import_data_summary">"इस एप्लिकेशन के द्वारा निर्यात पूर्ण बैकअप को सपोर्ट करता है , साथ ही फाइलों टिक्कमते , हबिठबुल्ल या रिवाइयर द्वारा उत्पन्न फाइल्स को सपोर्ट करता है। अधिक जानकारी के लिए सामान्य प्रश्न देखें।"</string>
+<string name="export_as_csv_summary">"ऐसी फाइल्स उत्पन्न करता है जो स्प्रेडशीट सॉफ़्टवरेस जैसे Microsoft Excel, OpenOffice Calc मे खुल सकती है.
+ इस फ़ाइल में वापस आयात नहीं किया जा सकता है।"</string>
+    <string name="export_full_backup_summary">"ऐसी फाइल्स उत्पन्न करता है जिसमे आपका सारा डेटा रहता है इस फ़ाइल को वापस आयात किया जा सकता है।"</string>
+    <string name="bug_report_failed">"बग रिपोर्ट जनरेट करने मे असफल"</string>
+    <string name="generate_bug_report">"बग रिपोर्ट जनरेट करने मे सफल"</string>
+<string name="troubleshooting">"
+समस्या निवारण"</string>
+<string name="help_translate">"
+इस एप्लिकेशन का अनुवाद करने में मदद करें"</string>
+    <string name="night_mode">"नाइट मोड"</string>
+    <string name="use_pure_black">"नाइट मोड मे पूरा काला यूज़ करें"</string>
+<string name="pure_black_description">"
+रात मोड में शुद्ध काले रंग के साथ ग्रे पृष्ठभूमि में बदलें.  अमोलेड प्रदर्शन के साथ फोन में बैटरी उपयोग कम कर देता है ।"</string>
+    <string name="interface_preferences">"इंटरफेस"</string>
+<string name="reverse_days">"
+दिनों की रिवर्स आदेश"</string>
+    <string name="reverse_days_description">"दिनों को रिवर्स क्रम में मुख्य स्क्रीन पर दिखाएँ"</string>
+    <string name="day">"दिन "</string>
+    <string name="week">"हफ्ते"</string>
+    <string name="month">"माह"</string>
+
+    <!-- Three-month period -->
+    <string name="quarter">"तिमाही"</string>
+    <string name="year">"साल"</string>
+
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"समय शुरू"</string>
+<string name="every_x_days">"
+हर %d दिन"</string>
+<string name="every_x_weeks">"
+हर %d हफ्ते"</string>
+<string name="every_x_months">"
+हर %d साल"</string>
+
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"स्कोर"</string>
+    <string name="reminder_sound">"अनुस्मारक ध्वनि"</string>
+
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+<string name="none">"
+कोई आवाज नहीं"</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2e1a9cd96..0b08a536d 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -21,7 +21,7 @@
     <string name="toast_habit_archived">"Navike su arhivirane."</string>
     <string name="toast_habit_unarchived">"Navike su vraćene iz arhive."</string>
     <string name="overview">"Pregled"</string>
-    <string name="habit_strength">"Jačina navike"</string>
+    <string name="habit_strength">"Snaga navike"</string>
     <string name="history">"Povijest"</string>
     <string name="clear">"Očisti"</string>
     <string name="description_hint">"Pitanje (Jesi li danas...?)"</string>
@@ -36,7 +36,7 @@
 
     <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
     <string name="streaks">"Niz"</string>
-    <string name="no_habits_found">"Nemate "</string>
+    <string name="no_habits_found">"Nemate aktivnih navika"</string>
     <string name="long_press_to_toggle">"Pritisnite i držite za označavanje ili odznačavanje."</string>
     <string name="reminder_off">"Isključen"</string>
     <string name="validation_name_should_not_be_blank">"Naziv ne može biti prazan."</string>
@@ -50,7 +50,7 @@
     <!-- App introduction -->
     <string name="intro_title_1">"Dobrodošli"</string>
     <string name="intro_description_1">"Loop Habit Tracker vam pomaže stvoriti i održavati dobre navike."</string>
-    <string name="intro_title_2">"Stvori neke nove navike"</string>
+    <string name="intro_title_2">"Stvorite neke nove navike"</string>
     <string name="intro_description_2">"Svaki dan, nakon izvođenja vaše navike, postavite \"kvačicu\" u aplikaciji."</string>
     <string name="intro_title_3">"Nastavite tako"</string>
     <string name="intro_description_3">"Navike"</string>
@@ -61,15 +61,15 @@
     <string name="interval_1_hour">"1 sat"</string>
     <string name="interval_2_hour">"2 sata"</string>
     <string name="interval_4_hour">"4 sata"</string>
-    <string name="interval_8_hour">" 8 sati"</string>
-    <string name="pref_toggle_title">"Označi ponavljanja sa kratkim pritiskom"</string>
+    <string name="interval_8_hour">"8 sati"</string>
+    <string name="pref_toggle_title">"Označi ponavljanja sa kratkim pritisk."</string>
     <string name="pref_toggle_description">"Zgodnije je, no može uzrokovati slučajna označavanja."</string>
     <string name="pref_snooze_interval_title">"Interval odgađanja na podsjetnicima"</string>
     <string name="pref_rate_this_app">"Ocijenite ovu aplikaciju na Google Playu"</string>
-    <string name="pref_send_feedback">"Pošaljite povratne informacije razvojnom programeru"</string>
-    <string name="pref_view_source_code">"Prikaži izvorni kod na GitHubu"</string>
+    <string name="pref_send_feedback">"Pošaljite povratne informacije raz. programeru"</string>
+    <string name="pref_view_source_code">"Pogledajte izvorni kod na GitHubu"</string>
     <string name="pref_view_app_introduction">"Prikaži uvod u aplikaciju"</string>
-    <string name="links">"Veze"</string>
+    <string name="links">"Poveznice"</string>
     <string name="behavior">"Ponašanje"</string>
     <string name="name">"Naziv"</string>
     <string name="show_archived">"Prikaži arhivirano"</string>
@@ -103,6 +103,8 @@ Jasno vidite kako su se vaše navike poboljšale kroz vrijeme u prekrasnim i det
 Podržava i dnevne navike i navike sa složenijim planiranjem, kao npr. 3 puta svakog tjedna; jednom svaki drugi tjedan; ili svaki drugi dan."</string>
 <string name="store_feature_reminders">"&lt;b&gt;Podsjetnici&lt;/b&gt;
 Stvorite individualne podsjetnike za svaku naviku, u određenom satu u danu. Lako provjeravajte, odbacite i odgodite vašu naviku direktno iz obavijesti, bez otvaranja aplikacije."</string>
+
+    <!-- Fuzzy -->
     <string name="store_feature_opensource">"&lt;b&gt;Potpuno bez oglasa i otvorenog izvora koda&lt;/b&gt;"</string>
 <string name="store_feature_wear">"&lt;b&gt;Optimizirano za pametne satove&lt;/b&gt;
 Podsjetnici se mogu provjeravati, odgoditi ili odbaciti direktno sa vašeg Android Wear sata."</string>
@@ -132,7 +134,7 @@ Podsjetnici se mogu provjeravati, odgoditi ili odbaciti direktno sa vašeg Andro
     <string name="two_times_per_week">"2 puta tjedno"</string>
     <string name="five_times_per_week">"5 puta tjedno"</string>
     <string name="custom_frequency">"Prilagođeno ..."</string>
-    <string name="help">"Pomoć i FAQ"</string>
+    <string name="help">"Pomoć i pitanja"</string>
     <string name="could_not_export">"Izvoz podataka nije uspio."</string>
     <string name="could_not_import">"Uvoz podataka nije uspio."</string>
 
@@ -142,7 +144,7 @@ Podsjetnici se mogu provjeravati, odgoditi ili odbaciti direktno sa vašeg Andro
     <string name="full_backup_success">"Sigurnosna kopija je uspješno izvezena."</string>
     <string name="import_data">"Uvezi podatke"</string>
     <string name="export_full_backup">"Izvezi sigurnosnu kopiju"</string>
-    <string name="import_data_summary">"Podržava sigurnosne kopije izvezene iz ove aplikacije, isto kao i datoteke generirane u Tickmate, HabitBull i Rewire. Pogledajte FAQ za više informacija."</string>
+    <string name="import_data_summary">"Podržava sigurnosne kopije izvezene iz ove aplikacije, isto kao i datoteke generirane u Tickmate, HabitBull i Rewire. Pogledajte Pomoć i pitanja za više informacija."</string>
     <string name="export_as_csv_summary">"Generira datoteke koje se mogu otvarati programima za tablice kao što su Microsoft Excel ili OpenOffice Calc. Ova datoteka se ne može uvoziti."</string>
     <string name="export_full_backup_summary">"Generira datoteku koja sadrži sve vaše podatke. Ova datoteka se može uvoziti."</string>
     <string name="bug_report_failed">"Generiranje izvješća o pogrešci nije uspjelo."</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ad39efbdd..3e8d95056 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -99,6 +99,8 @@
 <string name="store_description_1">"Loop ti aiuta a creare e mantenere buone abitudini, permettendoti di raggiungere i tuoi obbiettivi a lungo termine. Grafici dettagliati e le statistiche ti mostrano come le tue abitudini sono migliorate nel tempo. E' completamente senza pubblicità ed opensource."</string>
 <string name="store_feature_interface">"&lt;b&gt;Interfaccia semplice e moderna&lt;/b&gt;
 Loop ha un'interfaccia minimale che è semplice da usare e segue le linee guida del Material Design"</string>
+
+<!-- Fuzzy -->
 <string name="store_feature_score">"&lt;b&gt;Forza dell'abitudine&lt;/b&gt;
 In aggiunta al traguardo attuale, Loop ha un algoritmo avanzato per calcolare la forza delle tue abitudini. Ogni ripetizione la rafforza, mentre ogni giorno mancato la indebolisce. Pochi giorni mancati dopo una lunga serie però non vanificherà completamente il tuo progresso totale."</string>
 <string name="store_feature_statistics">"&lt;b&gt;Grafici dettagliati e statistiche&lt;/b&gt;
@@ -121,7 +123,7 @@ Non ci sono pubblicità, notifiche invasive o permessi intrusivi e mai ce ne sar
 
 <!-- This is a shorter version of "Habit Strength" -->
 <string name="strength">"Forza"</string>
-<string name="best_streaks">"Migliore serie"</string>
+<string name="best_streaks">"Serie migliori"</string>
 <string name="current_streaks">"Serie corrente"</string>
 
 <!-- Fuzzy -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 000000000..33d4fc5d3
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">"Loop Habit Tracker"</string>
+    <string name="main_activity_title">"Gewoontes"</string>
+    <string name="action_settings">"Instellingen"</string>
+    <string name="edit">"Wijzig"</string>
+    <string name="delete">"Verwijder"</string>
+    <string name="archive">"Archiveer"</string>
+    <string name="unarchive">"Dearchiveren"</string>
+    <string name="add_habit">"Voeg gewoonte toe"</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_restored">"Gewoonte 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>
+    <string name="toast_habit_changed">"Gewoonte gewijzigd."</string>
+
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+    <string name="toast_habit_changed_back">"Wijziging gewoonte ongedaan gemaakt."</string>
+    <string name="toast_habit_archived">"Gewoonte gearchiveerd."</string>
+    <string name="toast_habit_unarchived">"Gewoonte hersteld uit archief."</string>
+    <string name="overview">"Overzicht"</string>
+    <string name="habit_strength">"Gewoonte-sterkte"</string>
+    <string name="history">"Geschiedenis"</string>
+    <string name="clear">"Wis"</string>
+    <string name="description_hint">"Vraag (Heb jij vandaag .... ?)"</string>
+
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"Herhaal"</string>
+    <string name="times_every">"keer in "</string>
+    <string name="days">"dagen"</string>
+    <string name="reminder">"Herinnering"</string>
+    <string name="discard">"Verwijder"</string>
+<string name="save">"Opslaan
+"</string>
+
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+    <string name="streaks">"Reeksen"</string>
+    <string name="no_habits_found">"Je hebt geen actieve gewoontes"</string>
+    <string name="long_press_to_toggle">"Houdt ingedrukt om te selecteren of deselecteren"</string>
+    <string name="reminder_off">"Uit"</string>
+    <string name="validation_name_should_not_be_blank">"Naam kan niet leeg zijn."</string>
+    <string name="validation_number_should_be_positive">"Nummer moet positief zijn."</string>
+    <string name="validation_at_most_one_rep_per_day">"Je kunt maximaal een repetitie per dag hebben"</string>
+    <string name="create_habit">"Maak gewoonte aan"</string>
+    <string name="edit_habit">"Wijzig gewoonte"</string>
+    <string name="check">"Voltooid"</string>
+    <string name="snooze">"Later"</string>
+
+    <!-- App introduction -->
+    <string name="intro_title_1">"Welkom"</string>
+    <string name="intro_description_1">"Loop Habit Tracker helpt je om goede gewoontes te creëren en te onderhouden."</string>
+    <string name="intro_title_2">"Creëer enkele nieuwe gewoontes"</string>
+    <string name="intro_description_2">"Plaats iedere dag, na het uitvoeren van jouw gewoonte, een vinkje in de app."</string>
+    <string name="intro_title_3">"Blijf het doen"</string>
+    <string name="intro_description_3">"Gewoontes die een langere tijd consistent worden uitgevoerd, zullen een volle ster verdienen."</string>
+    <string name="intro_title_4">"Volg jouw voortgang"</string>
+    <string name="intro_description_4">"Gedetailleerde grafieken tonen je hoe jouw gewoontes met de tijd verbeteren."</string>
+    <string name="interval_15_minutes">"15 minuten"</string>
+    <string name="interval_30_minutes">"30 minuten"</string>
+    <string name="interval_1_hour">"1 uur"</string>
+    <string name="interval_2_hour">"2 uur"</string>
+    <string name="interval_4_hour">"4 uur"</string>
+    <string name="interval_8_hour">"8 uur"</string>
+    <string name="pref_toggle_title">"Wijzig herhalingen door kort indrukken"</string>
+    <string name="pref_toggle_description">"Handiger, maar kan onbedoelde wijzigingen veroorzaken."</string>
+    <string name="pref_snooze_interval_title">"Snooze interval voor herinneringen"</string>
+    <string name="pref_rate_this_app">"Beoordeel deze app in Google Play"</string>
+    <string name="pref_send_feedback">"Stuur feedback aan de ontwikkelaar"</string>
+    <string name="pref_view_source_code">"Bekijk de broncode op GitHub"</string>
+    <string name="pref_view_app_introduction">"Bekijk de app introductie"</string>
+    <string name="links">"Links"</string>
+    <string name="behavior">"Gedrag"</string>
+    <string name="name">"Naam"</string>
+    <string name="show_archived">"Toon gearchiveerd"</string>
+    <string name="settings">"Instellingen"</string>
+    <string name="snooze_interval">"Snooze interval"</string>
+    <string name="hint_title">"Wist je dat?"</string>
+    <string name="hint_drag">"Om de rijen te ordenen houdt de gewoonte ingedrukt en sleep het naar de gewenste plek."</string>
+    <string name="hint_landscape">"Je kunt meer dagen zien door de telefoon in landschapmodus te zetten."</string>
+    <string name="delete_habits">"Verwijder gewoontes"</string>
+    <string name="delete_habits_message">"De gewoontes zullen permanent verwijderd worden. Deze actie kan niet ongedaan gemaakt worden."</string>
+    <string name="weekends">"In het weekend"</string>
+    <string name="any_weekday">"Maandag tot vrijdag"</string>
+    <string name="any_day">"Elke dag van de week"</string>
+    <string name="select_weekdays">"Selecteer dagen"</string>
+    <string name="export_to_csv">"Exporteer als CSV"</string>
+    <string name="done_label">"Voltooid"</string>
+    <string name="clear_label">"Wis"</string>
+    <string name="select_hours">"Selecteer uren"</string>
+    <string name="select_minutes">"Selecteer minuten"</string>
+
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Creëer goede gewoontes en hou hun voortgang in de loop van de tijd bij (reclamevrij)"</string>
+    <string name="store_description_1">"Loop helpt jou om goede gewoontes te creëren en te onderhouden zodat je jouw lange-termijn doelen kunt behalen. Gedetaileerde grafieken en statistieken laten je zien hoe jouw gewoontes zich verbeteren door te tijd heen. De app is compleet  advertentie-vrij en open source."</string>
+<string name="store_feature_interface">"&lt;b&gt;Een simpele, mooie en modern uiterlijk&lt;/b&gt;
+Loop heeft een minimalistisch uiterlijk, is makkelijk in gebruik en volgt de material design richtlijnen."</string>
+<string name="store_feature_score">"&lt;b&gt;Gewoonte-score&lt;/b&gt;
+Naast het tonen van de huidige reeks heeft Loop een geavanceerd algoritme for het berekenen van de sterkte van je gewoontes. Elke herhaling maken je gewoonte sterker, en elke gemiste dag maakt hem zwakker. Enkele gemiste dagen na een lange reeks zal jouw progressie echter niet geheel ongedaan maken."</string>
+<string name="store_feature_statistics">"&lt;b&gt;Gedetailleerde grafieken en statistieken&lt;/b&gt;
+Zie duidelijk hoe jouw gewoontes verbeteren door te tijd heen met prachtige en gedetailleerde grafieken. Scroll terug om de gehele geschiedenis van jouw gewoontes te zien."</string>
+<string name="store_feature_schedules">"&lt;b&gt;Flexibele planningen&lt;/b&gt;
+Ondersteunt zowel dagelijkse gewoontes als gewoontes met meerdere complexere planningen. Zoals 3 keer per week; 1 keer in de 2 weken; of om de dag."</string>
+<string name="store_feature_reminders">"&lt;b&gt;Herinneringen&lt;/b&gt;
+Creeer een individuele herinnering voor elke gewoonte, op een bepaald uur van de dag. Selecteer, stel uit en snooze jouw gewoontes gemakkelijk vanuit de notificatie zonder de app te openen."</string>
+<string name="store_feature_opensource">"&lt;b&gt;Volledig reclamevrij en open source&lt;/b&gt;
+Er zijn absoluut geen advertenties, vervelende notificaties of indringende machtigingen in deze app, en deze zullen er nooit komen. De volledige broncode is beschikbaar onder de GPLv3."</string>
+<string name="store_feature_wear">"&lt;b&gt;Geoptimaliseerd voor smartwatches&lt;/b&gt;
+Herinneringen kunnen worden bekeken, gesnoozed, of uitgesteld direct vanaf jouw Android Wear horloge."</string>
+    <string name="about">"Over"</string>
+    <string name="translators">"Vertalers"</string>
+    <string name="developers">"Ontwikkelaars"</string>
+
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"Versie %s"</string>
+    <string name="frequency">"Frequentie"</string>
+    <string name="checkmark">"Vinkje"</string>
+
+    <!-- This is a shorter version of "Habit Strength" -->
+    <string name="strength">"Sterkte"</string>
+    <string name="best_streaks">"Beste reeksen"</string>
+    <string name="current_streaks">"Huidige reeks"</string>
+    <string name="number_of_repetitions">"Aantal herhalingen"</string>
+    <string name="last_x_days">"Laatste %d dagen"</string>
+    <string name="last_x_weeks">"Laatste %d weken"</string>
+    <string name="last_x_months">"Laatste %d maanden"</string>
+    <string name="last_x_years">"Laatste %d jaren"</string>
+
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"Altijd"</string>
+    <string name="every_day">"Iedere dag"</string>
+    <string name="every_week">"Iedere week"</string>
+    <string name="two_times_per_week">"2 keer per week"</string>
+    <string name="five_times_per_week">"5 keer per week"</string>
+    <string name="custom_frequency">"Aangepast"</string>
+    <string name="help">"Hulp en veelgestelde vragen"</string>
+    <string name="could_not_export">"Het exporteren van de data is mislukt."</string>
+    <string name="could_not_import">"Importeren van data mislukt."</string>
+
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"Bestand niet herkend."</string>
+    <string name="habits_imported">"Gewoontes succesvol geïmporteerd."</string>
+    <string name="full_backup_success">"Volledige backup succesvol geëxporteerd."</string>
+    <string name="import_data">"Importeer gegevens"</string>
+    <string name="export_full_backup">"Exporteer volledige backup"</string>
+    <string name="import_data_summary">"Ondersteund volledige backups geexporteerd door deze app. Ondersteund ook bestanden gegenereerd door Tickmate, HabitBull of Rewire. Zie FAQ voor meer informatie"</string>
+    <string name="export_as_csv_summary">"Genereert bestanden die geopend kunnen worden door spreadsheet software zoals Microsoft Excel or OpenOffice Calc. Dit bestand kan niet terug geïmporteerd worden."</string>
+    <string name="export_full_backup_summary">"Genereert een bestand met al uw gegevens. Dit bestand kan ook terug geïmporteerd worden."</string>
+    <string name="bug_report_failed">"Het genereren van het foutenrapport is mislukt."</string>
+    <string name="generate_bug_report">"Genereer foutenrapport"</string>
+    <string name="troubleshooting">"Probleemoplossing"</string>
+    <string name="help_translate">"Help deze app te vertalen"</string>
+    <string name="night_mode">"Nachtmodus"</string>
+    <string name="use_pure_black">"Gebruik puur zwart in nachtmodus"</string>
+    <string name="pure_black_description">"Vervangt grijze achtergronden door puur zwart in nachtmodus. Vermindert batterijgebruik in telefoons met AMOLED scherm."</string>
+    <string name="interface_preferences">"Uiterlijk"</string>
+    <string name="reverse_days">"Omgekeerde volgorde van dagen"</string>
+    <string name="reverse_days_description">"Toon dagen in omgekeerde volgorde op het hoofdscherm"</string>
+    <string name="day">"Dag"</string>
+    <string name="week">"Week"</string>
+    <string name="month">"Maand"</string>
+
+    <!-- Three-month period -->
+    <string name="quarter">"Kwartaal"</string>
+    <string name="year">"Jaar"</string>
+
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"keer per"</string>
+    <string name="every_x_days">"Iedere %d dagen"</string>
+    <string name="every_x_weeks">"Iedere %d weken"</string>
+    <string name="every_x_months">"Iedere %d maanden"</string>
+
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"Score"</string>
+    <string name="reminder_sound">"Herinneringsgeluid"</string>
+
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+    <string name="none">"Stil"</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 000000000..40a69a1ec
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">"Hábitos"</string>
+    <string name="main_activity_title">"Hábitos"</string>
+    <string name="action_settings">"Configurações"</string>
+    <string name="edit">"Editar"</string>
+    <string name="delete">"Deletar"</string>
+    <string name="archive">"Arquivar"</string>
+    <string name="unarchive">"Desarquivar"</string>
+    <string name="add_habit">"Adicionar hábito"</string>
+    <string name="color_picker_default_title">"Mudar cor"</string>
+    <string name="toast_habit_created">"Hábito criado."</string>
+    <string name="toast_habit_deleted">"Hábito deletado."</string>
+    <string name="toast_habit_restored">"Hábitos restaurados."</string>
+    <string name="toast_nothing_to_undo">"Nada para desfazer."</string>
+    <string name="toast_nothing_to_redo">"Nada para refazer."</string>
+    <string name="toast_habit_changed">"Hábito modificado."</string>
+
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+    <string name="toast_habit_changed_back">"Hábito restaurado."</string>
+    <string name="toast_habit_archived">"Hábitos arquivados."</string>
+    <string name="toast_habit_unarchived">"Hábitos restaurados."</string>
+    <string name="overview">"Visão geral"</string>
+    <string name="habit_strength">"Estabilidade"</string>
+    <string name="history">"Histórico"</string>
+    <string name="clear">"Limpar"</string>
+    <string name="description_hint">"Pergunta (por ex., \"você meditou hoje?\")"</string>
+
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"Repetir"</string>
+    <string name="times_every">"vezes em"</string>
+    <string name="days">"dias"</string>
+    <string name="reminder">"Lembrete"</string>
+    <string name="discard">"Cancelar"</string>
+    <string name="save">"Salvar"</string>
+
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+    <string name="streaks">"Correntes"</string>
+    <string name="no_habits_found">"Você não tem nenhum hábito ativo"</string>
+    <string name="long_press_to_toggle">"Sustente por um segundo para marcar ou desmarcar"</string>
+    <string name="reminder_off">"Desligado"</string>
+    <string name="validation_name_should_not_be_blank">"Nome não pode ficar em branco."</string>
+    <string name="validation_number_should_be_positive">"Número precisa ser positivo."</string>
+    <string name="validation_at_most_one_rep_per_day">"Você pode ter no máximo uma repetição por dia."</string>
+    <string name="create_habit">"Criar hábito"</string>
+    <string name="edit_habit">"Editar hábito"</string>
+    <string name="check">"Marcar"</string>
+    <string name="snooze">"Mais tarde"</string>
+
+    <!-- App introduction -->
+    <string name="intro_title_1">"Bem vindo"</string>
+    <string name="intro_description_1">"Loop é um aplicativo que te ajuda a criar e manter bons hábitos."</string>
+    <string name="intro_title_2">"Adicione alguns hábitos"</string>
+    <string name="intro_description_2">"Todo dia, depois de praticar o seu hábito, marque no aplicativo."</string>
+    <string name="intro_title_3">"Continue praticando"</string>
+    <string name="intro_description_3">"Hábitos praticados regularmente por um longo período recebem uma estrela."</string>
+    <string name="intro_title_4">"Acompanhe o seu progresso"</string>
+    <string name="intro_description_4">"Veja como seus hábitos estão progredindo através de diagramas."</string>
+    <string name="interval_15_minutes">"15 minutos"</string>
+    <string name="interval_30_minutes">"30 minutos"</string>
+    <string name="interval_1_hour">"1 hora"</string>
+    <string name="interval_2_hour">"2 horas"</string>
+    <string name="interval_4_hour">"4 horas"</string>
+    <string name="interval_8_hour">"8 horas"</string>
+    <string name="pref_toggle_title">"Marcar repetições com um toque curto"</string>
+    <string name="pref_toggle_description">"Mais conveniente, mas pode causar marcações acidentais"</string>
+    <string name="pref_snooze_interval_title">"Duração do \"mais tarde\" nos lembretes"</string>
+    <string name="pref_rate_this_app">"Avaliar esse app no Google Play"</string>
+    <string name="pref_send_feedback">"Mandar sugestões para o desenvolvedor"</string>
+    <string name="pref_view_source_code">"Ver código-fonte no GitHub"</string>
+    <string name="pref_view_app_introduction">"Assistir introdução ao aplicativo"</string>
+    <string name="links">"Links"</string>
+    <string name="behavior">"Interação"</string>
+    <string name="name">"Nome"</string>
+    <string name="show_archived">"Mostrar hábitos arquivados"</string>
+    <string name="settings">"Configurações"</string>
+    <string name="snooze_interval">"Duração do \"mais tarde\""</string>
+    <string name="hint_title">"Dica"</string>
+    <string name="hint_drag">"Para mudar a ordem dos hábitos, aperte no nome do hábito, sustente e arraste."</string>
+    <string name="hint_landscape">"Para ver mais dias, coloque seu aparelho em modo paisagem."</string>
+    <string name="delete_habits">"Deletar hábitos"</string>
+    <string name="delete_habits_message">"Os hábitos escolhidos serão deletados permanentemente. Esta ação não pode ser desfeita."</string>
+    <string name="weekends">"Fim de semana"</string>
+    <string name="any_weekday">"Segunda a sexta"</string>
+    <string name="any_day">"Qualquer dia da semana"</string>
+    <string name="select_weekdays">"Selecionar dias"</string>
+    <string name="export_to_csv">"Exportar em formato CSV"</string>
+    <string name="done_label">"Pronto"</string>
+    <string name="clear_label">"Limpar"</string>
+    <string name="select_hours">"Selecionar horas"</string>
+    <string name="select_minutes">"Selecionar minutos"</string>
+
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Acompanhe o progresso dos seus hábitos com o passar do tempo (sem anúncios)"</string>
+    <string name="store_description_1">"Loop é um aplicativo que te ajuda a criar e manter bons hábitos, permitindo que você alcance os seus objetivos de longo prazo. Gráficos e estatísticas te mostram em detalhe como os teus hábitos progrediram ao passar do tempo. Este aplicativo não tem propagandas e é Open Source."</string>
+<string name="store_feature_interface">"&lt;b&gt;Interface bonita, moderna e simples&lt;/b&gt;
+Loop tem uma interface minimalista bem simples de se usar, e segue o novo visual Material Design."</string>
+<string name="store_feature_score">"&lt;b&gt;Estabilidade dos hábitos&lt;/b&gt;
+Além de mostrar quantos dias seguidos você praticou cada rotina, Loop também conta com um avançado algoritmo para calcular a estabilidade dos seus hábitos. Cada repetição melhora a estabilidade do hábito, e cada dia de folga piora a estabilidade. Alguns dias de folga após um longo período perfeito, no entanto, não destruirá por completo o teu progresso."</string>
+<string name="store_feature_statistics">"&lt;b&gt;Gráficos e estatísticas detalhadas&lt;/b&gt;
+Veja claramente como os teus hábitos estão progredindo com o passar do tempo, através de bonitos e detalhados diagramas. O histórico completo de cada hábito fica arquivado."</string>
+<string name="store_feature_schedules">"&lt;b&gt;Rotina flexível&lt;/b&gt;
+Loop aceita tanto hábitos diários, quanto hábitos com rotinas mais complexas, como 3 vezes por semana; uma vez a cada duas semanas; ou uma vez a cada dois dias."</string>
+<string name="store_feature_reminders">"&lt;b&gt;Lembretes&lt;/b&gt;
+É possível criar lembretes individuais para cada hábito, na hora do dia em que você escolher. Marque como completado diretamente da barra de notificação, sem precisar abrir o aplicativo."</string>
+<string name="store_feature_opensource">"&lt;b&gt;Completamente sem propagandas e Open Source&lt;/b&gt;
+Não há nenhum anúncio neste aplicativo, nem notificações chatas ou permissões intrusivas; e será assim para sempre. O código fonte completo está disponível sob a licença livre GPLv3."</string>
+<string name="store_feature_wear">"&lt;b&gt;Otimizado para relógios inteligentes&lt;/b&gt;
+Lembretes podem ser marcados ou ignorados diretamente a partir do seu relógio Android Wear."</string>
+    <string name="about">"Sobre"</string>
+    <string name="translators">"Tradutores"</string>
+    <string name="developers">"Desenvolvedores"</string>
+
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"Versão %s"</string>
+    <string name="frequency">"Frequência"</string>
+    <string name="checkmark">"Marcações"</string>
+
+    <!-- This is a shorter version of "Habit Strength" -->
+    <string name="strength">"Estabilidade"</string>
+    <string name="best_streaks">"Correntes mais longas"</string>
+    <string name="current_streaks">"Corrente atual"</string>
+    <string name="number_of_repetitions">"Número de repetições"</string>
+    <string name="last_x_days">"Últimos %d dias"</string>
+    <string name="last_x_weeks">"Últimas %d semanas"</string>
+    <string name="last_x_months">"Últimos %d meses"</string>
+    <string name="last_x_years">"Últimos %d anos"</string>
+
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"Desde o início"</string>
+    <string name="every_day">"Todo dia"</string>
+    <string name="every_week">"Toda semana"</string>
+    <string name="two_times_per_week">"2 vezes por semana"</string>
+    <string name="five_times_per_week">"5 vezes por semana"</string>
+    <string name="custom_frequency">"Personalizar ..."</string>
+    <string name="help">"Ajuda &amp; FAQ"</string>
+    <string name="could_not_export">"Erro ao exportar dados."</string>
+    <string name="could_not_import">"Erro ao importar dados."</string>
+
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"Arquivo não reconhecido."</string>
+    <string name="habits_imported">"Hábitos importados com sucesso."</string>
+    <string name="full_backup_success">"Backup completo exportado com sucesso."</string>
+    <string name="import_data">"Importar dados"</string>
+    <string name="export_full_backup">"Exportar backup completo"</string>
+    <string name="import_data_summary">"Aceita backups completos exportados por este app, além de arquivos gerados por Tickmate, HabitBull ou Rewire. Veja \"Ajuda\" para mais informações."</string>
+    <string name="export_as_csv_summary">"Gera arquivos que podem ser abertos em editores de planilha, como Microsoft Excel ou Openoffice Calc. Estes arquivos não podem ser importados de volta."</string>
+    <string name="export_full_backup_summary">"Gera um arquivo que contém todos os dados. Este arquivo pode ser importado de volta."</string>
+    <string name="bug_report_failed">"Erro ao gerar relatório de erros."</string>
+    <string name="generate_bug_report">"Gerar relatório de erros."</string>
+    <string name="troubleshooting">"Solução de problemas"</string>
+    <string name="help_translate">"Ajude a traduzir este app"</string>
+    <string name="night_mode">"Modo noturno"</string>
+    <string name="use_pure_black">"Usar preto em modo noturno"</string>
+    <string name="pure_black_description">"Substitui os tons de cinza por preto puro em modo noturno. Economiza bateria em telefones com tela AMOLED."</string>
+    <string name="interface_preferences">"Interface"</string>
+    <string name="reverse_days">"Inverter a ordem dos dias"</string>
+    <string name="reverse_days_description">"Mostra os dias em ordem inversa na tela principal"</string>
+    <string name="day">"Dia"</string>
+    <string name="week">"Semana"</string>
+    <string name="month">"Mês"</string>
+
+    <!-- Three-month period -->
+    <string name="quarter">"Trimestre"</string>
+    <string name="year">"Ano"</string>
+
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"vez em"</string>
+    <string name="every_x_days">"A cada %d dias"</string>
+    <string name="every_x_weeks">"A cada %d semanas"</string>
+    <string name="every_x_months">"A cada %d meses"</string>
+
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"Estabilidade"</string>
+    <string name="reminder_sound">"Toque dos lembretes"</string>
+
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+    <string name="none">"Nenhum"</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b1ae2b971..9459ff1ef 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,180 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="app_name">"Hábitos"</string>
-<string name="main_activity_title">"Hábitos"</string>
-<string name="action_settings">"Configurações"</string>
-<string name="edit">"Editar"</string>
-<string name="delete">"Deletar"</string>
-<string name="archive">"Arquivar"</string>
-<string name="unarchive">"Desarquivar"</string>
-<string name="add_habit">"Adicionar hábito"</string>
-<string name="color_picker_default_title">"Mudar cor"</string>
-<string name="toast_habit_created">"Hábito criado."</string>
-<string name="toast_habit_deleted">"Hábito deletado."</string>
-<string name="toast_habit_restored">"Hábitos restaurados."</string>
-<string name="toast_nothing_to_undo">"Nada para desfazer."</string>
-<string name="toast_nothing_to_redo">"Nada para refazer."</string>
-<string name="toast_habit_changed">"Hábito modificado."</string>
+    <string name="app_name">"Loop Habit Tracker"</string>
+    <string name="main_activity_title">"Hábitos"</string>
+    <string name="action_settings">"Definições"</string>
+    <string name="edit">"Editar"</string>
+    <string name="delete">"Eliminar"</string>
+    <string name="archive">"Arquivar"</string>
+    <string name="unarchive">"Desarquivar"</string>
+    <string name="add_habit">"Adicionar hábito"</string>
+    <string name="color_picker_default_title">"Mudar cor"</string>
+    <string name="toast_habit_created">"Hábito criado."</string>
+    <string name="toast_habit_deleted">"Hábito eliminado."</string>
+    <string name="toast_habit_restored">"Hábito restaurado."</string>
+    <string name="toast_nothing_to_undo">"Nada a anular."</string>
+    <string name="toast_nothing_to_redo">"Nada a refazer."</string>
+    <string name="toast_habit_changed">"Hábito modificado."</string>
 
-<!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
-<string name="toast_habit_changed_back">"Hábito restaurado."</string>
-<string name="toast_habit_archived">"Hábitos arquivados."</string>
-<string name="toast_habit_unarchived">"Hábitos restaurados."</string>
-<string name="overview">"Visão geral"</string>
-<string name="habit_strength">"Estabilidade"</string>
-<string name="history">"Histórico"</string>
-<string name="clear">"Limpar"</string>
-<string name="description_hint">"Pergunta (por ex., \"você meditou hoje?\")"</string>
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+    <string name="toast_habit_changed_back">"Hábito restaurado."</string>
+    <string name="toast_habit_archived">"Hábito arquivado."</string>
+    <string name="toast_habit_unarchived">"Hábito desarquivado."</string>
+    <string name="overview">"Visão geral"</string>
+    <string name="habit_strength">"Pontuação"</string>
+    <string name="history">"Histórico"</string>
+    <string name="clear">"Limpar"</string>
+    <string name="description_hint">"Pergunta (e.g., já meditou hoje?)"</string>
 
-<!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
-<string name="repeat">"Repetir"</string>
-<string name="times_every">"vezes em"</string>
-<string name="days">"dias"</string>
-<string name="reminder">"Lembrete"</string>
-<string name="discard">"Cancelar"</string>
-<string name="save">"Salvar"</string>
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"Repetir"</string>
+    <string name="times_every">"vezes em"</string>
+    <string name="days">"dias"</string>
+    <string name="reminder">"Lembrete"</string>
+    <string name="discard">"Cancelar"</string>
+    <string name="save">"Guardar"</string>
 
-<!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
-<string name="streaks">"Correntes"</string>
-<string name="no_habits_found">"Você não tem nenhum hábito ativo"</string>
-<string name="long_press_to_toggle">"Sustente por um segundo para marcar ou desmarcar"</string>
-<string name="reminder_off">"Desligado"</string>
-<string name="validation_name_should_not_be_blank">"Nome não pode ficar em branco."</string>
-<string name="validation_number_should_be_positive">"Número precisa ser positivo."</string>
-<string name="validation_at_most_one_rep_per_day">"Você pode ter no máximo uma repetição por dia."</string>
-<string name="create_habit">"Criar hábito"</string>
-<string name="edit_habit">"Editar hábito"</string>
-<string name="check">"Marcar"</string>
-<string name="snooze">"Mais tarde"</string>
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+    <string name="streaks">"Séries"</string>
+    <string name="no_habits_found">"Não tem hábitos ativos"</string>
+    <string name="long_press_to_toggle">"Mantenha pressionado para marcar ou desmarcar"</string>
+    <string name="reminder_off">"Desligado"</string>
+    <string name="validation_name_should_not_be_blank">"Nome não pode estar em branco."</string>
+    <string name="validation_number_should_be_positive">"Número tem de ser positivo."</string>
+    <string name="validation_at_most_one_rep_per_day">"Apenas pode ter no máximo uma repetição por dia"</string>
+    <string name="create_habit">"Criar hábito"</string>
+    <string name="edit_habit">"Editar hábito"</string>
+    <string name="check">"Selecionar"</string>
+    <string name="snooze">"Mais tarde"</string>
 
-<!-- App introduction -->
-<string name="intro_title_1">"Bem vindo"</string>
-<string name="intro_description_1">"Loop é um aplicativo que te ajuda a criar e manter bons hábitos."</string>
-<string name="intro_title_2">"Adicione alguns hábitos"</string>
-<string name="intro_description_2">"Todo dia, depois de praticar o seu hábito, marque no aplicativo."</string>
-<string name="intro_title_3">"Continue praticando"</string>
-<string name="intro_description_3">"Hábitos praticados regularmente por um longo período recebem uma estrela."</string>
-<string name="intro_title_4">"Acompanhe o seu progresso"</string>
-<string name="intro_description_4">"Veja como seus hábitos estão progredindo através de diagramas."</string>
-<string name="interval_15_minutes">"15 minutos"</string>
-<string name="interval_30_minutes">"30 minutos"</string>
-<string name="interval_1_hour">"1 hora"</string>
-<string name="interval_2_hour">"2 horas"</string>
-<string name="interval_4_hour">"4 horas"</string>
-<string name="interval_8_hour">"8 horas"</string>
-<string name="pref_toggle_title">"Marcar repetições com um toque curto"</string>
-<string name="pref_toggle_description">"Mais conveniente, mas pode causar marcações acidentais"</string>
-<string name="pref_snooze_interval_title">"Duração do \"mais tarde\" nos lembretes"</string>
-<string name="pref_rate_this_app">"Avaliar esse app no Google Play"</string>
-<string name="pref_send_feedback">"Mandar sugestões para o desenvolvedor"</string>
-<string name="pref_view_source_code">"Ver código-fonte no GitHub"</string>
-<string name="pref_view_app_introduction">"Assistir introdução ao aplicativo"</string>
-<string name="links">"Links"</string>
-<string name="behavior">"Interação"</string>
-<string name="name">"Nome"</string>
-<string name="show_archived">"Mostrar hábitos arquivados"</string>
-<string name="settings">"Configurações"</string>
-<string name="snooze_interval">"Duração do \"mais tarde\""</string>
-<string name="hint_title">"Dica"</string>
-<string name="hint_drag">"Para mudar a ordem dos hábitos, aperte no nome do hábito, sustente e arraste."</string>
-<string name="hint_landscape">"Para ver mais dias, coloque seu aparelho em modo paisagem."</string>
-<string name="delete_habits">"Deletar hábitos"</string>
-<string name="delete_habits_message">"Os hábitos escolhidos serão deletados permanentemente. Esta ação não pode ser desfeita."</string>
-<string name="weekends">"Fim de semana"</string>
-<string name="any_weekday">"Segunda a sexta"</string>
-<string name="any_day">"Qualquer dia da semana"</string>
-<string name="select_weekdays">"Selecionar dias"</string>
-<string name="export_to_csv">"Exportar em formato CSV"</string>
-<string name="done_label">"Pronto"</string>
-<string name="clear_label">"Limpar"</string>
-<string name="select_hours">"Selecionar horas"</string>
-<string name="select_minutes">"Selecionar minutos"</string>
+    <!-- App introduction -->
+    <string name="intro_title_1">"Bem-vindo"</string>
+    <string name="intro_description_1">"Loop é uma aplicação que o ajuda a criar e manter bons hábitos."</string>
+    <string name="intro_title_2">"Adicione alguns hábitos"</string>
+    <string name="intro_description_2">"Todos os dias, após concluir o seu hábito, marque uma cruz na app."</string>
+    <string name="intro_title_3">"Continue praticando"</string>
+    <string name="intro_description_3">"Hábitos praticados regularmente durante algum tempo recebem uma estrela."</string>
+    <string name="intro_title_4">"Acompanhe o seu progresso"</string>
+    <string name="intro_description_4">"Gráficos mostram-lhe como os seus hábitos melhoraram ao longo do tempo."</string>
+    <string name="interval_15_minutes">"15 minutos"</string>
+    <string name="interval_30_minutes">"30 minutos"</string>
+    <string name="interval_1_hour">"1 hora"</string>
+    <string name="interval_2_hour">"2 horas"</string>
+    <string name="interval_4_hour">"4 horas"</string>
+    <string name="interval_8_hour">"8 horas"</string>
+    <string name="pref_toggle_title">"Toque para alternar entre repetições"</string>
+    <string name="pref_toggle_description">"Mais conveniente, mas pode causar toques acidentais"</string>
+    <string name="pref_snooze_interval_title">"Intervalo da opção 'Mais Tarde' nos lembretes"</string>
+    <string name="pref_rate_this_app">"Avaliar a app no Google Play"</string>
+    <string name="pref_send_feedback">"Enviar feedback ao programador"</string>
+    <string name="pref_view_source_code">"Ver código-fonte no GitHub"</string>
+    <string name="pref_view_app_introduction">"Ver introdução da aplicação"</string>
+    <string name="links">"Links"</string>
+    <string name="behavior">"Comportamento"</string>
+    <string name="name">"Nome"</string>
+    <string name="show_archived">"Mostrar hábitos arquivados"</string>
+    <string name="settings">"Definições"</string>
+    <string name="snooze_interval">"Intervalo da opção 'Mais Tarde'"</string>
+    <string name="hint_title">"Sabia que?"</string>
+    <string name="hint_drag">"Para reorganizar a lista, mantenha pressionado o nome do hábito e arraste-o para o lugar certo."</string>
+    <string name="hint_landscape">"Pode ver mais dias se utilizar o telemóvel em modo paisagem."</string>
+    <string name="delete_habits">"Apagar hábitos"</string>
+    <string name="delete_habits_message">"Os hábitos serão permanentemente eliminados. Esta ação é irreversível."</string>
+    <string name="weekends">"Fins de Semana"</string>
+    <string name="any_weekday">"Segunda a Sexta"</string>
+    <string name="any_day">"Qualquer dia da semana"</string>
+    <string name="select_weekdays">"Selecionar dias"</string>
+    <string name="export_to_csv">"Exportar como CSV"</string>
+    <string name="done_label">"Concluído"</string>
+    <string name="clear_label">"Limpar"</string>
+    <string name="select_hours">"Selecionar horas"</string>
+    <string name="select_minutes">"Selecionar minutos"</string>
 
-<!-- Short description used on the Google Play store. There is an 80-character limit. -->
-<string name="store_short_description">"Acompanhe o progresso dos seus hábitos com o passar do tempo (sem anúncios)"</string>
-<string name="store_description_1">"Loop é um aplicativo que te ajuda a criar e manter bons hábitos, permitindo que você alcance os seus objetivos de longo prazo. Gráficos e estatísticas te mostram em detalhe como os teus hábitos progrediram ao passar do tempo. Este aplicativo não tem propagandas e é Open Source."</string>
-<string name="store_feature_interface">"&lt;b&gt;Interface bonita, moderna e simples&lt;/b&gt;
-Loop tem uma interface minimalista bem simples de se usar, e segue o novo visual Material Design."</string>
-<string name="store_feature_score">"&lt;b&gt;Estabilidade dos hábitos&lt;/b&gt;
-Além de mostrar quantos dias seguidos você praticou cada rotina, Loop também conta com um avançado algoritmo para calcular a estabilidade dos seus hábitos. Cada repetição melhora a estabilidade do hábito, e cada dia de folga piora a estabilidade. Alguns dias de folga após um longo período perfeito, no entanto, não destruirá por completo o teu progresso."</string>
-<string name="store_feature_statistics">"&lt;b&gt;Gráficos e estatísticas detalhadas&lt;/b&gt;
-Veja claramente como os teus hábitos estão progredindo com o passar do tempo, através de bonitos e detalhados diagramas. O histórico completo de cada hábito fica arquivado."</string>
-<string name="store_feature_schedules">"&lt;b&gt;Rotina flexível&lt;/b&gt;
-Loop aceita tanto hábitos diários, quanto hábitos com rotinas mais complexas, como 3 vezes por semana; uma vez a cada duas semanas; ou uma vez a cada dois dias."</string>
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Crie bons hábitos e siga o seu progresso ao longo do tempo (sem anúncios)"</string>
+    <string name="store_description_1">"Loop ajuda-o a criar e manter bons hábitos, permitindo-lhe alcançar os seus objetivos. Gráficos detalhados e estatísticas mostram-lhe como os seus hábitos melhoraram ao longo do tempo. É completamente livre de anúncios e open source."</string>
+<string name="store_feature_interface">"&lt;b&gt;Interface simples, bela e moderna&lt;/b&gt;
+Loop tem uma interface minimalista que é fácil de usar e adota as normas do Material Design"</string>
+<string name="store_feature_score">"&lt;b&gt;Pontuação dos hábitos&lt;/b&gt;
+Além de lhe mostrar a sua série atual, Loop também possui um avançado algoritmo que calcula a pontuação dos seus hábitos. Cada repetição aumenta a pontuação do seu hábito, e cada dia falhado a piora. No entanto, alguns dias falhados após uma longa série não destroem completamente o seu progresso."</string>
+<string name="store_feature_statistics">"&lt;b&gt;Gráficos detalhados e estatísticas&lt;/b&gt;
+Veja como os seus hábitos melhoram ao longo do tempo com gráficos elegantes e detalhados. Deslize para trás para ver um histórico completo dos seus hábitos."</string>
+<string name="store_feature_schedules">"&lt;b&gt;Rotinass flexíveis&lt;/b&gt;
+Suporta hábitos diários, bem como hábitos com rotinas mais complexos, como 3 vezes por semana; uma vez a cada duas semanas; ou uma vez a cada 2 dias."</string>
 <string name="store_feature_reminders">"&lt;b&gt;Lembretes&lt;/b&gt;
-É possível criar lembretes individuais para cada hábito, na hora do dia em que você escolher. Marque como completado diretamente da barra de notificação, sem precisar abrir o aplicativo."</string>
-<string name="store_feature_opensource">"&lt;b&gt;Completamente sem propagandas e Open Source&lt;/b&gt;
-Não há nenhum anúncio neste aplicativo, nem notificações chatas ou permissões intrusivas; e será assim para sempre. O código fonte completo está disponível sob a licença livre GPLv3."</string>
-<string name="store_feature_wear">"&lt;b&gt;Otimizado para relógios inteligentes&lt;/b&gt;
-Lembretes podem ser marcados ou ignorados diretamente a partir do seu relógio Android Wear."</string>
-<string name="about">"Sobre"</string>
-<string name="translators">"Tradutores"</string>
-<string name="developers">"Desenvolvedores"</string>
+Crie um lembrete individual para cada hábito numa hora à sua escolha. Veja, ignore ou adie facilmente o seu hábito a partir da notificação, sem precisar de abrir a aplicação."</string>
+<string name="store_feature_opensource">"&lt;b&gt;Completamente livre de publicidade e open source&lt;/b&gt;
+Não há anúncios, notificações irritantes ou permissões intrusivas nesta aplicação, e nunca haverá. O código fonte completo está disponível ao abrigo da licença GPLv3."</string>
+<string name="store_feature_wear">"&lt;b&gt;Otimizado para smartwatches&lt;/b&gt;
+Lembretes podem ser vistos, adiados ou ignorados diretamente a partir do seu smartwatch Android Wear."</string>
+    <string name="about">"Sobre"</string>
+    <string name="translators">"Tradutores"</string>
+    <string name="developers">"Programadores"</string>
 
-<!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
-<string name="version_n">"Versão %s"</string>
-<string name="frequency">"Frequência"</string>
-<string name="checkmark">"Marcações"</string>
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"Versão %s"</string>
+    <string name="frequency">"Frequência"</string>
+    <string name="checkmark">"Cruz"</string>
 
-<!-- This is a shorter version of "Habit Strength" -->
-<string name="strength">"Estabilidade"</string>
-<string name="best_streaks">"Correntes mais longas"</string>
-<string name="current_streaks">"Corrente atual"</string>
-<string name="number_of_repetitions">"Número de repetições"</string>
-<string name="last_x_days">"Últimos %d dias"</string>
-<string name="last_x_weeks">"Últimas %d semanas"</string>
-<string name="last_x_months">"Últimos %d meses"</string>
-<string name="last_x_years">"Últimos %d anos"</string>
+    <!-- This is a shorter version of "Habit Strength" -->
+    <string name="strength">"Pontuação"</string>
+    <string name="best_streaks">"Melhores séries"</string>
+    <string name="current_streaks">"Série atual"</string>
+    <string name="number_of_repetitions">"Número de repetições"</string>
+    <string name="last_x_days">"Últimos %d dias"</string>
+    <string name="last_x_weeks">"Últimas %d semanas"</string>
+    <string name="last_x_months">"Últimos %d meses"</string>
+    <string name="last_x_years">"Últimos %d anos"</string>
 
-<!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
-<string name="all_time">"Desde o início"</string>
-<string name="every_day">"Todo dia"</string>
-<string name="every_week">"Toda semana"</string>
-<string name="two_times_per_week">"2 vezes por semana"</string>
-<string name="five_times_per_week">"5 vezes por semana"</string>
-<string name="custom_frequency">"Personalizar ..."</string>
-<string name="help">"Ajuda &amp; FAQ"</string>
-<string name="could_not_export">"Erro ao exportar dados."</string>
-<string name="could_not_import">"Erro ao importar dados."</string>
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"Desde sempre"</string>
+    <string name="every_day">"Todos os dias"</string>
+    <string name="every_week">"Todas as semanas"</string>
+    <string name="two_times_per_week">"2 vezes por semana"</string>
+    <string name="five_times_per_week">"5 vezes por semana"</string>
+    <string name="custom_frequency">"Personalizar..."</string>
+    <string name="help">"Ajuda &amp; FAQ"</string>
+    <string name="could_not_export">"Falha ao exportar dados."</string>
+    <string name="could_not_import">"Falha ao importar dados."</string>
 
-<!-- Appears when the user tries to import a file which we do not support or recognize. -->
-<string name="file_not_recognized">"Arquivo não reconhecido."</string>
-<string name="habits_imported">"Hábitos importados com sucesso."</string>
-<string name="full_backup_success">"Backup completo exportado com sucesso."</string>
-<string name="import_data">"Importar dados"</string>
-<string name="export_full_backup">"Exportar backup completo"</string>
-<string name="import_data_summary">"Aceita backups completos exportados por este app, além de arquivos gerados por Tickmate, HabitBull ou Rewire. Veja \"Ajuda\" para mais informações."</string>
-<string name="export_as_csv_summary">"Gera arquivos que podem ser abertos em editores de planilha, como Microsoft Excel ou Openoffice Calc. Estes arquivos não podem ser importados de volta."</string>
-<string name="export_full_backup_summary">"Gera um arquivo que contém todos os dados. Este arquivo pode ser importado de volta."</string>
-<string name="bug_report_failed">"Erro ao gerar relatório de erros."</string>
-<string name="generate_bug_report">"Gerar relatório de erros."</string>
-<string name="troubleshooting">"Solução de problemas"</string>
-<string name="help_translate">"Ajude a traduzir este app"</string>
-<string name="night_mode">"Modo noturno"</string>
-<string name="use_pure_black">"Usar preto em modo noturno"</string>
-<string name="pure_black_description">"Substitui os tons de cinza por preto puro em modo noturno. Economiza bateria em telefones com tela AMOLED."</string>
-<string name="interface_preferences">"Interface"</string>
-<string name="reverse_days">"Inverter a ordem dos dias"</string>
-<string name="reverse_days_description">"Mostra os dias em ordem inversa na tela principal"</string>
-<string name="day">"Dia"</string>
-<string name="week">"Semana"</string>
-<string name="month">"Mês"</string>
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"Ficheiro não reconhecido."</string>
+    <string name="habits_imported">"Hábitos importados com sucesso."</string>
+    <string name="full_backup_success">"Cópia de segurança completa exportada com sucesso."</string>
+    <string name="import_data">"Importar dados"</string>
+    <string name="export_full_backup">"Exportar cópia de segurança completa"</string>
+    <string name="import_data_summary">"Suporta cópias de segurança completas exportadas por esta app, bem como ficheiros gerados pelo Tickmate, HabitBull ou Rewire. Veja as FAQ para mais informações."</string>
+    <string name="export_as_csv_summary">"Gera ficheiros que podem ser abertos por programas de folhas de cálculo, como o Microsoft Excel ou o OpenOffice Calc. Este ficheiro não pode ser importado novamente para a app."</string>
+    <string name="export_full_backup_summary">"Gera um ficheiro que contém todos os dados dos seus hábitos. Este ficheiro pode ser novamente importado para a app."</string>
+    <string name="bug_report_failed">"Falha a gerar relatório de erros."</string>
+    <string name="generate_bug_report">"Gerar relatório de erros"</string>
+    <string name="troubleshooting">"Resolução de problemas"</string>
+    <string name="help_translate">"Ajude a traduzir esta aplicação"</string>
+    <string name="night_mode">"Modo noturno"</string>
+    <string name="use_pure_black">"Usar preto puro no modo noturno"</string>
+    <string name="pure_black_description">"Substitui os fundos cinzentos por pretos puros no modo noturno. Reduz a utilização da bateria em telemóveis com ecrã AMOLED."</string>
+    <string name="interface_preferences">"Interface"</string>
+    <string name="reverse_days">"Inverter a ordem dos dias"</string>
+    <string name="reverse_days_description">"Mostra os dias em ordem inversa na página principal"</string>
+    <string name="day">"Dia"</string>
+    <string name="week">"Semana"</string>
+    <string name="month">"Mês"</string>
 
-<!-- Three-month period -->
-<string name="quarter">"Trimestre"</string>
-<string name="year">"Ano"</string>
+    <!-- Three-month period -->
+    <string name="quarter">"Trimestre"</string>
+    <string name="year">"Ano"</string>
 
-<!-- Middle part of the sentence '1 time in xx days' -->
-<!-- Middle part of the sentence '1 time in xx days' -->
-<string name="time_every">"vez em"</string>
-<string name="every_x_days">"A cada %d dias"</string>
-<string name="every_x_weeks">"A cada %d semanas"</string>
-<string name="every_x_months">"A cada %d meses"</string>
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"vez em"</string>
+    <string name="every_x_days">"A cada %d dias"</string>
+    <string name="every_x_weeks">"A cada %d semanas"</string>
+    <string name="every_x_months">"A cada %d meses"</string>
 
-<!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
-<string name="score">"Estabilidade"</string>
-<string name="reminder_sound">"Toque dos lembretes"</string>
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"Pontuação"</string>
+    <string name="reminder_sound">"Som do lembrete"</string>
 
-<!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
-<string name="none">"Nenhum"</string>
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+    <string name="none">"Silencioso"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index fcaca320b..c499b6edd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,180 +1,181 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="app_name">"Трекер звичок Loop"</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="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="toast_habit_changed">"Звичка змінена."</string>
+    <string name="app_name">"Трекер звичок Loop"</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="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="toast_habit_changed">"Звичку змінено."</string>
 
-<!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
-<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="description_hint">"Питання (приклад: \"Чи робили ви ранкову зарядку сьогодні?\")"</string>
+    <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
+    <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="description_hint">"Питання (приклад: \"Чи робили ви ранкову зарядку сьогодні?\")"</string>
 
-<!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
-<string name="repeat">"Повторювати"</string>
-<string name="times_every">"разів за"</string>
-<string name="days">"днів"</string>
-<string name="reminder">"Нагадування"</string>
-<string name="discard">"Відмінити"</string>
-<string name="save">"Зберегти"</string>
+    <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
+    <string name="repeat">"Повторювати"</string>
+    <string name="times_every">"разів за"</string>
+    <string name="days">"дні(-в)"</string>
+    <string name="reminder">"Нагадування"</string>
+    <string name="discard">"Скасувати"</string>
+    <string name="save">"Зберегти"</string>
 
-<!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
-<string name="streaks">"Серії"</string>
-<string name="no_habits_found">"У вас немає активних звичок"</string>
-<string name="long_press_to_toggle">"Натисніть та утримуйте, щоб встановити або зняти галочку"</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="edit_habit">"Редагувати звичку"</string>
-<string name="check">"Відмітити"</string>
-<string name="snooze">"Відкласти"</string>
+    <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
+    <string name="streaks">"Серії"</string>
+    <string name="no_habits_found">"У вас немає активних звичок"</string>
+    <string name="long_press_to_toggle">"Натисніть та утримуйте, щоб встановити або зняти галочку"</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="edit_habit">"Редаґувати звичку"</string>
+    <string name="check">"Відзначити"</string>
+    <string name="snooze">"Відкласти"</string>
 
-<!-- App introduction -->
-<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_title_3">"Продовжуйте в тому ж дусі"</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">"1 година"</string>
-<string name="interval_2_hour">"2 години"</string>
-<string name="interval_4_hour">"4 години"</string>
-<string name="interval_8_hour">"8 годин"</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">"Оцінити цю програму в Google Play"</string>
-<string name="pref_send_feedback">"Надіслати відгук розробнику"</string>
-<string name="pref_view_source_code">"Подивитись вихідний код на GitHub"</string>
-<string name="pref_view_app_introduction">"Переглянути вступні інструкції"</string>
-<string name="links">"Посилання"</string>
-<string name="behavior">"Поведінка"</string>
-<string name="name">"Назва"</string>
-<string name="show_archived">"Показати архівовані"</string>
-<string name="settings">"Налаштування"</string>
-<string name="snooze_interval">"Інтервал відкладення"</string>
-<string name="hint_title">"Чи знаєте ви?"</string>
-<string name="hint_drag">"Щоб змінити порядок записів, натисніть і утримуйте назву запису, потім перетягніть запис на потрібне місце."</string>
-<string name="hint_landscape">"В альбомному режимі відображається більше днів."</string>
-<string name="delete_habits">"Видалити звички"</string>
-<string name="delete_habits_message">"Звички будуть видалені. Ця дія не може бути скасованою."</string>
-<string name="weekends">"По вихідних"</string>
-<string name="any_weekday">"По буднях"</string>
-<string name="any_day">"Кожного дня"</string>
-<string name="select_weekdays">"Оберіть дні"</string>
-<string name="export_to_csv">"Експортувати дані (CVS)"</string>
-<string name="done_label">"Готово"</string>
-<string name="clear_label">"Очистити"</string>
-<string name="select_hours">"Оберіть години"</string>
-<string name="select_minutes">"Оберіть хвилини"</string>
+    <!-- App introduction -->
+    <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_title_3">"Продовжуйте в тому ж дусі"</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">"1 година"</string>
+    <string name="interval_2_hour">"2 години"</string>
+    <string name="interval_4_hour">"4 години"</string>
+    <string name="interval_8_hour">"8 годин"</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">"Оцінити цю програму в Google Play"</string>
+    <string name="pref_send_feedback">"Надіслати відозву розробнику"</string>
+    <string name="pref_view_source_code">"Подивитися вихідний код на GitHub"</string>
+    <string name="pref_view_app_introduction">"Переглянути вступні інструкції"</string>
+    <string name="links">"Посилання"</string>
+    <string name="behavior">"Поведінка"</string>
+    <string name="name">"Назва"</string>
+    <string name="show_archived">"Показати архівовані"</string>
+    <string name="settings">"Налаштування"</string>
+    <string name="snooze_interval">"Інтервал відкладення"</string>
+    <string name="hint_title">"Чи знаєте ви?"</string>
+    <string name="hint_drag">"Аби змінити лад записів, натисніть і утримуйте назву запису, опісля перетягніть запис на потрібне місце."</string>
+    <string name="hint_landscape">"В альбомному режимі відображається більше днів."</string>
+    <string name="delete_habits">"Вилучити звички"</string>
+    <string name="delete_habits_message">"Звички буде вилучено. Цю дію не можна скасувати."</string>
+    <string name="weekends">"По вихідних"</string>
+    <string name="any_weekday">"По буднях"</string>
+    <string name="any_day">"Щодня"</string>
+    <string name="select_weekdays">"Оберіть дні"</string>
+    <string name="export_to_csv">"Експортувати дані (CVS)"</string>
+    <string name="done_label">"Готово"</string>
+    <string name="clear_label">"Очистити"</string>
+    <string name="select_hours">"Оберіть години"</string>
+    <string name="select_minutes">"Оберіть хвилини"</string>
 
-<!-- Short description used on the Google Play store. There is an 80-character limit. -->
-<string name="store_short_description">"Розвивайте корисні звички і відстежуйте свої успіхи (без реклами)"</string>
-<string name="store_description_1">"Трекер звичок Loop допоможе вам розвивати та підтримувати хороші звички, що дозволить вам досягнути ваших довгострокових цілей. Докладні графіки та статистичні дані показують вам, як ваші звички покращилися з часом. Трекер не містить реклами і є програмою з відкритим вихідним кодом."</string>
-<string name="store_feature_interface">"&lt;b&gt;Простий, красивий і сучасний інтерфейс&lt;/b&gt;
-Loop має легкий у використанні мінімалістичний інтерфейс, що відповідає принципам Material Design."</string>
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Розвивайте корисні звички і відстежуйте свої успіхи (без реклами)"</string>
+    <string name="store_description_1">"Трекер звичок Loop допоможе вам розвивати і підтримувати хороші звички, що дозволить вам досягнути ваших довгострокових цілей. Детальні ґрафіки та статистичні дані показують вам, як ваші звички покращилися з часом. Трекер не містить реклами і є програмою з відкритим вихідним кодом."</string>
+<string name="store_feature_interface">"&lt;b&gt;Проста, красива і сучасна оболонка&lt;/b&gt;
+Loop має легку у використанні, мінімалістську оболонку, що відповідає принципам Material Design."</string>
 <string name="store_feature_score">"&lt;b&gt;Оцінка звичок&lt;/b&gt;
-На додаток до відображення поточної серії повторень, програма має передовий алгоритм розрахунку \"сили\" ваших звичок. Кожне повторення робить вашу звичку \"сильніше\", а кожний пропуск - \"слабкіше\". Проте, кілька пропущених днів після тривалої серії повторень не зведуть ваші успіхи повністю нанівець."</string>
-<string name="store_feature_statistics">"&lt;b&gt;Детальні діаграми і статистичні дані&lt;/b&gt;
-За допомогою красивих і деталізованих діаграм ви з легкістю можете переглянути, як ваші звички закріпилися з часом. Прокрутіть назад, щод переглянути повну історію ваших звичок."</string>
-<string name="store_feature_schedules">"&lt;b&gt;Гнучкий графік&lt;/b&gt;
-Підтримуються як щоденні звички, так і звички з більш складними графіками, наприклад: 3 рази на тиждень, один раз на два тижні, через день."</string>
+На додаток до відображення поточної серії повторень, програма має передовий алгоритм розрахунку \"сили\" ваших звичок. Кожне повторення робить вашу звичку \"сильнішою\", водночас пропуск - \"слабкішою\". Проте, кілька пропущених днів після тривалої серії повторень не зведуть ваші успіхи геть нанівець."</string>
+<string name="store_feature_statistics">"&lt;b&gt;Детальні діяграми і статистичні дані&lt;/b&gt;
+За допомогою красивих і деталізованих діяграм ви з легкістю можете подивитися, як ваші звички закріпилися з часом. Прокрутіть назад, аби переглянути повну історію ваших звичок."</string>
+<string name="store_feature_schedules">"&lt;b&gt;Гнучкий ґрафік&lt;/b&gt;
+Підтримуються як щоденні звички, так і звички зі складнішими ґрафіками, наприклад: тричі на тиждень, один раз на два тижні, через день."</string>
 <string name="store_feature_reminders">"&lt;b&gt;Нагадування&lt;/b&gt;
-Створюйте окремі нагадування для кожної звички в певні години дня. З легкістю відмічайте, пропускайте або відкладайте виконання звички безпосередньо із повідомлення, не відкриваючи програму."</string>
-<string name="store_feature_opensource">"&lt;b&gt;Повна відсутність реклами та відкритий вихідний код&lt;/b&gt;
-У програмі абсолютно немає реклами, дратівливих повідомлень або нав'язливих дозволів,і ніколи не буде. Весь вихідний код доступний на умовах ліцензії GPLv3."</string>
-<string name="store_feature_wear">"&lt;b&gt;Оптимізовано для \"розумних\" годинників&lt;/b&gt;
-Нагадування можуть бути відмічені, відкладені або пропущені безпосередньо з вашого годинника Android Wear."</string>
-<string name="about">"Про програму"</string>
-<string name="translators">"Перекладачі"</string>
-<string name="developers">"Розробники"</string>
+Створюйте окремі нагадування для кожної звички у певні години дня. З легкістю відзначайте, пропускайте або ж відкладайте виконання звички безпосередньо зі сповіщення, не відкриваючи програму."</string>
+<string name="store_feature_opensource">"&lt;b&gt;Цілковита відсутність реклами та відкритий вихідний код&lt;/b&gt;
+У програмі абсолютно немає реклами, дратівливих повідомлень, чи ж нав'язливих дозволів, і ніколи не буде. Увесь вихідний код доступний на умовах ліцензії GPLv3."</string>
+<string name="store_feature_wear">"&lt;b&gt;Оптимізовано для розумних годинників&lt;/b&gt;
+Нагадування можна відзначити, відкласти або ж пропустити безпосередньо з вашого годинника Android Wear."</string>
+    <string name="about">"Про програму"</string>
+    <string name="translators">"Перекладачі"</string>
+    <string name="developers">"Розробники"</string>
 
-<!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
-<string name="version_n">"Версія %s"</string>
-<string name="frequency">"Частота"</string>
-<string name="checkmark">"Галочка"</string>
+    <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
+    <string name="version_n">"Версія %s"</string>
+    <string name="frequency">"Частота"</string>
+    <string name="checkmark">"Галочка"</string>
 
-<!-- This is a shorter version of "Habit Strength" -->
-<string name="strength">"Сила"</string>
-<string name="best_streaks">"Кращі серії"</string>
-<string name="current_streaks">"Поточна серія"</string>
-<string name="number_of_repetitions">"Кількість повторень"</string>
-<string name="last_x_days">"Останні %d днів"</string>
-<string name="last_x_weeks">"Останні %d тижнів"</string>
-<string name="last_x_months">"Останні %d місяців"</string>
-<string name="last_x_years">"Останні %d років"</string>
+    <!-- This is a shorter version of "Habit Strength" -->
+    <string name="strength">"Сила"</string>
+    <string name="best_streaks">"Найкращі серії"</string>
+    <string name="current_streaks">"Поточна серія"</string>
+    <string name="number_of_repetitions">"Число повторень"</string>
+    <string name="last_x_days">"Останні %d дні(-в)"</string>
+    <string name="last_x_weeks">"Останні %d тижні(-в)"</string>
+    <string name="last_x_months">"Останні %d місяці(-в)"</string>
+    <string name="last_x_years">"Останні %d роки(-ів)"</string>
 
-<!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
-<string name="all_time">"За весь час"</string>
-<string name="every_day">"Кожен день"</string>
-<string name="every_week">"Кожен тиждень"</string>
-<string name="two_times_per_week">"2 рази на тиждень"</string>
-<string name="five_times_per_week">"5 разів на тиждень"</string>
-<string name="custom_frequency">"Інше ..."</string>
-<string name="help">"Допомога та FAQ"</string>
-<string name="could_not_export">"Помилка експорту даних."</string>
-<string name="could_not_import">"Помилка імпорту даних."</string>
+    <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
+    <string name="all_time">"За весь час"</string>
+    <string name="every_day">"Щодня"</string>
+    <string name="every_week">"Щотижня"</string>
+    <string name="two_times_per_week">"Двічі на тиждень"</string>
+    <string name="five_times_per_week">"5 разів на тиждень"</string>
+    <string name="custom_frequency">"Инше..."</string>
+    <string name="help">"Допомога та ЧаПи"</string>
+    <string name="could_not_export">"Помилка експортування даних."</string>
+    <string name="could_not_import">"Помилка імпортування даних."</string>
 
-<!-- Appears when the user tries to import a file which we do not support or recognize. -->
-<string name="file_not_recognized">"Неможливо визначити тип файлу."</string>
-<string name="habits_imported">"Звички успішно імпортовані."</string>
-<string name="full_backup_success">"Повна резервна копія успішно експортована."</string>
-<string name="import_data">"Імпортувати дані"</string>
-<string name="export_full_backup">"Експортувати повну резервну копію"</string>
-<string name="import_data_summary">"Підтримує імпорт повної резервної копії, експортованої цією програмою, а також файлів, згенерованих програмами Tickmate, HabitBull та Rewire. Більше інформації дивіться в FAQ."</string>
-<string name="export_as_csv_summary">"Генерує файли, які можна відкрити в програмах для роботи з таблицями (таких як Microsoft Excel або OpenOffice Calc). Цей файл не можна імпортувати назад."</string>
-<string name="export_full_backup_summary">"Генерує файл, що містить всі ваші дані. Цей файл можна імпортувати назад."</string>
-<string name="bug_report_failed">"Помилка генерації звіту про помилку."</string>
-<string name="generate_bug_report">"Згенерувати звіт про помилку"</string>
-<string name="troubleshooting">"Усунення несправностей"</string>
-<string name="help_translate">"Допоможіть перекласти цю програму"</string>
-<string name="night_mode">"Нічний режим"</string>
-<string name="use_pure_black">"Використовувати справжній чорний в нічному режимі"</string>
-<string name="pure_black_description">"Замінює сірий фон на справжній чорний в нічному режимі. Зменшує використання батареї в телефонах з дисплеєм AMOLED."</string>
-<string name="interface_preferences">"Інтерфейс"</string>
-<string name="reverse_days">"Зворотній порядок днів"</string>
-<string name="reverse_days_description">"Відображати дні в зворотному порядку на головному екрані"</string>
-<string name="day">"День"</string>
-<string name="week">"Тиждень"</string>
-<string name="month">"Місяць"</string>
+    <!-- Appears when the user tries to import a file which we do not support or recognize. -->
+    <string name="file_not_recognized">"Неможливо визначити тип файлу."</string>
+    <string name="habits_imported">"Звички успішно імпортовано."</string>
+    <string name="full_backup_success">"Повна резервна копія успішно експортована."</string>
+    <string name="import_data">"Імпортувати дані"</string>
+    <string name="export_full_backup">"Експортувати повну резервну копію"</string>
+    <string name="import_data_summary">"Підтримує імпорт повної резервної копії, експортованої цією програмою, а також файлів, створених програмами Tickmate, HabitBull та Rewire. Більше інформації дивіться у ЧаПи."</string>
+    <string name="export_as_csv_summary">"Створює файли, які можна відкрити у програмах для роботи з таблицями (як-от: Microsoft Excel або OpenOffice Calc). Цей файл не можна імпортувати назад."</string>
+    <string name="export_full_backup_summary">"Створює файл, що містить усі ваші дані. Цей файл можна імпортувати назад."</string>
+    <string name="bug_report_failed">"Помилка створення звіту про помилку."</string>
+    <string name="generate_bug_report">"Створити звіт про помилку"</string>
+    <string name="troubleshooting">"Усунення несправностей"</string>
+    <string name="help_translate">"Допоможіть перекласти цю програму"</string>
+    <string name="night_mode">"Нічний режим"</string>
+    <string name="use_pure_black">"Користати цілком чорне тло у нічному режимі"</string>
+    <string name="pure_black_description">"Замінює сіре тло на цілком чорне у нічному режимі. Зменшує використання батареї в телефонах із дисплеєм AMOLED."</string>
+    <string name="interface_preferences">"Оболонка"</string>
+    <string name="reverse_days">"Зворотній лад днів"</string>
+    <string name="reverse_days_description">"Відображає дні у зворотньому ладу на головному екрані"</string>
+    <string name="day">"День"</string>
+    <string name="week">"Тиждень"</string>
+    <string name="month">"Місяць"</string>
 
-<!-- Three-month period -->
-<string name="quarter">"Квартал"</string>
-<string name="year">"Рік"</string>
+    <!-- Three-month period -->
+    <string name="quarter">"Квартал"</string>
+    <string name="year">"Рік"</string>
 
-<!-- Middle part of the sentence '1 time in xx days' -->
-<!-- Middle part of the sentence '1 time in xx days' -->
-<string name="time_every">"раз за"</string>
-<string name="every_x_days">"Кожні %d днів"</string>
-<string name="every_x_weeks">"Кожні %d тижнів"</string>
-<string name="every_x_months">"Кожні %d місяців"</string>
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">"раз за"</string>
+    <string name="every_x_days">"Кожні %d дні(-в)"</string>
+    <string name="every_x_weeks">"Кожні %d тижні(-в)"</string>
+    <string name="every_x_months">"Кожні %d місяці(-в)"</string>
 
-<!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
-<string name="score">"Стабільність"</string>
-<string name="reminder_sound">"Звук нагадування"</string>
+    <!-- "Стабільність" не вміщається, тому ліпше "Сталість". -->
+    <!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
+    <string name="score">"Сталість"</string>
+    <string name="reminder_sound">"Звук нагадування"</string>
 
-<!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
-<string name="none">"Немає"</string>
+    <!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
+    <string name="none">"Немає"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 926c20863..442ff9fe4 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="app_name">"循環習慣記錄"</string>
+<string name="app_name">"Loop 習以為常"</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="unarchive">"取消存檔"</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>
 
 <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
 <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="habit_strength">"習慣強度"</string>
 <string name="history">"歴史紀錄"</string>
 <string name="clear">"清空"</string>
 <string name="description_hint">"問題(你今天…了嗎？)"</string>
@@ -37,7 +37,7 @@
 <!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
 <string name="streaks">"記錄"</string>
 <string name="no_habits_found">"你還沒有任何習慣"</string>
-<string name="long_press_to_toggle">"長按 標記/取消標記"</string>
+<string name="long_press_to_toggle">"長按以標記/取消標記"</string>
 <string name="reminder_off">"關閉"</string>
 <string name="validation_name_should_not_be_blank">"習慣標題不能空白"</string>
 <string name="validation_number_should_be_positive">"數字必需大於零"</string>
@@ -55,7 +55,7 @@
 <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>
@@ -65,7 +65,7 @@
 <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">"評價這個APP在Google Play"</string>
+<string name="pref_rate_this_app">"在Google Play上評價這個App"</string>
 <string name="pref_send_feedback">"發送改進意見給開發者"</string>
 <string name="pref_view_source_code">"在GitHub上查看原始碼"</string>
 <string name="pref_view_app_introduction">"App簡介"</string>
@@ -84,7 +84,7 @@
 <string name="any_weekday">"工作日"</string>
 <string name="any_day">"每天"</string>
 <string name="select_weekdays">"選擇天數"</string>
-<string name="export_to_csv">"導出數據 (CSV)"</string>
+<string name="export_to_csv">"匯出數據 (CSV)"</string>
 <string name="done_label">"完成"</string>
 <string name="clear_label">"取消"</string>
 <string name="select_hours">"選擇小時"</string>
@@ -92,20 +92,20 @@
 
 <!-- Short description used on the Google Play store. There is an 80-character limit. -->
 <string name="store_short_description">"建立好新習慣並隨著時間進步 (無廣告)"</string>
-<string name="store_description_1">"習以為常幫助你建立和維持好習慣，達到長期目標。詳細的圖片和數字顯示出你的進步。完成無廣告的開源軟體。"</string>
-<string name="store_feature_interface">"&amp;lt;b&amp;gt;簡單，美觀，時尚的界面&amp;lt;/b&amp;gt;
+<string name="store_description_1">"習以為常幫助你建立和維持好習慣，達到長期目標。詳細的圖表和數據顯示出你的進步。這是一個無廣告的開源軟體。"</string>
+<string name="store_feature_interface">"&lt;b&gt;簡單，美觀，時尚的界面&lt;/b&gt;
 輕量型界面易於使用。"</string>
-<string name="store_feature_score">"&amp;lt;b&amp;gt; 習慣分數&amp;lt;/b&amp;gt;
+<string name="store_feature_score">"&lt;b&gt;習慣分數&lt;/b&gt;
 除了顯示你目前的習慣連勝，循環記錄有高級的演算法計算你的習慣強度。每完成一次能使你的習慣強度增加，每次錯過則會減弱。然而，幾次錯過並不會影響你的習慣進步。"</string>
-<string name="store_feature_statistics">"&amp;lt;b&amp;gt; 詳細的圖片和資料分析&amp;lt;/b&amp;gt;
+<string name="store_feature_statistics">"&lt;b&gt;詳細的圖片和資料分析&lt;/b&gt;
 詳細的圖片能顯示出你的進步。往後滑動可以查看完整的歷史記錄。"</string>
-<string name="store_feature_schedules">"&amp;lt;b&amp;gt; 靈活的時間表&amp;lt;/b&amp;gt;
+<string name="store_feature_schedules">"&lt;b&gt;靈活的時間表&lt;/b&gt;
 支援日常習慣或者是更複雜的時間間隔（例如每周3次，每周1次）"</string>
-<string name="store_feature_reminders">"&amp;lt;b&amp;gt;提醒&amp;lt;/b&amp;gt;
+<string name="store_feature_reminders">"&lt;b&gt;提醒&lt;/b&gt;
 可以選擇為每個習慣加入提醒。不需要打開程式就可以 記錄、忽略或者是延遲習慣。"</string>
-<string name="store_feature_opensource">"&amp;lt;b&amp;gt;完全無廣告和開源軟體&amp;lt;/b&amp;gt;
+<string name="store_feature_opensource">"&lt;b&gt;完全無廣告和開源軟體&lt;/b&gt;
 永遠不會有廣告和煩人的提醒。完整的程式碼在GPLv3。"</string>
-<string name="store_feature_wear">"&amp;lt;b&amp;gt;可以用在智慧型手錶上&amp;lt;/b&amp;gt;
+<string name="store_feature_wear">"&lt;b&gt;可以用在智慧型手錶上&lt;/b&gt;
 提醒可以直接在android手錶上 記錄、忽略，或者延遲。"</string>
 <string name="about">"關於本程式"</string>
 <string name="translators">"翻譯者"</string>
@@ -118,8 +118,8 @@
 
 <!-- This is a shorter version of "Habit Strength" -->
 <string name="strength">"強度"</string>
-<string name="best_streaks">"最長連勝"</string>
-<string name="current_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>
 <string name="last_x_weeks">"過去 %d 周"</string>
@@ -129,25 +129,25 @@
 <!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
 <string name="all_time">"全部"</string>
 <string name="every_day">"每天"</string>
-<string name="every_week">"每周"</string>
-<string name="two_times_per_week">"每周兩次"</string>
-<string name="five_times_per_week">"每周五次"</string>
-<string name="custom_frequency">"自訂"</string>
-<string name="help">"幫助&amp;常見問題"</string>
-<string name="could_not_export">"輸出資料失數"</string>
-<string name="could_not_import">"輸入資料失數"</string>
+<string name="every_week">"每週"</string>
+<string name="two_times_per_week">"每週兩次"</string>
+<string name="five_times_per_week">"每週五次"</string>
+<string name="custom_frequency">"自訂週期"</string>
+<string name="help">"幫助&amp;amp;常見問題"</string>
+<string name="could_not_export">"輸出資料失敗"</string>
+<string name="could_not_import">"輸入資料失敗"</string>
 
 <!-- Appears when the user tries to import a file which we do not support or recognize. -->
 <string name="file_not_recognized">"無法辨識"</string>
 <string name="habits_imported">"習慣輸入成功"</string>
 <string name="full_backup_success">"習慣備份成功"</string>
-<string name="import_data">"輸入資料"</string>
-<string name="export_full_backup">"導出完整備份"</string>
-<string name="import_data_summary">"支援此程式輸出的資料， 也支援Tickmate ， HabitBull 或 rewire 導出文件，。請參閱常見問題以獲得更多訊息。"</string>
-<string name="export_as_csv_summary">"生成可以利用表格程式打開的文件，如Microsoft Excel或OpenOffice Calc。此文件無法重新導入。"</string>
-<string name="export_full_backup_summary">"生成一個包含所有資料的文件。該文件可以再重新輸入回来。"</string>
+<string name="import_data">"匯入資料"</string>
+<string name="export_full_backup">"匯出完整備份"</string>
+<string name="import_data_summary">"支援此程式所匯出的資料， 也支援Tickmate，HabitBull 或 Rewire 所產生的文件。請參閱常見問題以獲得更多訊息。"</string>
+<string name="export_as_csv_summary">"生成可以利用表格程式打開的文件，如Microsoft Excel或OpenOffice Calc。此文件無法重新匯入。"</string>
+<string name="export_full_backup_summary">"生成一個包含所有資料的文件。該文件可以再重新匯入。"</string>
 <string name="bug_report_failed">"錯誤報告：生成失敗"</string>
-<string name="generate_bug_report">"生成錯誤報告"</string>
+<string name="generate_bug_report">"產生錯誤報告"</string>
 <string name="troubleshooting">"問題排除"</string>
 <string name="help_translate">"協助翻譯本程式"</string>
 <string name="night_mode">"夜間模式"</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6a1e1e071..867e29ec9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -251,4 +251,8 @@
         <item name="android:background">@drawable/toolbar_shadow</item>
         <item name="android:alpha">0.2</item>
     </style>
+
+    <style name="TimePickerDialog" parent="@style/Theme.AppCompat.Light.Dialog">
+        <item name="windowNoTitle">true</item>
+    </style>
 </resources>