no comment.

AndroidManifest.xml

@@ -122,6 +122,7 @@
 		<activity
 			android:name=".activity.SettingsActivity"
 			android:label="@string/settings"
+			android:launchMode="singleTask"
 			android:theme="@style/Theme.Twidere.Light">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
@@ -353,6 +354,15 @@
 		<activity
 			android:name=".activity.NativeMapActivity"
 			android:label="@string/view_map"/>
+		<activity
+			android:name=".activity.SettingsDetailsActivity"
+			android:label="@string/settings"/>
+		<activity
+			android:name=".activity.InternalSettingsActivity"
+			android:label="@string/settings"/>
+		<activity
+			android:name=".activity.InternalSettingsDetailsActivity"
+			android:label="@string/settings"/>
 		<activity
 			android:name=".activity.FileSaveAsActivity"
 			android:label="@string/save_as">

lint.xml

@@ -9,6 +9,9 @@
     <issue id="MissingTranslation" severity="informational" />
     <issue id="NamespaceTypo" severity="error" />
     <issue id="NestedScrolling" severity="error" />
+    <issue id="NewApi">
+        <ignore path="src/org/mariotaku/twidere/activity/SettingsDetailsActivity.java" />
+    </issue>
     <issue id="PxUsage" severity="error" />
     <issue id="ScrollViewCount" severity="error" />
     <issue id="SdCardPath" severity="error" />

res/values/plurals.xml

@@ -2,26 +2,6 @@
 <!-- Generated by crowdin.net -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-	<plurals name="Nminutes">
-		<item quantity="one">@string/Nminutes_quantity_one</item>
-		<item quantity="other">@string/Nminutes_quantity_other</item>
-	</plurals>
-	<plurals name="Nhours">
-		<item quantity="one">@string/Nhours_quantity_one</item>
-		<item quantity="other">@string/Nhours_quantity_other</item>
-	</plurals>
-	<plurals name="Ndays">
-		<item quantity="one">@string/Ndays_quantity_one</item>
-		<item quantity="other">@string/Ndays_quantity_other</item>
-	</plurals>
-	<plurals name="Nmonths">
-		<item quantity="one">@string/Nmonths_quantity_one</item>
-		<item quantity="other">@string/Nmonths_quantity_other</item>
-	</plurals>
-	<plurals name="Nyears">
-		<item quantity="one">@string/Nyears_quantity_one</item>
-		<item quantity="other">@string/Nyears_quantity_other</item>
-	</plurals>
 	<plurals name="Ntweets">
 		<item quantity="one">@string/Ntweets_quantity_one</item>
 		<item quantity="other">@string/Ntweets_quantity_other</item>

res/values/strings.xml

@@ -226,16 +226,6 @@
 	<string name="list_created_by_user">List created by this user</string>
 	<string name="report_errors_automatically">Report errors automatically</string>
 	<string name="report_errors_automatically_summary">Report errors automatically, it will not collect your personal data.</string>
-	<string name="Nminutes_quantity_one">1 min</string>
-	<string name="Nminutes_quantity_other"><xliff:g id="minutes">%d</xliff:g> min</string>
-	<string name="Nhours_quantity_one">1 hr</string>
-	<string name="Nhours_quantity_other"><xliff:g id="hours">%d</xliff:g> hrs</string>
-	<string name="Ndays_quantity_one">1 day</string>
-	<string name="Ndays_quantity_other"><xliff:g id="days">%d</xliff:g> days</string>
-	<string name="Nmonths_quantity_one">1 month</string>
-	<string name="Nmonths_quantity_other"><xliff:g id="months">%d</xliff:g> months</string>
-	<string name="Nyears_quantity_one">1 year</string>
-	<string name="Nyears_quantity_other"><xliff:g id="years">%d</xliff:g> years</string>
 	<string name="Ntweets_quantity_one">You have a new tweet.</string>
 	<string name="Ntweets_quantity_other">You have <xliff:g id="items">%d</xliff:g>+ new tweets.</string>
 	<string name="Nmentions_quantity_one">Someone mentioned you.</string>
@@ -294,5 +284,8 @@
 	<string name="icon">Icon</string>
 	<string name="pick_file">Pick file</string>
 	<string name="user_timeline">User timeline</string>
+	<string name="notification_ringtone">Ringtone</string>
+	<string name="notification_light_color">Light Color</string>
+	<string name="invalid_image">Invalid image.</string>
 
 </resources>