From 2899bbdbfa9c6563ae8134b8986d416eb396874f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Sat, 24 Aug 2019 13:00:20 +0200
Subject: [PATCH] Fix string naming

---
 Habitica/res/layout/activity_gift_iap.xml     |  8 ++--
 .../dialog_purchase_shopitem_button.xml       |  2 +-
 Habitica/res/layout/dialog_task_filter.xml    |  4 +-
 Habitica/res/layout/fragment_about.xml        | 10 ++--
 Habitica/res/layout/fragment_gem_purchase.xml | 12 ++---
 Habitica/res/layout/fragment_group_info.xml   |  4 +-
 Habitica/res/layout/fragment_party_detail.xml | 12 ++---
 Habitica/res/layout/fragment_quest_detail.xml | 10 ++--
 Habitica/res/layout/fragment_subscription.xml | 26 +++++-----
 .../res/layout/fragment_tavern_detail.xml     |  2 +-
 .../layout/notification_item_actionable.xml   |  4 +-
 Habitica/res/layout/stats_view.xml            |  2 +-
 Habitica/res/layout/subscription_details.xml  |  2 +-
 Habitica/res/menu/login.xml                   | 11 +++++
 Habitica/res/navigation/navigation.xml        | 28 +++++------
 Habitica/res/values-bg/strings.sidebar.xml    |  4 +-
 Habitica/res/values-de/strings.sidebar.xml    |  4 +-
 Habitica/res/values-de/strings.xml            |  8 ++--
 .../res/values-en-rGB/strings.sidebar.xml     |  4 +-
 Habitica/res/values-en-rGB/strings.xml        | 30 ++++++------
 Habitica/res/values-es/strings.sidebar.xml    |  4 +-
 Habitica/res/values-es/strings.xml            | 30 ++++++------
 Habitica/res/values-fr/strings.sidebar.xml    |  4 +-
 Habitica/res/values-fr/strings.xml            | 30 ++++++------
 .../res/values-hr-rHR/strings.sidebar.xml     |  4 +-
 Habitica/res/values-hr-rHR/strings.xml        | 48 +++++++++----------
 Habitica/res/values-in/strings.sidebar.xml    |  4 +-
 Habitica/res/values-in/strings.xml            | 30 ++++++------
 Habitica/res/values-it/strings.sidebar.xml    |  4 +-
 Habitica/res/values-it/strings.xml            | 30 ++++++------
 Habitica/res/values-iw/strings.sidebar.xml    |  4 +-
 Habitica/res/values-iw/strings.xml            |  8 ++--
 Habitica/res/values-ja/strings.sidebar.xml    |  4 +-
 Habitica/res/values-ja/strings.xml            | 30 ++++++------
 Habitica/res/values-ko/strings.sidebar.xml    |  4 +-
 Habitica/res/values-ko/strings.xml            | 30 ++++++------
 Habitica/res/values-lt/strings.sidebar.xml    |  4 +-
 Habitica/res/values-lt/strings.xml            | 30 ++++++------
 Habitica/res/values-nl/strings.sidebar.xml    |  4 +-
 Habitica/res/values-nl/strings.xml            | 30 ++++++------
 Habitica/res/values-pl/strings.sidebar.xml    |  4 +-
 Habitica/res/values-pl/strings.xml            | 30 ++++++------
 .../res/values-pt-rBR/strings.sidebar.xml     |  4 +-
 Habitica/res/values-pt-rBR/strings.xml        | 30 ++++++------
 .../res/values-pt-rPT/strings.sidebar.xml     |  4 +-
 Habitica/res/values-pt-rPT/strings.xml        | 22 ++++-----
 Habitica/res/values-ru/strings.sidebar.xml    |  4 +-
 Habitica/res/values-ru/strings.xml            | 30 ++++++------
 Habitica/res/values-tr/strings.sidebar.xml    |  4 +-
 Habitica/res/values-tr/strings.xml            | 30 ++++++------
 .../res/values-zh-rTW/strings.sidebar.xml     |  4 +-
 Habitica/res/values-zh-rTW/strings.xml        | 38 +++++++--------
 Habitica/res/values-zh/strings.sidebar.xml    |  4 +-
 Habitica/res/values-zh/strings.xml            | 30 ++++++------
 Habitica/res/values/dimens.xml                |  1 +
 Habitica/res/values/strings.sidebar.xml       |  2 +-
 Habitica/res/values/strings.xml               | 31 ++++++------
 57 files changed, 405 insertions(+), 390 deletions(-)
 create mode 100644 Habitica/res/menu/login.xml

diff --git a/Habitica/res/layout/activity_gift_iap.xml b/Habitica/res/layout/activity_gift_iap.xml
index d8335d41b..6a1cea61e 100644
--- a/Habitica/res/layout/activity_gift_iap.xml
+++ b/Habitica/res/layout/activity_gift_iap.xml
@@ -77,7 +77,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/one_month"
-                    app:gemCapText="@string/subscribe1month.gemcap"
+                    app:gemCapText="@string/subscribe1month_gemcap"
                     app:isNonRecurring="true"/>
 
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
@@ -85,7 +85,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/three_months"
-                    app:gemCapText="@string/subscribe3month.gemcap"
+                    app:gemCapText="@string/subscribe3month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="1" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
@@ -93,7 +93,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/six_months"
-                    app:gemCapText="@string/subscribe6month.gemcap"
+                    app:gemCapText="@string/subscribe6month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="2" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
@@ -101,7 +101,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/twelve_months"
-                    app:gemCapText="@string/subscribe12month.gemcap"
+                    app:gemCapText="@string/subscribe12month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="4" >
 
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
index 1c1a9e0db..726ac5800 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -13,7 +13,7 @@
         android:id="@+id/buy_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/reward.dialog.buy"
+        android:text="@string/reward_dialog_buy"
         android:textColor="@color/brand_300"
         style="@style/Subheader1" />
     <com.habitrpg.android.habitica.ui.views.CurrencyView
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 9fb1f405f..349e9ddeb 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -81,11 +81,11 @@
                     style="@style/Body1_Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="End"
+                    android:layout_gravity="end"
                     android:text="@string/edit_tag_btn_edit"
                     android:textColor="#6133b4"
                     android:textSize="16sp"
-                    android:gravity="End|center_vertical"
+                    android:gravity="end|center_vertical"
                     android:paddingEnd="0dp"/>
         </LinearLayout>
         <ScrollView
diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index b1e7eaed6..f7d922441 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -98,7 +98,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="35sp"
             android:background="@drawable/rounded_purple_square"
-            android:text="@string/about.rate_our_app"
+            android:text="@string/about_rate_our_app"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
@@ -110,7 +110,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20sp"
             android:background="@drawable/rounded_purple_square"
-            android:text="@string/about.bugreport"
+            android:text="@string/about_bugreport"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
@@ -122,7 +122,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20sp"
             android:background="@drawable/rounded_purple_square"
-            android:text="@string/about.give_us_feedback"
+            android:text="@string/about_give_us_feedback"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
@@ -133,7 +133,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_marginTop="20sp"
-            android:text="@string/about.habitica_open_source"
+            android:text="@string/about_habitica_open_source"
             android:textSize="@dimen/card_small_text" />
 
         <Button
@@ -143,7 +143,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
             android:background="@drawable/rounded_purple_square"
-            android:text="@string/about.source_code"
+            android:text="@string/about_source_code"
             android:textAllCaps="false"
             android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index a4a4973d7..f582f32ca 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -17,7 +17,7 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:paddingBottom="20dp"
-            android:text="@string/gem.purchase.title"
+            android:text="@string/gem_purchase_title"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
             android:textColor="@color/blue_10"
@@ -94,7 +94,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/gem.purchase.subtitle"
+            android:text="@string/gem_purchase_subtitle"
             android:gravity="center"
             android:textStyle="normal|bold"
             android:textColor="?colorPrimary"
@@ -104,25 +104,25 @@
             android:layout_marginBottom="12dp"/>
 
         <TextView
-            android:text="@string/gem.purchase.listitem1"
+            android:text="@string/gem_purchase_listitem1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
             />
         <TextView
-            android:text="@string/gem.purchase.listitem2"
+            android:text="@string/gem_purchase_listitem2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
             />
         <TextView
-            android:text="@string/gem.purchase.listitem3"
+            android:text="@string/gem_purchase_listitem3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
             />
         <TextView
-            android:text="@string/gem.purchase.listitem4"
+            android:text="@string/gem_purchase_listitem4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 71adea6c8..1adfa9d01 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -41,7 +41,7 @@
                             android:id="@+id/buttonPartyInviteAccept"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
+                            android:text="@string/quest_accept"
                             android:textColor="@color/btn_success"
                             style="?android:buttonBarButtonStyle" />
 
@@ -49,7 +49,7 @@
                             android:id="@+id/buttonPartyInviteReject"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
+                            android:text="@string/quest_reject"
                             android:textColor="@color/btn_danger"
                             style="?android:buttonBarButtonStyle" />
                     </LinearLayout>
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index e04174760..120c9461d 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -37,7 +37,7 @@
                             android:id="@+id/party_invite_accept_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
+                            android:text="@string/quest_accept"
                             android:textColor="@color/btn_success"
                             style="?android:buttonBarButtonStyle" />
 
@@ -45,7 +45,7 @@
                             android:id="@+id/party_invite_reject_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
+                            android:text="@string/quest_reject"
                             android:textColor="@color/btn_danger"
                             style="?android:buttonBarButtonStyle" />
                     </LinearLayout>
@@ -152,7 +152,7 @@
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
+                            android:text="@string/quest_accept"
                             style="@style/HabiticaButton.Green"
                             android:layout_marginEnd="16dp" />
 
@@ -161,7 +161,7 @@
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
+                            android:text="@string/quest_reject"
                             style="@style/HabiticaButton.Red"/>
                     </LinearLayout>
                     <LinearLayout
@@ -175,7 +175,7 @@
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.begin"
+                            android:text="@string/quest_begin"
                             style="@style/HabiticaButton.Yellow"
                             android:layout_marginEnd="16dp" />
 
@@ -184,7 +184,7 @@
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.cancel"
+                            android:text="@string/quest_cancel"
                             style="@style/HabiticaButton.Red" />
                     </LinearLayout>
                     <LinearLayout
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index c9ad0e74b..85ef37ffe 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -113,7 +113,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.accept"
+                android:text="@string/quest_accept"
                 style="@style/HabiticaButton.Green"
                 android:layout_marginRight="16dp" />
 
@@ -122,7 +122,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.reject"
+                android:text="@string/quest_reject"
                 style="@style/HabiticaButton.Red"/>
         </LinearLayout>
         <LinearLayout
@@ -137,7 +137,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.begin"
+                android:text="@string/quest_begin"
                 style="@style/HabiticaButton.Yellow"
                 android:layout_marginRight="16dp" />
 
@@ -146,14 +146,14 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.cancel"
+                android:text="@string/quest_cancel"
                 style="@style/HabiticaButton.Red" />
             <Button
                 android:id="@+id/quest_abort_button"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.abort"
+                android:text="@string/quest_abort"
                 style="@style/HabiticaButton.Red" />
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index fcb1c1909..78c6e7936 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -94,7 +94,7 @@
                 style="@style/subscriptionBox">
 
                 <TextView
-                    android:text="@string/subscribe.listitem1"
+                    android:text="@string/subscribe_listitem1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -111,7 +111,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem1.description"
-                android:text="@string/subscribe.listitem1.description"
+                android:text="@string/subscribe_listitem1_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -123,7 +123,7 @@
                 android:layout_height="wrap_content"
                 style="@style/subscriptionBox">
                 <TextView
-                    android:text="@string/subscribe.listitem2"
+                    android:text="@string/subscribe_listitem2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -139,7 +139,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem2.description"
-                android:text="@string/subscribe.listitem2.description"
+                android:text="@string/subscribe_listitem2_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -151,7 +151,7 @@
                 android:layout_height="wrap_content"
                 style="@style/subscriptionBox">
                 <TextView
-                    android:text="@string/subscribe.listitem3"
+                    android:text="@string/subscribe_listitem3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -167,7 +167,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem3.description"
-                android:text="@string/subscribe.listitem3.description"
+                android:text="@string/subscribe_listitem3_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -180,7 +180,7 @@
                 style="@style/subscriptionBox"
                 android:layout_marginBottom="8dp">
                 <TextView
-                    android:text="@string/subscribe.listitem4"
+                    android:text="@string/subscribe_listitem4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -195,7 +195,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem4.description"
-                android:text="@string/subscribe.listitem4.description"
+                android:text="@string/subscribe_listitem4_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -237,28 +237,28 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/month"
-                    app:gemCapText="@string/subscribe1month.gemcap"/>
+                    app:gemCapText="@string/subscribe1month_gemcap"/>
 
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription3month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/three_months"
-                    app:gemCapText="@string/subscribe3month.gemcap"
+                    app:gemCapText="@string/subscribe3month_gemcap"
                     app:hourGlassCount="1" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription6month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/six_months"
-                    app:gemCapText="@string/subscribe6month.gemcap"
+                    app:gemCapText="@string/subscribe6month_gemcap"
                     app:hourGlassCount="2" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription12month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/twelve_months"
-                    app:gemCapText="@string/subscribe12month.gemcap"
+                    app:gemCapText="@string/subscribe12month_gemcap"
                     app:hourGlassCount="4" >
 
                 </com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView>
@@ -309,7 +309,7 @@
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
                 android:paddingBottom="20dp"
-                android:text="@string/subscribe.title"
+                android:text="@string/subscribe_title"
                 android:layout_gravity="center_horizontal"
                 android:gravity="center"
                 android:textColor="@color/gray_300"
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index d3a994461..d4b567730 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/tavern.inn.rest"
+            android:text="@string/tavern_inn_rest"
             style="@style/HabiticaButton.Yellow"/>
         <TextView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/notification_item_actionable.xml b/Habitica/res/layout/notification_item_actionable.xml
index e772184b0..89efb25f3 100644
--- a/Habitica/res/layout/notification_item_actionable.xml
+++ b/Habitica/res/layout/notification_item_actionable.xml
@@ -102,7 +102,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="16dp"
             android:layout_weight="1"
-            android:text="@string/quest.reject" />
+            android:text="@string/quest_reject" />
 
         <Button
             android:id="@+id/accept_button"
@@ -110,7 +110,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/quest.accept" />
+            android:text="@string/quest_accept" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/Habitica/res/layout/stats_view.xml b/Habitica/res/layout/stats_view.xml
index ec3141e3b..fd8cf6dd7 100644
--- a/Habitica/res/layout/stats_view.xml
+++ b/Habitica/res/layout/stats_view.xml
@@ -76,7 +76,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/sidebar.equipment"
+                android:text="@string/sidebar_equipment"
                 android:textSize="12sp"
                 android:textColor="@color/gray_300"
                 android:gravity="center_horizontal"/>
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 235bd5bd7..2ed42e21c 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -139,7 +139,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/subscriptionBoxText.Subtitle"
-            android:text="@string/cancel_subscription_notgoogle.description"
+            android:text="@string/cancel_subscription_notgoogle_description"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"/>
         <Button
diff --git a/Habitica/res/menu/login.xml b/Habitica/res/menu/login.xml
new file mode 100644
index 000000000..443a5b53c
--- /dev/null
+++ b/Habitica/res/menu/login.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_toggleRegistering"
+        android:orderInCategory="1"
+        app:showAsAction="ifRoom"
+        android:title="@string/login_btn"/>
+
+</menu>
\ No newline at end of file
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index ce1223a4c..26bf828bd 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -8,7 +8,7 @@
     <fragment
         android:id="@+id/equipmentOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment"
