Merge branch 'devel' of github.com:KotatsuApp/Kotatsu into devel

app/src/main/res/menu/nav_bottom.xml

@@ -15,11 +15,11 @@
 	<item
 		android:id="@+id/nav_feed"
 		android:icon="@drawable/ic_feed_selector"
-		android:title="@string/updates" />
+		android:title="@string/feed" />
 
 	<item
 		android:id="@+id/nav_tools"
 		android:icon="@drawable/ic_tools_selector"
-		android:title="@string/tools" />
+		android:title="@string/options" />
 
 </menu>

app/src/main/res/values/strings.xml

@@ -376,4 +376,5 @@
 	<string name="import_completed">Import completed</string>
 	<string name="import_completed_hint">You can delete the original file from storage to save space</string>
 	<string name="import_will_start_soon">Import will start soon</string>
+	<string name="feed">Feed</string>
 </resources>