diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 95a08842c..d773eca2f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -94,4 +94,7 @@
   <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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f7640173b..74258a4ab 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -22,5 +22,5 @@
         <item>480</item>
     </string-array>
 
-    <string name="snooze_interval_default">15</string>
+    <string name="snooze_interval_default" translatable="false">15</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens_date_time.xml b/app/src/main/res/values/dimens_date_time.xml
index ca2417527..201590689 100644
--- a/app/src/main/res/values/dimens_date_time.xml
+++ b/app/src/main/res/values/dimens_date_time.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="circle_radius_multiplier" format="float" type="string">0.82</item>
-    <item name="circle_radius_multiplier_24HourMode" format="float" type="string">0.85</item>
-    <item name="selection_radius_multiplier" format="float" type="string">0.16</item>
-    <item name="ampm_circle_radius_multiplier" format="float" type="string">0.19</item>
-    <item name="numbers_radius_multiplier_normal" format="float" type="string">0.81</item>
-    <item name="numbers_radius_multiplier_inner" format="float" type="string">0.60</item>
-    <item name="numbers_radius_multiplier_outer" format="float" type="string">0.83</item>
-    <item name="text_size_multiplier_normal" format="float" type="string">0.17</item>
-    <item name="text_size_multiplier_inner" format="float" type="string">0.14</item>
-    <item name="text_size_multiplier_outer" format="float" type="string">0.11</item>
+    <item name="circle_radius_multiplier" format="float" type="string" translatable="false">0.82</item>
+    <item name="circle_radius_multiplier_24HourMode" format="float" type="string" translatable="false">0.85</item>
+    <item name="selection_radius_multiplier" format="float" type="string" translatable="false">0.16</item>
+    <item name="ampm_circle_radius_multiplier" format="float" type="string" translatable="false">0.19</item>
+    <item name="numbers_radius_multiplier_normal" format="float" type="string" translatable="false">0.81</item>
+    <item name="numbers_radius_multiplier_inner" format="float" type="string" translatable="false">0.60</item>
+    <item name="numbers_radius_multiplier_outer" format="float" type="string" translatable="false">0.83</item>
+    <item name="text_size_multiplier_normal" format="float" type="string" translatable="false">0.17</item>
+    <item name="text_size_multiplier_inner" format="float" type="string" translatable="false">0.14</item>
+    <item name="text_size_multiplier_outer" format="float" type="string" translatable="false">0.11</item>
 
     <dimen name="time_label_size">60sp</dimen>
     <dimen name="extra_time_label_margin">-30dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d0d6a5399..dac78f66e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,29 +21,29 @@
     <string name="toast_habit_archived">Habits archived.</string>
     <string name="toast_habit_unarchived">Habits unarchived.</string>
 
-    <string name="color_swatch_description">Color <xliff:g id="color_index" example="14">%1$d</xliff:g></string>
-    <string name="color_swatch_description_selected">Color <xliff:g id="color_index" example="14">%1$d</xliff:g> selected</string>
+    <string name="color_swatch_description" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g></string>
+    <string name="color_swatch_description_selected" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g> selected</string>
 
     <!-- Date and time picker -->
     <string name="done_label">Done</string>
     <string name="clear_label">Clear</string>
-    <string name="hour_picker_description">Hours circular slider</string>
-    <string name="minute_picker_description">Minutes circular slider</string>
+    <string name="hour_picker_description" translatable="false">Hours circular slider</string>
+    <string name="minute_picker_description" translatable="false">Minutes circular slider</string>
     <string name="select_hours">Select hours</string>
     <string name="select_minutes">Select minutes</string>
-    <string name="day_picker_description">Month grid of days</string>
-    <string name="year_picker_description">Year list</string>
+    <string name="day_picker_description" translatable="false">Month grid of days</string>
+    <string name="year_picker_description" translatable="false">Year list</string>
     <string name="select_day">Select month and day</string>
     <string name="select_year">Select year</string>
-    <string name="item_is_selected"><xliff:g id="item" example="2013">%1$s</xliff:g> selected</string>
-    <string name="deleted_key"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
-    <string name="time_placeholder">--</string>
-    <string name="time_separator">:</string>
-    <string name="radial_numbers_typeface">sans-serif</string>
-    <string name="sans_serif">sans-serif</string>
-    <string name="day_of_week_label_typeface">sans-serif</string>
+    <string name="item_is_selected" translatable="false"><xliff:g id="item" example="2013">%1$s</xliff:g> selected</string>
+    <string name="deleted_key" translatable="false"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
+    <string name="time_placeholder" translatable="false">--</string>
+    <string name="time_separator" translatable="false">:</string>
+    <string name="radial_numbers_typeface" translatable="false">sans-serif</string>
+    <string name="sans_serif" translatable="false">sans-serif</string>
+    <string name="day_of_week_label_typeface" translatable="false">sans-serif</string>
 
-    <string name="title_activity_show_habit" />
+    <string name="title_activity_show_habit" translatable="false"/>
     <string name="overview">Overview</string>
     <string name="habit_strength">Habit strength</string>
     <string name="history">History</string>
@@ -51,14 +51,14 @@
     <string name="description">Description</string>
     <string name="description_hint">Question (Did you … today?)</string>
     <string name="repeat">Repeat</string>
-    <string name="times_every">times every</string>
+    <string name="times_every">times in</string>
     <string name="days">days</string>
     <string name="reminder">Reminder</string>
     <string name="discard">Discard</string>
     <string name="save">Save</string>
     <string name="streaks">Streaks</string>
     <string name="no_habits_found">You have no active habits</string>
-    <string name="long_press_to_toggle">Long press to check or uncheck</string>
+    <string name="long_press_to_toggle">Press-and-hold to check or uncheck</string>
     <string name="reminder_off">Off</string>
     <string name="validation_name_should_not_be_blank">Name cannot be blank.</string>
     <string name="validation_number_should_be_positive">Number must be positive.</string>