-        android:label="@string/sidebar.equipment" >
+        android:label="@string/sidebar_equipment" >
         <deepLink app:uri="habitica.com/inventory/equipment" />
         <action
             android:id="@+id/openEquipmentDetail"
@@ -17,7 +17,7 @@
     <fragment
         android:id="@+id/equipmentDetailFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment"
-        android:label="@string/sidebar.equipment" >
+        android:label="@string/sidebar_equipment" >
         <argument
             android:name="type"
             app:argType="string" />
@@ -36,7 +36,7 @@
     <fragment
         android:id="@+id/partyFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment"
-        android:label="@string/sidebar.party">
+        android:label="@string/sidebar_party">
         <deepLink app:uri="habitica.com/party" />
         <action
             android:id="@+id/openQuestDetail"
@@ -60,7 +60,7 @@
     <fragment
         android:id="@+id/skillsFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment"
-        android:label="@string/sidebar.skills">
+        android:label="@string/sidebar_skills">
 
     </fragment>
     <fragment
@@ -72,13 +72,13 @@
     <fragment
         android:id="@+id/tavernFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.TavernFragment"
-        android:label="@string/sidebar.tavern">
+        android:label="@string/sidebar_tavern">
         <deepLink app:uri="habitica.com/tavern" />
     </fragment>
     <fragment
         android:id="@+id/guildsOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment"
-        android:label="@string/sidebar.guilds" >
+        android:label="@string/sidebar_guilds" >
         <deepLink app:uri="habitica.com/groups/myGuilds" />
         <action
             android:id="@+id/openGuildDetail"
@@ -90,7 +90,7 @@
     <fragment
         android:id="@+id/challengesOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment"
-        android:label="@string/sidebar.challenges" >
+        android:label="@string/sidebar_challenges" >
         <deepLink app:uri="habitica.com/challenges/myChallenges" />
         <deepLink app:uri="habitica.com/challenges/findChallenges" />
         <action
@@ -104,7 +104,7 @@
     <fragment
         android:id="@+id/avatarOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment"
-        android:label="@string/sidebar.avatar" >
+        android:label="@string/sidebar_avatar" >
         <action
             android:id="@+id/openAvatarDetail"
             app:destination="@id/avatarCustomizationFragment" />
@@ -122,7 +122,7 @@
     <fragment
         android:id="@+id/stableFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment"
-        android:label="@string/sidebar.stable" >
+        android:label="@string/sidebar_stable" >
         <deepLink app:uri="habitica.com/inventory/stable" />
         <action
             android:id="@+id/openPetDetail"
@@ -134,11 +134,11 @@
     <activity
         android:id="@+id/gemPurchaseActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity"
-        android:label="@string/gem.purchase.toolbartitle" />
+        android:label="@string/gem_purchase_toolbartitle" />
     <fragment
         android:id="@+id/newsFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.NewsFragment"
-        android:label="@string/sidebar.news" />
+        android:label="@string/sidebar_news" />
     <fragment
         android:id="@+id/FAQOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment"
@@ -151,11 +151,11 @@
     <fragment
         android:id="@+id/aboutFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.AboutFragment"
-        android:label="@string/sidebar.about" />
+        android:label="@string/sidebar_about" />
     <fragment
         android:id="@+id/inboxFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.InboxFragment"
-        android:label="@string/sidebar.inbox" >
+        android:label="@string/sidebar_inbox" >
         <action
             android:id="@+id/openInboxDetail"
             app:destination="@id/inboxMessageListFragment" />
@@ -196,7 +196,7 @@
     <fragment
         android:id="@+id/avatarCustomizationFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment"
-        android:label="@string/sidebar.avatar" >
+        android:label="@string/sidebar_avatar" >
         <argument
             android:name="type"
             app:argType="string" />
diff --git a/Habitica/res/values-bg/strings.sidebar.xml b/Habitica/res/values-bg/strings.sidebar.xml
index 781dd9041..4e20255b3 100644
--- a/Habitica/res/values-bg/strings.sidebar.xml
+++ b/Habitica/res/values-bg/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Задачи</string>
   <string name="sidebar_skills">Умения</string>
-  <string name="sidebar.section_social">Общност</string>
+  <string name="sidebar_section_social">Общност</string>
   <string name="sidebar_inbox">Съобщения</string>
   <string name="sidebar_tavern">Кръчма</string>
   <string name="sidebar_party">Група</string>
   <string name="sidebar_purchaseGems">Купуване на диаманти</string>
   <string name="sidebar_guilds">Гилдии</string>
   <string name="sidebar_challenges">Предизвикателства</string>
-  <string name="sidebar.section_inventory">Инвентар</string>
+  <string name="sidebar_section_inventory">Инвентар</string>
   <string name="sidebar_avatar">Герой</string>
   <string name="sidebar_equipment">Екипировка</string>
   <string name="sidebar_stable">Конюшня</string>
diff --git a/Habitica/res/values-de/strings.sidebar.xml b/Habitica/res/values-de/strings.sidebar.xml
index 571ffeb58..9eca7353e 100644
--- a/Habitica/res/values-de/strings.sidebar.xml
+++ b/Habitica/res/values-de/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Aufgaben</string>
   <string name="sidebar_skills">Fähigkeiten</string>
-  <string name="sidebar.section_social">Soziales</string>
+  <string name="sidebar_section_social">Soziales</string>
   <string name="sidebar_inbox">Nachrichten</string>
   <string name="sidebar_tavern">Gasthaus</string>
   <string name="sidebar_party">Gruppe</string>
   <string name="sidebar_purchaseGems">Edelsteine &amp; Abonnement</string>
   <string name="sidebar_guilds">Gilden</string>
   <string name="sidebar_challenges">Wettbewerbe</string>
-  <string name="sidebar.section_inventory">Inventar</string>
+  <string name="sidebar_section_inventory">Inventar</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Ausrüstung</string>
   <string name="sidebar_stable">Stall</string>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 2fa260abc..6e116f2de 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -341,10 +341,10 @@
   <string name="subscription_duration">Alle %s wiederholen</string>
   <string name="subscription_duration_norenew">Für %s</string>
   <string name="subscribe">Abonnieren</string>
-  <string name="subscribe.listitem1_description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
-  <string name="subscribe.listitem2_description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
-  <string name="subscribe.listitem3_description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
-  <string name="subscribe.listitem4_description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
+  <string name="subscribe_listitem1_description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
+  <string name="subscribe_listitem2_description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
+  <string name="subscribe_listitem3_description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
+  <string name="subscribe_listitem4_description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
   <string name="subscription_hourglasses">+%d Mystische Sanduhr</string>
   <string name="payment_method">Zahlungsmethode</string>
   <string name="subscription">Abonnement</string>
diff --git a/Habitica/res/values-en-rGB/strings.sidebar.xml b/Habitica/res/values-en-rGB/strings.sidebar.xml
index dcafc0645..275272e44 100644
--- a/Habitica/res/values-en-rGB/strings.sidebar.xml
+++ b/Habitica/res/values-en-rGB/strings.sidebar.xml
@@ -2,13 +2,13 @@
 <resources>
   <string name="sidebar_tasks">Tasks</string>
   <string name="sidebar_skills">Skills</string>
-  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_section_social">Social</string>
   <string name="sidebar_tavern">Tavern</string>
   <string name="sidebar_party">Party</string>
   <string name="sidebar_purchaseGems">Gems &amp; Subscription</string>
   <string name="sidebar_guilds">Guilds</string>
   <string name="sidebar_challenges">Challenges</string>
-  <string name="sidebar.section_inventory">Inventory</string>
+  <string name="sidebar_section_inventory">Inventory</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Equipment</string>
   <string name="sidebar_stable">Stable</string>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 6e3b42af9..c680e7a27 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -93,10 +93,10 @@
   <string name="new_checklist_item">new checklist item</string>
   <string name="unlock_lvl_11">Unlock at lvl 11</string>
   <string name="forgot_pw_btn">Forgot Password</string>
-  <string name="tavern.inn_checkOut">Re-activate your Dailies</string>
-  <string name="tavern.inn_rest">Pause your Dailies</string>
-  <string name="reward.dialog_buy">Buy</string>
-  <string name="reward.dialog_dismiss">Dismiss</string>
+  <string name="tavern_inn_checkOut">Re-activate your Dailies</string>
+  <string name="tavern_inn_rest">Pause your Dailies</string>
+  <string name="reward_dialog_buy">Buy</string>
+  <string name="reward_dialog_dismiss">Dismiss</string>
   <string name="party">Party</string>
   <string name="chat">Chat</string>
   <string name="members">Members</string>
@@ -287,13 +287,13 @@
   <string name="widget_dailies">Habitica Dailies</string>
   <string name="widget_todo_list">Habitica To-Do List</string>
   <string name="google_services_missing">Google Play services could not be found.</string>
-  <string name="gem.purchase_toolbartitle">Purchase</string>
-  <string name="gem.purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
-  <string name="gem.purchase_subtitle">Gems allow you to buy fun extras for your account, including:</string>
-  <string name="gem.purchase_listitem1">Cool costumes for your avatar</string>
-  <string name="gem.purchase_listitem2">Awesome backgrounds</string>
-  <string name="gem.purchase_listitem3">Quests that reward you with pet eggs</string>
-  <string name="gem.purchase_listitem4">The ability to change your class before level 100</string>
+  <string name="gem_purchase_toolbartitle">Purchase</string>
+  <string name="gem_purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
+  <string name="gem_purchase_subtitle">Gems allow you to buy fun extras for your account, including:</string>
+  <string name="gem_purchase_listitem1">Cool costumes for your avatar</string>
+  <string name="gem_purchase_listitem2">Awesome backgrounds</string>
+  <string name="gem_purchase_listitem3">Quests that reward you with pet eggs</string>
+  <string name="gem_purchase_listitem4">The ability to change your class before level 100</string>
   <string name="support_habitica">Support Habitica</string>
   <string name="skill_transformation_use">use</string>
   <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
@@ -316,10 +316,10 @@
   <string name="subscriptions">Subscriptions</string>
   <string name="subscription_duration">Recurring every %s</string>
   <string name="subscribe">Subscribe</string>
-  <string name="subscribe.listitem1_description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
-  <string name="subscribe.listitem2_description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travellers will grant you access to historic (and futuristic!) cosmetic items.</string>
-  <string name="subscribe.listitem3_description">Makes completed To-Dos and task history available for longer.</string>
-  <string name="subscribe.listitem4_description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
+  <string name="subscribe_listitem1_description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
+  <string name="subscribe_listitem2_description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travellers will grant you access to historic (and futuristic!) cosmetic items.</string>
+  <string name="subscribe_listitem3_description">Makes completed To-Dos and task history available for longer.</string>
+  <string name="subscribe_listitem4_description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
   <string name="subscription_hourglasses">+%d Mystic Hourglass</string>
   <string name="payment_method">Payment method</string>
   <string name="subscription">Subscription</string>
diff --git a/Habitica/res/values-es/strings.sidebar.xml b/Habitica/res/values-es/strings.sidebar.xml
index 285fda638..ccf48fdb7 100644
--- a/Habitica/res/values-es/strings.sidebar.xml
+++ b/Habitica/res/values-es/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Tareas</string>
   <string name="sidebar_skills">Habilidades</string>
-  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_section_social">Social</string>
   <string name="sidebar_inbox">Mensajes</string>
   <string name="sidebar_tavern">Taberna</string>
   <string name="sidebar_party">Equipo</string>
   <string name="sidebar_purchaseGems">Gemas y Suscripción</string>
   <string name="sidebar_guilds">Gremios</string>
   <string name="sidebar_challenges">Desafíos</string>
-  <string name="sidebar.section_inventory">Inventario</string>
+  <string name="sidebar_section_inventory">Inventario</string>
   <string name="sidebar_avatar">Personaje</string>
   <string name="sidebar_equipment">Equipamiento</string>
   <string name="sidebar_stable">Establo</string>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index de3237b01..660076b98 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">Acuérdate de marcar tus tareas completadas</string>
     <string name="unlock_lvl_11">Se desbloquea en el nivel 11</string>
     <string name="forgot_pw_btn">He olvidado la contraseña</string>
-  <string name="tavern.inn_checkOut">Reactivar tareas diarias</string>
-  <string name="tavern.inn_rest">Pausar tareas diarias</string>
-  <string name="reward.dialog_buy">Comprar</string>
-  <string name="reward.dialog_dismiss">Descartar</string>
+  <string name="tavern_inn_checkOut">Reactivar tareas diarias</string>
+  <string name="tavern_inn_rest">Pausar tareas diarias</string>
+  <string name="reward_dialog_buy">Comprar</string>
+  <string name="reward_dialog_dismiss">Descartar</string>
   <string name="party">Equipo</string>
   <string name="chat">Conversación</string>
   <string name="members">Miembros</string>
@@ -311,13 +311,13 @@
   <string name="widget_dailies">Tareas Diarias Habitica</string>
   <string name="widget_todo_list">Tareas Pendientes</string>
     <string name="google_services_missing">No pudieron encontrarse los servidores de Google Play.</string>
-  <string name="gem.purchase_toolbartitle">Compra</string>
-  <string name="gem.purchase_title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
-  <string name="gem.purchase_subtitle">Las Gemas te permiten comprar divertidos extras para tu cuenta, incluyendo:</string>
-  <string name="gem.purchase_listitem1">Disfraces geniales para tu personaje</string>
-  <string name="gem.purchase_listitem2">Fondos increíbles</string>
-  <string name="gem.purchase_listitem3">Misiones que te recompensan con huevos de mascota</string>
-  <string name="gem.purchase_listitem4">La habilidad para cambiar tu clase antes del nivel 100</string>
+  <string name="gem_purchase_toolbartitle">Compra</string>
+  <string name="gem_purchase_title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
+  <string name="gem_purchase_subtitle">Las Gemas te permiten comprar divertidos extras para tu cuenta, incluyendo:</string>
+  <string name="gem_purchase_listitem1">Disfraces geniales para tu personaje</string>
+  <string name="gem_purchase_listitem2">Fondos increíbles</string>
+  <string name="gem_purchase_listitem3">Misiones que te recompensan con huevos de mascota</string>
+  <string name="gem_purchase_listitem4">La habilidad para cambiar tu clase antes del nivel 100</string>
   <string name="support_habitica">Apoya Habitica</string>
   <string name="skill_transformation_use">usa</string>
   <string name="hatching_market_info">¿No consigues los objetos que necesitas? ¡Echa un vistazo al Mercado!</string>
@@ -341,10 +341,10 @@
   <string name="subscription_duration">Se repite cada %s</string>
   <string name="subscription_duration_norenew">Por %s</string>
   <string name="subscribe">Suscríbete</string>
