From be114bde7f427285f32851704dc31dffa56fec69 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sun, 20 Mar 2016 17:01:58 -0400
Subject: [PATCH 1/6] Bump version to 1.3.3

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 641951fa4..1ae537237 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="12"
-    android:versionName="1.3.2">
+    android:versionCode="13"
+    android:versionName="1.3.3">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

From ae0dad91209719f18f50a793b4f11b30975fd7ba Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sun, 20 Mar 2016 17:06:22 -0400
Subject: [PATCH 2/6] Use DateHelper instead of instantiating GregorianCalendar
 directly

Fixes #58
---
 .../main/java/org/isoron/uhabits/views/HabitHistoryView.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
index 67191b417..d5448ba88 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -101,12 +101,11 @@ private void init()
 
     private void updateDate()
     {
-        baseDate = new GregorianCalendar();
-        baseDate.setTimeInMillis(DateHelper.getLocalTime());
+        baseDate = DateHelper.getStartOfTodayCalendar();
         baseDate.add(Calendar.DAY_OF_YEAR, -(getDataOffset() - 1) * 7);
 
         nDays = (nColumns - 1) * 7;
-        todayWeekday = new GregorianCalendar().get(Calendar.DAY_OF_WEEK) % 7;
+        todayWeekday = DateHelper.getStartOfTodayCalendar().get(Calendar.DAY_OF_WEEK) % 7;
 
         baseDate.add(Calendar.DAY_OF_YEAR, -nDays);
         baseDate.add(Calendar.DAY_OF_YEAR, -todayWeekday);

From f9377e17681a9d8f3e7508c90aa1fd5a284bad15 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sun, 20 Mar 2016 17:10:57 -0400
Subject: [PATCH 3/6] Draw month name on the correct column

Fixes #55
---
 .../java/org/isoron/uhabits/views/HabitHistoryView.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
index d5448ba88..45e1bfa1c 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -310,8 +310,11 @@ private void drawAxis(Canvas canvas, Rect location)
 
     private void drawColumnHeader(Canvas canvas, Rect location, GregorianCalendar date)
     {
-        String month = dfMonth.format(date.getTime());
-        String year = dfYear.format(date.getTime());
+        GregorianCalendar forwardDate = (GregorianCalendar) date.clone();
+        forwardDate.add(Calendar.DAY_OF_YEAR, 6);
+
+        String month = dfMonth.format(forwardDate.getTime());
+        String year = dfYear.format(forwardDate.getTime());
 
         if (!month.equals(previousMonth))
         {

From 3016263750050cee3e5b17167fda4bae87c29b4d Mon Sep 17 00:00:00 2001
From: Alinson Xavier <isoron@gmail.com>
Date: Sun, 20 Mar 2016 17:22:33 -0400
Subject: [PATCH 4/6] Update translations

---
 app/src/main/res/values-ar/strings.xml | 210 +++++++++++------------
 app/src/main/res/values-de/strings.xml | 199 ++++++++++------------
 app/src/main/res/values-fr/strings.xml | 207 +++++++++++------------
 app/src/main/res/values-it/strings.xml | 219 +++++++++++-------------
 app/src/main/res/values-ja/strings.xml | 205 +++++++++++------------
 app/src/main/res/values-pl/strings.xml | 206 +++++++++++------------
 app/src/main/res/values-pt/strings.xml | 220 ++++++++++++------------
 app/src/main/res/values-ru/strings.xml | 205 +++++++++++------------
 app/src/main/res/values-sv/strings.xml | 213 +++++++++++-------------
 app/src/main/res/values-zh/strings.xml | 221 ++++++++++++-------------
 10 files changed, 979 insertions(+), 1126 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 5eb8a85c4..9de2a2d8f 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,121 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Al Alloush
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
 <resources>
 
-    <!-- There is no letter P in arabic so the name is unfortunately translated to "Loob" -->
-    <string name="app_name">"لوب  ملاحق العادة "</string>
-    <string name="main_activity_title">"عادات"</string>
-    <string name="action_settings">"إعدادات"</string>
-    <string name="edit">"تعديل"</string>
-    <string name="delete">"حذف"</string>
-    <string name="archive">"أرشيف"</string>
-    <string name="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>
+<!-- There is no letter P in arabic so the name is unfortunately translated to "Loob" -->
+<string name="app_name">"لوب  ملاحق العادة "</string>
+<string name="main_activity_title">"عادات"</string>
+<string name="action_settings">"إعدادات"</string>
+<string name="edit">"تعديل"</string>
+<string name="delete">"حذف"</string>
+<string name="archive">"أرشيف"</string>
+<string name="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>
-    <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>
+<!-- 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>
+<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">"ساعة واحدة"</string>
-    <string name="interval_2_hour">"ساعتين"</string>
-    <string name="interval_4_hour">"أربع ساعات"</string>
-    <string name="interval_8_hour">"ثماني ساعات"</string>
-    <string name="pref_toggle_title">"تبديل بكبسه"</string>
-    <string name="pref_toggle_description">"أكثر سهولة، لكنه ممكن يسبب كبسات غير مقصوده"</string>
-    <string name="pref_snooze_interval_title">"فترتي الغفوى على التذكير"</string>
-    <string name="pref_rate_this_app">"تقييم هذا التطبيق على جوجل بلاي"</string>
-    <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>
+<!-- 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">"ساعة واحدة"</string>
+<string name="interval_2_hour">"ساعتين"</string>
+<string name="interval_4_hour">"أربع ساعات"</string>
+<string name="interval_8_hour">"ثماني ساعات"</string>
+<string name="pref_toggle_title">"تبديل بكبسه"</string>
+<string name="pref_toggle_description">"أكثر سهولة، لكنه ممكن يسبب كبسات غير مقصوده"</string>
+<string name="pref_snooze_interval_title">"فترتي الغفوى على التذكير"</string>
+<string name="pref_rate_this_app">"تقييم هذا التطبيق على جوجل بلاي"</string>
+<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>
 
-    <!-- This is a bit unclear to me. It is like a prompt asking the user to select specific days, or is it more like an alarm mode where it will only activate on select days? -->
-    <string name="select_weekdays">"إختار أيام "</string>
-    <string name="export_to_csv">"تصدير البيانات"</string>
-    <string name="done_label">"منجز"</string>
-    <string name="clear_label">"نظف"</string>
-    <string name="select_hours">"تحديد ساعات"</string>
-    <string name="select_minutes">"تحديد دقائق "</string>
+<!-- This is a bit unclear to me. It is like a prompt asking the user to select specific days, or is it more like an alarm mode where it will only activate on select days? -->
+<string name="select_weekdays">"إختار أيام "</string>
+<string name="export_to_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>
+<!-- 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">"&lt;b&gt;نتيجة العادات&lt;/b&gt;
+<string name="store_feature_score">"&lt;b&gt;نتيجة العادات&lt;/b&gt; 
 بالإضافة إلى عرض التقدم الحالي، لوب ديه خوارزمية متقدمة لحساب قوة عاداتك. كل التكرار يجعل هذه العادة أقوى، وفي كل يوم غاب يجعلها أضعف. مع ذلك غيب أيام قليلة بعد تقدم طويلة ، لن تدمر تماما تقدمك ."</string>
 <string name="store_feature_statistics">"&lt;b&gt;الرسوم البيانية والإحصاءات المفصلة&lt;/b&gt;
 نرى بوضوح كيف كنت قد تحسنت عاداتك بمرور الوقت مع الرسوم البيانية  الجميله ومفصلة. انتقل إلى الوراء لنرى التاريخ الكامل لعاداتك."</string>
@@ -127,11 +109,11 @@
 لا توجد على الاطلاق الإعلانات والشعارات المزعجة أو أذونات إضافية في هذا التطبيق، و سوف يكون هناك أبدا."</string>
 <string name="store_feature_wear">"&lt;b&gt;الأمثل للساعات الذكية&lt;/b&gt;
 يمكن التحقق من رسائل التذكير، رفض أو غفوة عادتك مباشرة من ساعتك الاندرويد وير. "</string>
-    <string name="about">"معلومات حول"</string>
-    <string name="translators">"المترجمين"</string>
-    <string name="developers">"المطورين"</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>
+<!-- %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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 589ab77b2..2eef7fd5c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,118 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Matthias Meisser
-  ~ Copyright (C) 2016 Can Altas
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
 <resources>
-    <string name="app_name">"Loop Habit Tracker"</string>
-    <string name="main_activity_title">"Gewohnheiten"</string>
-    <string name="action_settings">"Einstellung"</string>
-    <string name="edit">"Bearbeiten"</string>
-    <string name="delete">"Löschen"</string>
-    <string name="archive">"Archivieren"</string>
-    <string name="unarchive">"Dearchivieren"</string>
-    <string name="add_habit">"Gewohnheit hinzufügen"</string>
-    <string name="color_picker_default_title">"Farbe ändern"</string>
-    <string name="toast_habit_created">"Gewohnheit erstellt."</string>
-    <string name="toast_habit_deleted">"Gewohnheiten gelöscht."</string>
-    <string name="toast_habit_restored">"Gewohnheiten wiederhergestellt."</string>
-    <string name="toast_nothing_to_undo">"Nichts zum rückgängig machen."</string>
-    <string name="toast_nothing_to_redo">"Nichts zum wiederherstellen"</string>
-    <string name="toast_habit_changed">"Gewohnheit geändert"</string>
+<string name="app_name">"Loop Habit Tracker"</string>
+<string name="main_activity_title">"Gewohnheiten"</string>
+<string name="action_settings">"Einstellung"</string>
+<string name="edit">"Bearbeiten"</string>
+<string name="delete">"Löschen"</string>
+<string name="archive">"Archivieren"</string>
+<string name="unarchive">"Dearchivieren"</string>
+<string name="add_habit">"Gewohnheit hinzufügen"</string>
+<string name="color_picker_default_title">"Farbe ändern"</string>
+<string name="toast_habit_created">"Gewohnheit erstellt."</string>
+<string name="toast_habit_deleted">"Gewohnheiten gelöscht."</string>
+<string name="toast_habit_restored">"Gewohnheiten wiederhergestellt."</string>
+<string name="toast_nothing_to_undo">"Nichts zum rückgängig machen."</string>
+<string name="toast_nothing_to_redo">"Nichts zum wiederherstellen"</string>
+<string name="toast_habit_changed">"Gewohnheit geändert"</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">"Gewohnheit zurückgeändert"</string>
-    <string name="toast_habit_archived">"Gewohnheiten archiviert."</string>
-    <string name="toast_habit_unarchived">"Gewohnheiten dearchiviert."</string>
-    <string name="overview">"Übersicht"</string>
-    <string name="habit_strength">"Stärke"</string>
-    <string name="history">"Verlauf"</string>
-    <string name="clear">"Löschen"</string>
-    <string name="description_hint">"Frage (Hast du heute ...?)"</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">"Gewohnheit zurückgeändert"</string>
+<string name="toast_habit_archived">"Gewohnheiten archiviert."</string>
+<string name="toast_habit_unarchived">"Gewohnheiten dearchiviert."</string>
+<string name="overview">"Übersicht"</string>
+<string name="habit_strength">"Stärke"</string>
+<string name="history">"Verlauf"</string>
+<string name="clear">"Löschen"</string>
+<string name="description_hint">"Frage (Hast du heute ...?)"</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">"Wiederhole"</string>
-    <string name="times_every">"mal in"</string>
-    <string name="days">"Tagen"</string>
-    <string name="reminder">"Erinnerung"</string>
-    <string name="discard">"Verwerfen"</string>
-    <string name="save">"Speichern"</string>
-    <string name="streaks">"Serie"</string>
-    <string name="no_habits_found">"Du hast keine aktiven Gewohnheiten"</string>
-    <string name="long_press_to_toggle">"Berühre und halte um zu (de)markieren"</string>
-    <string name="reminder_off">"Aus"</string>
-    <string name="validation_name_should_not_be_blank">"Name darf nicht leer sein."</string>
-    <string name="validation_number_should_be_positive">"Zahl muss positiv sein."</string>
-    <string name="validation_at_most_one_rep_per_day">"Du musst wenigstens eine Wiederholung pro Tag haben"</string>
-    <string name="create_habit">"Gewohnheit erstellen"</string>
-    <string name="edit_habit">"Gewohnheit bearbeiten"</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">"Wiederhole"</string>
+<string name="times_every">"mal in"</string>
+<string name="days">"Tagen"</string>
+<string name="reminder">"Erinnerung"</string>
+<string name="discard">"Verwerfen"</string>
+<string name="save">"Speichern"</string>
+<string name="streaks">"Serie"</string>
+<string name="no_habits_found">"Du hast keine aktiven Gewohnheiten"</string>
+<string name="long_press_to_toggle">"Berühre und halte um zu (de)markieren"</string>
+<string name="reminder_off">"Aus"</string>
+<string name="validation_name_should_not_be_blank">"Name darf nicht leer sein."</string>
+<string name="validation_number_should_be_positive">"Zahl muss positiv sein."</string>
+<string name="validation_at_most_one_rep_per_day">"Du musst wenigstens eine Wiederholung pro Tag haben"</string>
+<string name="create_habit">"Gewohnheit erstellen"</string>
+<string name="edit_habit">"Gewohnheit bearbeiten"</string>
 <string name="check">"prüfen
 "</string>
-    <string name="snooze">"Später"</string>
+<string name="snooze">"Später"</string>
 
-    <!-- App introduction -->
-    <string name="intro_title_1">"Willkommen"</string>
-    <string name="intro_description_1">"Loop Habit Tracker hilft dir gute Gewohnheiten anzunehmen."</string>
-    <string name="intro_title_2">"Erstelle einige neue Gewohnheiten"</string>
-    <string name="intro_description_2">"Jeden tag nachdem du das habit absolviert hast, hake es ab."</string>
-    <string name="intro_title_3">"Bleib dabei"</string>
-    <string name="intro_description_3">"Habits die du über längere Zeit durchgehalten hast, bekommen einen ganzen Stern."</string>
-    <string name="intro_title_4">"Verfolge deinen Fortschritt"</string>
-    <string name="intro_description_4">"Detailierte Diagramme zeigen dir, wie sich deine Angewohnheiten entwickelt haben."</string>
-    <string name="interval_15_minutes">"15 Minuten"</string>
-    <string name="interval_30_minutes">"30 Minuten"</string>
-    <string name="interval_1_hour">"1 Stunde"</string>
-    <string name="interval_2_hour">"2 Stunden"</string>
-    <string name="interval_4_hour">"4 Stunden"</string>
-    <string name="interval_8_hour">"8 Stunden"</string>
-    <string name="pref_toggle_title">"Wähle Wiederholungen durch kurzes Drücken"</string>
-    <string name="pref_toggle_description">"Bequemer,  verursacht evtl. falsche Auswahl"</string>
-    <string name="pref_snooze_interval_title">"Pausen-Interval bei Erinnerungen"</string>
-    <string name="pref_rate_this_app">"Bewerte diese App bei Google Play"</string>
-    <string name="pref_send_feedback">"Sende dem Entwickler Feedback"</string>
-    <string name="pref_view_source_code">"Sehe den Quellcode auf GitHub"</string>
-    <string name="pref_view_app_introduction">"Zeige Einleitung"</string>
-    <string name="links">"Links"</string>
-    <string name="behavior">"Verhalten"</string>
-    <string name="name">"Name"</string>
-    <string name="show_archived">"Zeige Archivierte"</string>
-    <string name="settings">"Einstellungen"</string>
-    <string name="snooze_interval">"Pausen-Interval"</string>
-    <string name="hint_title">"Wusstest du?"</string>
-    <string name="hint_drag">"Um Einträge umzusortieren, ziehe sie an die richtige Stelle."</string>
-    <string name="hint_landscape">"Du kannst mehr Tage sehen, wenn du dein Phone quer hälst."</string>
-    <string name="delete_habits">"Gewohnheit löschen"</string>
-    <string name="delete_habits_message">"Dies habit wird permanent gelöscht. Dies kann nicht rückgängig gemacht werden."</string>
-    <string name="weekends">"An Wochenenden"</string>
+<!-- App introduction -->
+<string name="intro_title_1">"Willkommen"</string>
+<string name="intro_description_1">"Loop Habit Tracker hilft dir gute Gewohnheiten anzunehmen."</string>
+<string name="intro_title_2">"Erstelle einige neue Gewohnheiten"</string>
+<string name="intro_description_2">"Jeden tag nachdem du das habit absolviert hast, hake es ab."</string>
+<string name="intro_title_3">"Bleib dabei"</string>
+<string name="intro_description_3">"Habits die du über längere Zeit durchgehalten hast, bekommen einen ganzen Stern."</string>
+<string name="intro_title_4">"Verfolge deinen Fortschritt"</string>
+<string name="intro_description_4">"Detailierte Diagramme zeigen dir, wie sich deine Angewohnheiten entwickelt haben."</string>
+<string name="interval_15_minutes">"15 Minuten"</string>
+<string name="interval_30_minutes">"30 Minuten"</string>
+<string name="interval_1_hour">"1 Stunde"</string>
+<string name="interval_2_hour">"2 Stunden"</string>
+<string name="interval_4_hour">"4 Stunden"</string>
+<string name="interval_8_hour">"8 Stunden"</string>
+<string name="pref_toggle_title">"Wähle Wiederholungen durch kurzes Drücken"</string>
+<string name="pref_toggle_description">"Bequemer,  verursacht evtl. falsche Auswahl"</string>
+<string name="pref_snooze_interval_title">"Pausen-Interval bei Erinnerungen"</string>
+<string name="pref_rate_this_app">"Bewerte diese App bei Google Play"</string>
+<string name="pref_send_feedback">"Sende dem Entwickler Feedback"</string>
+<string name="pref_view_source_code">"Sehe den Quellcode auf GitHub"</string>
+<string name="pref_view_app_introduction">"Zeige Einleitung"</string>
+<string name="links">"Links"</string>
+<string name="behavior">"Verhalten"</string>
+<string name="name">"Name"</string>
+<string name="show_archived">"Zeige Archivierte"</string>
+<string name="settings">"Einstellungen"</string>
+<string name="snooze_interval">"Pausen-Interval"</string>
+<string name="hint_title">"Wusstest du?"</string>
+<string name="hint_drag">"Um Einträge umzusortieren, ziehe sie an die richtige Stelle."</string>
+<string name="hint_landscape">"Du kannst mehr Tage sehen, wenn du dein Phone quer hälst."</string>
+<string name="delete_habits">"Gewohnheit löschen"</string>
+<string name="delete_habits_message">"Dies habit wird permanent gelöscht. Dies kann nicht rückgängig gemacht werden."</string>
+<string name="weekends">"An Wochenenden"</string>
 <string name="any_weekday">"Wochentage
 "</string>
-    <string name="any_day">"Jeden Tag"</string>
-    <string name="select_weekdays">"Wähle die Tage"</string>
-    <string name="export_to_csv">"Daten exportieren"</string>
+<string name="any_day">"Jeden Tag"</string>
+<string name="select_weekdays">"Wähle die Tage"</string>
+<string name="export_to_csv">"Daten exportieren"</string>
 <string name="done_label">"Fertig
 "</string>
-    <string name="clear_label">"Löschen"</string>
-    <string name="select_hours">"Wähle Stunden"</string>
-    <string name="select_minutes">"Wähle Minuten"</string>
+<string name="clear_label">"Löschen"</string>
+<string name="select_hours">"Wähle Stunden"</string>
+<string name="select_minutes">"Wähle Minuten"</string>
 
-    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
-    <string name="store_short_description">"Nimm gute Gewohnheiten an und verfolge deinen Fortschritt (ohne Werbung)"</string>
-    <string name="store_description_1">"Loop hilft dir gute Gewohnheiten anzunehmen und deine langfristigen Ziele zu erreichen. Detailierte Statistiken zeigen dir, wie du dich entwickelt hast. Es ist ohne Werbung und Open Source."</string>
+<!-- Short description used on the Google Play store. There is an 80-character limit. -->
+<string name="store_short_description">"Nimm gute Gewohnheiten an und verfolge deinen Fortschritt (ohne Werbung)"</string>
+<string name="store_description_1">"Loop hilft dir gute Gewohnheiten anzunehmen und deine langfristigen Ziele zu erreichen. Detailierte Statistiken zeigen dir, wie du dich entwickelt hast. Es ist ohne Werbung und Open Source."</string>
 <string name="store_feature_interface">"&lt;b&gt;Einfache, schöne und moderne Oberfläche&lt;/b&gt;
 Loop hat eine minimale Oberfläche und ist deshalb einfach zu benutzen. Es folgt den Material Design Richtlinien."</string>
 <string name="store_feature_score">"&lt;b&gt;Habit Punkte&lt;/b&gt;
@@ -127,11 +108,11 @@ Erstelle individuelle Erinnerungen und wann diese dich benachrichtigen sollen. K
 Es gibt absolut keine Werbung, nervende Einblendungen oder merkwürdige Berechtigungen in dieser App und das wird auch so bleiben. Der komplette Quellcode steht unter der GPLv3."</string>
 <string name="store_feature_wear">"&lt;b&gt;Optimiert für Smartwatches&lt;/b&gt;
 Erinnerungen können direkt von deiner Android Wear Watch kontrolliert, pausiert oder verschoben werden."</string>
-    <string name="about">"Über"</string>
-    <string name="translators">"Übersetzer"</string>
-    <string name="developers">"Entwickler"</string>
+<string name="about">"Über"</string>
+<string name="translators">"Übersetzer"</string>
+<string name="developers">"Entwickler"</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">"Frequenz"</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">"Frequenz"</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 8427d3da6..39087c07f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,117 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 François Mahé
-  ~ Copyright (C) 2016 Thibaut Girka
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
 <resources>
-    <string name="app_name">"Loop - Suivi d'habitudes"</string>
-    <string name="main_activity_title">"Habitude"</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>
+<string name="app_name">"Loop - Suivi d'habitudes"</string>
+<string name="main_activity_title">"Habitude"</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 non changé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 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 non changé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>
-    <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>
+<!-- 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>
+<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éer de nouvelles habitudes"</string>
-    <string name="intro_description_2">"Chaque jour, après avoir fait votre habitude, mettez une croix sur l'application"</string>
-    <string name="intro_title_3">"Continuez à le faire"</string>
-    <string name="intro_description_3">"Les habitudes faites de manière régulière pendant une période de temps étendue gagneront une étoile complète"</string>
-    <string name="intro_title_4">"Suivre votre progrès"</string>
-    <string name="intro_description_4">"Des graphiques détaillés montrant 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>
+<!-- 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éer de nouvelles habitudes"</string>
+<string name="intro_description_2">"Chaque jour, après avoir fait votre habitude, mettez une croix sur l'application"</string>
+<string name="intro_title_3">"Continuez à le faire"</string>
+<string name="intro_description_3">"Les habitudes faites de manière régulière pendant une période de temps étendue gagneront une étoile complète"</string>
+<string name="intro_title_4">"Suivre votre progrès"</string>
+<string name="intro_description_4">"Des graphiques détaillés montrant 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">"Noter 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 archivées"</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 pour toujours. Cette action ne peut être défaite."</string>
-    <string name="weekends">"Weekends"</string>
-    <string name="any_weekday">"Jours de la semaine"</string>
-    <string name="any_day">"N'importe quel jour"</string>
-    <string name="select_weekdays">"Sélectionner des jours"</string>
-    <string name="export_to_csv">"Exporter les données"</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>
+<!-- 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">"Noter 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 archivées"</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 pour toujours. Cette action ne peut être défaite."</string>
+<string name="weekends">"Weekends"</string>
+<string name="any_weekday">"Jours de la semaine"</string>
+<string name="any_day">"N'importe quel jour"</string>
+<string name="select_weekdays">"Sélectionner des jours"</string>
+<string name="export_to_csv">"Exporter les données"</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 des bonnes habitudes et suivez leurs avancées 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 open source."</string>
+<!-- Short description used on the Google Play store. There is an 80-character limit. -->
+<string name="store_short_description">"Créez des bonnes habitudes et suivez leurs avancées 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 open source."</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;
@@ -126,11 +107,11 @@ Créez un rappel propre pour chaque habitude, à une heure choisie de la journé
 Il n'y a pas de publicités, de notifications embêtantes ou de permissions intrusives 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>
+<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>
+<!-- %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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1967eec81..9d0668d1c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,136 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Marco Cavazza
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <resources>
 
-    <!-- Fuzzy -->
-    <string name="app_name">"Loop"</string>
-    <string name="main_activity_title">"Abitudine"</string>
-    <string name="action_settings">"Impostazioni"</string>
-    <string name="edit">"Modifica"</string>
-    <string name="delete">"Elimina"</string>
-    <string name="archive">"Archivia"</string>
-    <string name="unarchive">"Ripristina"</string>
-    <string name="add_habit">"Aggiungi abitudine"</string>
-    <string name="color_picker_default_title">"Cambia il colore"</string>
-    <string name="toast_habit_created">"Abitudine creata."</string>
-    <string name="toast_habit_deleted">"Abitudine rimossa."</string>
-    <string name="toast_habit_restored">"Abitudine ripristinata."</string>
-    <string name="toast_nothing_to_undo">"Niente da annullare."</string>
-    <string name="toast_nothing_to_redo">"Niente da ripetere."</string>
-    <string name="toast_habit_changed">"Abitudine modificata."</string>
+<!-- Fuzzy -->
+<string name="app_name">"Loop"</string>
+<string name="main_activity_title">"Abitudini"</string>
+<string name="action_settings">"Impostazioni"</string>
+<string name="edit">"Modifica"</string>
+<string name="delete">"Elimina"</string>
+<string name="archive">"Archivia"</string>
+<string name="unarchive">"Ripristina"</string>
+<string name="add_habit">"Aggiungi"</string>
+<string name="color_picker_default_title">"Cambia colore"</string>
+<string name="toast_habit_created">"Abitudine creata."</string>
+<string name="toast_habit_deleted">"Abitudine rimossa."</string>
+<string name="toast_habit_restored">"Abitudine ripristinata."</string>
+<string name="toast_nothing_to_undo">"Niente da annullare."</string>
+<string name="toast_nothing_to_redo">"Niente da ripetere."</string>
+<string name="toast_habit_changed">"Abitudine modificata."</string>
 
-    <!-- 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">"Abitudine ripristinata."</string>
-    <string name="toast_habit_archived">"Abitudine archiviata."</string>
-    <string name="toast_habit_unarchived">"Abitudine ripristinata."</string>
-    <string name="overview">"Panoramica"</string>
-    <string name="habit_strength">"Forza dell'abitudine"</string>
-    <string name="history">"Cronologia"</string>
-    <string name="clear">"Pulisci"</string>
-    <string name="description_hint">"Domanda (Hai ... oggi?)"</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">"Abitudine ripristinata."</string>
+<string name="toast_habit_archived">"Abitudine archiviata."</string>
+<string name="toast_habit_unarchived">"Abitudine ripristinata."</string>
+<string name="overview">"Panoramica"</string>
+<string name="habit_strength">"Forza dell'abitudine"</string>
+<string name="history">"Cronologia"</string>
+<string name="clear">"Pulisci"</string>
+<string name="description_hint">"Domanda (Hai ... oggi?)"</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">"Ripetizione"</string>
-    <string name="times_every">"volte in"</string>
-    <string name="days">"giorni"</string>
-    <string name="reminder">"Promemoria"</string>
-    <string name="discard">"Annulla"</string>
-    <string name="save">"Salva"</string>
-    <string name="streaks">"Serie"</string>
-    <string name="no_habits_found">"Non hai abitudini attive"</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">"Ripetizione"</string>
+<string name="times_every">"volte in"</string>
+<string name="days">"giorni"</string>
+<string name="reminder">"Promemoria"</string>
+<string name="discard">"Annulla"</string>
+<string name="save">"Salva"</string>
+<string name="streaks">"Serie"</string>
+<string name="no_habits_found">"Non hai abitudini attive"</string>
 
-    <!-- Fuzzy -->
-    <string name="long_press_to_toggle">"Premi e tieni premuto per completare o annullare"</string>
-    <string name="reminder_off">"Off"</string>
-    <string name="validation_name_should_not_be_blank">"Il nome non può essere vuoto."</string>
-    <string name="validation_number_should_be_positive">"I numeri devono essere positivi."</string>
-    <string name="validation_at_most_one_rep_per_day">"Puoi avere al massimo una ripetizione al giorno"</string>
-    <string name="create_habit">"Crea abitudine"</string>
-    <string name="edit_habit">"Modifica abitudine"</string>
+<!-- Fuzzy -->
+<string name="long_press_to_toggle">"Premi e tieni premuto per completare o annullare"</string>
+<string name="reminder_off">"Off"</string>
+<string name="validation_name_should_not_be_blank">"Il nome non può essere vuoto."</string>
+<string name="validation_number_should_be_positive">"I numeri devono essere positivi."</string>
+<string name="validation_at_most_one_rep_per_day">"Puoi avere al massimo una ripetizione al giorno"</string>
+<string name="create_habit">"Crea abitudine"</string>
+<string name="edit_habit">"Modifica abitudine"</string>
 
-    <!-- Fuzzy -->
-    <string name="check">"Completa"</string>
-    <string name="snooze">"Più tardi"</string>
+<!-- Fuzzy -->
+<string name="check">"Completa"</string>
+<string name="snooze">"Più tardi"</string>
 
-    <!-- App introduction -->
-    <string name="intro_title_1">"Benvenuto"</string>
-    <string name="intro_description_1">"Loop Habit Tracker ti aiuta a creare e mantenere delle buone abitudini."</string>
-    <string name="intro_title_2">"Aggiungi qualche nuova abitudine"</string>
-    <string name="intro_description_2">"Ogni giorno, dopo aver portato a termine la tua abitudine, spuntala nell'app."</string>
-    <string name="intro_title_3">"Continua così"</string>
-    <string name="intro_description_3">"Abitudini portate a termine con regolarità per un lungo periodo ti faranno guadagnare una stella intera."</string>
-    <string name="intro_title_4">"Segui i tuoi progressi"</string>
-    <string name="intro_description_4">"Grafici dettagliati ti mostrano come le tue abitudini sono migliorate nel corso del tempo."</string>
-    <string name="interval_15_minutes">"15 minuti"</string>
-    <string name="interval_30_minutes">"30 minuti"</string>
-    <string name="interval_1_hour">"1 ora"</string>
-    <string name="interval_2_hour">"2 ore"</string>
-    <string name="interval_4_hour">"4 ore"</string>
-    <string name="interval_8_hour">"8 ore"</string>
-    <string name="pref_toggle_title">"Spunta le ripetizioni velocemente"</string>
-    <string name="pref_toggle_description">"Più comodo, ma potrebbe causare delle spunte accidentali."</string>
-    <string name="pref_snooze_interval_title">"Intervallo di ritardo dei promemoria"</string>
-    <string name="pref_rate_this_app">"Valuta quest'app su Google Play"</string>
-    <string name="pref_send_feedback">"Manda un feedback allo sviluppatore"</string>
-    <string name="pref_view_source_code">"Vedi il codice sorgente su GitHub"</string>
-    <string name="pref_view_app_introduction">"Visualizza l'introduzione dell'app"</string>
-    <string name="links">"Links"</string>
-    <string name="behavior">"Comportamento"</string>
-    <string name="name">"Nome"</string>
-    <string name="show_archived">"Visualizza archiviati"</string>
-    <string name="settings">"Impostazioni"</string>
-    <string name="snooze_interval">"Snooze"</string>
-    <string name="hint_title">"Lo sapevi?"</string>
-    <string name="hint_drag">"Per riordinare la lista, premi e mantieni premuto l'abitudine e spostala nella posizione desiderata."</string>
-    <string name="hint_landscape">"Puoi vedere più giorni mettendo il tuo telefono orizzontale."</string>
-    <string name="delete_habits">"Elimina abitudine"</string>
-    <string name="delete_habits_message">"L'abitudine verrà cancellata definitivamente. Non sarà possibile annullare."</string>
-    <string name="weekends">"Weekend"</string>
-    <string name="any_weekday">"Giorni feriali"</string>
-    <string name="any_day">"Qualsiasi giorno"</string>
-    <string name="select_weekdays">"Giorni selezionati"</string>
-    <string name="export_to_csv">"Esporta i dati"</string>
-    <string name="done_label">"Fatto"</string>
-    <string name="clear_label">"Pulisci"</string>
-    <string name="select_hours">"Ore selezionate"</string>
-    <string name="select_minutes">"Minuti selezionati"</string>
+<!-- App introduction -->
+<string name="intro_title_1">"Benvenuto"</string>
+<string name="intro_description_1">"Loop Habit Tracker ti aiuta a creare e mantenere delle buone abitudini."</string>
+<string name="intro_title_2">"Aggiungi qualche nuova abitudine"</string>
+<string name="intro_description_2">"Ogni giorno, dopo aver portato a termine la tua abitudine, spuntala nell'app."</string>
+<string name="intro_title_3">"Continua così"</string>
+<string name="intro_description_3">"Abitudini portate a termine con regolarità per un lungo periodo ti faranno guadagnare una stella intera."</string>
+<string name="intro_title_4">"Segui i tuoi progressi"</string>
+<string name="intro_description_4">"Grafici dettagliati ti mostrano come le tue abitudini sono migliorate nel corso del tempo."</string>
+<string name="interval_15_minutes">"15 minuti"</string>
+<string name="interval_30_minutes">"30 minuti"</string>
+<string name="interval_1_hour">"1 ora"</string>
+<string name="interval_2_hour">"2 ore"</string>
+<string name="interval_4_hour">"4 ore"</string>
+<string name="interval_8_hour">"8 ore"</string>
+<string name="pref_toggle_title">"Spunta le ripetizioni velocemente"</string>
+<string name="pref_toggle_description">"Più comodo, ma potrebbe causare delle spunte accidentali."</string>
+<string name="pref_snooze_interval_title">"Intervallo di ritardo dei promemoria"</string>
+<string name="pref_rate_this_app">"Valuta quest'app su Google Play"</string>
+<string name="pref_send_feedback">"Manda un feedback allo sviluppatore"</string>
+<string name="pref_view_source_code">"Vedi il codice sorgente su GitHub"</string>
+<string name="pref_view_app_introduction">"Visualizza l'introduzione dell'app"</string>
+<string name="links">"Links"</string>
+<string name="behavior">"Comportamento"</string>
+<string name="name">"Nome"</string>
+<string name="show_archived">"Visualizza archiviati"</string>
+<string name="settings">"Impostazioni"</string>
+<string name="snooze_interval">"Snooze"</string>
+<string name="hint_title">"Lo sapevi?"</string>
+<string name="hint_drag">"Per riordinare la lista, premi e mantieni premuto l'abitudine e spostala nella posizione desiderata."</string>
+<string name="hint_landscape">"Puoi vedere più giorni mettendo il tuo telefono orizzontale."</string>
+<string name="delete_habits">"Elimina abitudine"</string>
+<string name="delete_habits_message">"L'abitudine verrà cancellata definitivamente. Non sarà possibile annullare."</string>
+<string name="weekends">"Weekend"</string>
+<string name="any_weekday">"Giorni feriali"</string>
+<string name="any_day">"Qualsiasi giorno"</string>
+<string name="select_weekdays">"Giorni selezionati"</string>
+<string name="export_to_csv">"Esporta i dati"</string>
+<string name="done_label">"Fatto"</string>
+<string name="clear_label">"Pulisci"</string>
+<string name="select_hours">"Ore selezionate"</string>
+<string name="select_minutes">"Minuti selezionati"</string>
 
-    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
-    <string name="store_short_description">"Acquisisci nuove abitudini e traccia il tuo progresso nel tempo (senza pubblicità)"</string>
-    <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 durante il 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>
+<!-- Short description used on the Google Play store. There is an 80-character limit. -->
+<string name="store_short_description">"Acquisisci nuove abitudini e traccia il tuo progresso nel tempo (senza pubblicità)"</string>
+<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 durante il 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>
 <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; Visualizza in modo semplice come le tue abitudini sono migliorate nel tempo con grafici dettagliati. Scorri indietro per vedere la cronologia completa delle tue abitudini."</string>
-    <string name="store_feature_schedules">"&lt;b&gt;Programmi flessibili&lt;/b&gt; Supporto per abitudini sia giornaliere che con organizzazioni più complesse, come 3 volte alla settimana; una volta ogni 2 settimane; ogni due giorni..."</string>
+<string name="store_feature_statistics">"&lt;b&gt;Grafici dettagliati e statistiche&lt;/b&gt; Visualizza in modo semplice come le tue abitudini sono migliorate nel tempo con grafici dettagliati. Scorri indietro per vedere la cronologia completa delle tue abitudini."</string>
+<string name="store_feature_schedules">"&lt;b&gt;Programmi flessibili&lt;/b&gt; Supporto per abitudini sia giornaliere che con organizzazioni più complesse, come 3 volte alla settimana; una volta ogni 2 settimane; ogni due giorni..."</string>
 <string name="store_feature_reminders">"&lt;b&gt;Promemoria&lt;/b&gt;
 Crea un promemoria per ogni abitudine, ad una specificata ora del giorno. Completa, ritarda o ignora il promemoria direttamente dalla notifica, senza aprire l'app."</string>
 <string name="store_feature_opensource">"&lt;b&gt;Completamente gratuito ed opensource&lt;/b&gt;
 Non ci sono pubblicità, notifiche invasive o permessi intrusivi e mai ce ne saranno. Il codice sorgente completo è disponibile sotto licenza GPLv3."</string>
-    <string name="store_feature_wear">"&lt;b&gt;Ottimizzata per gli smartwatch&lt;/b&gt; I promemoria possono essere completati, ritardati o ignorati direttamente dal tuo orologio Android Wear."</string>
-    <string name="about">"A proposito di"</string>
-    <string name="translators">"Traduttori"</string>
-    <string name="developers">"Sviluppatori"</string>
+<string name="store_feature_wear">"&lt;b&gt;Ottimizzata per gli smartwatch&lt;/b&gt; I promemoria possono essere completati, ritardati o ignorati direttamente dal tuo orologio Android Wear."</string>
+<string name="about">"A proposito di"</string>
+<string name="translators">"Traduttori"</string>
+<string name="developers">"Sviluppatori"</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">"Versione %s"</string>
-    <string name="frequency">"Frequenza"</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">"Versione %s"</string>
+<string name="frequency">"Frequenza"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c7debbdf4..e5095df2a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,115 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 naofumi
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <resources>
-    <string name="app_name">"ループ習慣トラッカー"</string>
-    <string name="main_activity_title">"習慣"</string>
-    <string name="action_settings">"設定"</string>
-    <string name="edit">"編集"</string>
-    <string name="delete">"削除"</string>
-    <string name="archive">"アーカイブ"</string>
-    <string name="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">"ループ習慣トラッカー"</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>
-    <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">"多くとも 1 日 1 回にすることができます。"</string>
-    <string name="create_habit">"習慣を作成"</string>
-    <string name="edit_habit">"習慣を編集"</string>
-    <string name="check">"チェック"</string>
-    <string name="snooze">"後で"</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>
+<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">"多くとも 1 日 1 回にすることができます。"</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">"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">"データのエクスポート"</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">"ループ習慣トラッカーは、良い習慣を作って、維持するのに役立ちます。"</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">"データのエクスポート"</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>
+<!-- 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">"&lt;b&gt;習慣のスコア&lt;/b&gt;
@@ -124,11 +105,11 @@
 このアプリは、広告、迷惑な通知、押し付けがましいアクセス許可は全くありませんし、そうなることもありません。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 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>
+<!-- %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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 08c881877..ed0ab83ae 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,116 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Adam Jurkiewicz
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
 <resources>
-    <string name="app_name">"Śledzenie Nawyków Loop"</string>
-    <string name="main_activity_title">"Nawyki"</string>
-    <string name="action_settings">"Ustawienia"</string>
-    <string name="edit">"Edytuj"</string>
-    <string name="delete">"Usuń"</string>
-    <string name="archive">"Archiwizuj"</string>
-    <string name="unarchive">"Odarchiwizuj"</string>
-    <string name="add_habit">"Dodaj nawyk"</string>
-    <string name="color_picker_default_title">"Zmień kolor"</string>
-    <string name="toast_habit_created">"Utworzono nawyk."</string>
-    <string name="toast_habit_deleted">"Usunięto nawyki."</string>
-    <string name="toast_habit_restored">"Przywrócono nawyki."</string>
-    <string name="toast_nothing_to_undo">"Nic do cofnięcia."</string>
-    <string name="toast_nothing_to_redo">"Nic do powtórzenia"</string>
-    <string name="toast_habit_changed">"Zmieniono nawyk."</string>
+<string name="app_name">"Śledzenie Nawyków Loop"</string>
+<string name="main_activity_title">"Nawyki"</string>
+<string name="action_settings">"Ustawienia"</string>
+<string name="edit">"Edytuj"</string>
+<string name="delete">"Usuń"</string>
+<string name="archive">"Archiwizuj"</string>
+<string name="unarchive">"Odarchiwizuj"</string>
+<string name="add_habit">"Dodaj nawyk"</string>
+<string name="color_picker_default_title">"Zmień kolor"</string>
+<string name="toast_habit_created">"Utworzono nawyk."</string>
+<string name="toast_habit_deleted">"Usunięto nawyki."</string>
+<string name="toast_habit_restored">"Przywrócono nawyki."</string>
+<string name="toast_nothing_to_undo">"Nic do cofnięcia."</string>
+<string name="toast_nothing_to_redo">"Nic do powtórzenia"</string>
+<string name="toast_habit_changed">"Zmieniono nawyk."</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">"Zmieniono nawyk z powrotem."</string>
-    <string name="toast_habit_archived">"Nawyki zarchiwizowane."</string>
-    <string name="toast_habit_unarchived">"Nawyki odarchiwizowane."</string>
-    <string name="overview">"Przegląd"</string>
-    <string name="habit_strength">"Siła nawyku"</string>
-    <string name="history">"Historia"</string>
-    <string name="clear">"Wyczyść"</string>
-    <string name="description_hint">"Pytanie (Czy zrobiłeś ... dzisiaj?)"</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">"Zmieniono nawyk z powrotem."</string>
+<string name="toast_habit_archived">"Nawyki zarchiwizowane."</string>
+<string name="toast_habit_unarchived">"Nawyki odarchiwizowane."</string>
+<string name="overview">"Przegląd"</string>
+<string name="habit_strength">"Siła nawyku"</string>
+<string name="history">"Historia"</string>
+<string name="clear">"Wyczyść"</string>
+<string name="description_hint">"Pytanie (Czy zrobiłeś ... dzisiaj?)"</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">"Powtórz"</string>
-    <string name="times_every">"razy w"</string>
-    <string name="days">"dni"</string>
-    <string name="reminder">"Przypomnienie"</string>
-    <string name="discard">"Odrzuć"</string>
-    <string name="save">"Zapisz"</string>
-    <string name="streaks">"Serie"</string>
-    <string name="no_habits_found">"Nie masz aktywnych nawyków"</string>
-    <string name="long_press_to_toggle">"Naciśnij i przytrzymaj aby zaznaczyć lub odznaczyć"</string>
-    <string name="reminder_off">"Wyłączony"</string>
-    <string name="validation_name_should_not_be_blank">"Nazwa nie może być pusta."</string>
-    <string name="validation_number_should_be_positive">"Liczba musi być dodatnia."</string>
-    <string name="validation_at_most_one_rep_per_day">"Możesz mieć maksymalnie jedno powtórzenie dziennie."</string>
-    <string name="create_habit">"Utwórz nawyk"</string>
-    <string name="edit_habit">"Edytuj nawyk"</string>
-    <string name="check">"Zaznacz"</string>
-    <string name="snooze">"Później"</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">"Powtórz"</string>
+<string name="times_every">"razy w"</string>
+<string name="days">"dni"</string>
+<string name="reminder">"Przypomnienie"</string>
+<string name="discard">"Odrzuć"</string>
+<string name="save">"Zapisz"</string>
+<string name="streaks">"Serie"</string>
+<string name="no_habits_found">"Nie masz aktywnych nawyków"</string>
+<string name="long_press_to_toggle">"Naciśnij i przytrzymaj aby zaznaczyć lub odznaczyć"</string>
+<string name="reminder_off">"Wyłączony"</string>
+<string name="validation_name_should_not_be_blank">"Nazwa nie może być pusta."</string>
+<string name="validation_number_should_be_positive">"Liczba musi być dodatnia."</string>
+<string name="validation_at_most_one_rep_per_day">"Możesz mieć maksymalnie jedno powtórzenie dziennie."</string>
+<string name="create_habit">"Utwórz nawyk"</string>
+<string name="edit_habit">"Edytuj nawyk"</string>
+<string name="check">"Zaznacz"</string>
+<string name="snooze">"Później"</string>
 
-    <!-- App introduction -->
-    <string name="intro_title_1">"Witaj"</string>
-    <string name="intro_description_1">"Śledzenie nawyków Loop pozwala Ci na utworzenie i prowadzenie dobrych nawyków."</string>
-    <string name="intro_title_2">"Utwórz nowe nawyki"</string>
-    <string name="intro_description_2">"Codziennie, po wykonaniu swojego nawyku, postaw znaczek w aplikacji."</string>
-    <string name="intro_title_3">"Kontynuuj swoje nawyki"</string>
-    <string name="intro_description_3">"Nawyki wykonywane przez dłuższy czas otrzymają pełną gwiazdkę."</string>
-    <string name="intro_title_4">"Śledź swój postęp"</string>
-    <string name="intro_description_4">"Szczegółowe grafiki pokazują jak Twoje nawyki polepszyły się z biegiem czasu."</string>
-    <string name="interval_15_minutes">"15 minut"</string>
-    <string name="interval_30_minutes">"30 minut"</string>
-    <string name="interval_1_hour">"1 godzina"</string>
-    <string name="interval_2_hour">"2 godziny"</string>
-    <string name="interval_4_hour">"4 godziny"</string>
-    <string name="interval_8_hour">"8 godzin"</string>
-    <string name="pref_toggle_title">"Przełącz powtarzanie przy krótkim naciśnięciu"</string>
-    <string name="pref_toggle_description">"Wygodniejsze ale może spowodować przypadkowe przełączenia."</string>
-    <string name="pref_snooze_interval_title">"Czas drzemki między przypomnieniami"</string>
-    <string name="pref_rate_this_app">"Oceń tą aplikację w Google Play"</string>
-    <string name="pref_send_feedback">"Prześlij uwagi do programisty"</string>
-    <string name="pref_view_source_code">"Zobacz kod źródłowy na GitHub'ie"</string>
-    <string name="pref_view_app_introduction">"Zobacz wprowadzenie do aplikacji"</string>
-    <string name="links">"Linki"</string>
-    <string name="behavior">"Zachowanie"</string>
-    <string name="name">"Nazwa"</string>
-    <string name="show_archived">"Pokaż zarchiwizowane"</string>
-    <string name="settings">"Ustawienia"</string>
-    <string name="snooze_interval">"Czas drzemki"</string>
-    <string name="hint_title">"Czy wiesz że?"</string>
-    <string name="hint_drag">"Aby zmienić kolejność naciśnij i przytrzymaj na nazwie nawyku i przesuń go na odpowiednie miejsce."</string>
-    <string name="hint_landscape">"Możesz zobaczyć więcej dni trzymając telefon poziomo."</string>
-    <string name="delete_habits">"Usuń Nawyki"</string>
-    <string name="delete_habits_message">"Nawyki zostaną trwale usunięte. Tej operacji nie można cofnąć."</string>
-    <string name="weekends">"Weekendy"</string>
-    <string name="any_weekday">"Dni robocze"</string>
-    <string name="any_day">"Każdy dzień"</string>
-    <string name="select_weekdays">"Wybierz dni"</string>
-    <string name="export_to_csv">"Eksportuj dane"</string>
-    <string name="done_label">"Gotowe"</string>
-    <string name="clear_label">"Wyczyść"</string>
-    <string name="select_hours">"Wybierz godziny"</string>
-    <string name="select_minutes">"Wybierz minuty"</string>
+<!-- App introduction -->
+<string name="intro_title_1">"Witaj"</string>
+<string name="intro_description_1">"Śledzenie nawyków Loop pozwala Ci na utworzenie i prowadzenie dobrych nawyków."</string>
+<string name="intro_title_2">"Utwórz nowe nawyki"</string>
+<string name="intro_description_2">"Codziennie, po wykonaniu swojego nawyku, postaw znaczek w aplikacji."</string>
+<string name="intro_title_3">"Kontynuuj swoje nawyki"</string>
+<string name="intro_description_3">"Nawyki wykonywane przez dłuższy czas otrzymają pełną gwiazdkę."</string>
+<string name="intro_title_4">"Śledź swój postęp"</string>
+<string name="intro_description_4">"Szczegółowe grafiki pokazują jak Twoje nawyki polepszyły się z biegiem czasu."</string>
+<string name="interval_15_minutes">"15 minut"</string>
+<string name="interval_30_minutes">"30 minut"</string>
+<string name="interval_1_hour">"1 godzina"</string>
+<string name="interval_2_hour">"2 godziny"</string>
+<string name="interval_4_hour">"4 godziny"</string>
+<string name="interval_8_hour">"8 godzin"</string>
+<string name="pref_toggle_title">"Przełącz powtarzanie przy krótkim naciśnięciu"</string>
+<string name="pref_toggle_description">"Wygodniejsze ale może spowodować przypadkowe przełączenia."</string>
+<string name="pref_snooze_interval_title">"Czas drzemki między przypomnieniami"</string>
+<string name="pref_rate_this_app">"Oceń tą aplikację w Google Play"</string>
+<string name="pref_send_feedback">"Prześlij uwagi do programisty"</string>
+<string name="pref_view_source_code">"Zobacz kod źródłowy na GitHub'ie"</string>
+<string name="pref_view_app_introduction">"Zobacz wprowadzenie do aplikacji"</string>
+<string name="links">"Linki"</string>
+<string name="behavior">"Zachowanie"</string>
+<string name="name">"Nazwa"</string>
+<string name="show_archived">"Pokaż zarchiwizowane"</string>
+<string name="settings">"Ustawienia"</string>
+<string name="snooze_interval">"Czas drzemki"</string>
+<string name="hint_title">"Czy wiesz że?"</string>
+<string name="hint_drag">"Aby zmienić kolejność naciśnij i przytrzymaj na nazwie nawyku i przesuń go na odpowiednie miejsce."</string>
+<string name="hint_landscape">"Możesz zobaczyć więcej dni trzymając telefon poziomo."</string>
+<string name="delete_habits">"Usuń Nawyki"</string>
+<string name="delete_habits_message">"Nawyki zostaną trwale usunięte. Tej operacji nie można cofnąć."</string>
+<string name="weekends">"Weekendy"</string>
+<string name="any_weekday">"Dni robocze"</string>
+<string name="any_day">"Każdy dzień"</string>
+<string name="select_weekdays">"Wybierz dni"</string>
+<string name="export_to_csv">"Eksportuj dane"</string>
+<string name="done_label">"Gotowe"</string>
+<string name="clear_label">"Wyczyść"</string>
+<string name="select_hours">"Wybierz godziny"</string>
+<string name="select_minutes">"Wybierz minuty"</string>
 
-    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
-    <string name="store_short_description">"Twórz dobre nawyki i śledź ich postęp (bez reklam)"</string>
-    <string name="store_description_1">"Loop pozwala Ci na tworzenie i utrzymywanie dobrych nawyków, pozwala na Ci na osiągnięcie Twoich długoterminowych celów. Szczegółowe grafiki i statystyki pozwalają na zobaczenie jak Twoje nawyki polepszyły się. Jest całkowicie wolna od reklam i open source."</string>
+<!-- Short description used on the Google Play store. There is an 80-character limit. -->
+<string name="store_short_description">"Twórz dobre nawyki i śledź ich postęp (bez reklam)"</string>
+<string name="store_description_1">"Loop pozwala Ci na tworzenie i utrzymywanie dobrych nawyków, dzięki czemu pomoże osiągnąć Twoje długoterminowe cele. Szczegółowe grafiki i statystyki pozwalają na zobaczenie jak Twoje nawyki polepszyły się. Jest całkowicie wolna od reklam i open source."</string>
 <string name="store_feature_interface">"&lt;b&gt;Prosty, piękny i nowoczesny interfejs&lt;/b&gt;
-Loop posiada minimalistyczny interfejs, który jest prosty do użycia i przestrzega zasad material design."</string>
+Loop posiada minimalistyczny interfejs, który jest prosty do użycia i przestrzega zasad Material Design."</string>
 <string name="store_feature_score">"&lt;b&gt;Punkty nawyku&lt;/b&gt;
 Oprócz pokazywania Twojej aktualnej serii, Loop posiada zaawansowany algorytm obliczania siły Twoich nawyków. Każde powtórzenie nawyku czyni go silniejszymi a każdy opuszczony dzień słabszym. Jednakże kilka opuszczonych dni po dłuższej serii nie zrujnuje Twojego całego postępu."</string>
 <string name="store_feature_statistics">"&lt;b&gt;Szczegółowe grafiki i statystyki&lt;/b&gt;
@@ -123,11 +105,11 @@ Utwórz indywidualne przypomnienia dla każdego nawyku, w określonej godzinie d
 Absolutnie nie ma żadnych reklam, denerwujących powiadomień czy szpiegujących uprawnień w tej aplikacji i nigdy nie będzie. Cały kod źródłowy jest dostępny pod licencją GPLv3."</string>
 <string name="store_feature_wear">"&lt;b&gt;Zoptymalizowana pod smartwatche&lt;/b&gt;
 Przypomnienia można sprawdzić, uśpić czy usunąć bezpośrednio z twojego zegarka Android Wear."</string>
-    <string name="about">"O aplikacji"</string>
-    <string name="translators">"Tłumacze"</string>
-    <string name="developers">"Programiści"</string>
+<string name="about">"O aplikacji"</string>
+<string name="translators">"Tłumacze"</string>
+<string name="developers">"Programiści"</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">"Wersja %s"</string>
-    <string name="frequency">"Częstotliwość"</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">"Wersja %s"</string>
+<string name="frequency">"Częstotliwość"</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 6ef9f817d..1305a6919 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,110 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <resources>
-    <string name="app_name">Loop Habit Tracker</string>
-  <string name="action_settings">Configurações</string>
-  <string name="add_habit">Adicionar hábito</string>
-  <string name="archive">Arquivar</string>
-  <string name="check">Marcar</string>
-  <string name="clear">Limpar</string>
-  <string name="clear_label">Limpar</string>
-  <string name="color_picker_default_title">Mudar cor</string>
-  <string name="create_habit">Criar hábito</string>
-  <string name="days">dias</string>
-  <string name="delete">Deletar</string>
-  <string name="description_hint">Pergunta (por ex., \"você meditou hoje?\")</string>
-  <string name="discard">Cancelar</string>
-  <string name="edit">Editar</string>
-  <string name="edit_habit">Editar hábito</string>
-  <string name="habit_strength">Estabilidade</string>
-  <string name="history">Histórico</string>
-  <string name="interval_15_minutes">15 minutos</string>
-  <string name="interval_1_hour">1 hora</string>
-  <string name="interval_2_hour">2 horas</string>
-  <string name="interval_30_minutes">30 minutos</string>
-  <string name="interval_4_hour">4 horas</string>
-  <string name="interval_8_hour">8 horas</string>
-  <string name="intro_title_1">Bem vindo</string>
-  <string name="long_press_to_toggle">Sustente por um segundo para marcar ou desmarcar</string>
-  <string name="main_activity_title">Hábitos</string>
-  <string name="overview">Visão geral</string>
-  <string name="reminder">Lembrete</string>
-  <string name="reminder_off">Desligado</string>
-  <string name="repeat">Repetir</string>
-  <string name="save">Salvar</string>
-  <string name="select_day">Selecionar mês e dia</string>
-  <string name="select_hours">Selecionar horas</string>
-  <string name="select_minutes">Selecionar minutos</string>
-  <string name="select_year">Selecionar ano</string>
-  <string name="snooze">Mais tarde</string>
-  <string name="streaks">Correntes</string>
-  <string name="no_habits_found">Você não tem nenhum hábito ativo</string>
-  <string name="toast_habit_archived">Hábitos arquivados.</string>
-  <string name="toast_habit_changed">Hábito modificado.</string>
-  <string name="toast_habit_changed_back">Hábito restaurado.</string>
-  <string name="toast_habit_created">Hábito criado.</string>
-  <string name="toast_habit_deleted">Hábito deletado.</string>
-  <string name="toast_habit_unarchived">Hábitos restaurados.</string>
-  <string name="toast_nothing_to_redo">Nada para refazer.</string>
-  <string name="toast_nothing_to_undo">Nada para desfazer.</string>
-  <string name="unarchive">Desarquivar</string>
-  <string name="validation_at_most_one_rep_per_day">Você pode ter no máximo uma repetição por dia.</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="done_label">Pronto</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="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_send_feedback">Mandar sugestões para o desenvolvedor</string>
-  <string name="pref_rate_this_app">Avaliar esse app no Google Play</string>
-  <string name="links">Links</string>
-  <string name="behavior">Interação</string>
-  <string name="name">Nome</string>
-  <string name="times_every">vezes em</string>
-  <string name="show_archived">Mostrar hábitos arquivados</string>
-  <string name="snooze_interval">Duração do \"mais tarde\"</string>
-  <string name="settings">Configurações</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_description_3">Hábitos praticados regularmente por um longo período recebem uma estrela.</string>
-  <string name="intro_title_3">Continue praticando</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="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="toast_habit_restored">Hábitos restaurados.</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</string>
-  <string name="select_weekdays">Selecionar dias</string>
-  <string name="export_to_csv">Exportar dados</string>
-  <string name="about">Sobre</string>
-  <string name="developers">Desenvolvedores</string>
-  <string name="translators">Tradutores</string>
-  <string name="version_n">Versão %s</string>
-  <string name="frequency">Frequência</string>
+<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>
+<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"</string>
+<string name="select_weekdays">"Selecionar dias"</string>
+<string name="export_to_csv">"Exportar dados"</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". -->
+<!-- Fuzzy -->
+<string name="version_n">"Versão %s"</string>
+<string name="frequency">"Frequência"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 824b474af..575a5648c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,115 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Dmitriy Bogdanov
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <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>
-    <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>
+<!-- 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>
+<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 Habit Tracker помогает вам заводить и поддерживать полезные привычки."</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">"Экспортировать данные"</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 Habit Tracker помогает вам заводить и поддерживать полезные привычки."</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">"Экспортировать данные"</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>
+<!-- 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;
 У приложения минималистичный интерфейс, который лёгок в использовании и придерживается руководства по Material Design."</string>
 <string name="store_feature_score">"&lt;b&gt;Оценка привычек&lt;/b&gt;
@@ -124,11 +105,11 @@
 В приложении совершенно нет рекламы, назойливых уведомлений или лишних разрешений. И их никогда не будет. Весь исходный код доступен под лицензией 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 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>
+<!-- %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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 99785590c..564865af2 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,122 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 dalecarlian
-  ~ Copyright (C) 2016 Robin
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <resources>
-    <string name="app_name">"Loop Habit Tracker"</string>
-    <string name="main_activity_title">"Vanor"</string>
-    <string name="action_settings">"Inställningar"</string>
-    <string name="edit">"Redigera"</string>
-    <string name="delete">"Ta bort"</string>
-    <string name="archive">"Arkivera"</string>
-    <string name="unarchive">"Avarkivera"</string>
-    <string name="add_habit">"Lägg till vana"</string>
-    <string name="color_picker_default_title">"Byt färg"</string>
-    <string name="toast_habit_created">"Vana skapad"</string>
-    <string name="toast_habit_deleted">"Vana borttagen"</string>
-    <string name="toast_habit_restored">"Vana återställd"</string>
-    <string name="toast_nothing_to_undo">"Inget att ångra"</string>
-    <string name="toast_nothing_to_redo">"Inget att göra om"</string>
-    <string name="toast_habit_changed">"Vana ändrad"</string>
+<string name="app_name">"Loop Habit Tracker"</string>
+<string name="main_activity_title">"Vanor"</string>
+<string name="action_settings">"Inställningar"</string>
+<string name="edit">"Redigera"</string>
+<string name="delete">"Ta bort"</string>
+<string name="archive">"Arkivera"</string>
+<string name="unarchive">"Avarkivera"</string>
+<string name="add_habit">"Lägg till vana"</string>
+<string name="color_picker_default_title">"Byt färg"</string>
+<string name="toast_habit_created">"Vana skapad"</string>
+<string name="toast_habit_deleted">"Vana borttagen"</string>
+<string name="toast_habit_restored">"Vana återställd"</string>
+<string name="toast_nothing_to_undo">"Inget att ångra"</string>
+<string name="toast_nothing_to_redo">"Inget att göra om"</string>
+<string name="toast_habit_changed">"Vana ändrad"</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">"Vana ändrad tillbaka"</string>
+<string name="toast_habit_archived">"Vanor arkiverade"</string>
+<string name="toast_habit_unarchived">"Vanor avakriverade"</string>
+<string name="overview">"Översikt"</string>
+<string name="habit_strength">"Vanestyrka"</string>
+<string name="history">"Historik"</string>
+<string name="clear">"Rensa"</string>
+<string name="description_hint">"Fråga (Har du ... idag?)"</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">"Vana ändrad tillbaka"</string>
-    <string name="toast_habit_archived">"Vanor arkiverade"</string>
-    <string name="toast_habit_unarchived">"Vanor avakriverade"</string>
-    <string name="overview">"Översikt"</string>
-    <string name="habit_strength">"Vanestyrka"</string>
-    <string name="history">"Historik"</string>
-    <string name="clear">"Rensa"</string>
-    <string name="description_hint">"Fråga (Har du ... idag?)"</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">"Upprepa"</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">"Repetera"</string>
+<!-- A bit unclear on where this is going in. Is it a part of a sentence? -->
+<!-- Fuzzy -->
+<string name="times_every">"gånger var"</string>
 
-    <!-- A bit unclear on where this is going in. Is it a part of a sentence? -->
-    <string name="times_every">"gånger varje"</string>
-    <string name="days">"dagar"</string>
-    <string name="reminder">"Påminnelse"</string>
-    <string name="discard">"Kasta bort"</string>
-    <string name="save">"Spara"</string>
-    <string name="streaks">"Framgångar"</string>
-    <string name="no_habits_found">"Du har inga aktiva vanor"</string>
-    <string name="long_press_to_toggle">"Tryck och håll in för att markera och avmarkera"</string>
-    <string name="reminder_off">"Av"</string>
-    <string name="validation_name_should_not_be_blank">"Namn får inte vara blank."</string>
-    <string name="validation_number_should_be_positive">"Nummer måste vara positiv."</string>
-    <string name="validation_at_most_one_rep_per_day">"Du har som mest en repetition per dag"</string>
-    <string name="create_habit">"Skapa vana"</string>
-    <string name="edit_habit">"Redigera vana"</string>
-    <string name="check">"Markera"</string>
-    <string name="snooze">"Senare"</string>
+<!-- Fuzzy -->
+<string name="days">"dag"</string>
+<string name="reminder">"Påminnelse"</string>
+<string name="discard">"Avbryt"</string>
+<string name="save">"Spara"</string>
+<string name="streaks">"Framgångar"</string>
+<string name="no_habits_found">"Du har inga aktiva vanor"</string>
+<string name="long_press_to_toggle">"Tryck och håll in för att markera och avmarkera"</string>
+<string name="reminder_off">"Av"</string>
+<string name="validation_name_should_not_be_blank">"Namn får inte vara blank."</string>
+<string name="validation_number_should_be_positive">"Nummer måste vara positiv."</string>
+<string name="validation_at_most_one_rep_per_day">"Du kan ha max en upprepning per dag"</string>
+<string name="create_habit">"Skapa vana"</string>
+<string name="edit_habit">"Redigera vana"</string>
+<string name="check">"Markera"</string>
+<string name="snooze">"Senare"</string>
 
-    <!-- App introduction -->
-    <string name="intro_title_1">"Välkommen"</string>
-    <string name="intro_description_1">"Loop Habit Tracker Hjälper dig att skapa och underhålla bra vanor."</string>
-    <string name="intro_title_2">"Skapa några nya vanor"</string>
-    <string name="intro_description_2">"Varje dag, efter att du utfört dina vanor, lägg till en markering i appen."</string>
-    <string name="intro_title_3">"Fortsätt göra det"</string>
-    <string name="intro_description_3">"Vanor som utförs konstant över en lång period kommer att tjäna dig en full stjärna."</string>
-    <string name="intro_title_4">"Följ dina framsteg"</string>
-    <string name="intro_description_4">"Detaljerade grafer visar dig hur dina vanor har utvecklats över tid."</string>
-    <string name="interval_15_minutes">"15 minuter"</string>
-    <string name="interval_30_minutes">"30 minuter"</string>
-    <string name="interval_1_hour">"1 timme"</string>
-    <string name="interval_2_hour">"2 timmar"</string>
-    <string name="interval_4_hour">"4 timmar"</string>
-    <string name="interval_8_hour">"8 timmar"</string>
-    <string name="pref_toggle_title">"Aktivera repetitioner med kort tryckning"</string>
-    <string name="pref_toggle_description">"Mer bekvämt, men kan orsaka oavsiktliga aktiveringar. "</string>
-    <string name="pref_snooze_interval_title">"Snooza intervall på påminnelsen"</string>
-    <string name="pref_rate_this_app">"Betygsätt denna app på Google Play"</string>
-    <string name="pref_send_feedback">"Skicka feedback till utvecklaren"</string>
-    <string name="pref_view_source_code">"Visa källkod på Github"</string>
-    <string name="pref_view_app_introduction">"Visa appintroduktion"</string>
-    <string name="links">"Länkar"</string>
-    <string name="behavior">"Beteende"</string>
-    <string name="name">"Namn"</string>
-    <string name="show_archived">"Visa arkiverade"</string>
-    <string name="settings">"Inställningar"</string>
-    <string name="snooze_interval">"Snooze intervall"</string>
-    <string name="hint_title">"Visste du? "</string>
-    <string name="hint_drag">"För att arrangera inlägg, tryck och håll in på namnet av inlägget, dra den sedan till rätt plats."</string>
-    <string name="hint_landscape">"Du kan se fler dagar genom att hålla telefon i landskapsläge."</string>
-    <string name="delete_habits">"Ta bort vanor"</string>
-    <string name="delete_habits_message">"Vanorna kommer att tas bort permanent. Denna åtgärd kan inte ångras."</string>
-    <string name="weekends">"Helger"</string>
-    <string name="any_weekday">"Veckodagar"</string>
-    <string name="any_day">"Vilken dag som helst"</string>
-    <string name="select_weekdays">"Välj dagar"</string>
-    <string name="export_to_csv">"Exportera data"</string>
-    <string name="done_label">"Klart"</string>
-    <string name="clear_label">"Rensa"</string>
-    <string name="select_hours">"Välj timmar"</string>
-    <string name="select_minutes">"Välj minuter"</string>
+<!-- App introduction -->
+<string name="intro_title_1">"Välkommen"</string>
+<string name="intro_description_1">"Loop Habit Tracker Hjälper dig att skapa och underhålla bra vanor."</string>
+<string name="intro_title_2">"Skapa några nya vanor"</string>
+<string name="intro_description_2">"Varje dag, efter att du utfört dina vanor, lägg till en markering i appen."</string>
+<string name="intro_title_3">"Fortsätt göra det"</string>
+<string name="intro_description_3">"Vanor som utförs konstant över en lång period kommer att tjäna dig en full stjärna."</string>
+<string name="intro_title_4">"Följ dina framsteg"</string>
+<string name="intro_description_4">"Detaljerade grafer visar dig hur dina vanor har utvecklats över tid."</string>
+<string name="interval_15_minutes">"15 minuter"</string>
+<string name="interval_30_minutes">"30 minuter"</string>
+<string name="interval_1_hour">"1 timme"</string>
+<string name="interval_2_hour">"2 timmar"</string>
+<string name="interval_4_hour">"4 timmar"</string>
+<string name="interval_8_hour">"8 timmar"</string>
+<string name="pref_toggle_title">"Aktivera repetitioner med kort tryckning"</string>
+<string name="pref_toggle_description">"Mer bekvämt, men kan orsaka oavsiktliga aktiveringar. "</string>
+<string name="pref_snooze_interval_title">"Snooza intervall på påminnelsen"</string>
+<string name="pref_rate_this_app">"Betygsätt denna app på Google Play"</string>
+<string name="pref_send_feedback">"Skicka feedback till utvecklaren"</string>
+<string name="pref_view_source_code">"Visa källkod på Github"</string>
+<string name="pref_view_app_introduction">"Visa appintroduktion"</string>
+<string name="links">"Länkar"</string>
+<string name="behavior">"Beteende"</string>
+<string name="name">"Namn"</string>
+<string name="show_archived">"Visa arkiverade"</string>
+<string name="settings">"Inställningar"</string>
+<string name="snooze_interval">"Snooze intervall"</string>
+<string name="hint_title">"Visste du? "</string>
+<string name="hint_drag">"För att arrangera inlägg, tryck och håll in på namnet av inlägget, dra den sedan till rätt plats."</string>
+<string name="hint_landscape">"Du kan se fler dagar genom att hålla telefon i landskapsläge."</string>
+<string name="delete_habits">"Ta bort vanor"</string>
+<string name="delete_habits_message">"Vanorna kommer att tas bort permanent. Denna åtgärd kan inte ångras."</string>
+<string name="weekends">"Helger"</string>
+<string name="any_weekday">"Veckodagar"</string>
+<string name="any_day">"Vilken dag som helst"</string>
+<string name="select_weekdays">"Välj dagar"</string>
+<string name="export_to_csv">"Exportera data"</string>
+<string name="done_label">"Klart"</string>
+<string name="clear_label">"Rensa"</string>
+<string name="select_hours">"Välj timmar"</string>
+<string name="select_minutes">"Välj minuter"</string>
 
-    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
-    <string name="store_short_description">"Skapa bra vanor och följ deras utveckling över tid. (reklamfri)"</string>
-    <string name="store_description_1">"Loop Hjälper dig att skapa och underhålla bra vanor, genom att tillåta dig arkivera dina långtidsvanor. Detaljerade grafer och statistik visar dig hur dina vanor har förbättrats över tid. Det är helt reklamfritt och öppen källkod."</string>
+<!-- Short description used on the Google Play store. There is an 80-character limit. -->
+<string name="store_short_description">"Skapa bra vanor och följ deras utveckling över tid. (reklamfri)"</string>
+<string name="store_description_1">"Loop Hjälper dig att skapa och underhålla bra vanor, genom att tillåta dig arkivera dina långtidsvanor. Detaljerade grafer och statistik visar dig hur dina vanor har förbättrats över tid. Det är helt reklamfritt och öppen källkod."</string>
 <string name="store_feature_interface">"&lt;b&gt;Enkelt, snyggt och modernt användargränssnitt&lt;b&gt;
 Loop har minimalistiskt gränssnitt som är enkel att använda och följer material design riktlinjer."</string>
 
-    <!-- Fuzzy -->
+<!-- Fuzzy -->
 <string name="store_feature_score">"&lt;b&gt;Vanepoäng&lt;b&gt;
 Förutom att visa din nuvarande aktivitet har Loop en avancerad algoritm som räknar ut styrkan i dina vanor. Varje repetition gör din vana starkare och varje missad dag gör den svagare. Ett par missar efter en lång, oavbruten aktivitet kommer dock inte att helt förstöra dina framsteg."</string>
 <string name="store_feature_statistics">"&lt;b&gt;Detaljerade grafer och statistik&lt;/b&gt;
@@ -129,11 +112,11 @@ Skapa en påminnelse för varje vana. Du kan enkelt bocka av, ta bort eller skju
 Det är absolut ingen reklam, störande notifikationer eller onödiga behörighetskrav för den här appen, och det kommer aldrig att bli. Hela källkoden finns tillgänglig under GPLv3."</string>
 <string name="store_feature_wear">"&lt;b&gt;Optimerad för smartklockor&lt;b&gt;
 Påminnelser kan kollas upp, snoozade eller tas bort direkt från din Android Wear enhet."</string>
-    <string name="about">"Om"</string>
-    <string name="translators">"Översättare"</string>
-    <string name="developers">"Utvecklare"</string>
+<string name="about">"Om"</string>
+<string name="translators">"Översättare"</string>
+<string name="developers">"Utvecklare"</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">"Frekvens"</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">"Frekvens"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index b2b0019e1..19da9f5c0 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,120 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2016 Limin Lu
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <resources>
-  <string name="app_name">循环习惯记录</string>
-  <string name="main_activity_title">习惯</string>
-  <string name="action_settings">设置</string>
-  <string name="edit">编辑</string>
-  <string name="delete">删除</string>
-  <string name="archive">存档</string>
-  <string name="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_nothing_to_undo">Nothing to undo.</string>
-  <string name="toast_nothing_to_redo">Nothing to redo.</string>
-  <string name="toast_habit_changed">习惯修改了.</string>
-  <string name="toast_habit_changed_back">取消了修改.</string>
-  <string name="toast_habit_archived">习惯存档成功.</string>
-  <string name="toast_habit_unarchived">习惯取消存档成功.</string>
-
-  <!-- Date and time picker -->
-  <string name="done_label">完陈</string>
-  <string name="clear_label">取消</string>
-  <string name="select_hours">选择小时</string>
-  <string name="select_minutes">选择分钟</string>
-
-  <string name="overview">总览</string>
-  <string name="habit_strength">习惯强度</string>
-  <string name="history">历史</string>
-  <string name="clear">取消</string>
-  <string name="description_hint">提醒问题（你xxx了吗）</string>
-  <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>
-  <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="app_name">"循环习惯记录"</string>
+<string name="main_activity_title">"习惯"</string>
+<string name="action_settings">"设置"</string>
+<string name="edit">"编辑"</string>
+<string name="delete">"删除"</string>
+<string name="archive">"存档"</string>
+<string name="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">"Nothing to undo."</string>
+<string name="toast_nothing_to_redo">"Nothing to redo."</string>
+<string name="toast_habit_changed">"习惯修改了."</string>
 
-  <string name="intro_title_2">建立一些新习惯</string>
-  <string name="intro_description_2">每天，你完成一项习惯后，在应用上做一个标记</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">"提醒问题（你xxx了吗）"</string>
 
-  <string name="intro_title_3">保持习惯</string>
-  <string name="intro_description_3">你可以得到一个完整的星星在连续性的完成习惯达到一定时间</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>
+<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>
 
-  <string name="intro_title_4">记录你的进步</string>
-  <string name="intro_description_4">详细的图形显示你的进步</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">"评价这个应用在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">"导出数据"</string>
+<string name="done_label">"完成"</string>
+<string name="clear_label">"取消"</string>
+<string name="select_hours">"选择小时"</string>
+<string name="select_minutes">"选择分钟"</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">评价这个应用在Play商店</string>
-  <string name="pref_send_feedback">发送反馈给开发者</string>
-  <string name="pref_view_source_code">看源代码在GitHub</string>
-  <string name="pref_view_app_introduction">阅读应用介绍</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">"&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次，每周1次）"</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;
+提醒可以直接在安卓手表上 记录，忽略，或者推迟。"</string>
+<string name="about">"关于应用"</string>
+<string name="translators">"翻译者"</string>
+<string name="developers">"开发者"</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="any_day">任意</string>
-  <string name="any_weekday">工做日</string>
-  <string name="delete_habits">删除</string>
-  <string name="delete_habits_message">习惯会永久的删除，操作不可恢复</string>
-  <string name="hint_drag">如果要重新排列习惯，按住习惯的名字拖到想要的位置</string>
-  <string name="hint_landscape">横过来手机可以看到更多天数的习惯</string>
-  <string name="hint_title">你知道吗？</string>
-  <string name="select_weekdays">选择天数</string>
-  <string name="toast_habit_restored">习惯恢复成功</string>
-  <string name="weekends">周末</string>
-  <string name="about">关于应用</string>
-  <string name="developers">开发者</string>
-  <string name="translators">翻译者</string>
-  <string name="export_to_csv">导出数据</string>
-  <string name="version_n">%s版</string>
-  <string name="frequency">频率</string>
-</resources>
+<!-- %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>
+</resources>
\ No newline at end of file

From d5df6ddcdb98c2164482a07570bb6b3f035c7e3b Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sat, 19 Mar 2016 05:03:23 -0400
Subject: [PATCH 5/6] Add Spanish and Korean translations

Closes #40
---
 app/src/main/res/layout/about.xml      |   8 ++
 app/src/main/res/values-es/strings.xml | 134 ++++++++++++++++++++++++
 app/src/main/res/values-ko/strings.xml | 135 +++++++++++++++++++++++++
 3 files changed, 277 insertions(+)
 create mode 100644 app/src/main/res/values-es/strings.xml
 create mode 100644 app/src/main/res/values-ko/strings.xml

diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index e627bafa3..726217d01 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -153,6 +153,14 @@
                 style="@style/aboutItemStyle"
                 android:text="Robin (Svenska)"/>
 
+            <TextView
+                style="@style/aboutItemStyle"
+                android:text="Josh (한국어 )"/>
+
+            <TextView
+                style="@style/aboutItemStyle"
+                android:text="Ander Raso Vazquez (Español)"/>
+
             <TextView
                 style="@style/aboutItemStyle"
                 android:text="Álinson Xavier (Português)"/>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 000000000..361409bd1
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Ander Raso Vazquez
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string name="app_name">"Loop Analizador de Hábitos"</string>
+    <string name="main_activity_title">"Hábitos"</string>
+    <string name="action_settings">"Configuración"</string>
+    <string name="edit">"Editar"</string>
+    <string name="delete">"Eliminar"</string>
+    <string name="archive">"Archivar"</string>
+    <string name="unarchive">"Desarchivar"</string>
+    <string name="add_habit">"Agregar hábito"</string>
+    <string name="color_picker_default_title">"Cambiar color"</string>
+    <string name="toast_habit_created">"Hábito creado."</string>
+    <string name="toast_habit_deleted">"Hábitos eliminados."</string>
+    <string name="toast_habit_restored">"Hábitos restaurados."</string>
+    <string name="toast_nothing_to_undo">"Nada que deshacer."</string>
+    <string name="toast_nothing_to_redo">"Nada que rehacer."</string>
+    <string name="toast_habit_changed">"Hábito cambiado."</string>
+
+    <!-- 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 cambiado devuelta."</string>
+    <string name="toast_habit_archived">"Hábitos archivados."</string>
+    <string name="toast_habit_unarchived">"Hábitos desarchivados."</string>
+    <string name="overview">"Visión general"</string>
+    <string name="habit_strength">"Fuerza del hábito"</string>
+    <string name="history">"Historial"</string>
+    <string name="clear">"Borrar"</string>
+    <string name="description_hint">"Pregunta (Has ... hoy?)"</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">"veces"</string>
+    <string name="days">"días"</string>
+    <string name="reminder">"Recordatorio"</string>
+    <string name="discard">"Descartar"</string>
+    <string name="save">"Guardar"</string>
+    <string name="streaks">"Rachas"</string>
+    <string name="no_habits_found">"No hay ningún hábito activo"</string>
+    <string name="long_press_to_toggle">"Mantener apretado para"</string>
+    <string name="reminder_off">"No"</string>
+    <string name="validation_name_should_not_be_blank">"Nombre no puede estar en blanco."</string>
+    <string name="validation_number_should_be_positive">"Número debe ser positivo."</string>
+    <string name="validation_at_most_one_rep_per_day">"Puedes tener como máximo una repetición por día"</string>
+    <string name="create_habit">"Crear hábito"</string>
+    <string name="edit_habit">"Editar hábito"</string>
+    <string name="check">"Marcar"</string>
+    <string name="snooze">"Posponer"</string>
+
+    <!-- App introduction -->
+    <string name="intro_title_1">"Bienvenido"</string>
+    <string name="intro_description_1">"Loop Analizador de Hábitos te ayuda a crear y mantener buenos hábitos."</string>
+    <string name="intro_title_2">"Crea algunos hábitos nuevos"</string>
+    <string name="intro_description_2">"Cada día, después de realizar tu hábito, pon una marca en la app."</string>
+    <string name="intro_title_3">"Sigue haciéndolo."</string>
+    <string name="intro_description_3">"Los hábitos realizados consistentemente por un largo tiempo ganarán una estrella completa."</string>
+    <string name="intro_title_4">"Haz un seguimiento de tu progreso"</string>
+    <string name="intro_description_4">"Detallados gráficos muestran como han mejorado tus hábitos con el tiempo."</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">"Marca las repeticiones con una corta pulsación."</string>
+    <string name="pref_toggle_description">"Más cómodo, pero puede causar marcas accidentales."</string>
+    <string name="pref_snooze_interval_title">"Tiempo de espera al posponer recordatorios."</string>
+    <string name="pref_rate_this_app">"Valora esta app en Google Play"</string>
+    <string name="pref_send_feedback">"Enviar sugerencias al desarrollador"</string>
+    <string name="pref_view_source_code">"Ver código fuente en GitHub"</string>
+    <string name="pref_view_app_introduction">"Ver la introducción de la app"</string>
+    <string name="links">"Enlaces"</string>
+    <string name="behavior">"Comportamiento"</string>
+    <string name="name">"Nombre"</string>
+    <string name="show_archived">"Ver archivados"</string>
+    <string name="settings">"Configuración"</string>
+    <string name="snooze_interval">"Intervalo de espera"</string>
+    <string name="hint_title">"¿Sabías qué?"</string>
+    <string name="hint_drag">"Para reordenar las entradas, mantén la pulsación sobre el nombre del hábito, después arrástralo a su posición correcta."</string>
+    <string name="hint_landscape">"Puedes ver más días al poner tu teléfono en modo horizontal."</string>
+    <string name="delete_habits">"Eliminar Hábitos"</string>
+    <string name="delete_habits_message">"Los hábitos serán eliminados permanentemente. Esta acción no se puede deshacer."</string>
+    <string name="weekends">"Fines de semana"</string>
+    <string name="any_weekday">"Días laborables"</string>
+    <string name="any_day">"Cada día"</string>
+    <string name="select_weekdays">"Seleccionar días"</string>
+    <string name="export_to_csv">"Exportar datos"</string>
+    <string name="done_label">"Hecho"</string>
+    <string name="clear_label">"Quitar"</string>
+    <string name="select_hours">"Seleccionar horas"</string>
+    <string name="select_minutes">"Seleccionar"</string>
+
+    <!-- Short description used on the Google Play store. There is an 80-character limit. -->
+    <string name="store_short_description">"Crea buenos hábitos y haz un seguimiento de su progreso a lo largo del tiempo (sin anuncios)"</string>
+    <string name="store_description_1">"Loop te ayuda a crear y mantener buenos hábitos, permitiéndote alcanzar tus metas a largo plazo. Detallados gráficos y estadísticas muestran como tus hábitos mejoran con el tiempo. No existe ningún anuncio y es de código abierto."</string>
+<string name="store_feature_interface">"&lt;b&gt;Una interfaz simple, bella y moderna&lt;/b&gt;
+Loop tiene una interfaz minimalista que es fácil de usar y sigue los principios del material design."</string>
+<string name="store_feature_score">"&lt;b&gt;Puntuación del hábito&lt;/b&gt;
+Además de mostrar tu racha actual, Loop tiene un algoritmo avanzado para calcular la fuerza de tus hábitos. Cada repetición hace tu hábito más fuerte y cada día fallido lo hace más débil. Sin embargo, unos pocos días después de una larga racha no destruirán completamente todo tu progreso."</string>
+<string name="store_feature_statistics">"&lt;b&gt;Detallados gráficos y estadísticas&lt;/b&gt;
+Observa claramente como tus hábitos han mejorado con el tiempo con bellos y detallados gráficos. Ve hacia atrás para ver el historial completo del hábito."</string>
+<string name="store_feature_schedules">"&lt;b&gt;Horarios flexibles&lt;/b&gt;
+Soporta hábitos diarios y hábitos con repeticiones más complejas, como 3 veces por semana; una vez cada varias semanas; o cada día."</string>
+<string name="store_feature_reminders">"&lt;b&gt;Recordatorios&lt;/b&gt;
+Crea recordatorios individuales para cada hábito a una hora determinada del día. Fácilmente marcables, descartables o posponibles directamente desde la notificación, sin abrir la app."</string>
+<string name="store_feature_opensource">"&lt;b&gt;Completamente sin anuncios y de código abierto&lt;/b&gt;
+No existe ningún tipo de publicidad, notificaciones molestas o permisos intrusivos, y nunca los habrá. Todo el código está disponible bajo GPLv3."</string>
+<string name="store_feature_wear">"&lt;b&gt;Optimizado para smartwatches&lt;/b&gt;
+Los recordatorios se pueden marcar, posponer o descartar directamente desde tu reloj Android Wear."</string>
+    <string name="about">"Acerca de"</string>
+    <string name="translators">"Traductores"</string>
+    <string name="developers">"Desarrolladores"</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">"Versión %s"</string>
+    <string name="frequency">"Frecuencia"</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
new file mode 100644
index 000000000..fc3704036
--- /dev/null
+++ b/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Josh
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<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>
+    <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">"숫자는 0보다 커야합니다."</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">"정보 내보내기"</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디자인을 따라 사용이 편합니다."</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번; 2주에 한번; 같은 여러 종류의 스케줄을 만들 수 있습니다."</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;
+안드로이드 시계에서 바로 알림을 확인, 미루기 혹은 무시할 수 있습니다."</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>
+</resources>
\ No newline at end of file

From 7bb3db213f7cee6521fba62335abf7733064dce5 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sun, 20 Mar 2016 17:46:10 -0400
Subject: [PATCH 6/6] Update changelog

---
 CHANGELOG.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1d67b807..89efd1ab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
 # Changelog
 
+### 1.3.3 (March 20, 2016)
+
+* Add Spanish and Korean translations
+* Make small corrections to other translations
+* Fix incorrect date in history calendar
+
 ### 1.3.2 (March 18, 2016)
 
-* Arabic, Italian, Polish, Russian and Swedish translations
+* Add Arabic, Italian, Polish, Russian and Swedish translations
 * Minor fixes to German and French translations
 * Minor bug fixes
 
@@ -16,7 +22,7 @@
 
 * New frequency plot: view total repetitions per day of week
 * New history editor: put checkmarks in the past
-* German, French and Japanese translations
+* Add German, French and Japanese translations
 * Add about screen, with credits to all contributors
 * Fix small bug that prevented habit from being reordered
 * Fix small bug caused by rotating the device