diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d0dde83..d5146fe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
### v1.0.1
- Update SimpleMarkdownParser
+- Move untranslatable strings
### v1.0.0 (2017-06-14)
- Added AMOLED mode
diff --git a/app/src/main/res/raw/adblock_domains__yoyo.txt b/app/src/main/res/raw/adblock_domains__yoyo.txt
old mode 100755
new mode 100644
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 3fdaac6a..22c42b4d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -31,4 +31,31 @@
- Czech (Čeština)
- Swedish (Svenska)
+
+
+
+ - @string/font_size_normal
+ - @string/font_size_large
+ - @string/font_size_huge
+
+
+
+ - normal
+ - large
+ - huge
+
+
+
+
+ - @string/rotation_val_system
+ - @string/rotation_val_sensor
+ - @string/rotation_val_portrait
+ - @string/rotation_val_landscape
+
+
+ - @string/rotation_system
+ - @string/rotation_sensor
+ - @string/rotation_portrait
+ - @string/rotation_landscape
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml
new file mode 100644
index 00000000..39394e2a
--- /dev/null
+++ b/app/src/main/res/values/strings-not_translatable.xml
@@ -0,0 +1,142 @@
+
+
+ dandelion*
+ Your companion app for browsing diaspora*
+
+ \n\n\n_________________________\n
+ **Tags:** #dandelíon \n\n
+ *via [dandelion*](/people?q=dandelion00%40diasp.org) client / [GitHub](https://github.com/Diaspora-for-Android/dandelion)*
+
+
+ Tor
+
+
+ @string/new_post
+ @string/search
+ http
+ https
+
+
+ not_implemented
+ @string/not_implemented
+ @string/not_implemented
+ @string/not_implemented
+ @string/not_implemented
+
+
+ auto
+ sensor
+ portrait
+ landscape
+
+
+ @string/stream
+ @string/liked
+ @string/commented
+ @string/mentions
+ @string/activities
+ @string/aspects
+ @string/profile
+ @string/statistics
+ @string/contacts
+
+
+ @string/nav_menu_more
+ pref_key__current_pod_0
+ pref_key_font_size
+ pref_key__language
+ pref_key_intellihide_toolbars
+ pref_key_personal_settings
+ pref_key_manage_tags
+ pref_key_manage_contacts
+ pref_key_change_account
+ pref_key_load_images
+ pref_key_clear_cache
+ pref_key__chrome_custom_tabs_enabled
+ pref_key__http_proxy_load_tor_preset
+ pref_key__extended_notifications
+ pref_key__topbar_stream_shortcut
+ pref_key__app_first_start
+ pref_key__app_first_start_current_version
+
+
+ pref_key__primary_color__amoled_mode
+ @string/pref_key__primary_color_shade
+ pref_key_primary_color_base
+ pref_key_primary_color_shade
+ @string/pref_key__accent_color_shade
+ pref_key_accent_color_base
+ pref_key_accent_color_shade
+
+ pref_key_append_shared_via_app
+ pref_key_proxy_enabled
+ pref_key_proxy_host
+ pref_key_proxy_port
+ wasProxyEnabled
+
+
+
+ pref_key__screen_rotation
+ pref_key__visibility_navslider__exit
+ pref_key__visibility_nav__help_license
+ pref_key__visibility_nav__public_activities
+ pref_key__visibility_nav__mentions
+ pref_key__visibility_nav__commented
+ pref_key__visibility_nav__liked
+ pref_key__visibility_nav__activities
+ pref_key__visibility_nav__aspects
+ pref_key__visibility_nav__followed_tags
+ pref_key__visibility_nav__profile
+ pref_key__visibility_nav__contacts
+ pref_key__visibility_nav__reports
+ pref_key__visibility_nav__statistics
+ pref_key__visibility_nav__toggle_mobile_desktop
+
+
+ pref_key__podprofile_avatar_url
+ pref_key__podprofile_name
+ pref_key__podprofile_id
+ pref_key__podprofile_aspects
+ pref_key__podprofile_aspects_favs
+ pref_key__podprofile_followed_tags
+ pref_key__podprofile_followed_tags_favs
+ pref_key__podprofile_unread_message_count
+ pref_key__podprofile_notification_count
+ pref_key__podprofile_last_stream_position
+ @string/contacts
+
+
+ pref_key__logging_spam_enabled
+ pref_key__logging_enabled
+ pref_key__wipe_settings
+ @string/about_activity__title_debug_info
+ @string/fragment_debug__section_log
+ @string/fragment_debug__section_log
+ @string/fragment_debug__section_log_spam
+
+
+ @string/pref_desc__http_proxy_enabled
+ HTTP
+ Chrome Custom Tabs
+
+
+
+
+ pref_key__title__appearance
+ pref_key__title__pod_settings
+ pref_key__title__network
+ pref_key__title__more
+ pref_key__title__debugging
+ pref_key__title__proxy
+ pref_key__title__themes
+
+
+ pref_key__cat_themes
+ pref_key__cat_nav_slider
+ pref_key__cat_proxy
+ pref_key__cat_debugging
+
+ pref_key__adblock_enable
+
diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml
index 654dc46f..cf3860c3 100644
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@@ -1,81 +1,16 @@
- pref_key__current_pod_0
- pref_key_font_size
- pref_key__language
- pref_key_intellihide_toolbars
- pref_key_personal_settings
- pref_key_manage_tags
- pref_key_manage_contacts
- pref_key_change_account
- pref_key_load_images
- pref_key_clear_cache
- pref_key__chrome_custom_tabs_enabled
- pref_key__http_proxy_load_tor_preset
- pref_key__extended_notifications
- pref_key__topbar_stream_shortcut
- pref_key__app_first_start
- pref_key__app_first_start_current_version
-
-
- pref_key__primary_color__amoled_mode
- @string/pref_key__primary_color_shade
- pref_key_primary_color_base
- pref_key_primary_color_shade
- @string/pref_key__accent_color_shade
- pref_key_accent_color_base
- pref_key_accent_color_shade
-
- pref_key_append_shared_via_app
- pref_key_proxy_enabled
- pref_key_proxy_host
- pref_key_proxy_port
- wasProxyEnabled
Top toolbar loads stream
Click an empty space in the top toolbar to open the stream
- pref_key__screen_rotation
-
- pref_key__visibility_navslider__exit
- pref_key__visibility_nav__help_license
- pref_key__visibility_nav__public_activities
- pref_key__visibility_nav__mentions
- pref_key__visibility_nav__commented
- pref_key__visibility_nav__liked
- pref_key__visibility_nav__activities
- pref_key__visibility_nav__aspects
- pref_key__visibility_nav__followed_tags
- pref_key__visibility_nav__profile
- pref_key__visibility_nav__contacts
- pref_key__visibility_nav__reports
- pref_key__visibility_nav__statistics
- pref_key__visibility_nav__toggle_mobile_desktop
-
-
- pref_key__podprofile_avatar_url
- pref_key__podprofile_name
- pref_key__podprofile_id
- pref_key__podprofile_aspects
- pref_key__podprofile_aspects_favs
- pref_key__podprofile_followed_tags
- pref_key__podprofile_followed_tags_favs
- pref_key__podprofile_unread_message_count
- pref_key__podprofile_notification_count
- pref_key__podprofile_last_stream_position
-
-
- pref_key__logging_spam_enabled
- pref_key__logging_enabled
- pref_key__wipe_settings
Appearance
Network
Pod settings
- @string/nav_menu_more
Operability
@@ -107,17 +42,6 @@
Control text size of the WebView
Font size
-
- - @string/font_size_normal
- - @string/font_size_large
- - @string/font_size_huge
-
-
-
- - normal
- - large
- - huge
-
Normal
Large
Huge
@@ -129,51 +53,29 @@
Screen rotation
Control automatic screen rotation
- auto
- sensor
- portrait
- landscape
Default
Sensor\n(ignore system settings)
Portrait
Landscape
-
- - @string/rotation_val_system
- - @string/rotation_val_sensor
- - @string/rotation_val_portrait
- - @string/rotation_val_landscape
-
-
- - @string/rotation_system
- - @string/rotation_sensor
- - @string/rotation_portrait
- - @string/rotation_landscape
-
Load Tor Preset
Load proxy settings for Tor (Orbot) HTTP Proxy
Proxy
- @string/pref_desc__http_proxy_enabled
Enable Proxy
Proxy dandelion*\'s traffic to circumvent firewalls.\nMay require restart. This might not work on some phones.
Host
Port
- HTTP
- SOCKS5
App needs to restart to disable proxy usage
Orbot proxy preset loaded
- Chrome Custom Tabs
Open external links with Chrome Custom Tabs. Chromium or Google Chrome needs to be installed in order to use this feature. \nIMPORTANT NOTE: Chrome Custom Tabs do not use configured proxy servers!
Personal settings
Open your diaspora* account settings
-
- @string/contacts
Manage your contact list
Manage Hashtags
@@ -194,35 +96,13 @@
Append a reference to this app to shared texts: [via #dandelion]
- @string/about_activity__title_debug_info
- @string/fragment_debug__section_log
Miscellaneous
- @string/fragment_debug__section_log
- @string/fragment_debug__section_log_spam
-
Full Reset
Locally wipe all settings related to the app and log out from all accounts
This will reset all changed settings of the app to their default values and log you out from all pods. Your downloaded images will stay untouched. Are you sure you want to proceed?
-
-
- pref_key__title__appearance
- pref_key__title__pod_settings
- pref_key__title__network
- pref_key__title__more
- pref_key__title__debugging
- pref_key__title__proxy
- pref_key__title__themes
-
-
- pref_key__cat_themes
- pref_key__cat_nav_slider
- pref_key__cat_proxy
- pref_key__cat_debugging
-
- pref_key__adblock_enable
Enable basic AdBlocker. Ads may be included e.g. in embedded views
Block advertisements
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c95542b2..afdc6564 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,15 +1,4 @@
-
- dandelion*
- diaspora*
- Diaspora for Android
- #dandelion
- Your companion app for browsing diaspora*
-
- \n\n\n_________________________\n
- **Tags:** #dandelíon \n\n
- *via [dandelion*](/people?q=dandelion00%40diasp.org) client / [GitHub](https://github.com/Diaspora-for-Android/dandelion)*
-
Open navigation drawer
Close navigation drawer
@@ -31,7 +20,6 @@
Contacts
Changelog
Statistics
- Tor
All Notifications
@@ -52,19 +40,10 @@
- @string/stream
- @string/liked
- @string/commented
- @string/mentions
- @string/activities
- @string/aspects
- @string/profile
- @string/statistics
More
About | Help
Followed Tags
Public activities
- @string/contacts
Reports
Share link as text
@@ -78,13 +57,11 @@
New post
Go to top
Search by tags or persons
- @string/new_post
Exit app
Toggle mobile/desktop view
Share…
- @string/search
by tags
by people
Please add a name
@@ -114,15 +91,7 @@
Custom Pod
Pod name
Protocol
- http
- https
Pod address
Missing value
Jump to last visited page in stream?
-
- not_implemented
- @string/not_implemented
- @string/not_implemented
- @string/not_implemented
- @string/not_implemented
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 12194b6d..fc1cd638 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,9 +14,6 @@
- true
-