-  <string name="subscribe.listitem1_description">El comerciante Alejandro te venderá las Gemas para 20 oro cada una! Sus cargamentos mensuales están  limitados a 25 Gemas cada mes, pero puede aumentar según la duración de suscripción. El tope aumenta en 5 Gemas por cada tres meses de suscripción consecutiva, hasta un máximo de 50 Gemas por mes!</string>
-  <string name="subscribe.listitem2_description">¡Cada mes recibirás un artículo cosmético único para tu avatar! Además, por cada tres meses de suscripción consecutiva, Viajeros en Tiempo Misteriosos te otorgará acceso a artículos cosméticos históricos (y futuristas!).</string>
-  <string name="subscribe.listitem3_description">Hace que las tareas completas y la historia de tareas estén disponibles por más tiempo.</string>
-  <string name="subscribe.listitem4_description">Doble caída gorras te permitirá recibir más elementos de tus tareas completadas todos los días, ayudando a completar tu establo más rápido!</string>
+  <string name="subscribe_listitem1_description">El comerciante Alejandro te venderá las Gemas para 20 oro cada una! Sus cargamentos mensuales están  limitados a 25 Gemas cada mes, pero puede aumentar según la duración de suscripción. El tope aumenta en 5 Gemas por cada tres meses de suscripción consecutiva, hasta un máximo de 50 Gemas por mes!</string>
+  <string name="subscribe_listitem2_description">¡Cada mes recibirás un artículo cosmético único para tu avatar! Además, por cada tres meses de suscripción consecutiva, Viajeros en Tiempo Misteriosos te otorgará acceso a artículos cosméticos históricos (y futuristas!).</string>
+  <string name="subscribe_listitem3_description">Hace que las tareas completas y la historia de tareas estén disponibles por más tiempo.</string>
+  <string name="subscribe_listitem4_description">Doble caída gorras te permitirá recibir más elementos de tus tareas completadas todos los días, ayudando a completar tu establo más rápido!</string>
   <string name="subscribe1month_gemcap">Límite de 25 gemas</string>
   <string name="subscribe3month_gemcap">Límite de 30 gemas</string>
   <string name="subscribe6month_gemcap">Límite de 35 gemas</string>
diff --git a/Habitica/res/values-fr/strings.sidebar.xml b/Habitica/res/values-fr/strings.sidebar.xml
index 4357cdc85..53ba7d73c 100644
--- a/Habitica/res/values-fr/strings.sidebar.xml
+++ b/Habitica/res/values-fr/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Tâches</string>
   <string name="sidebar_skills">Compétences</string>
-  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_section_social">Social</string>
   <string name="sidebar_inbox">Messages</string>
   <string name="sidebar_tavern">Auberge</string>
   <string name="sidebar_party">Équipe</string>
   <string name="sidebar_purchaseGems">Gemmes et abonnement</string>
   <string name="sidebar_guilds">Guildes</string>
   <string name="sidebar_challenges">Défis</string>
-  <string name="sidebar.section_inventory">Inventaire</string>
+  <string name="sidebar_section_inventory">Inventaire</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Équipement</string>
   <string name="sidebar_stable">Écurie</string>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 5697a07d4..2ab1b64ba 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -96,10 +96,10 @@
     <string name="reminder_title">Rappelez-vous de cocher vos tâches quotidiennes</string>
     <string name="unlock_lvl_11">Disponible au niveau 11</string>
     <string name="forgot_pw_btn">Mot de passe oublié</string>
-  <string name="tavern.inn_checkOut">Réactiver vos tâches quotidiennes</string>
-  <string name="tavern.inn_rest">Suspendre vos tâches quotidiennes</string>
-  <string name="reward.dialog_buy">Acheter</string>
-  <string name="reward.dialog_dismiss">Annuler</string>
+  <string name="tavern_inn_checkOut">Réactiver vos tâches quotidiennes</string>
+  <string name="tavern_inn_rest">Suspendre vos tâches quotidiennes</string>
+  <string name="reward_dialog_buy">Acheter</string>
+  <string name="reward_dialog_dismiss">Annuler</string>
   <string name="party">Équipe</string>
   <string name="chat">Discussion</string>
   <string name="members">Membres</string>
@@ -311,13 +311,13 @@
   <string name="widget_dailies">Quotidiennes Habitica</string>
   <string name="widget_todo_list">Liste des tâches Habitica</string>
     <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
-  <string name="gem.purchase_toolbartitle">Acheter</string>
-  <string name="gem.purchase_title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
-  <string name="gem.purchase_subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
-  <string name="gem.purchase_listitem1">Des costumes chouettes pour votre avatar</string>
-  <string name="gem.purchase_listitem2">De magnifiques arrière-plans</string>
-  <string name="gem.purchase_listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
-  <string name="gem.purchase_listitem4">La possibilité de changer de classe avant le niveau 100</string>
+  <string name="gem_purchase_toolbartitle">Acheter</string>
+  <string name="gem_purchase_title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
+  <string name="gem_purchase_subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
+  <string name="gem_purchase_listitem1">Des costumes chouettes pour votre avatar</string>
+  <string name="gem_purchase_listitem2">De magnifiques arrière-plans</string>
+  <string name="gem_purchase_listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
+  <string name="gem_purchase_listitem4">La possibilité de changer de classe avant le niveau 100</string>
   <string name="support_habitica">Soutenir Habitica</string>
   <string name="skill_transformation_use">Utiliser</string>
   <string name="hatching_market_info">Vous ne recevez pas le bon butin ? Allez voir au marché !</string>
@@ -341,10 +341,10 @@
   <string name="subscription_duration">Périodique tous les %s</string>
   <string name="subscription_duration_norenew">Pour %s</string>
   <string name="subscribe">S\'abonner</string>
-  <string name="subscribe.listitem1_description">Alexander le marchand vous vendra des gemmes au prix de 20 pièces d\'or par gemme.\n\nSes commandes mensuelles sont plafonnées initialement à 25 gemmes par mois mais peut augmenter en fonction de la durée de votre abonnement\n\n. Ce plafond augmente de 5 gemmes pour chaque période de trois mois consécutif d\'abonnement, jusqu\'à un maximum de 50 gemmes par mois !</string>
-  <string name="subscribe.listitem2_description">Chaque mois vous recevrez un objet cosmétique unique pour votre avatar !\n\nEn plus, pour chaque période de trois mois d\'abonnement consécutif, les voyageurs temporels vous donneront accès à des objets cosmétiques passés (ou futurs).</string>
-  <string name="subscribe.listitem3_description">Rend l\'historique des tâches disponible plus longtemps.</string>
-  <string name="subscribe.listitem4_description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre écurie plus rapidement !</string>
+  <string name="subscribe_listitem1_description">Alexander le marchand vous vendra des gemmes au prix de 20 pièces d\'or par gemme.\n\nSes commandes mensuelles sont plafonnées initialement à 25 gemmes par mois mais peut augmenter en fonction de la durée de votre abonnement\n\n. Ce plafond augmente de 5 gemmes pour chaque période de trois mois consécutif d\'abonnement, jusqu\'à un maximum de 50 gemmes par mois !</string>
+  <string name="subscribe_listitem2_description">Chaque mois vous recevrez un objet cosmétique unique pour votre avatar !\n\nEn plus, pour chaque période de trois mois d\'abonnement consécutif, les voyageurs temporels vous donneront accès à des objets cosmétiques passés (ou futurs).</string>
+  <string name="subscribe_listitem3_description">Rend l\'historique des tâches disponible plus longtemps.</string>
+  <string name="subscribe_listitem4_description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre écurie plus rapidement !</string>
   <string name="subscribe1month_gemcap">Plafond de 25 gemmes</string>
   <string name="subscribe3month_gemcap">Plafond de 30 gemmes</string>
   <string name="subscribe6month_gemcap">Plafond de 35 gemmes</string>
diff --git a/Habitica/res/values-hr-rHR/strings.sidebar.xml b/Habitica/res/values-hr-rHR/strings.sidebar.xml
index ab72ce5e5..fa0ad28d0 100644
--- a/Habitica/res/values-hr-rHR/strings.sidebar.xml
+++ b/Habitica/res/values-hr-rHR/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Zadaci</string>
   <string name="sidebar_skills">Vještine</string>
-  <string name="sidebar.section_social">Društvo</string>
+  <string name="sidebar_section_social">Društvo</string>
   <string name="sidebar_inbox">Poruke</string>
   <string name="sidebar_tavern">Krčma</string>
   <string name="sidebar_party">Družina</string>
   <string name="sidebar_purchaseGems">Dragulji &amp; Pretplata</string>
   <string name="sidebar_guilds">Cehovi</string>
   <string name="sidebar_challenges">Izazovi</string>
-  <string name="sidebar.section_inventory">Inventar</string>
+  <string name="sidebar_section_inventory">Inventar</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Oprema</string>
   <string name="sidebar_stable">Štala</string>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 576e4cb18..bf0e98564 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -99,10 +99,10 @@
     <string name="reminder_title">Ne zaboravi prekrižiti svoje zadatke</string>
     <string name="unlock_lvl_11">Otključava se na levelu 11</string>
     <string name="forgot_pw_btn">Zaboravio/la sam lozinku</string>
-  <string name="tavern.inn_checkOut">Reaktiviraj svoje Svakodnevne zadatke</string>
-  <string name="tavern.inn_rest">Pauziraj svoje Svakodnevne zadatke</string>
-  <string name="reward.dialog_buy">Kupi</string>
-  <string name="reward.dialog_dismiss">Zanemari</string>
+  <string name="tavern_inn_checkOut">Reaktiviraj svoje Svakodnevne zadatke</string>
+  <string name="tavern_inn_rest">Pauziraj svoje Svakodnevne zadatke</string>
+  <string name="reward_dialog_buy">Kupi</string>
+  <string name="reward_dialog_dismiss">Zanemari</string>
   <string name="party">Družina</string>
   <string name="chat">Chat</string>
   <string name="members">Članovi</string>
@@ -313,13 +313,13 @@
   <string name="widget_dailies">Habitica Svakodnevni zadaci</string>
   <string name="widget_todo_list">Habitica Popis Zadataka</string>
     <string name="google_services_missing">Nije bilo moguće pronaći usluge Google Playa.</string>
-  <string name="gem.purchase_toolbartitle">Kupi</string>
-  <string name="gem.purchase_title">Kupovina Dragulja podržava razvojne programere i pomaže u održavanju Habitice</string>
-  <string name="gem.purchase_subtitle">Dragulji ti omogućuju kupovinu zabavnih dodataka za svoj račun, uključujući:</string>
-  <string name="gem.purchase_listitem1">Kul kostime za svog avatara</string>
-  <string name="gem.purchase_listitem2">Zakon pozadine</string>
-  <string name="gem.purchase.listitem3">Pustolovine koje te nagrađuju jajima ljubimaca</string>
-  <string name="gem.purchase.listitem4">Mogućnost promjene klase prije levela 100</string>
+  <string name="gem_purchase_toolbartitle">Kupi</string>
+  <string name="gem_purchase_title">Kupovina Dragulja podržava razvojne programere i pomaže u održavanju Habitice</string>
+  <string name="gem_purchase_subtitle">Dragulji ti omogućuju kupovinu zabavnih dodataka za svoj račun, uključujući:</string>
+  <string name="gem_purchase_listitem1">Kul kostime za svog avatara</string>
+  <string name="gem_purchase_listitem2">Zakon pozadine</string>
+  <string name="gem_purchase.listitem3">Pustolovine koje te nagrađuju jajima ljubimaca</string>
+  <string name="gem_purchase.listitem4">Mogućnost promjene klase prije levela 100</string>
   <string name="support_habitica">Podrži Habiticu</string>
   <string name="skill_transformation_use">koristi</string>
   <string name="hatching_market_info">Ne dobivaš prave poklone? Poviri u Tržnicu!</string>
@@ -333,24 +333,24 @@
   <string name="belongs_to_challenge">Pripada Izazovu</string>
   <string name="has_reminder">Ima podsjetnik</string>
   <string name="has_tag">Ima oznaku</string>
-  <string name="subscribe.title">Pretplatama se podržavaju razvojni programeri i pomaže se u održavanju Habitice</string>
+  <string name="subscribe_title">Pretplatama se podržavaju razvojni programeri i pomaže se u održavanju Habitice</string>
   <string name="subscribe_prompt">Postani pretplatnik i dobit ćeš ove korisne prednosti:</string>
-  <string name="subscribe.listitem1">Kupovinu dragulja zlatnicima</string>
-  <string name="subscribe.listitem2">Ekskluzivne mjesečne predmete</string>
-  <string name="subscribe.listitem3">Zadržavanje dodatne povijesti unosa</string>
-  <string name="subscribe.listitem4">Udvostručen dnevni limit poklona</string>
+  <string name="subscribe_listitem1">Kupovinu dragulja zlatnicima</string>
+  <string name="subscribe_listitem2">Ekskluzivne mjesečne predmete</string>
+  <string name="subscribe_listitem3">Zadržavanje dodatne povijesti unosa</string>
+  <string name="subscribe_listitem4">Udvostručen dnevni limit poklona</string>
   <string name="subscriptions">Pretplate</string>
   <string name="subscription_duration">Ponavlja se svaku %s</string>
   <string name="subscription_duration_norenew">Za %s</string>
   <string name="subscribe">Pretplati se</string>
-  <string name="subscribe.listitem1.description">Trgovac Aleksandar će ti sada prodavati dragulje po cijeni od 20 zlatnika po dragulju!\n\nNjegove mjesečne pošiljke su ispočetka ograničene na 25 Dragulja po mjesecu, ali se ovaj broj može povećati na osnovu duljine tvoje pretplate.\n\nLimit se povećava za 5 Dragulja za svaka tri mjeseca uzastopne pretplate i tako sve do maksimuma od 50 Dragulja po mjesecu!</string>
-  <string name="subscribe.listitem2.description">Svaki mjesec ćeš dobiti jedinstveni kozmetički predmet za svog avatara!n\nUz to, za svaka tri mjeseca uzastopne pretplate, Mistični Vremenski Putnici će ti dozvoliti pristup povijesnim (i futurističkim) kozmetičkim predmetima.</string>
-  <string name="subscribe.listitem3.description">Čini izvršene Zadatke i povijest zadataka duže dostupnima.</string>
-  <string name="subscribe.listitem4.description">Udvostručeni limit poklona će ti omogućiti da dobivaš više predmeta za zadatke koje izvršiš svaki dan, što će ti pomoći upotpuniti tvoju štalu prije!</string>
-  <string name="subscribe1month.gemcap">Limit od 25 Dragulja</string>
-  <string name="subscribe3month.gemcap">Limit od 30 Dragulja</string>
-  <string name="subscribe6month.gemcap">Limit od 35 Dragulja</string>
-  <string name="subscribe12month.gemcap">Limit od 45 Dragulja</string>
+  <string name="subscribe_listitem1.description">Trgovac Aleksandar će ti sada prodavati dragulje po cijeni od 20 zlatnika po dragulju!\n\nNjegove mjesečne pošiljke su ispočetka ograničene na 25 Dragulja po mjesecu, ali se ovaj broj može povećati na osnovu duljine tvoje pretplate.\n\nLimit se povećava za 5 Dragulja za svaka tri mjeseca uzastopne pretplate i tako sve do maksimuma od 50 Dragulja po mjesecu!</string>
+  <string name="subscribe_listitem2.description">Svaki mjesec ćeš dobiti jedinstveni kozmetički predmet za svog avatara!n\nUz to, za svaka tri mjeseca uzastopne pretplate, Mistični Vremenski Putnici će ti dozvoliti pristup povijesnim (i futurističkim) kozmetičkim predmetima.</string>
+  <string name="subscribe_listitem3.description">Čini izvršene Zadatke i povijest zadataka duže dostupnima.</string>
+  <string name="subscribe_listitem4.description">Udvostručeni limit poklona će ti omogućiti da dobivaš više predmeta za zadatke koje izvršiš svaki dan, što će ti pomoći upotpuniti tvoju štalu prije!</string>
+  <string name="subscribe1month_gemcap">Limit od 25 Dragulja</string>
+  <string name="subscribe3month_gemcap">Limit od 30 Dragulja</string>
+  <string name="subscribe6month_gemcap">Limit od 35 Dragulja</string>
+  <string name="subscribe12month_gemcap">Limit od 45 Dragulja</string>
   <string name="subscription_hourglasses">+%d Mistični Pješčani sat</string>
   <string name="payment_method">Način plaćanja</string>
   <string name="subscription">Pretplata</string>
diff --git a/Habitica/res/values-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml
index 914278a37..c67620fb4 100644
--- a/Habitica/res/values-in/strings.sidebar.xml
+++ b/Habitica/res/values-in/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Tugas</string>
   <string name="sidebar_skills">Kemampuan</string>
-  <string name="sidebar.section_social">Sosial</string>
+  <string name="sidebar_section_social">Sosial</string>
   <string name="sidebar_inbox">Pesan</string>
   <string name="sidebar_tavern">Kedai Minuman</string>
   <string name="sidebar_party">Party</string>
   <string name="sidebar_purchaseGems">Permata &amp; Berlangganan</string>
   <string name="sidebar_guilds">Guild</string>
   <string name="sidebar_challenges">Tantangan</string>
-  <string name="sidebar.section_inventory">Inventori</string>
+  <string name="sidebar_section_inventory">Inventori</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Perlengkapan</string>
   <string name="sidebar_stable">Istal</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 0befaa313..c78445b45 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -93,10 +93,10 @@
   <string name="new_checklist_item">item cek baru</string>
   <string name="unlock_lvl_11">Buka pada lvl 11</string>
   <string name="forgot_pw_btn">Lupa Kata Sandi</string>
-  <string name="tavern.inn_checkOut">Aktifkan kembali Keseharianmu</string>
-  <string name="tavern.inn_rest">Nonaktifkan Keseharianmu</string>
-  <string name="reward.dialog_buy">Beli</string>
-  <string name="reward.dialog_dismiss">Tutup</string>
+  <string name="tavern_inn_checkOut">Aktifkan kembali Keseharianmu</string>
+  <string name="tavern_inn_rest">Nonaktifkan Keseharianmu</string>
+  <string name="reward_dialog_buy">Beli</string>
+  <string name="reward_dialog_dismiss">Tutup</string>
   <string name="party">Party</string>
   <string name="chat">Obrolan</string>
   <string name="members">Anggota</string>
@@ -298,13 +298,13 @@
   <string name="widget_dailies">Keseharian Habitica</string>
   <string name="widget_todo_list">Daftar To-Do Habitica</string>
   <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
-  <string name="gem.purchase_toolbartitle">Bayar</string>
-  <string name="gem.purchase_title">Membeli gem dapat mendukung pengembang dan menjaga Habitica tetap berjalan</string>
-  <string name="gem.purchase_subtitle">Permata membuatmu dapat membeli tambahan yang menyenangkan untuk akunmu, termasuk:</string>
-  <string name="gem.purchase_listitem1">Kostum keren untuk avatarmu</string>
-  <string name="gem.purchase_listitem2">Latar belakang yang keren</string>
-  <string name="gem.purchase_listitem3">Misi yang memberikanmu hadiah telur</string>
-  <string name="gem.purchase_listitem4">Kemampuan untuk mengganti profesi sebelum level 100</string>
+  <string name="gem_purchase_toolbartitle">Bayar</string>
+  <string name="gem_purchase_title">Membeli gem dapat mendukung pengembang dan menjaga Habitica tetap berjalan</string>
+  <string name="gem_purchase_subtitle">Permata membuatmu dapat membeli tambahan yang menyenangkan untuk akunmu, termasuk:</string>
+  <string name="gem_purchase_listitem1">Kostum keren untuk avatarmu</string>
+  <string name="gem_purchase_listitem2">Latar belakang yang keren</string>
+  <string name="gem_purchase_listitem3">Misi yang memberikanmu hadiah telur</string>
+  <string name="gem_purchase_listitem4">Kemampuan untuk mengganti profesi sebelum level 100</string>
   <string name="support_habitica">Dukung Habitica</string>
   <string name="skill_transformation_use">gunakan</string>
   <string name="hatching_market_info">Tidak mendapatkan item yang diinginkan? Beli di Market!</string>
@@ -327,10 +327,10 @@
   <string name="subscriptions">Langganan</string>
   <string name="subscription_duration">Berulang setiap %s</string>
   <string name="subscribe">Berlangganan</string>
-  <string name="subscribe.listitem1_description">Alexander sang Saudagar akan menjual permata kepadamu masing-masing seharga 20 koin emas!\n\nPengiriman bulanannya dibatasi di 25 Permata per bulan, tapi bisa meningkat berdasarkan lama berlangganan-mu. \n\nBatasnya meningkat sebanyak 5 Permata setiap tiga bulan berturut-turut kamu berlangganan, hingga batas maksimal 50 Permata per bulan!</string>
-  <string name="subscribe.listitem2_description">Setiap bulan kamu akan menerima sebuah item kosmetik unik untuk avatarmu!\n\nPlus, setiap tiga bulan berturut-turut kamu berlangganan, sang Penjelajah Waktu Misterius akan memberimu akses kepada item kosmetik bersejarah (atau futuristik!).</string>
-  <string name="subscribe.listitem3_description">Buat To-Do yang telah diselesaikan dan riwayat tugas tersedia lebih lama.</string>
-  <string name="subscribe.listitem4_description">Dua kali lipat batas drop akan mengizinkanmu mendapat lebih banyak item untuk tugas yang terselesaikan setiap hari, membantumu melengkapi istalmu lebih cepat!</string>
+  <string name="subscribe_listitem1_description">Alexander sang Saudagar akan menjual permata kepadamu masing-masing seharga 20 koin emas!\n\nPengiriman bulanannya dibatasi di 25 Permata per bulan, tapi bisa meningkat berdasarkan lama berlangganan-mu. \n\nBatasnya meningkat sebanyak 5 Permata setiap tiga bulan berturut-turut kamu berlangganan, hingga batas maksimal 50 Permata per bulan!</string>
+  <string name="subscribe_listitem2_description">Setiap bulan kamu akan menerima sebuah item kosmetik unik untuk avatarmu!\n\nPlus, setiap tiga bulan berturut-turut kamu berlangganan, sang Penjelajah Waktu Misterius akan memberimu akses kepada item kosmetik bersejarah (atau futuristik!).</string>
+  <string name="subscribe_listitem3_description">Buat To-Do yang telah diselesaikan dan riwayat tugas tersedia lebih lama.</string>
+  <string name="subscribe_listitem4_description">Dua kali lipat batas drop akan mengizinkanmu mendapat lebih banyak item untuk tugas yang terselesaikan setiap hari, membantumu melengkapi istalmu lebih cepat!</string>
   <string name="subscription_hourglasses">+%d Jam Pasir Mistis</string>
   <string name="payment_method">Metode Pembayaran</string>
   <string name="subscription">Langganan</string>
diff --git a/Habitica/res/values-it/strings.sidebar.xml b/Habitica/res/values-it/strings.sidebar.xml
index cd15da1ea..852cc4cba 100644
--- a/Habitica/res/values-it/strings.sidebar.xml
+++ b/Habitica/res/values-it/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Attività</string>
   <string name="sidebar_skills">Abilità</string>
-  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_section_social">Social</string>
   <string name="sidebar_inbox">Messaggi</string>
   <string name="sidebar_tavern">Taverna</string>
   <string name="sidebar_party">Squadra</string>
   <string name="sidebar_purchaseGems">Gemme e abbonamento</string>
   <string name="sidebar_guilds">Gilde</string>
   <string name="sidebar_challenges">Sfide</string>
-  <string name="sidebar.section_inventory">Inventario</string>
+  <string name="sidebar_section_inventory">Inventario</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Equipaggiamento</string>
   <string name="sidebar_stable">Scuderia</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 37a571383..1a7aa1fcc 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">Ricorda di completare le tue attività</string>
     <string name="unlock_lvl_11">Sblocca al liv. 11</string>
     <string name="forgot_pw_btn">Password dimenticata</string>
-  <string name="tavern.inn_checkOut">Riattiva le tue Daily</string>
-  <string name="tavern.inn_rest">Sospendi le tue Daily</string>
-  <string name="reward.dialog_buy">Compra</string>
-  <string name="reward.dialog_dismiss">Annulla</string>
+  <string name="tavern_inn_checkOut">Riattiva le tue Daily</string>
+  <string name="tavern_inn_rest">Sospendi le tue Daily</string>
+  <string name="reward_dialog_buy">Compra</string>
+  <string name="reward_dialog_dismiss">Annulla</string>
   <string name="party">Squadra</string>
   <string name="chat">Chat</string>
   <string name="members">Membri</string>
@@ -312,13 +312,13 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="widget_dailies">Habitica Daily</string>
   <string name="widget_todo_list">Habitica lista To-Do</string>
     <string name="google_services_missing">Impossibile trovare Google Play Services.</string>
-  <string name="gem.purchase_toolbartitle">Compra</string>
-  <string name="gem.purchase_title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
-  <string name="gem.purchase_subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
-  <string name="gem.purchase_listitem1">Costumi per il tuo avatar</string>
-  <string name="gem.purchase_listitem2">Magnifici sfondi</string>
-  <string name="gem.purchase_listitem3">Missioni che ti premiano con uova di animali</string>
-  <string name="gem.purchase_listitem4">La possibilità di cambiare classe prima del livello 100</string>
+  <string name="gem_purchase_toolbartitle">Compra</string>
+  <string name="gem_purchase_title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
+  <string name="gem_purchase_subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
+  <string name="gem_purchase_listitem1">Costumi per il tuo avatar</string>
+  <string name="gem_purchase_listitem2">Magnifici sfondi</string>
+  <string name="gem_purchase_listitem3">Missioni che ti premiano con uova di animali</string>
+  <string name="gem_purchase_listitem4">La possibilità di cambiare classe prima del livello 100</string>
   <string name="support_habitica">Supporta Habitica</string>
   <string name="skill_transformation_use">usa</string>
   <string name="hatching_market_info">Non trovi i drop giusti? Dai un\'occhiata al Mercato!</string>
@@ -342,10 +342,10 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="subscription_duration">Ricorrente ogni %s</string>
   <string name="subscription_duration_norenew">Per %s</string>
   <string name="subscribe">Abbonati</string>
-  <string name="subscribe.listitem1_description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
-  <string name="subscribe.listitem2_description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
-  <string name="subscribe.listitem3_description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
-  <string name="subscribe.listitem4_description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
+  <string name="subscribe_listitem1_description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
+  <string name="subscribe_listitem2_description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
+  <string name="subscribe_listitem3_description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
+  <string name="subscribe_listitem4_description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
   <string name="subscribe1month_gemcap">Limite di 25 Gemme</string>
   <string name="subscribe3month_gemcap">Limite di 30 Gemme</string>
   <string name="subscribe6month_gemcap">Limite di 35 Gemme</string>
diff --git a/Habitica/res/values-iw/strings.sidebar.xml b/Habitica/res/values-iw/strings.sidebar.xml
index 0ba5d3caf..9a10bb13c 100644
--- a/Habitica/res/values-iw/strings.sidebar.xml
+++ b/Habitica/res/values-iw/strings.sidebar.xml
@@ -2,13 +2,13 @@
 <resources>
   <string name="sidebar_tasks">משימות</string>
   <string name="sidebar_skills">מיומניויות</string>
-  <string name="sidebar.section_social">חברתי</string>
+  <string name="sidebar_section_social">חברתי</string>
   <string name="sidebar_tavern">פונדק</string>
   <string name="sidebar_party">חבורה</string>
   <string name="sidebar_purchaseGems">קנה אבני חן</string>
   <string name="sidebar_guilds">גילדות</string>
   <string name="sidebar_challenges">אתגרים</string>
-  <string name="sidebar.section_inventory">מלאי ציוד</string>
+  <string name="sidebar_section_inventory">מלאי ציוד</string>
   <string name="sidebar_avatar">דמות</string>
   <string name="sidebar_equipment">ציוד</string>
   <string name="sidebar_stable">אורווה</string>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 27ee41930..e304842fd 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -81,10 +81,10 @@
     <string name="new_checklist_item">שורה חדשה לרשימה</string>
     <string name="unlock_lvl_11">משתחרר בדרגה 11</string>
     <string name="forgot_pw_btn">שכחתי סיסמה</string>
-  <string name="tavern.inn_checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
-  <string name="tavern.inn_rest">עצרו את המטלות היומיות שלכם</string>
-  <string name="reward.dialog_buy">קנייה</string>
-  <string name="reward.dialog_dismiss">בטל</string>
+  <string name="tavern_inn_checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
+  <string name="tavern_inn_rest">עצרו את המטלות היומיות שלכם</string>
+  <string name="reward_dialog_buy">קנייה</string>
+  <string name="reward_dialog_dismiss">בטל</string>
   <string name="party">חבורה</string>
   <string name="chat">צ׳אט</string>
   <string name="members">חברים</string>
diff --git a/Habitica/res/values-ja/strings.sidebar.xml b/Habitica/res/values-ja/strings.sidebar.xml
index 99de599fb..63d29081d 100644
--- a/Habitica/res/values-ja/strings.sidebar.xml
+++ b/Habitica/res/values-ja/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">タスク</string>
   <string name="sidebar_skills">スキル</string>
-  <string name="sidebar.section_social">コミュニティー</string>
+  <string name="sidebar_section_social">コミュニティー</string>
   <string name="sidebar_inbox">メッセージ</string>
   <string name="sidebar_tavern">キャンプ場</string>
   <string name="sidebar_party">パーティー</string>
   <string name="sidebar_purchaseGems">ジェムの購入</string>
   <string name="sidebar_guilds">ギルド</string>
   <string name="sidebar_challenges">チャレンジ</string>
-  <string name="sidebar.section_inventory">所持品</string>
+  <string name="sidebar_section_inventory">所持品</string>
   <string name="sidebar_avatar">アバター</string>
   <string name="sidebar_equipment">装備</string>
   <string name="sidebar_stable">動物小屋</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index e272474ea..88eb1c955 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">忘れずにタスクをチェックしましょう</string>
     <string name="unlock_lvl_11">レベル11 でアンロック</string>
     <string name="forgot_pw_btn">パスワードがわからない</string>
-  <string name="tavern.inn_checkOut">日課を再開する</string>
-  <string name="tavern.inn_rest">日課を中断する</string>
-  <string name="reward.dialog_buy">買う</string>
-  <string name="reward.dialog_dismiss">中止</string>
+  <string name="tavern_inn_checkOut">日課を再開する</string>
+  <string name="tavern_inn_rest">日課を中断する</string>
+  <string name="reward_dialog_buy">買う</string>
+  <string name="reward_dialog_dismiss">中止</string>
   <string name="party">パーティー</string>
   <string name="chat">チャット</string>
   <string name="members">メンバー</string>
@@ -311,13 +311,13 @@
   <string name="widget_dailies">Habitica の日課</string>
   <string name="widget_todo_list">Habitica のTo-Do リスト</string>
     <string name="google_services_missing">Google Play サービスが見つかりません。</string>
-  <string name="gem.purchase_toolbartitle">購入</string>
-  <string name="gem.purchase_title">ジェムを購入することで、開発者を支援し、Habitica の運営を維持する手助けができます</string>
-  <string name="gem.purchase_subtitle">ジェムで、楽しいおまけを買うことができます : </string>
-  <string name="gem.purchase_listitem1">アバター用のクールなファッション</string>
-  <string name="gem.purchase_listitem2">すんごい背景</string>
-  <string name="gem.purchase_listitem3">ペットのたまごを獲得できるクエスト</string>
-  <string name="gem.purchase_listitem4">レベル 100 以前でのクラス変更</string>
+  <string name="gem_purchase_toolbartitle">購入</string>
+  <string name="gem_purchase_title">ジェムを購入することで、開発者を支援し、Habitica の運営を維持する手助けができます</string>
+  <string name="gem_purchase_subtitle">ジェムで、楽しいおまけを買うことができます : </string>
+  <string name="gem_purchase_listitem1">アバター用のクールなファッション</string>
+  <string name="gem_purchase_listitem2">すんごい背景</string>
+  <string name="gem_purchase_listitem3">ペットのたまごを獲得できるクエスト</string>
+  <string name="gem_purchase_listitem4">レベル 100 以前でのクラス変更</string>
   <string name="support_habitica">Habitica の支援</string>
   <string name="skill_transformation_use">唱える</string>
   <string name="hatching_market_info">ほしい落とし物が見つからない?　市場をチェックしてみよう!</string>
@@ -340,16 +340,16 @@
   <string name="subscriptions">寄付</string>
   <string name="subscription_duration">%sごとに繰り返す</string>
   <string name="subscribe">寄付する</string>
-  <string name="subscribe.listitem1_description">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！
+  <string name="subscribe_listitem1_description">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！
 \n
 \nアレクサンダーと1ヵ月の間に取り引きできるジェムの数は、最初は25個に限定されていますが、寄付期間によって増えます。
 \n
 \n寄付の継続3カ月ごとにその数が5個ずつ増えていき、最大で月に50個を買うことができます！</string>
-  <string name="subscribe.listitem2_description">毎月、アバターを個性的に装飾するアイテムが手に入ります！
+  <string name="subscribe_listitem2_description">毎月、アバターを個性的に装飾するアイテムが手に入ります！
 \n
 \nさらに寄付の継続3カ月ごとに、謎のタイムトラベラーによって、歴史的（そして未来的！）な装飾アイテムが入手可能になります。</string>
-  <string name="subscribe.listitem3_description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
-  <string name="subscribe.listitem4_description">落とし物の上限が2倍になり、毎日の完了したタスクから、より多くのアイテムを獲得することができます。動物小屋のコンプリートも早くなります！</string>
+  <string name="subscribe_listitem3_description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
+  <string name="subscribe_listitem4_description">落とし物の上限が2倍になり、毎日の完了したタスクから、より多くのアイテムを獲得することができます。動物小屋のコンプリートも早くなります！</string>
   <string name="subscribe1month_gemcap">上限 25 ジェム</string>
   <string name="subscribe3month_gemcap">上限 30 ジェム</string>
   <string name="subscribe6month_gemcap">上限 35 ジェム</string>
diff --git a/Habitica/res/values-ko/strings.sidebar.xml b/Habitica/res/values-ko/strings.sidebar.xml
index 9655db590..7194124cd 100644
--- a/Habitica/res/values-ko/strings.sidebar.xml
+++ b/Habitica/res/values-ko/strings.sidebar.xml
@@ -2,13 +2,13 @@
 <resources>
   <string name="sidebar_tasks">과제</string>
   <string name="sidebar_skills">스킬</string>
-  <string name="sidebar.section_social">소셜</string>
+  <string name="sidebar_section_social">소셜</string>
   <string name="sidebar_tavern">주막</string>
   <string name="sidebar_party">파티</string>
   <string name="sidebar_purchaseGems">보석 &amp; 구독</string>
   <string name="sidebar_guilds">길드</string>
   <string name="sidebar_challenges">도전</string>
-  <string name="sidebar.section_inventory">인벤토리</string>
+  <string name="sidebar_section_inventory">인벤토리</string>
   <string name="sidebar_avatar">아바타</string>
   <string name="sidebar_equipment">장비</string>
   <string name="sidebar_stable">마구간</string>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 57dfb3339..3f3d751c6 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -93,10 +93,10 @@
   <string name="new_checklist_item">새로운 체크리스트 항목</string>
     <string name="unlock_lvl_11">레벨 11에 열림</string>
     <string name="forgot_pw_btn">암호 찾기</string>
-  <string name="tavern.inn_checkOut">일일과제 활성화</string>
-  <string name="tavern.inn_rest">일일과제 일시중지</string>
-  <string name="reward.dialog_buy">구매</string>
-  <string name="reward.dialog_dismiss">닫기</string>
+  <string name="tavern_inn_checkOut">일일과제 활성화</string>
+  <string name="tavern_inn_rest">일일과제 일시중지</string>
+  <string name="reward_dialog_buy">구매</string>
+  <string name="reward_dialog_dismiss">닫기</string>
   <string name="party">파티</string>
   <string name="chat">채팅</string>
   <string name="members">멤버</string>
@@ -299,13 +299,13 @@
   <string name="widget_dailies">Habitica 일일과제</string>
   <string name="widget_todo_list">Habitica 할일 목록</string>
     <string name="google_services_missing">구글 플레이 서비스를 찾을 수 없습니다.</string>
-  <string name="gem.purchase_toolbartitle">구매</string>
-  <string name="gem.purchase_title">보석을 구매하시면 개발자를 지원하고 Habitica가 계속될 수 있도록 도울 수 있습니다</string>
-  <string name="gem.purchase_subtitle">보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:</string>
-  <string name="gem.purchase_listitem1">아바타를 위한 멋진 의상</string>
-  <string name="gem.purchase_listitem2">환상적인 배경들</string>
-  <string name="gem.purchase_listitem3">펫알을 얻을 수 있는 재미있는 퀘스트들</string>
-  <string name="gem.purchase_listitem4">레벨 100 이전에도 직업 변경 가능</string>
+  <string name="gem_purchase_toolbartitle">구매</string>
+  <string name="gem_purchase_title">보석을 구매하시면 개발자를 지원하고 Habitica가 계속될 수 있도록 도울 수 있습니다</string>
+  <string name="gem_purchase_subtitle">보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:</string>
+  <string name="gem_purchase_listitem1">아바타를 위한 멋진 의상</string>
+  <string name="gem_purchase_listitem2">환상적인 배경들</string>
+  <string name="gem_purchase_listitem3">펫알을 얻을 수 있는 재미있는 퀘스트들</string>
+  <string name="gem_purchase_listitem4">레벨 100 이전에도 직업 변경 가능</string>
   <string name="support_habitica">Habitica 지원하기</string>
   <string name="skill_transformation_use">사용</string>
   <string name="hatching_market_info">필요한 아이템이 드롭되지 않나요? 시장으로 가보세요!</string>
@@ -328,16 +328,16 @@
   <string name="subscriptions">구독</string>
   <string name="subscription_duration">자동이체: 매 %s</string>
   <string name="subscribe">구독하기</string>
-  <string name="subscribe.listitem1_description">이제부터 상인 알렉산더가 보석을 개당 20골드에 판매합니다!
+  <string name="subscribe_listitem1_description">이제부터 상인 알렉산더가 보석을 개당 20골드에 판매합니다!
 \n
 \n처음에는 매달 구비량이 한 달에 25개로 제한되어 있지만, 후원 기간에 따라 올라갈 수 있습니다.
 \n
 \n연속 정기후원 3개월마다 보석 제한개수가 5개씩, 최대 월 50개까지 올라갑니다!</string>
-  <string name="subscribe.listitem2_description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!
+  <string name="subscribe_listitem2_description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!
 \n
 \n더불어, 정기 후원을 해주시는 매 3달마다, 미스터리 시간 여행자가 전통적인 (그리고 미래지향적인!) 꾸미기 아이템을 소개해 줄 겁니다.</string>
-  <string name="subscribe.listitem3_description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
-  <string name="subscribe.listitem4_description">드롭 제한 두 배로 인하여 매일 과제를 수행하며 펫 컬렉션 완성을 도울 더 많은 아이템을 얻을 수 있습니다!</string>
+  <string name="subscribe_listitem3_description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
+  <string name="subscribe_listitem4_description">드롭 제한 두 배로 인하여 매일 과제를 수행하며 펫 컬렉션 완성을 도울 더 많은 아이템을 얻을 수 있습니다!</string>
   <string name="subscription_hourglasses">신비한 모래시계 +%d개</string>
   <string name="payment_method">결제수단</string>
   <string name="subscription">정기구독</string>
diff --git a/Habitica/res/values-lt/strings.sidebar.xml b/Habitica/res/values-lt/strings.sidebar.xml
index 5637382ef..ac7caf850 100644
--- a/Habitica/res/values-lt/strings.sidebar.xml
+++ b/Habitica/res/values-lt/strings.sidebar.xml
@@ -2,13 +2,13 @@
 <resources>
   <string name="sidebar_tasks">Užduotys</string>
   <string name="sidebar_skills">Sugebėjimai</string>
-  <string name="sidebar.section_social">Bendruomenė</string>
+  <string name="sidebar_section_social">Bendruomenė</string>
   <string name="sidebar_tavern">Smuklė</string>
   <string name="sidebar_party">Grupė</string>
   <string name="sidebar_purchaseGems">Pirkti Brangakmenius</string>
   <string name="sidebar_guilds">Gildijos</string>
   <string name="sidebar_challenges">Iššūkiai</string>
-  <string name="sidebar.section_inventory">Inventorius</string>
+  <string name="sidebar_section_inventory">Inventorius</string>
   <string name="sidebar_avatar">Veikėjas</string>
   <string name="sidebar_equipment">Apranga</string>
   <string name="sidebar_stable">Augintiniai</string>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 1577368b6..a1087f858 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -87,10 +87,10 @@
   <string name="new_checklist_item">naujas sąrašo punktas</string>
     <string name="unlock_lvl_11">Atsidengia pasiekus 11 lygį</string>
     <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
-  <string name="tavern.inn_checkOut">Atnaujinti Kasdienes Užduotis</string>
-  <string name="tavern.inn_rest">Sustabdyti Kasdienes Užduotis</string>
-  <string name="reward.dialog_buy">Pirkti</string>
-  <string name="reward.dialog_dismiss">Atšaukti</string>
+  <string name="tavern_inn_checkOut">Atnaujinti Kasdienes Užduotis</string>
+  <string name="tavern_inn_rest">Sustabdyti Kasdienes Užduotis</string>
+  <string name="reward_dialog_buy">Pirkti</string>
+  <string name="reward_dialog_dismiss">Atšaukti</string>
   <string name="party">Grupė</string>
   <string name="chat">Pokalbiai</string>
   <string name="members">Nariai</string>
@@ -260,13 +260,13 @@
   <string name="widget_habit_button">Habitica Pažymėti Įprotį</string>
   <string name="widget_dailies">Habitica Kasdienės Užduotys</string>
     <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
-  <string name="gem.purchase_toolbartitle">Pirkti</string>
-  <string name="gem.purchase_title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
-  <string name="gem.purchase_subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
-  <string name="gem.purchase_listitem1">Gražūs veikėjo kostiumai</string>
-  <string name="gem.purchase_listitem2">Nuostabūs fonai</string>
-  <string name="gem.purchase_listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
-  <string name="gem.purchase_listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
+  <string name="gem_purchase_toolbartitle">Pirkti</string>
+  <string name="gem_purchase_title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
+  <string name="gem_purchase_subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
+  <string name="gem_purchase_listitem1">Gražūs veikėjo kostiumai</string>
+  <string name="gem_purchase_listitem2">Nuostabūs fonai</string>
+  <string name="gem_purchase_listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
+  <string name="gem_purchase_listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
   <string name="support_habitica">Paremti Habitica</string>
   <string name="skill_transformation_use">naudoti</string>
   <string name="hatching_market_info">Negaunate reikiamų lašiukų? Patikrinkite turguje!</string>
@@ -347,16 +347,16 @@
     <string name="subscription_duration">Pasikartojantis kiekvienas %s</string>
     <string name="subscription_duration_norenew">Dėl %s</string>
     <string name="subscribe">Prenumeruoti</string>
-    <string name="subscribe.listitem1_description">Aleksandras Prekybininkas dabar parduos jums brangakmenius po 20 aukso!
+    <string name="subscribe_listitem1_description">Aleksandras Prekybininkas dabar parduos jums brangakmenius po 20 aukso!
 \n
 \nJo mėnesinės siuntos iš pradžių yra ribojamos per 25 brangakmenius per mėnesį, tačiau jos gali padidėti pagal jūsų prenumeratos ilgį.
 \n
 \nViršutinė prenumerata kas tris mėnesius iš eilės padidėja 5 brangakmeniais, ne daugiau kaip 50 brangakmenių per mėnesį!</string>
-    <string name="subscribe.listitem2_description">Kiekvieną mėnesį gausite unikalų kosmetikos elementą savo avatarui!
+    <string name="subscribe_listitem2_description">Kiekvieną mėnesį gausite unikalų kosmetikos elementą savo avatarui!
 \n
 \nBe to, kas tris mėnesius iš eilės prenumeratos, paslaptingas laikas keliautojai suteiks jums prieigą prie istorinių (ir futuristinių!) Kosmetikos gaminių.</string>
-    <string name="subscribe.listitem3_description">Padaro užbaigtą darbų atlikimą ir užduočių istoriją ilgiau.</string>
-    <string name="subscribe.listitem4_description">Dukart lašų dangteliai leis jums kiekvieną dieną gauti daugiau elementų iš jūsų atliktų užduočių, o tai padės greičiau atlikti savo stabilumą!</string>
+    <string name="subscribe_listitem3_description">Padaro užbaigtą darbų atlikimą ir užduočių istoriją ilgiau.</string>
+    <string name="subscribe_listitem4_description">Dukart lašų dangteliai leis jums kiekvieną dieną gauti daugiau elementų iš jūsų atliktų užduočių, o tai padės greičiau atlikti savo stabilumą!</string>
     <string name="subscribe1month_gemcap">25 perlas riba</string>
     <string name="subscribe3month_gemcap">30 perlas riba</string>
     <string name="subscribe6month_gemcap">35 perlas riba</string>
diff --git a/Habitica/res/values-nl/strings.sidebar.xml b/Habitica/res/values-nl/strings.sidebar.xml
index d0991fdea..dfd9a7a12 100644
--- a/Habitica/res/values-nl/strings.sidebar.xml
+++ b/Habitica/res/values-nl/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Taken</string>
   <string name="sidebar_skills">Vaardigheden</string>
-  <string name="sidebar.section_social">Sociaal</string>
+  <string name="sidebar_section_social">Sociaal</string>
   <string name="sidebar_inbox">Berichten</string>
   <string name="sidebar_tavern">Herberg</string>
   <string name="sidebar_party">Groep</string>
   <string name="sidebar_purchaseGems">Edelstenen &amp; abonnement</string>
   <string name="sidebar_guilds">Gilden</string>
   <string name="sidebar_challenges">Uitdagingen</string>
-  <string name="sidebar.section_inventory">Boedel</string>
+  <string name="sidebar_section_inventory">Boedel</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Uitrusting</string>
   <string name="sidebar_stable">Stal</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index e334d4b5c..b8e0e58ca 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">Vergeet je taken niet af te vinken</string>
     <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
     <string name="forgot_pw_btn">Wachtwoord vergeten</string>
-  <string name="tavern.inn_checkOut">Heractiveer je Dagelijkse taken</string>
-  <string name="tavern.inn_rest">Pauzeer je Dagelijkse Taken</string>
-  <string name="reward.dialog_buy">Kopen</string>
-  <string name="reward.dialog_dismiss">Verwijderen</string>
+  <string name="tavern_inn_checkOut">Heractiveer je Dagelijkse taken</string>
+  <string name="tavern_inn_rest">Pauzeer je Dagelijkse Taken</string>
+  <string name="reward_dialog_buy">Kopen</string>
+  <string name="reward_dialog_dismiss">Verwijderen</string>
   <string name="party">Groep</string>
   <string name="chat">Chat</string>
   <string name="members">Leden</string>
@@ -311,13 +311,13 @@
   <string name="widget_dailies">Habitica Dagelijkse taken</string>
   <string name="widget_todo_list">Habitica to-do lijst</string>
     <string name="google_services_missing">Google play diensten niet gevonden.</string>
-  <string name="gem.purchase_toolbartitle">Kopen</string>
-  <string name="gem.purchase_title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
-  <string name="gem.purchase_subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
-  <string name="gem.purchase_listitem1">Gave kostuums voor je avatar</string>
-  <string name="gem.purchase_listitem2">Gave achtergronden</string>
-  <string name="gem.purchase_listitem3">Queesten die je belonen met huisdiereieren</string>
-  <string name="gem.purchase_listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
+  <string name="gem_purchase_toolbartitle">Kopen</string>
+  <string name="gem_purchase_title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
+  <string name="gem_purchase_subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
+  <string name="gem_purchase_listitem1">Gave kostuums voor je avatar</string>
+  <string name="gem_purchase_listitem2">Gave achtergronden</string>
+  <string name="gem_purchase_listitem3">Queesten die je belonen met huisdiereieren</string>
+  <string name="gem_purchase_listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
   <string name="support_habitica">Steun Habitica</string>
   <string name="skill_transformation_use">gebruik</string>
   <string name="hatching_market_info">Krijg je niet de goede drops? Neem een kijkje op de Markt!</string>
@@ -341,10 +341,10 @@
   <string name="subscription_duration">Keert iedere %s terug</string>
   <string name="subscription_duration_norenew">Voor %s</string>
   <string name="subscribe">Abonneer</string>
-  <string name="subscribe.listitem1_description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
-  <string name="subscribe.listitem2_description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnementsperiodes, geven de mysterieuze tijdreizigers je toegang tot historische (en futuristische!) cosmetische voorwerpen.</string>
-  <string name="subscribe.listitem3_description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
-  <string name="subscribe.listitem4_description">Dubbele vondstlimieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
+  <string name="subscribe_listitem1_description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
+  <string name="subscribe_listitem2_description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnementsperiodes, geven de mysterieuze tijdreizigers je toegang tot historische (en futuristische!) cosmetische voorwerpen.</string>
+  <string name="subscribe_listitem3_description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
+  <string name="subscribe_listitem4_description">Dubbele vondstlimieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
   <string name="subscribe1month_gemcap">25 Edelsteen drempel</string>
   <string name="subscribe3month_gemcap">30 Edelsteen drempel</string>
   <string name="subscribe6month_gemcap">35 Edelsteen drempel</string>
diff --git a/Habitica/res/values-pl/strings.sidebar.xml b/Habitica/res/values-pl/strings.sidebar.xml
index bda4f8ff6..d76386bee 100644
--- a/Habitica/res/values-pl/strings.sidebar.xml
+++ b/Habitica/res/values-pl/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Zadania</string>
   <string name="sidebar_skills">Umiejętności</string>
-  <string name="sidebar.section_social">Społeczność</string>
+  <string name="sidebar_section_social">Społeczność</string>
   <string name="sidebar_inbox">Wiadomości</string>
   <string name="sidebar_tavern">Karczma</string>
   <string name="sidebar_party">Drużyna</string>
   <string name="sidebar_purchaseGems">Kup Klejnoty</string>
   <string name="sidebar_guilds">Gildie</string>
   <string name="sidebar_challenges">Wyzwania</string>
-  <string name="sidebar.section_inventory">Ekwipunek</string>
+  <string name="sidebar_section_inventory">Ekwipunek</string>
   <string name="sidebar_avatar">Awatar</string>
   <string name="sidebar_equipment">Ekwipunek</string>
   <string name="sidebar_stable">Stajnia</string>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index b1f7e0111..c1f6050e3 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -95,10 +95,10 @@
   <string name="new_checklist_item">nowa część zadania</string>
   <string name="unlock_lvl_11">Odblokuj na poziomie 11</string>
   <string name="forgot_pw_btn">Zapomniane hasło</string>
-  <string name="tavern.inn_checkOut">Reaktywuj swoje codzienne</string>
-  <string name="tavern.inn_rest">Zapauzuj swoje codzienne</string>
-  <string name="reward.dialog_buy">Kup</string>
-  <string name="reward.dialog_dismiss">Anuluj</string>
+  <string name="tavern_inn_checkOut">Reaktywuj swoje codzienne</string>
+  <string name="tavern_inn_rest">Zapauzuj swoje codzienne</string>
+  <string name="reward_dialog_buy">Kup</string>
+  <string name="reward_dialog_dismiss">Anuluj</string>
   <string name="party">Drużyna</string>
   <string name="chat">Czat</string>
   <string name="members">Członkowie</string>
@@ -300,13 +300,13 @@
   <string name="widget_dailies">Codzienne Habitiki</string>
   <string name="widget_todo_list">Lista Do-Zrobienia Habitiki</string>
   <string name="google_services_missing">Nie znaleziono usługi Google Play.</string>
-  <string name="gem.purchase_toolbartitle">Zamów</string>
-  <string name="gem.purchase_title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
-  <string name="gem.purchase_subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
-  <string name="gem.purchase_listitem1">Świetne kostiumy dla awatara</string>
-  <string name="gem.purchase_listitem2">Genialne tła</string>
-  <string name="gem.purchase_listitem3">Zadania, w których nagrodą są jaja</string>
-  <string name="gem.purchase_listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
+  <string name="gem_purchase_toolbartitle">Zamów</string>
+  <string name="gem_purchase_title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
+  <string name="gem_purchase_subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
+  <string name="gem_purchase_listitem1">Świetne kostiumy dla awatara</string>
+  <string name="gem_purchase_listitem2">Genialne tła</string>
+  <string name="gem_purchase_listitem3">Zadania, w których nagrodą są jaja</string>
+  <string name="gem_purchase_listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
   <string name="support_habitica">Wesprzyj Habitikę</string>
   <string name="skill_transformation_use">użyj</string>
   <string name="hatching_market_info">Nie znajdujesz poszukiwanych prezentów? Sprawdź na Targu!</string>
@@ -329,8 +329,8 @@
   <string name="subscriptions">Subskrypcje</string>
   <string name="subscription_duration">Powtarzaj co %s</string>
   <string name="subscribe">Subskrybuj</string>
-  <string name="subscribe.listitem1_description">Kupiec Alexander będzie ci teraz sprzedawać Klejnoty po 20 złota każdy!\n\nJego miesięczne wysyłki są początkowo ograniczone do 25 Klejnotów na miesiąc, ale mogą się zwiększyć na podstawie długości twojego abonamentu.\n\nLimit zwiększa się o 5 Klejnotów co każde trzy miesiące ciągłego abonamentu, aż do maksymalnie 50 Klejnotów na miesiąc!</string>
-  <string name="subscribe.listitem3_description">Historia ukończonych Do-Zrobienia i zadań jest dostępna dłużej.</string>
+  <string name="subscribe_listitem1_description">Kupiec Alexander będzie ci teraz sprzedawać Klejnoty po 20 złota każdy!\n\nJego miesięczne wysyłki są początkowo ograniczone do 25 Klejnotów na miesiąc, ale mogą się zwiększyć na podstawie długości twojego abonamentu.\n\nLimit zwiększa się o 5 Klejnotów co każde trzy miesiące ciągłego abonamentu, aż do maksymalnie 50 Klejnotów na miesiąc!</string>
+  <string name="subscribe_listitem3_description">Historia ukończonych Do-Zrobienia i zadań jest dostępna dłużej.</string>
   <string name="subscription_hourglasses">+%d Mistycznej Klepsydry</string>
   <string name="payment_method">Metoda płatności</string>
   <string name="subscription">Subskrypcja</string>
@@ -581,10 +581,10 @@
     <string name="evolved_pet_title">Oswoiłeś %s, idź na przejażdżkę!</string>
     <string name="opting_out_progress">Wycofywanie się</string>
     <string name="subscription_duration_norenew">Na %s</string>
-    <string name="subscribe.listitem2_description">Co miesiąc dostaniesz wyjątkowy kosmetyczny przedmiot który możesz założyć na swój awatar!
+    <string name="subscribe_listitem2_description">Co miesiąc dostaniesz wyjątkowy kosmetyczny przedmiot który możesz założyć na swój awatar!
 \n
 \nDodatkowo, za każde trzy miesiące ciągłej subskrypcji, Tajemniczy Podróżnicy w Czasie zapewnią ci dostęp do historycznych (i futurystycznych!) przedmiotów kosmetycznych.</string>
-    <string name="subscribe.listitem4_description">Podwojone limity łupów pozwolą ci otrzymać więcej przedmiotów każdego dnia, za ukończone zadania, co sprawi że twoja stajnia wypełni się szybciej!</string>
+    <string name="subscribe_listitem4_description">Podwojone limity łupów pozwolą ci otrzymać więcej przedmiotów każdego dnia, za ukończone zadania, co sprawi że twoja stajnia wypełni się szybciej!</string>
     <string name="subscribe1month_gemcap">Limit 25 klejnotów</string>
     <string name="subscribe3month_gemcap">Limit 3 klejnotów</string>
     <string name="subscribe6month_gemcap">Limit 35 klejnotów</string>
diff --git a/Habitica/res/values-pt-rBR/strings.sidebar.xml b/Habitica/res/values-pt-rBR/strings.sidebar.xml
index da5fd73ad..081e2bdc5 100644
--- a/Habitica/res/values-pt-rBR/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rBR/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Tarefas</string>
   <string name="sidebar_skills">Habilidades</string>
-  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_section_social">Social</string>
   <string name="sidebar_inbox">Mensagens</string>
   <string name="sidebar_tavern">Taverna</string>
   <string name="sidebar_party">Grupo</string>
   <string name="sidebar_purchaseGems">Gemas &amp; Inscrição</string>
   <string name="sidebar_guilds">Guildas</string>
   <string name="sidebar_challenges">Desafios</string>
-  <string name="sidebar.section_inventory">Inventário</string>
+  <string name="sidebar_section_inventory">Inventário</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Equipamento</string>
   <string name="sidebar_stable">Estábulo</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 56be08ce6..197e4c8e9 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">Lembre-se de marcar suas Diárias</string>
     <string name="unlock_lvl_11">Desbloqueie no nível 11</string>
     <string name="forgot_pw_btn">Esqueci a senha</string>
-  <string name="tavern.inn_checkOut">Reativar Diárias</string>
-  <string name="tavern.inn_rest">Pausar Diárias</string>
-  <string name="reward.dialog_buy">Comprar</string>
-  <string name="reward.dialog_dismiss">Desfazer</string>
+  <string name="tavern_inn_checkOut">Reativar Diárias</string>
+  <string name="tavern_inn_rest">Pausar Diárias</string>
+  <string name="reward_dialog_buy">Comprar</string>
+  <string name="reward_dialog_dismiss">Desfazer</string>
   <string name="party">Grupo</string>
   <string name="chat">Bate-papo</string>
   <string name="members">Membros</string>
@@ -311,13 +311,13 @@
   <string name="widget_dailies">Habitica Diárias</string>
   <string name="widget_todo_list">Lista de Afazeres do Habitica</string>
     <string name="google_services_missing">Servidores da Google Play não foram encontrados.</string>
-  <string name="gem.purchase_toolbartitle">Comprar</string>
-  <string name="gem.purchase_title">Comprar gemas irá contribuir com os desenvolvedores e ajudará a manter o Habitica funcionando</string>
-  <string name="gem.purchase_subtitle">Gemas permitem que você compre acessórios diferenciados para a sua conta, incluindo:</string>
-  <string name="gem.purchase_listitem1">Fantasias super legais para o seu avatar</string>
-  <string name="gem.purchase_listitem2">Cenários Super Legais</string>
-  <string name="gem.purchase_listitem3">Missões que recompensam você com ovos de mascotes</string>
-  <string name="gem.purchase_listitem4">Habilidade de trocar a sua classe antes do nível 100</string>
+  <string name="gem_purchase_toolbartitle">Comprar</string>
+  <string name="gem_purchase_title">Comprar gemas irá contribuir com os desenvolvedores e ajudará a manter o Habitica funcionando</string>
+  <string name="gem_purchase_subtitle">Gemas permitem que você compre acessórios diferenciados para a sua conta, incluindo:</string>
+  <string name="gem_purchase_listitem1">Fantasias super legais para o seu avatar</string>
+  <string name="gem_purchase_listitem2">Cenários Super Legais</string>
+  <string name="gem_purchase_listitem3">Missões que recompensam você com ovos de mascotes</string>
+  <string name="gem_purchase_listitem4">Habilidade de trocar a sua classe antes do nível 100</string>
   <string name="support_habitica">Contribua com o Habitica</string>
   <string name="skill_transformation_use">usar</string>
   <string name="hatching_market_info">Não conseguindo o drop certo? Dê uma olhada no Mercado!</string>
@@ -341,12 +341,12 @@
   <string name="subscription_duration">Acontece a cada %s</string>
   <string name="subscription_duration_norenew">Por%s</string>
   <string name="subscribe">Assinar</string>
-  <string name="subscribe.listitem1_description">Alexandre, o Mercador irá agora vender a você Gemas por 20 ouros cada uma!\n\nSuas remessas mensais são inicialmente restritas a 25 Gemas por mês, aumentam baseado no seu tempo de assinatura. A capacidade aumenta em 5 Gemas para cada três meses de assinatura, limitando-se a um máximo de 50 Gemas por mês!</string>
-  <string name="subscribe.listitem2_description">Cada mês você irá receber um item cosmético único para o seu personagem!
+  <string name="subscribe_listitem1_description">Alexandre, o Mercador irá agora vender a você Gemas por 20 ouros cada uma!\n\nSuas remessas mensais são inicialmente restritas a 25 Gemas por mês, aumentam baseado no seu tempo de assinatura. A capacidade aumenta em 5 Gemas para cada três meses de assinatura, limitando-se a um máximo de 50 Gemas por mês!</string>
+  <string name="subscribe_listitem2_description">Cada mês você irá receber um item cosmético único para o seu personagem!
 \n
 \nAlém disso, para cada três meses de inscrição, os Viajantes Misteriosos do Tempo irão te dar acesso a itens cosméticos históricos (e futuristas).</string>
-  <string name="subscribe.listitem3_description">Torna Afazeres completos e histórico de tarefas disponíveis por mais tempo.</string>
-  <string name="subscribe.listitem4_description">A capacidade de drop dobrada fará com que você receba mais itens de atividades completas todos os dias ajudando você a completar o seu estábulo mais rápido!</string>
+  <string name="subscribe_listitem3_description">Torna Afazeres completos e histórico de tarefas disponíveis por mais tempo.</string>
+  <string name="subscribe_listitem4_description">A capacidade de drop dobrada fará com que você receba mais itens de atividades completas todos os dias ajudando você a completar o seu estábulo mais rápido!</string>
   <string name="subscribe1month_gemcap">Limite de 25 Gemas</string>
   <string name="subscribe3month_gemcap">Limite de 30 Gemas</string>
   <string name="subscribe6month_gemcap">Limite de 35 Gemas</string>
diff --git a/Habitica/res/values-pt-rPT/strings.sidebar.xml b/Habitica/res/values-pt-rPT/strings.sidebar.xml
index 0903489b2..4b414a156 100644
--- a/Habitica/res/values-pt-rPT/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Tarefas</string>
   <string name="sidebar_skills">Habilidades</string>
-  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_section_social">Social</string>
   <string name="sidebar_inbox">Mensagens</string>
   <string name="sidebar_tavern">Taberna</string>
   <string name="sidebar_party">Equipa</string>
   <string name="sidebar_purchaseGems">Comprar Gemas</string>
   <string name="sidebar_guilds">Guildas</string>
   <string name="sidebar_challenges">Desafios</string>
-  <string name="sidebar.section_inventory">Inventário</string>
+  <string name="sidebar_section_inventory">Inventário</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Equipamento</string>
   <string name="sidebar_stable">Estábulo</string>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index 82b88954e..1780ae77d 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -93,10 +93,10 @@
   <string name="new_checklist_item">novo item da lista de verificações</string>
     <string name="unlock_lvl_11">Desbloquear no nível 11</string>
     <string name="forgot_pw_btn">Esqueci-me da Palavra-passe</string>
-  <string name="tavern.inn_checkOut">Reativar as suas Tarefas Diárias</string>
-  <string name="tavern.inn_rest">Pausar as suas Tarefes Diárias</string>
-  <string name="reward.dialog_buy">Comprar</string>
-  <string name="reward.dialog_dismiss">Rejeitar</string>
+  <string name="tavern_inn_checkOut">Reativar as suas Tarefas Diárias</string>
+  <string name="tavern_inn_rest">Pausar as suas Tarefes Diárias</string>
+  <string name="reward_dialog_buy">Comprar</string>
+  <string name="reward_dialog_dismiss">Rejeitar</string>
   <string name="party">Equipa</string>
   <string name="chat">Conversar</string>
   <string name="members">Membros</string>
@@ -282,13 +282,13 @@
   <string name="widget_dailies">Tarefas Diárias do Habitica</string>
   <string name="widget_todo_list">Habitica - Lista de Afazeres</string>
     <string name="google_services_missing">Os serviços Google play não pode ser achado.</string>
-  <string name="gem.purchase_toolbartitle">Comprar</string>
-  <string name="gem.purchase_title">Ao comprar gemas apoia os programadores e ajuda a manter o Habitica em funcionamento</string>
-  <string name="gem.purchase_subtitle">As gemas permitem-lhe comprar extras engraçados para a sua conta, incluindo:</string>
-  <string name="gem.purchase_listitem1">Disfarces divertidos para o teu avatar</string>
-  <string name="gem.purchase_listitem2">Fundos de Ecrã fantásticos</string>
-  <string name="gem.purchase_listitem3">Missões que recompensam com ovos de animal</string>
-  <string name="gem.purchase_listitem4">A habilidade de alterar a tua classe antes do nível 100</string>
+  <string name="gem_purchase_toolbartitle">Comprar</string>
+  <string name="gem_purchase_title">Ao comprar gemas apoia os programadores e ajuda a manter o Habitica em funcionamento</string>
+  <string name="gem_purchase_subtitle">As gemas permitem-lhe comprar extras engraçados para a sua conta, incluindo:</string>
+  <string name="gem_purchase_listitem1">Disfarces divertidos para o teu avatar</string>
+  <string name="gem_purchase_listitem2">Fundos de Ecrã fantásticos</string>
+  <string name="gem_purchase_listitem3">Missões que recompensam com ovos de animal</string>
+  <string name="gem_purchase_listitem4">A habilidade de alterar a tua classe antes do nível 100</string>
   <string name="support_habitica">Suportar o Habitica</string>
   <string name="skill_transformation_use">Usar</string>
   <string name="hatching_market_info">Não encontras os objectos certos? Dá uma olhada no Mercado!</string>
diff --git a/Habitica/res/values-ru/strings.sidebar.xml b/Habitica/res/values-ru/strings.sidebar.xml
index 7c31a21d3..0aa94ba5e 100644
--- a/Habitica/res/values-ru/strings.sidebar.xml
+++ b/Habitica/res/values-ru/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">Задачи</string>
   <string name="sidebar_skills">Навыки</string>
-  <string name="sidebar.section_social">Общение</string>
+  <string name="sidebar_section_social">Общение</string>
   <string name="sidebar_inbox">Сообщения</string>
   <string name="sidebar_tavern">Таверна</string>
   <string name="sidebar_party">Команда</string>
   <string name="sidebar_purchaseGems">Покупка самоцветов</string>
   <string name="sidebar_guilds">Гильдии</string>
   <string name="sidebar_challenges">Испытания</string>
-  <string name="sidebar.section_inventory">Инвентарь</string>
+  <string name="sidebar_section_inventory">Инвентарь</string>
   <string name="sidebar_avatar">Аватар</string>
   <string name="sidebar_equipment">Снаряжение</string>
   <string name="sidebar_stable">Стойла</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 4bf7e0d6e..c1dfba025 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">Не забудьте отмечать свои задачи</string>
     <string name="unlock_lvl_11">Открывается на 11 уровне</string>
     <string name="forgot_pw_btn">Забыли пароль</string>
-  <string name="tavern.inn_checkOut">Cнова активировать ваши ежедневные задания</string>
-  <string name="tavern.inn_rest">Временно приостановить ваши ежедневные задания</string>
-  <string name="reward.dialog_buy">Купить</string>
-  <string name="reward.dialog_dismiss">Отклонить</string>
+  <string name="tavern_inn_checkOut">Cнова активировать ваши ежедневные задания</string>
+  <string name="tavern_inn_rest">Временно приостановить ваши ежедневные задания</string>
+  <string name="reward_dialog_buy">Купить</string>
+  <string name="reward_dialog_dismiss">Отклонить</string>
   <string name="party">Команда</string>
   <string name="chat">Чат</string>
   <string name="members">Участники</string>
@@ -309,13 +309,13 @@
   <string name="widget_dailies">Ежедневные задания Habitica</string>
   <string name="widget_todo_list">Список задач Habitica</string>
     <string name="google_services_missing">Сервис Google play не найден.</string>
-  <string name="gem.purchase_toolbartitle">Купить</string>
-  <string name="gem.purchase_title">Покупка самоцветов поддерживает разработчиков и помогает развивать Habitica</string>
-  <string name="gem.purchase_subtitle">Самоцветы позволяют получить интересные дополнительные возможности, включая:</string>
-  <string name="gem.purchase_listitem1">Крутые костюмы для аватара</string>
-  <string name="gem.purchase_listitem2">Отличные фоны</string>
-  <string name="gem.purchase_listitem3">Задания с яйцами питомцев в качестве награды</string>
-  <string name="gem.purchase_listitem4">Способность изменить свой класс, если уровень менее 100</string>
+  <string name="gem_purchase_toolbartitle">Купить</string>
+  <string name="gem_purchase_title">Покупка самоцветов поддерживает разработчиков и помогает развивать Habitica</string>
+  <string name="gem_purchase_subtitle">Самоцветы позволяют получить интересные дополнительные возможности, включая:</string>
+  <string name="gem_purchase_listitem1">Крутые костюмы для аватара</string>
+  <string name="gem_purchase_listitem2">Отличные фоны</string>
+  <string name="gem_purchase_listitem3">Задания с яйцами питомцев в качестве награды</string>
+  <string name="gem_purchase_listitem4">Способность изменить свой класс, если уровень менее 100</string>
   <string name="support_habitica">Поддержать Habitica</string>
   <string name="skill_transformation_use">использовать</string>
   <string name="hatching_market_info">Не выпадает то, что нужно? Посмотри на рынке!</string>
@@ -338,10 +338,10 @@
   <string name="subscriptions">Абонемент</string>
   <string name="subscription_duration">Повторять каждые %s</string>
   <string name="subscribe">Подписаться</string>
-  <string name="subscribe.listitem1_description">Торговец Александр теперь будет продавать вам Драгоценные Камни за 20 золотых монет каждый!\n\nЕго месячная поставка сперва ограничится 25 Камнями в месяц, но может быть увеличена в зависимости от времени вашей подписки.\n\nРазмер поставки увеличивается на 5 Камней за каждые три месяца последовательной подписки вплоть до максимума в 50 Камней в месяц!</string>
-  <string name="subscribe.listitem2_description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
-  <string name="subscribe.listitem3_description">Завершенный список дел и история доступны дольше.</string>
-  <string name="subscribe.listitem4_description">Удвоенный предел количества полученных трофеев позволит вам получить больше предметов посредством выполнения задач каждый день, помогая быстрее заполнить стойла!</string>
+  <string name="subscribe_listitem1_description">Торговец Александр теперь будет продавать вам Драгоценные Камни за 20 золотых монет каждый!\n\nЕго месячная поставка сперва ограничится 25 Камнями в месяц, но может быть увеличена в зависимости от времени вашей подписки.\n\nРазмер поставки увеличивается на 5 Камней за каждые три месяца последовательной подписки вплоть до максимума в 50 Камней в месяц!</string>
+  <string name="subscribe_listitem2_description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
+  <string name="subscribe_listitem3_description">Завершенный список дел и история доступны дольше.</string>
+  <string name="subscribe_listitem4_description">Удвоенный предел количества полученных трофеев позволит вам получить больше предметов посредством выполнения задач каждый день, помогая быстрее заполнить стойла!</string>
   <string name="subscription_hourglasses">+%d Мистических песочных часов</string>
   <string name="payment_method">Способ оплаты</string>
   <string name="subscription">Подписка</string>
diff --git a/Habitica/res/values-tr/strings.sidebar.xml b/Habitica/res/values-tr/strings.sidebar.xml
index c031c4a83..eb70d4be0 100644
--- a/Habitica/res/values-tr/strings.sidebar.xml
+++ b/Habitica/res/values-tr/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">İşler</string>
   <string name="sidebar_skills">Yetenekler</string>
-  <string name="sidebar.section_social">Sosyal</string>
+  <string name="sidebar_section_social">Sosyal</string>
   <string name="sidebar_inbox">Mesajlar</string>
   <string name="sidebar_tavern">Taverna</string>
   <string name="sidebar_party">Takım</string>
   <string name="sidebar_purchaseGems">Elmas Satın Al</string>
   <string name="sidebar_guilds">Loncalar</string>
   <string name="sidebar_challenges">Mücadeleler</string>
-  <string name="sidebar.section_inventory">Envanter</string>
+  <string name="sidebar_section_inventory">Envanter</string>
   <string name="sidebar_avatar">Avatar</string>
   <string name="sidebar_equipment">Ekipman</string>
   <string name="sidebar_stable">Ahır</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 9ba14be38..d6a44e044 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">İşlerini işaretlemeyi unutma</string>
     <string name="unlock_lvl_11">Seviye 11\'de açılır</string>
     <string name="forgot_pw_btn">Şifremi Unuttum</string>
-  <string name="tavern.inn_checkOut">Günlük İşlerini tekrar etkinleştir</string>
-  <string name="tavern.inn_rest">Günlük İşleri durdur</string>
-  <string name="reward.dialog_buy">Satın al</string>
-  <string name="reward.dialog_dismiss">Yoksay</string>
+  <string name="tavern_inn_checkOut">Günlük İşlerini tekrar etkinleştir</string>
+  <string name="tavern_inn_rest">Günlük İşleri durdur</string>
+  <string name="reward_dialog_buy">Satın al</string>
+  <string name="reward_dialog_dismiss">Yoksay</string>
   <string name="party">Takım</string>
   <string name="chat">Sohbet</string>
   <string name="members">Üyeler</string>
@@ -307,13 +307,13 @@
   <string name="widget_dailies">Habitica Günlük İşler</string>
   <string name="widget_todo_list">Habitica Yapılacak İşler Listesi</string>
     <string name="google_services_missing">Google play services bulunamadı.</string>
-  <string name="gem.purchase_toolbartitle">Satın al</string>
-  <string name="gem.purchase_title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
-  <string name="gem.purchase_subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
-  <string name="gem.purchase_listitem1">Avatarın için havalı kostümler</string>
-  <string name="gem.purchase_listitem2">Muhteşem arka planlar</string>
-  <string name="gem.purchase_listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
-  <string name="gem.purchase_listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
+  <string name="gem_purchase_toolbartitle">Satın al</string>
+  <string name="gem_purchase_title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="gem_purchase_subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
+  <string name="gem_purchase_listitem1">Avatarın için havalı kostümler</string>
+  <string name="gem_purchase_listitem2">Muhteşem arka planlar</string>
+  <string name="gem_purchase_listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
+  <string name="gem_purchase_listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
   <string name="support_habitica">Habitica\'ya Destek Ol</string>
   <string name="skill_transformation_use">kullan</string>
   <string name="hatching_market_info">İş tamamlarken doğru eşyalar düşmedi mi? Pazara bir göz at!</string>
@@ -336,16 +336,16 @@
   <string name="subscriptions">Abonelikler</string>
   <string name="subscription_duration">Her %s tekrar eder</string>
   <string name="subscribe">Abone Ol</string>
-  <string name="subscribe.listitem1_description">Tüccar İskender artık sana tanesi 20 altına elmas satacak!
+  <string name="subscribe_listitem1_description">Tüccar İskender artık sana tanesi 20 altına elmas satacak!
 \n
 \nAylık sevkiyatı başlangıçta aylık 25 Elmas ile sınırlıdır, ama ardışık abonelik süresine göre artabilir.
 \n
 \nElmas limiti her üç aylık ardışık abonelik için 5 artar, toplam üst limit olan aylık 50 Elmasa kadar artabilir!</string>
-  <string name="subscribe.listitem2_description">Her ay avatarın için özel görsel bir eşya alırsın!
+  <string name="subscribe_listitem2_description">Her ay avatarın için özel görsel bir eşya alırsın!
 \n
 \nAyrıca, her üç aylık ardışık abonelik için, Gizemli Zaman Yolcuları sana tarihi (ve fütüristik!) görsel eşyalara erişim sağlar.</string>
-  <string name="subscribe.listitem3_description">Tamamlanmış Yapılacak İş ve İş geçmişlerine daha uzun süre erişim sağlar.</string>
-  <string name="subscribe.listitem4_description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
+  <string name="subscribe_listitem3_description">Tamamlanmış Yapılacak İş ve İş geçmişlerine daha uzun süre erişim sağlar.</string>
+  <string name="subscribe_listitem4_description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
   <string name="subscribe1month_gemcap">25 Elmas limiti</string>
   <string name="subscribe3month_gemcap">30 Elmas limiti</string>
   <string name="subscribe6month_gemcap">35 Elmas limiti</string>
diff --git a/Habitica/res/values-zh-rTW/strings.sidebar.xml b/Habitica/res/values-zh-rTW/strings.sidebar.xml
index 6c660541b..8f8202249 100644
--- a/Habitica/res/values-zh-rTW/strings.sidebar.xml
+++ b/Habitica/res/values-zh-rTW/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">任務</string>
   <string name="sidebar_skills">技能</string>
-  <string name="sidebar.section_social">社交</string>
+  <string name="sidebar_section_social">社交</string>
   <string name="sidebar_inbox">訊息</string>
   <string name="sidebar_tavern">酒館</string>
   <string name="sidebar_party">隊伍</string>
   <string name="sidebar_purchaseGems">購買寶石</string>
   <string name="sidebar_guilds">公會</string>
   <string name="sidebar_challenges">挑戰</string>
-  <string name="sidebar.section_inventory">物品欄</string>
+  <string name="sidebar_section_inventory">物品欄</string>
   <string name="sidebar_avatar">頭像</string>
   <string name="sidebar_equipment">裝備</string>
   <string name="sidebar_stable">馬廄</string>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 7e03a9a29..47f68118d 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -93,10 +93,10 @@
   <string name="new_checklist_item">新增清單內容</string>
     <string name="unlock_lvl_11">11 級時解鎖</string>
     <string name="forgot_pw_btn">忘記密碼</string>
-  <string name="tavern.inn_checkOut">重啟每日任務</string>
-  <string name="tavern.inn_rest">暫停每日任務</string>
-  <string name="reward.dialog_buy">購買</string>
-  <string name="reward.dialog_dismiss">取消</string>
+  <string name="tavern_inn_checkOut">重啟每日任務</string>
+  <string name="tavern_inn_rest">暫停每日任務</string>
+  <string name="reward_dialog_buy">購買</string>
+  <string name="reward_dialog_dismiss">取消</string>
   <string name="party">隊伍</string>
   <string name="chat">聊天</string>
   <string name="members">成員</string>
@@ -308,13 +308,13 @@
   <string name="widget_dailies">Habitica 每日任務</string>
   <string name="widget_todo_list">Habitica 待辦事項列表</string>
     <string name="google_services_missing">找不到 Google play 服務。</string>
-  <string name="gem.purchase_toolbartitle">購買</string>
-  <string name="gem.purchase_title">購買鑽石可以支持開發人員並幫助 Habitica 繼續營運</string>
-  <string name="gem.purchase_subtitle">鑽石可讓您購買額外有趣的物品，包含了:</string>
-  <string name="gem.purchase_listitem1">為您的角色穿上酷炫的服飾</string>
-  <string name="gem.purchase_listitem2">超讚的背景</string>
-  <string name="gem.purchase_listitem3">有寵物蛋獎勵的副本</string>
-  <string name="gem.purchase_listitem4">100 級以前更換職業的能力</string>
+  <string name="gem_purchase_toolbartitle">購買</string>
+  <string name="gem_purchase_title">購買鑽石可以支持開發人員並幫助 Habitica 繼續營運</string>
+  <string name="gem_purchase_subtitle">鑽石可讓您購買額外有趣的物品，包含了:</string>
+  <string name="gem_purchase_listitem1">為您的角色穿上酷炫的服飾</string>
+  <string name="gem_purchase_listitem2">超讚的背景</string>
+  <string name="gem_purchase_listitem3">有寵物蛋獎勵的副本</string>
+  <string name="gem_purchase_listitem4">100 級以前更換職業的能力</string>
   <string name="support_habitica">贊助 Habitica</string>
   <string name="skill_transformation_use">使用</string>
   <string name="hatching_market_info">沒有得到想要的掉落物品？來市場看看！</string>
@@ -337,16 +337,16 @@
   <string name="subscriptions">訂閱</string>
   <string name="subscription_duration">每%s重複出現</string>
   <string name="subscribe">加入會員</string>
-  <string name="subscribe.listitem1_description">商人 Alexander 可以按每個寶石 20 金幣的價格向你出售寶石！
+  <string name="subscribe_listitem1_description">商人 Alexander 可以按每個寶石 20 金幣的價格向你出售寶石！
 \n
 \n他每個月的初始進貨量是 25 個寶石，進貨量會隨著您的捐助額度增長！
 \n
 \n 每三個月寶石上限就會增加 5，直到最多 1 個月 50 顆寶石！</string>
-  <string name="subscribe.listitem2_description">每個月你將會收到一件獨特的角色飾品！
+  <string name="subscribe_listitem2_description">每個月你將會收到一件獨特的角色飾品！
 \n
 \n另外每連續訂閱三個月，神秘的時間旅行者將授予你得到過去(和未來)飾品的資格。</string>
-  <string name="subscribe.listitem3_description">使完成的待辦事項和任務的歷史記錄保留更長時間。</string>
-  <string name="subscribe.listitem4.description">雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！</string>
+  <string name="subscribe_listitem3_description">使完成的待辦事項和任務的歷史記錄保留更長時間。</string>
+  <string name="subscribe_listitem4.description">雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！</string>
   <string name="subscription_hourglasses">%d 個神秘沙漏</string>
   <string name="payment_method">付款方式</string>
   <string name="subscription">訂閱</string>
@@ -615,10 +615,10 @@
     <string name="opting_out_progress">退出</string>
     <string name="invite_username_description">如果你已有朋友在使用 Habitica，透過這裡的用戶名邀請他們。</string>
     <string name="subscription_duration_norenew">為了 %s</string>
-    <string name="subscribe1month.gemcap">25 寶石</string>
-    <string name="subscribe3month.gemcap">30 寶石</string>
-    <string name="subscribe6month.gemcap">35 寶石</string>
-    <string name="subscribe12month.gemcap">45 寶石</string>
+    <string name="subscribe1month_gemcap">25 寶石</string>
+    <string name="subscribe3month_gemcap">30 寶石</string>
+    <string name="subscribe6month_gemcap">35 寶石</string>
+    <string name="subscribe12month_gemcap">45 寶石</string>
     <string name="due">期限</string>
     <string name="welcome_text">哦，你一定是新來的。我是 Justin，你在 Habitica 的嚮導。
 \n
diff --git a/Habitica/res/values-zh/strings.sidebar.xml b/Habitica/res/values-zh/strings.sidebar.xml
index a846e8b6e..0081abbb7 100644
--- a/Habitica/res/values-zh/strings.sidebar.xml
+++ b/Habitica/res/values-zh/strings.sidebar.xml
@@ -2,14 +2,14 @@
 <resources>
   <string name="sidebar_tasks">任务</string>
   <string name="sidebar_skills">技能</string>
-  <string name="sidebar.section_social">社交</string>
+  <string name="sidebar_section_social">社交</string>
   <string name="sidebar_inbox">讯息</string>
   <string name="sidebar_tavern">酒馆</string>
   <string name="sidebar_party">队伍</string>
   <string name="sidebar_purchaseGems">宝石&amp;开通会员</string>
   <string name="sidebar_guilds">公会</string>
   <string name="sidebar_challenges">挑战</string>
-  <string name="sidebar.section_inventory">物品栏</string>
+  <string name="sidebar_section_inventory">物品栏</string>
   <string name="sidebar_avatar">角色形象</string>
   <string name="sidebar_equipment">装备</string>
   <string name="sidebar_stable">马厩</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 25da83646..dde9e3116 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -97,10 +97,10 @@
     <string name="reminder_title">记得完成你的任务</string>
     <string name="unlock_lvl_11">11级时解锁</string>
     <string name="forgot_pw_btn">忘记密码</string>
-  <string name="tavern.inn_checkOut">重启每日任务</string>
-  <string name="tavern.inn_rest">暂停每日任务</string>
-  <string name="reward.dialog_buy">购买</string>
-  <string name="reward.dialog_dismiss">解散</string>
+  <string name="tavern_inn_checkOut">重启每日任务</string>
+  <string name="tavern_inn_rest">暂停每日任务</string>
+  <string name="reward_dialog_buy">购买</string>
+  <string name="reward_dialog_dismiss">解散</string>
   <string name="party">队伍</string>
   <string name="chat">聊天</string>
   <string name="members">成员</string>
@@ -313,13 +313,13 @@
   <string name="widget_dailies">Habitica每日任务</string>
   <string name="widget_todo_list">Habitica 待办事项</string>
     <string name="google_services_missing">没有找到Google play服务。</string>
-  <string name="gem.purchase_toolbartitle">购买</string>
-  <string name="gem.purchase_title">购买宝石来支持开发者们和帮助保证Habitica的日常运营</string>
-  <string name="gem.purchase_subtitle">你可以通过宝石给你的账户购买更多有趣的额外物品，包括：</string>
-  <string name="gem.purchase_listitem1">角色形象的炫酷装扮</string>
-  <string name="gem.purchase_listitem2">超棒的背景</string>
-  <string name="gem.purchase_listitem3">任务会奖励你宠物蛋</string>
-  <string name="gem.purchase_listitem4">100级前改变你职业的能力</string>
+  <string name="gem_purchase_toolbartitle">购买</string>
+  <string name="gem_purchase_title">购买宝石来支持开发者们和帮助保证Habitica的日常运营</string>
+  <string name="gem_purchase_subtitle">你可以通过宝石给你的账户购买更多有趣的额外物品，包括：</string>
+  <string name="gem_purchase_listitem1">角色形象的炫酷装扮</string>
+  <string name="gem_purchase_listitem2">超棒的背景</string>
+  <string name="gem_purchase_listitem3">任务会奖励你宠物蛋</string>
+  <string name="gem_purchase_listitem4">100级前改变你职业的能力</string>
   <string name="support_habitica">支持Habitica</string>
   <string name="skill_transformation_use">使用</string>
   <string name="hatching_market_info">没有得到想要的掉落物品？来市场瞧瞧！</string>
@@ -342,14 +342,14 @@
   <string name="subscriptions">捐助</string>
   <string name="subscription_duration">每 %s 重复出现</string>
   <string name="subscribe">捐助</string>
-  <string name="subscribe.listitem1_description">商人Alexander可以按每个宝石20金币的价格向你出售宝石！
+  <string name="subscribe_listitem1_description">商人Alexander可以按每个宝石20金币的价格向你出售宝石！
 \n
 \n他每个月的初始进货量是25个宝石，进货量会随着您的捐助时长而增加！
 \n
 \n 每三个月宝石上限就会增加5，最大直到1个月50颗宝石！</string>
-  <string name="subscribe.listitem2_description">每个月你将会收到一件独特的角色饰品！另外，每连续捐助三个月，神秘的时间旅行者将授予你得到过去(和将来)的饰品的资格。</string>
-  <string name="subscribe.listitem3_description">使完成的待办事项和任务的历史记录保留更长时间。</string>
-  <string name="subscribe.listitem4_description">双倍掉落让你每天能够从完成的任务中得到更多的物品，帮助你更快地驯服坐骑！</string>
+  <string name="subscribe_listitem2_description">每个月你将会收到一件独特的角色饰品！另外，每连续捐助三个月，神秘的时间旅行者将授予你得到过去(和将来)的饰品的资格。</string>
+  <string name="subscribe_listitem3_description">使完成的待办事项和任务的历史记录保留更长时间。</string>
+  <string name="subscribe_listitem4_description">双倍掉落让你每天能够从完成的任务中得到更多的物品，帮助你更快地驯服坐骑！</string>
   <string name="subscribe1month_gemcap">25 宝石</string>
   <string name="subscribe3month_gemcap">30 宝石</string>
   <string name="subscribe6month_gemcap">35 宝石</string>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 3b85ecf5b..bd86cdbb9 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -109,4 +109,5 @@
     <dimen name="alert_side_padding">26dp</dimen>
     <dimen name="downwards_drop_shadow_height">16dp</dimen>
     <dimen name="collapsible_section_padding">12dp</dimen>
+    <dimen name="widget_rounding">5dp</dimen>
 </resources>
diff --git a/Habitica/res/values/strings.sidebar.xml b/Habitica/res/values/strings.sidebar.xml
index c7d4e9691..cd9e9b0d1 100644
--- a/Habitica/res/values/strings.sidebar.xml
+++ b/Habitica/res/values/strings.sidebar.xml
@@ -9,7 +9,7 @@
     <string name="sidebar_purchaseGems">Gems &amp; Subscription</string>
     <string name="sidebar_guilds">Guilds</string>
     <string name="sidebar_challenges">Challenges</string>
-    <string name="sidebar.section_inventory">Inventory</string>
+    <string name="sidebar_section_inventory">Inventory</string>
     <string name="sidebar_avatar">Avatar</string>
     <string name="sidebar_equipment">Equipment</string>
     <string name="sidebar_stable">Stable</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 7b4d1b27f..5d6242b71 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -65,9 +65,11 @@
 
 
     <!-- Network Errors -->
+    <string name="network_error_no_network_body">You are not connected to the internet.</string>
     <string name="internal_error_api">Server connection lost</string>
 
     <string name="authentication_error_title">Authentication Error</string>
+    <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
 
     <string name="login_validation_error_title">Validation Error</string>
     <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
@@ -120,12 +122,13 @@
     <string name="new_checklist_item">New checklist entry</string>
 
     <string name="reminder_title">Remember to check off your tasks</string>
+    <string name="skill_progress_title">Using Skill</string>
     <string name="unlock_lvl_11">Unlock at lvl 11</string>
     <string name="forgot_pw_btn">Forgot Password</string>
     <string name="tavern_inn_checkOut">Reactivate your Dailies</string>
-    <string name="tavern.inn_rest">Pause your Dailies</string>
-    <string name="reward.dialog_buy">Buy</string>
-    <string name="reward.dialog_dismiss">Dismiss</string>
+    <string name="tavern_inn_rest">Pause your Dailies</string>
+    <string name="reward_dialog_buy">Buy</string>
+    <string name="reward_dialog_dismiss">Dismiss</string>
     <string name="party">Party</string>
     <string name="chat">Chat</string>
     <string name="members">Members</string>
@@ -342,13 +345,13 @@
     <string name="widget_dailies">Habitica Dailies</string>
     <string name="widget_todo_list">Habitica To-Do List</string>
     <string name="google_services_missing">Google play services could not be found.</string>
-    <string name="gem.purchase_toolbartitle">Purchase</string>
-    <string name="gem.purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
-    <string name="gem.purchase_subtitle">Gems allow you to buy fun extras for you account, including:</string>
-    <string name="gem.purchase_listitem1">Cool costumes for your avatar</string>
-    <string name="gem.purchase_listitem2">Awesome backgrounds</string>
-    <string name="gem.purchase_listitem3">Quests that reward you with pet eggs</string>
-    <string name="gem.purchase_listitem4">The ability to change your class before level 100</string>
+    <string name="gem_purchase_toolbartitle">Purchase</string>
+    <string name="gem_purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
+    <string name="gem_purchase_subtitle">Gems allow you to buy fun extras for you account, including:</string>
+    <string name="gem_purchase_listitem1">Cool costumes for your avatar</string>
+    <string name="gem_purchase_listitem2">Awesome backgrounds</string>
+    <string name="gem_purchase_listitem3">Quests that reward you with pet eggs</string>
+    <string name="gem_purchase_listitem4">The ability to change your class before level 100</string>
     <string name="support_habitica">Support Habitica</string>
     <string name="skill_transformation_use">use</string>
     <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
@@ -374,10 +377,10 @@
     <string name="subscription_duration">Recurring every %s</string>
     <string name="subscription_duration_norenew">For %s</string>
     <string name="subscribe">Subscribe</string>
-    <string name="subscribe.listitem1_description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
-    <string name="subscribe.listitem2_description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
-    <string name="subscribe.listitem3_description">Makes completed To-Dos and task history available for longer.</string>
-    <string name="subscribe.listitem4_description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
+    <string name="subscribe_listitem1_description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
+    <string name="subscribe_listitem2_description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
+    <string name="subscribe_listitem3_description">Makes completed To-Dos and task history available for longer.</string>
+    <string name="subscribe_listitem4_description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
     <string name="subscribe1month_gemcap">25 Gem cap</string>
     <string name="subscribe3month_gemcap">30 Gem cap</string>
     <string name="subscribe6month_gemcap">35 Gem cap</string>