[tx-robot] updated from transifex

43 files changed, 8006 insertions, 7053 deletions

diff --git a/News-Android-App/src/main/res/values-ast/strings.xml b/News-Android-App/src/main/res/values-ast/strings.xml
index c3a1bb1b..5f7808ca 100644
--- a/News-Android-App/src/main/res/values-ast/strings.xml
+++ b/News-Android-App/src/main/res/values-ast/strings.xml
@@ -1,160 +1,178 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Autosincronizar</string>
-  <string name="app_name">Llector de noticies ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Seleutor d\'intervalu de sincronizaciones</string>
-  <string name="title_activity_news_detail">ActividáDetallesNoticies</string>
-  <string name="empty_view_content">Nun hai nengún elementu equí</string>
-  <string name="toast_GettingMoreItems">Descarga de más elementos aniciada ... Por favor espera.</string>
-  <string name="no_wifi_available">Nun hai conexón WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">¿Quies baxar les semeyes ensin una conexón WiFi?</string>
-  <string name="widget_header">Noticies ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d elementos nuevos disponibles</item>
-    <item quantity="other">%d elementos nuevos disponibles</item>
-  </plurals>
-  <string name="message_bar_reload">Recargar</string>
-  <string name="allUnreadFeeds">Tolos temes ensin lleer</string>
-  <string name="starredFeeds">Artículos destacaos</string>
-  <string name="title_activity_new_feed">Amestar feed nuevu</string>
-  <string name="menu_update">Refrescar</string>
-  <string name="menu_About_Changelog">Tocante a / Rexistru cambeos</string>
-  <string name="menu_markAllAsRead">Conseñar too como lleío</string>
-  <string name="menu_StartImageCaching">Baxar imáxenes</string>
-  <string name="menu_downloadMoreItems">Baxar más oxetos</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Favoritos</string>
-  <string name="action_read">Lleer</string>
-  <string name="action_playPodacst">Reproducir podcast</string>
-  <string name="action_openInBrowser">Abrir nel restolador</string>
-  <string name="action_Share">Compartir</string>
-  <string name="action_login">Axustes del sirvidor</string>
-  <string name="action_save">Guardar</string>
-  <string name="action_settings">Axustes</string>
-  <string name="action_sync_settings">Axustes de sincronización</string>
-  <string name="action_add_new_feed">Amestar feed nuevu</string>
-  <string name="action_textToSpeech">Axuntar información</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Tienes %d elementos nuevos ensin lleer</item>
-    <item quantity="other">Tienes %d elementos nuevos ensin lleer</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d elementos nuevos disponibles</item>
-    <item quantity="other">%d elementos nuevos disponibles</item>
-  </plurals>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Copiáu al cartafueyu</string>
-  <string name="error_download_failed">Descarga fallida</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Desaniciar</string>
-  <string name="feed_rename_button">Renomar</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nome d\'usuariu</string>
-  <string name="pref_title_password">Contraseña</string>
-  <string name="pref_title_owncloudRootPath">direición root d\'ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Aniciar sesión</string>
-  <string name="login_progress_signing_in">Aniciando sesión...</string>
-  <string name="error_field_required">Requierse esti campu</string>
-  <string name="error_invalid_url">La url ye incorreuta</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importar Cuenta</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Descargaos %d elementos vieyos</item>
-    <item quantity="other">Descargaos %d elementos vieyos</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Nun hai elementos disponibles</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Axustes</string>
-  <string name="cache_is_cleared">¡Llimpióse la Cache!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Xeneral</string>
-  <string name="pref_title_general_sort_order">Ordenar</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nuevu -&gt; Vieyu</item>
-    <item>Vieyu -&gt; Nuevu</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Llimpiando caché</string>
-  <string name="dialog_clearing_cache_please_wait">Llimpiando cache... Por favor espera</string>
-  <string name="reset_cache_unsaved_changes">Hai cambeos non sincronizaos. ¿Quies vaciar la caché de toes formes?</string>
-  <string name="warning">Avisu</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizar nel aniciu</string>
-  <string name="pref_title_ShowOnlyUnread">Amosar namái los artículos ensin lleer</string>
-  <string name="pref_title_DisableHostnameVerification">Deshabilitar verificación de nome d\'agospiu</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navegar colos botones de volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lleíu al desplazar</string>
-  <string name="pref_title_OpenInBrowserDirectly">Usa restolador esternu pa ver los artículos</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">¿Aceutar certificáu desconocíu?</string>
-  <string name="mtm_decision_always">Siempres</string>
-  <string name="mtm_decision_abort">Albortar</string>
-  <string name="mtm_notification">Verificación del certificáu</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nun s\'esbillaron podcast</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Amosar</string>
-  <string name="pref_title_app_theme">Tema de l\'aplicación</string>
-  <string name="pref_title_feed_list_layout">Llista de fontes</string>
-  <string name="pref_display_title_lines_count">Cuntar llínees por títulu</string>
-  <string-array name="pref_display_apptheme">
-    <item>Escuru</item>
-    <item>Claru</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simple</item>
-    <item>Estendíu</item>
-    <item>Estendíu (too\'l testu)</item>
-    <item>Estendiu con Visor Web</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificaciones</string>
-  <string name="pref_title_notification_new_articles_available">Amosar notificación cuando tean disponibles artículos nuevos</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Fallu</string>
-  <string name="login_dialog_text_something_went_wrong">Daqué foi mal :(</string>
-  <string name="login_dialog_text_not_compatible">Esta versión de App nun ye compatible cola to App de Noticies ownCloud. Por favor anueva la app de Noticies y el appframework.</string>
-  <string name="login_dialog_title_security_warning">Avisu de seguridá</string>
-  <string name="login_dialog_text_security_warning">Nun tas usando https. Un atacante pue interceutar el to tráficu y consiguir accesu a dalgunos datos sensibles (exem. la to contraseña). ¡Asina qu\'aconseyámoste usar https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Datos &amp; sincronización</string>
-  <string name="pref_title_clearCache">Llimpiar caché</string>
-  <string name="pref_title_CacheImagesOffline">Cachear imáxenes offline</string>
-  <string name="pref_title_Max_Cache_Size">Tamañu máx caché.</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Enxamás</item>
-    <item>Namás con WIFI</item>
-    <item>Namás con WIFI &amp; Datos</item>
-    <item>Entruga cuanto nun tea coneutáu a una WIFI</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutos</item>
-    <item>15 Minutos</item>
-    <item>30 Minutos</item>
-    <item>45 Minutos</item>
-    <item>1 Hores</item>
-    <item>2 Hores</item>
-    <item>3 Hores</item>
-    <item>6 Hores</item>
-    <item>12 Hores</item>
-    <item>24 Hores</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">desaniciar</string>
-</resources>
+
+    <string name="auto_sync_string">Autosincronizar</string>
+    <string name="title_activity_sync_interval_selector">Seleutor d\'intervalu de sincronizaciones</string>
+    <string name="title_activity_news_detail">ActividáDetallesNoticies</string>
+    <string name="empty_view_content">Nun hai nengún elementu equí</string>
+    <string name="toast_GettingMoreItems">Descarga de más elementos aniciada ... Por favor espera.</string>
+    <string name="no_wifi_available">Nun hai conexón WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">¿Quies baxar les semeyes ensin una conexón WiFi?</string>
+    <string name="widget_header">Noticies ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d elementos nuevos disponibles</item>
+        <item quantity="other">%d elementos nuevos disponibles</item>
+    </plurals>
+    <string name="message_bar_reload">Recargar</string>
+    <string name="allUnreadFeeds">Tolos temes ensin lleer</string>
+    <string name="starredFeeds">Artículos destacaos</string>
+    <string name="title_activity_new_feed">Amestar feed nuevu</string>
+
+    <string name="menu_update">Refrescar</string>
+    <string name="menu_About_Changelog">Tocante a / Rexistru cambeos</string>
+    <string name="menu_markAllAsRead">Conseñar too como lleío</string>
+    <string name="menu_StartImageCaching">Baxar imáxenes</string>
+    <string name="menu_downloadMoreItems">Baxar más oxetos</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Favoritos</string>
+    <string name="action_read">Lleer</string>
+    <string name="action_playPodacst">Reproducir podcast</string>
+    <string name="action_openInBrowser">Abrir nel restolador</string>
+    <string name="action_Share">Compartir</string>
+    <string name="action_login">Axustes del sirvidor</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_settings">Axustes</string>
+    <string name="action_sync_settings">Axustes de sincronización</string>
+    <string name="action_add_new_feed">Amestar feed nuevu</string>
+    <string name="action_textToSpeech">Axuntar información</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Tienes %d elementos nuevos ensin lleer</item>
+        <item quantity="other">Tienes %d elementos nuevos ensin lleer</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d elementos nuevos disponibles</item>
+        <item quantity="other">%d elementos nuevos disponibles</item>
+    </plurals>
+
+
+    <string name="toast_copied_to_clipboard">Copiáu al cartafueyu</string>
+    <string name="error_download_failed">Descarga fallida</string>
+    <string name="feed_remove_button">Desaniciar</string>
+    <string name="feed_rename_button">Renomar</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nome d\'usuariu</string>
+    <string name="pref_title_password">Contraseña</string>
+    <string name="pref_title_owncloudRootPath">direición root d\'ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Aniciar sesión</string>
+    <string name="login_progress_signing_in">Aniciando sesión...</string>
+    <string name="error_field_required">Requierse esti campu</string>
+    <string name="error_invalid_url">La url ye incorreuta</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importar Cuenta</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Descargaos %d elementos vieyos</item>
+        <item quantity="other">Descargaos %d elementos vieyos</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Nun hai elementos disponibles</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Axustes</string>
+    <string name="cache_is_cleared">¡Llimpióse la Cache!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Xeneral</string>
+    <string name="pref_title_general_sort_order">Ordenar</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nuevu -&gt; Vieyu</item>
+        <item>Vieyu -&gt; Nuevu</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Llimpiando caché</string>
+    <string name="dialog_clearing_cache_please_wait">Llimpiando cache... Por favor espera</string>
+    <string name="reset_cache_unsaved_changes">Hai cambeos non sincronizaos. ¿Quies vaciar la caché de toes formes?</string>
+    <string name="warning">Avisu</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizar nel aniciu</string>
+    <string name="pref_title_ShowOnlyUnread">Amosar namái los artículos ensin lleer</string>
+    <string name="pref_title_DisableHostnameVerification">Deshabilitar verificación de nome d\'agospiu</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navegar colos botones de volume</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lleíu al desplazar</string>
+    <string name="pref_title_OpenInBrowserDirectly">Usa restolador esternu pa ver los artículos</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">¿Aceutar certificáu desconocíu?</string>
+    <string name="mtm_decision_always">Siempres</string>
+    <string name="mtm_decision_abort">Albortar</string>
+    <string name="mtm_notification">Verificación del certificáu</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nun s\'esbillaron podcast</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Amosar</string>
+    <string name="pref_title_app_theme">Tema de l\'aplicación</string>
+    <string name="pref_title_feed_list_layout">Llista de fontes</string>
+    <string name="pref_display_title_lines_count">Cuntar llínees por títulu</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Escuru</item>
+        <item>Claru</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simple</item>
+        <item>Estendíu</item>
+        <item>Estendíu (too\'l testu)</item>
+        <item>Estendiu con Visor Web</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificaciones</string>
+    <string name="pref_title_notification_new_articles_available">Amosar notificación cuando tean disponibles artículos nuevos</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Fallu</string>
+    <string name="login_dialog_text_something_went_wrong">Daqué foi mal :(</string>
+    <string name="login_dialog_text_not_compatible">Esta versión de App nun ye compatible cola to App de Noticies ownCloud. Por favor anueva la app de Noticies y el appframework.</string>
+    <string name="login_dialog_title_security_warning">Avisu de seguridá</string>
+    <string name="login_dialog_text_security_warning">Nun tas usando https. Un atacante pue interceutar el to tráficu y consiguir accesu a dalgunos datos sensibles (exem. la to contraseña). ¡Asina qu\'aconseyámoste usar https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Datos &amp; sincronización</string>
+    <string name="pref_title_clearCache">Llimpiar caché</string>
+    <string name="pref_title_CacheImagesOffline">Cachear imáxenes offline</string>
+    <string name="pref_title_Max_Cache_Size">Tamañu máx caché.</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Enxamás</item>
+        <item>Namás con WIFI</item>
+        <item>Namás con WIFI &amp; Datos</item>
+        <item>Entruga cuanto nun tea coneutáu a una WIFI</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutos</item>
+        <item>15 Minutos</item>
+        <item>30 Minutos</item>
+        <item>45 Minutos</item>
+        <item>1 Hores</item>
+        <item>2 Hores</item>
+        <item>3 Hores</item>
+        <item>6 Hores</item>
+        <item>12 Hores</item>
+        <item>24 Hores</item>
+    </string-array>
+    <string name="content_desc_delete">desaniciar</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-az/strings.xml b/News-Android-App/src/main/res/values-az/strings.xml
index a326d056..ece47ab4 100644
--- a/News-Android-App/src/main/res/values-az/strings.xml
+++ b/News-Android-App/src/main/res/values-az/strings.xml
@@ -1,126 +1,137 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Avtomatik sinxronizasiya</string>
-  <string name="app_name">ownCloud xəbərlərinin oxuyucusu</string>
-  <string name="title_activity_sync_interval_selector">Seçici İnterval Sinxronizasiyası</string>
-  <string name="title_activity_news_detail">XəbərlərDetallıFəaliyyəti</string>
-  <string name="empty_view_content">Burda heş bir məlumat yoxdur</string>
-  <string name="no_wifi_available">Qoşulmuş WiFi yoxdur</string>
-  <string name="do_you_want_to_download_without_wifi">WiFi qoşulması olmadan, şəkilləri yükləmək istəyirsiniz?</string>
-  <string name="widget_header">ownCloud xəbərlər</string>
-  <string name="message_bar_reload">Yenidən yüklə</string>
-  <string name="allUnreadFeeds">Bütün oxunmayan hissələr</string>
-  <string name="starredFeeds">Ulduzlanmış elementlər</string>
-  <string name="title_activity_new_feed">Yeni kanalı əlavə et</string>
-  <string name="menu_update">Yenilə</string>
-  <string name="menu_About_Changelog">Haqqında / Dəyişikliklər</string>
-  <string name="menu_markAllAsRead">Hamısını oxunulmuş kimi qeydə al</string>
-  <string name="menu_StartImageCaching">Şəkilləri endir</string>
-  <string name="menu_downloadMoreItems">Çoxlu hissələri endir</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Ulduzlu</string>
-  <string name="action_read">Oxu</string>
-  <string name="action_playPodacst">Podcast oyna</string>
-  <string name="action_openInBrowser">Browser-də aç</string>
-  <string name="action_Share">Paylaş</string>
-  <string name="action_login">Server quraşdırmaları</string>
-  <string name="action_save">Saxlamaq</string>
-  <string name="action_settings">Quraşdırmalar</string>
-  <string name="action_sync_settings">Sync quraşdırmaları</string>
-  <string name="action_add_new_feed">Yeni kanalı əlavə et</string>
-  <string name="action_textToSpeech">Oxuyun</string>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Mübadilə buferinə nüsxələndi</string>
-  <string name="error_download_failed">Endirim olmadı</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Sil</string>
-  <string name="feed_rename_button">Adı dəyiş</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">İstifadəçi adı</string>
-  <string name="pref_title_password">Şifrə</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/</string>
-  <string name="action_sign_in_short">Daxil ol</string>
-  <string name="login_progress_signing_in">Daxil olunur...</string>
-  <string name="error_field_required">Bu sütun tələb edilir</string>
-  <string name="error_invalid_url">Bu URL yalnışdır</string>
-  <!--Import Accounts-->
-  <string name="import_account">Hesabi idxal et</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Heç bir əlavə mənbələr yoxdur</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Quraşdırmalar</string>
-  <!--General settings-->
-  <string name="pref_header_general">Ümumi</string>
-  <string name="pref_title_general_sort_order">Qayda ilə çeşidlə</string>
-  <string-array name="pref_general_sort_order">
-    <item>Yeni -&gt; Köhnə</item>
-    <item>Köhnə -&gt; Yeni</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Keş təmizlənir</string>
-  <string name="reset_cache_unsaved_changes">Orda sinxronizasiya edilməmiş dəyişikliklər var. Siz keşi istənilən halda sifirlamaq isteəyirsiniz?</string>
-  <string name="warning">Xəbərdarlıq</string>
-  <string name="pref_title_AutoSyncOnStart">İşə düşəndə sinxronizasiya elə</string>
-  <string name="pref_title_ShowOnlyUnread">Yalnız oxunmamış məqalələri göstər</string>
-  <string name="pref_title_DisableHostnameVerification">Host adının yoxlanışını söndür</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Təyinatını səs düymələri ilə et</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Ötürüldükdə, oxunulmuş kimi qeydə al</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Tanınmayan sertifikat qəbul edilsin? </string>
-  <string name="mtm_decision_always">Həmişə</string>
-  <string name="mtm_decision_abort">Durdur</string>
-  <string name="mtm_notification">Sertifikat yoxlanışı</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Heç bir podcast seçilməyib</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Ekran</string>
-  <string name="pref_title_app_theme">Proqram mövzusu</string>
-  <string name="pref_title_feed_list_layout">Axın siyahısının görünüşü</string>
-  <string-array name="pref_display_apptheme">
-    <item>Qaranlıq</item>
-    <item>İşıqlı</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Xəbərdarlıqlar</string>
-  <string name="pref_title_notification_new_articles_available">Yeni məqalə olduqda notifikasiyanı göstər</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Səhv</string>
-  <string name="login_dialog_text_something_went_wrong">Nə isə düzgün getmədi :(</string>
-  <string name="login_dialog_text_not_compatible">Bu proqram versiyası sizin ownCloud xəbərlər proqramına uyğun deyil. Xahiş olunur xəbərlər proqramını program mühitindən yeniləyəsiniz. </string>
-  <string name="login_dialog_title_security_warning">Təhlükəsizlik xəbərdarlığı</string>
-  <string name="login_dialog_text_security_warning">Siz HTTPS istifadə etmirsiniz. Hücumçu sizin gizli məlumatlarınızı ələ keçirə bilər(misal üçün şifrəniz). Bunun üçündə mütləq şəkildə HTTPS-dən istifadə etməniz məsləhət görülür.</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; sync</string>
-  <string name="pref_title_clearCache">Keşi təmizlə</string>
-  <string name="pref_title_CacheImagesOffline">Keş şəkilləri offlinedır</string>
-  <string name="pref_title_Max_Cache_Size">Maksimal keş həcmi</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Heç vaxt</item>
-    <item>Yalnız WiFi üzərindən</item>
-    <item>Yalnız WiFi &amp; Mobile</item>
-    <item>WiFi-a qoşulu olmayanda soruş</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Dəqiqqə</item>
-    <item>15 Dəqiqqə</item>
-    <item>30 Dəqiqqə</item>
-    <item>45 Dəqiqqə</item>
-    <item>1 Saat</item>
-    <item>2 Saat</item>
-    <item>3 Saat</item>
-    <item>6 Saat</item>
-    <item>12 Saat</item>
-    <item>24 Saat</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">sil</string>
-</resources>
+
+    <string name="auto_sync_string">Avtomatik sinxronizasiya</string>
+    <string name="title_activity_sync_interval_selector">Seçici İnterval Sinxronizasiyası</string>
+    <string name="title_activity_news_detail">XəbərlərDetallıFəaliyyəti</string>
+    <string name="empty_view_content">Burda heş bir məlumat yoxdur</string>
+    <string name="no_wifi_available">Qoşulmuş WiFi yoxdur</string>
+    <string name="do_you_want_to_download_without_wifi">WiFi qoşulması olmadan, şəkilləri yükləmək istəyirsiniz?</string>
+    <string name="widget_header">ownCloud xəbərlər</string>
+    <string name="message_bar_reload">Yenidən yüklə</string>
+    <string name="allUnreadFeeds">Bütün oxunmayan hissələr</string>
+    <string name="starredFeeds">Ulduzlanmış elementlər</string>
+    <string name="title_activity_new_feed">Yeni kanalı əlavə et</string>
+
+    <string name="menu_update">Yenilə</string>
+    <string name="menu_About_Changelog">Haqqında / Dəyişikliklər</string>
+    <string name="menu_markAllAsRead">Hamısını oxunulmuş kimi qeydə al</string>
+    <string name="menu_StartImageCaching">Şəkilləri endir</string>
+    <string name="menu_downloadMoreItems">Çoxlu hissələri endir</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Ulduzlu</string>
+    <string name="action_read">Oxu</string>
+    <string name="action_playPodacst">Podcast oyna</string>
+    <string name="action_openInBrowser">Browser-də aç</string>
+    <string name="action_Share">Paylaş</string>
+    <string name="action_login">Server quraşdırmaları</string>
+    <string name="action_save">Saxlamaq</string>
+    <string name="action_settings">Quraşdırmalar</string>
+    <string name="action_sync_settings">Sync quraşdırmaları</string>
+    <string name="action_add_new_feed">Yeni kanalı əlavə et</string>
+    <string name="action_textToSpeech">Oxuyun</string>
+    <string name="toast_copied_to_clipboard">Mübadilə buferinə nüsxələndi</string>
+    <string name="error_download_failed">Endirim olmadı</string>
+    <string name="feed_remove_button">Sil</string>
+    <string name="feed_rename_button">Adı dəyiş</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">İstifadəçi adı</string>
+    <string name="pref_title_password">Şifrə</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/</string>
+
+    <string name="action_sign_in_short">Daxil ol</string>
+    <string name="login_progress_signing_in">Daxil olunur...</string>
+    <string name="error_field_required">Bu sütun tələb edilir</string>
+    <string name="error_invalid_url">Bu URL yalnışdır</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Hesabi idxal et</string>
+
+
+    <string name="toast_no_more_downloads_available">Heç bir əlavə mənbələr yoxdur</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Quraşdırmalar</string>
+    <!-- General settings -->
+    <string name="pref_header_general">Ümumi</string>
+    <string name="pref_title_general_sort_order">Qayda ilə çeşidlə</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Yeni -&gt; Köhnə</item>
+        <item>Köhnə -&gt; Yeni</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Keş təmizlənir</string>
+    <string name="reset_cache_unsaved_changes">Orda sinxronizasiya edilməmiş dəyişikliklər var. Siz keşi istənilən halda sifirlamaq isteəyirsiniz?</string>
+    <string name="warning">Xəbərdarlıq</string>
+    <string name="pref_title_AutoSyncOnStart">İşə düşəndə sinxronizasiya elə</string>
+    <string name="pref_title_ShowOnlyUnread">Yalnız oxunmamış məqalələri göstər</string>
+    <string name="pref_title_DisableHostnameVerification">Host adının yoxlanışını söndür</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Təyinatını səs düymələri ilə et</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Ötürüldükdə, oxunulmuş kimi qeydə al</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Tanınmayan sertifikat qəbul edilsin? </string>
+    <string name="mtm_decision_always">Həmişə</string>
+    <string name="mtm_decision_abort">Durdur</string>
+    <string name="mtm_notification">Sertifikat yoxlanışı</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Heç bir podcast seçilməyib</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Ekran</string>
+    <string name="pref_title_app_theme">Proqram mövzusu</string>
+    <string name="pref_title_feed_list_layout">Axın siyahısının görünüşü</string>
+    <string-array name="pref_display_apptheme">
+        <item>Qaranlıq</item>
+        <item>İşıqlı</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Xəbərdarlıqlar</string>
+    <string name="pref_title_notification_new_articles_available">Yeni məqalə olduqda notifikasiyanı göstər</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Səhv</string>
+    <string name="login_dialog_text_something_went_wrong">Nə isə düzgün getmədi :(</string>
+    <string name="login_dialog_text_not_compatible">Bu proqram versiyası sizin ownCloud xəbərlər proqramına uyğun deyil. Xahiş olunur xəbərlər proqramını program mühitindən yeniləyəsiniz. </string>
+    <string name="login_dialog_title_security_warning">Təhlükəsizlik xəbərdarlığı</string>
+    <string name="login_dialog_text_security_warning">Siz HTTPS istifadə etmirsiniz. Hücumçu sizin gizli məlumatlarınızı ələ keçirə bilər(misal üçün şifrəniz). Bunun üçündə mütləq şəkildə HTTPS-dən istifadə etməniz məsləhət görülür.</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; sync</string>
+    <string name="pref_title_clearCache">Keşi təmizlə</string>
+    <string name="pref_title_CacheImagesOffline">Keş şəkilləri offlinedır</string>
+    <string name="pref_title_Max_Cache_Size">Maksimal keş həcmi</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Heç vaxt</item>
+        <item>Yalnız WiFi üzərindən</item>
+        <item>Yalnız WiFi &amp; Mobile</item>
+        <item>WiFi-a qoşulu olmayanda soruş</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Dəqiqqə</item>
+        <item>15 Dəqiqqə</item>
+        <item>30 Dəqiqqə</item>
+        <item>45 Dəqiqqə</item>
+        <item>1 Saat</item>
+        <item>2 Saat</item>
+        <item>3 Saat</item>
+        <item>6 Saat</item>
+        <item>12 Saat</item>
+        <item>24 Saat</item>
+    </string-array>
+    <string name="content_desc_delete">sil</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-bg-rBG/strings.xml b/News-Android-App/src/main/res/values-bg-rBG/strings.xml
index ea8d431d..7d763439 100644
--- a/News-Android-App/src/main/res/values-bg-rBG/strings.xml
+++ b/News-Android-App/src/main/res/values-bg-rBG/strings.xml
@@ -1,153 +1,170 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Автоматично синхронизиране</string>
-  <string name="app_name">ownCloud Новинарска Емисия</string>
-  <string name="title_activity_sync_interval_selector">Sync Interval Selector</string>
-  <string name="title_activity_news_detail">Детайли на Новината</string>
-  <string name="empty_view_content">Няма новини</string>
-  <string name="toast_GettingMoreItems">Започнло е сваляне на още елементи ... Моля, изчакайте.</string>
-  <string name="no_wifi_available">Не си свързан с WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Искаш ли да изтеглиш изображенията без WiFi връзка?</string>
-  <string name="widget_header">ownCloud Новини</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">Налични са %d нови елементи</item>
-    <item quantity="other">Налични са %d нови елементи</item>
-  </plurals>
-  <string name="message_bar_reload">Презареди</string>
-  <string name="allUnreadFeeds">Всички непрочетени</string>
-  <string name="starredFeeds">Любими</string>
-  <string name="title_activity_new_feed">Добави нов поток</string>
-  <string name="menu_update">Опресни</string>
-  <string name="menu_About_Changelog">Относно / Списък с Промени</string>
-  <string name="menu_markAllAsRead">Отбележи всички като прочетени</string>
-  <string name="menu_StartImageCaching">Изтегли изображенията</string>
-  <string name="menu_downloadMoreItems">Изтегли допълнителни новини</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Отбелязана</string>
-  <string name="action_read">Прочети</string>
-  <string name="action_playPodacst">Пусни Podcast-а</string>
-  <string name="action_openInBrowser">Отвори в Браузър</string>
-  <string name="action_Share">Сподели</string>
-  <string name="action_login">Настройки на Сървъра</string>
-  <string name="action_save">Запис</string>
-  <string name="action_settings">Настройки</string>
-  <string name="action_sync_settings">Настройки на Синхронизацията</string>
-  <string name="action_add_new_feed">Добави нов поток</string>
-  <string name="action_textToSpeech">Прочита</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Имате %d нови непрочетени елементи</item>
-    <item quantity="other">Имате %d нови непрочетени елементи</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">Налични са %d нови непрочетени елементи</item>
-    <item quantity="other">Налични са %d нови непрочетени елементи</item>
-  </plurals>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Копирана</string>
-  <string name="error_download_failed">Изтеглянето е неуспешно.</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Премахване</string>
-  <string name="feed_rename_button">Преименуване</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Потребител</string>
-  <string name="pref_title_password">Парола</string>
-  <string name="pref_title_owncloudRootPath">ownCloud root достъп</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Впиши се</string>
-  <string name="login_progress_signing_in">Вписване...</string>
-  <string name="error_field_required">Това поле е задължително</string>
-  <string name="error_invalid_url">Сгрешен интернет адрес</string>
-  <!--Import Accounts-->
-  <string name="import_account">Внеси Профил</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Свалени %d стари елементи</item>
-    <item quantity="other">Свалени %d стари елементи</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Няма други новини</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Настройки</string>
-  <string name="cache_is_cleared">Кеша е изчистен!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Общи</string>
-  <string name="pref_title_general_sort_order">Ред на Подреждане</string>
-  <string-array name="pref_general_sort_order">
-    <item>Нови -&gt; Стари</item>
-    <item>Стари -&gt; Нови</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Изчисти кеша</string>
-  <string name="dialog_clearing_cache_please_wait">Изчиства кеша… Моля изчакайте.</string>
-  <string name="reset_cache_unsaved_changes">Има несизнхронизирани промени. Искаш ли да нулираш кеша въпреки това?</string>
-  <string name="warning">Предупреждение</string>
-  <string name="pref_title_AutoSyncOnStart">Синхронизирай на стартиране</string>
-  <string name="pref_title_ShowOnlyUnread">Покажи само непрочетените новини</string>
-  <string name="pref_title_DisableHostnameVerification">Изключи Проверката на Сървъра</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Използвай бутоните за контрол на звука за навигация</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Маркирай като прочетен, когато скролираш</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Приеми Непознат Сертификат?</string>
-  <string name="mtm_decision_always">Винаги</string>
-  <string name="mtm_decision_abort">Прекрати</string>
-  <string name="mtm_notification">Проверка на Сертификата</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Няма избран podcast</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Изглед</string>
-  <string name="pref_title_app_theme">Визуална Тема</string>
-  <string name="pref_title_feed_list_layout">Оформление на списъка с потоци</string>
-  <string name="pref_display_title_lines_count">Брой на редовете за заглавия</string>
-  <string-array name="pref_display_apptheme">
-    <item>Тъмна</item>
-    <item>Светла</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Известия</string>
-  <string name="pref_title_notification_new_articles_available">Покажи известие, когато се появят нови артикули</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Грешка</string>
-  <string name="login_dialog_text_something_went_wrong">Възникна проблем :(</string>
-  <string name="login_dialog_text_not_compatible">Версията на тази програма не е съвместима с версията на приложението Новини в ownCloud. Моля, обнови тази програма.</string>
-  <string name="login_dialog_title_security_warning">Предупреждение за Сигурноста</string>
-  <string name="login_dialog_text_security_warning">Не използваш https. Нападател може да пресрешне твоят трафик и да се сдобие с тайна информация(пр. твоята парола). Силно препоръчително е да се използва https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Данни и Синхронизиране</string>
-  <string name="pref_title_clearCache">Изчисти кеша</string>
-  <string name="pref_title_CacheImagesOffline">Запази изображенията</string>
-  <string name="pref_title_Max_Cache_Size">Макс. Размер на Кеша</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Никога</item>
-    <item>Само през WiFi</item>
-    <item>Само през WiFi &amp; и мобилна връзка</item>
-    <item>Да попита, когато не е през WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Минути</item>
-    <item>15 Минути</item>
-    <item>30 Минути</item>
-    <item>45 Минути</item>
-    <item>1 Час</item>
-    <item>2 Часа</item>
-    <item>3 Часа</item>
-    <item>6 Часа</item>
-    <item>12 Часа</item>
-    <item>24 Часа</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">изтриване</string>
-</resources>
+
+    <string name="auto_sync_string">Автоматично синхронизиране</string>
+    <string name="title_activity_sync_interval_selector">Sync Interval Selector</string>
+    <string name="title_activity_news_detail">Детайли на Новината</string>
+    <string name="empty_view_content">Няма новини</string>
+    <string name="toast_GettingMoreItems">Започнло е сваляне на още елементи ... Моля, изчакайте.</string>
+    <string name="no_wifi_available">Не си свързан с WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Искаш ли да изтеглиш изображенията без WiFi връзка?</string>
+    <string name="widget_header">ownCloud Новини</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">Налични са %d нови елементи</item>
+        <item quantity="other">Налични са %d нови елементи</item>
+    </plurals>
+    <string name="message_bar_reload">Презареди</string>
+    <string name="allUnreadFeeds">Всички непрочетени</string>
+    <string name="starredFeeds">Любими</string>
+    <string name="title_activity_new_feed">Добави нов поток</string>
+
+    <string name="menu_update">Опресни</string>
+    <string name="menu_About_Changelog">Относно / Списък с Промени</string>
+    <string name="menu_markAllAsRead">Отбележи всички като прочетени</string>
+    <string name="menu_StartImageCaching">Изтегли изображенията</string>
+    <string name="menu_downloadMoreItems">Изтегли допълнителни новини</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Отбелязана</string>
+    <string name="action_read">Прочети</string>
+    <string name="action_playPodacst">Пусни Podcast-а</string>
+    <string name="action_openInBrowser">Отвори в Браузър</string>
+    <string name="action_Share">Сподели</string>
+    <string name="action_login">Настройки на Сървъра</string>
+    <string name="action_save">Запис</string>
+    <string name="action_settings">Настройки</string>
+    <string name="action_sync_settings">Настройки на Синхронизацията</string>
+    <string name="action_add_new_feed">Добави нов поток</string>
+    <string name="action_textToSpeech">Прочита</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Имате %d нови непрочетени елементи</item>
+        <item quantity="other">Имате %d нови непрочетени елементи</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">Налични са %d нови непрочетени елементи</item>
+        <item quantity="other">Налични са %d нови непрочетени елементи</item>
+    </plurals>
+
+
+    <string name="toast_copied_to_clipboard">Копирана</string>
+    <string name="error_download_failed">Изтеглянето е неуспешно.</string>
+    <string name="feed_remove_button">Премахване</string>
+    <string name="feed_rename_button">Преименуване</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Потребител</string>
+    <string name="pref_title_password">Парола</string>
+    <string name="pref_title_owncloudRootPath">ownCloud root достъп</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Впиши се</string>
+    <string name="login_progress_signing_in">Вписване...</string>
+    <string name="error_field_required">Това поле е задължително</string>
+    <string name="error_invalid_url">Сгрешен интернет адрес</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Внеси Профил</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Свалени %d стари елементи</item>
+        <item quantity="other">Свалени %d стари елементи</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Няма други новини</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Настройки</string>
+    <string name="cache_is_cleared">Кеша е изчистен!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Общи</string>
+    <string name="pref_title_general_sort_order">Ред на Подреждане</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Нови -&gt; Стари</item>
+        <item>Стари -&gt; Нови</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Изчисти кеша</string>
+    <string name="dialog_clearing_cache_please_wait">Изчиства кеша… Моля изчакайте.</string>
+    <string name="reset_cache_unsaved_changes">Има несизнхронизирани промени. Искаш ли да нулираш кеша въпреки това?</string>
+    <string name="warning">Предупреждение</string>
+    <string name="pref_title_AutoSyncOnStart">Синхронизирай на стартиране</string>
+    <string name="pref_title_ShowOnlyUnread">Покажи само непрочетените новини</string>
+    <string name="pref_title_DisableHostnameVerification">Изключи Проверката на Сървъра</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Използвай бутоните за контрол на звука за навигация</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Маркирай като прочетен, когато скролираш</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Приеми Непознат Сертификат?</string>
+    <string name="mtm_decision_always">Винаги</string>
+    <string name="mtm_decision_abort">Прекрати</string>
+    <string name="mtm_notification">Проверка на Сертификата</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Няма избран podcast</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Изглед</string>
+    <string name="pref_title_app_theme">Визуална Тема</string>
+    <string name="pref_title_feed_list_layout">Оформление на списъка с потоци</string>
+    <string name="pref_display_title_lines_count">Брой на редовете за заглавия</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Тъмна</item>
+        <item>Светла</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Известия</string>
+    <string name="pref_title_notification_new_articles_available">Покажи известие, когато се появят нови артикули</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Грешка</string>
+    <string name="login_dialog_text_something_went_wrong">Възникна проблем :(</string>
+    <string name="login_dialog_text_not_compatible">Версията на тази програма не е съвместима с версията на приложението Новини в ownCloud. Моля, обнови тази програма.</string>
+    <string name="login_dialog_title_security_warning">Предупреждение за Сигурноста</string>
+    <string name="login_dialog_text_security_warning">Не използваш https. Нападател може да пресрешне твоят трафик и да се сдобие с тайна информация(пр. твоята парола). Силно препоръчително е да се използва https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Данни и Синхронизиране</string>
+    <string name="pref_title_clearCache">Изчисти кеша</string>
+    <string name="pref_title_CacheImagesOffline">Запази изображенията</string>
+    <string name="pref_title_Max_Cache_Size">Макс. Размер на Кеша</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Никога</item>
+        <item>Само през WiFi</item>
+        <item>Само през WiFi &amp; и мобилна връзка</item>
+        <item>Да попита, когато не е през WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Минути</item>
+        <item>15 Минути</item>
+        <item>30 Минути</item>
+        <item>45 Минути</item>
+        <item>1 Час</item>
+        <item>2 Часа</item>
+        <item>3 Часа</item>
+        <item>6 Часа</item>
+        <item>12 Часа</item>
+        <item>24 Часа</item>
+    </string-array>
+    <string name="content_desc_delete">изтриване</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-bn-rBD/strings.xml b/News-Android-App/src/main/res/values-bn-rBD/strings.xml
index bd05f6b1..416894aa 100644
--- a/News-Android-App/src/main/res/values-bn-rBD/strings.xml
+++ b/News-Android-App/src/main/res/values-bn-rBD/strings.xml
@@ -1,120 +1,133 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">স্বয়ংক্রিয় sync</string>
-  <string name="app_name">ownCloud সংবাদপাঠক</string>
-  <string name="title_activity_sync_interval_selector">Sync Interval নির্বাচনকারী</string>
-  <string name="title_activity_news_detail">বিস্তারিত সংবাদ কার্যক্রম</string>
-  <string name="empty_view_content">এখানে কিছু নেই</string>
-  <string name="no_wifi_available">WiFi সংযুক্ত নয়</string>
-  <string name="do_you_want_to_download_without_wifi">আপনি কি WiFi সংযোগ ছাড়াই ইমেজ ডা্‌উনলোড করতে চান </string>
-  <string name="widget_header">ownCloud সংবাদ</string>
-  <string name="message_bar_reload">পূনরায় লোড কর</string>
-  <string name="allUnreadFeeds">অপঠিত সকল আইটেম</string>
-  <string name="starredFeeds">তারকাচিহ্নিত আইটেম</string>
-  <string name="title_activity_new_feed">নতুন feed যোগ কর</string>
-  <string name="menu_update">নবোদ্যম</string>
-  <string name="menu_About_Changelog">সম্পর্কে / লগপরিবর্তন</string>
-  <string name="menu_markAllAsRead">সব পঠিত হিসেবে চিহ্নিত কর</string>
-  <string name="menu_StartImageCaching">ইমেজ ডাউনলোড কর</string>
-  <string name="menu_downloadMoreItems">আরো আইটেম ডাউনলোড কর</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">তারা চিহ্নিত</string>
-  <string name="action_read">পড়</string>
-  <string name="action_playPodacst">পডকাস্ট চালাও</string>
-  <string name="action_openInBrowser">ব্রাউজারে খোল</string>
-  <string name="action_Share">ভাগাভাগি কর</string>
-  <string name="action_login">সার্ভার নিয়ামকসমূহ</string>
-  <string name="action_save">সংরক্ষণ</string>
-  <string name="action_settings">নিয়ামকসমূহ</string>
-  <string name="action_sync_settings">Sync নিয়ামকসমূহ</string>
-  <string name="action_add_new_feed">নতুন feed যোগ কর</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">ফিড যোগ কর</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">ক্লিপবোর্ডে কপি করা হলো</string>
-  <string name="error_download_failed">ডাউনলোড হয়নি</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">অপসারণ</string>
-  <string name="feed_rename_button">পূনঃনামকরণ</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">ব্যবহারকারী</string>
-  <string name="pref_title_password">কূটশব্দ</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">সাইন ইন</string>
-  <string name="login_progress_signing_in">সাইনিং ইন</string>
-  <string name="error_field_required">এই ফিল্ডটি প্রয়োজন</string>
-  <string name="error_invalid_url">ভুল url</string>
-  <!--Import Accounts-->
-  <string name="import_account">একাউন্ট আমদানি</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">আর কোন আইটেম নেই </string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">নিয়ামকসমূহ</string>
-  <!--General settings-->
-  <string name="pref_header_general">সাধারণ</string>
-  <string name="pref_title_general_sort_order">গোছাও</string>
-  <string-array name="pref_general_sort_order">
-    <item>নতুন -&gt; পুরনো</item>
-    <item>পুরনো -&gt; নতুন</item>
-  </string-array>
-  <string name="dialog_clearing_cache">ক্যাশে খালি করা হচ্ছে</string>
-  <string name="reset_cache_unsaved_changes">সমন্বয়হীন পরিবর্তন রয়েছে। আপনি কি তবু ক্যাশে রিসেট করতে চান?</string>
-  <string name="warning">সতর্কবাণী</string>
-  <string name="pref_title_AutoSyncOnStart">শুরুতেই সমন্বয় কর</string>
-  <string name="pref_title_ShowOnlyUnread">শুধু অপঠিত লেখা প্রদর্শন করুন</string>
-  <string name="pref_title_DisableHostnameVerification">হোস্টনেম প্রমাণ বন্ধ কর</string>
-  <string name="pref_title_NavigateWithVolumeButtons">শব্দ নিয়ণ্ত্রক বোতামের সাহায্যে নেভিগেট কর</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">স্ক্রল করাকালে পঠিত হিসেবে চিহ্নিত কর</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">অজানা প্রত্যয়নপত্র গ্রহণ করবো?</string>
-  <string name="mtm_decision_always">সর্বদা</string>
-  <string name="mtm_decision_abort">বাতিল কর</string>
-  <string name="mtm_notification">প্রত্যয়নপত্র প্রমাণ</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">কোন পডকাস্ট নির্বাচন করা হয়নি</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">প্রদর্শন কর</string>
-  <string name="pref_title_app_theme">অ্যাপ থিম</string>
-  <string name="pref_title_feed_list_layout">ফিডলিস্ট প্রদর্শনী</string>
-  <string-array name="pref_display_apptheme">
-    <item>গাঢ়</item>
-    <item>হাল্কা</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">বার্তাসমূহ</string>
-  <string name="pref_title_notification_new_articles_available">নতুন লেখা পাওয়া গেলে বার্তা প্রদর্শন কর</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">সমস্যা</string>
-  <string name="login_dialog_text_something_went_wrong">কিছু একটা ভুল হয়েছে :(</string>
-  <string name="login_dialog_text_not_compatible">এই অ্যাপ সংষ্করণ আপনার ownCloud News অ্যাপের সম্পূরক নয়। আপনার নিউজ অ্যাপ ও appframework নবায়ন করুন। </string>
-  <string name="login_dialog_title_security_warning">নিরাপত্তাজনিত সতর্কতা</string>
-  <string name="login_dialog_text_security_warning">আপনি https ব্যবহার করছেননা। কোন আক্রমণকারী আপনার ডাটাপথে প্রবেশ করে আপনার গুরুত্বপূর্ণ ডাটা পেয়ে যাবে যেমন: আপনার কুটশব্দ)। এজন্য আপনাকে https ব্যবহারের জন্য জোর সুপারিশ করা হলো!  </string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">ডাটা &amp; sync</string>
-  <string name="pref_title_clearCache">ক্যাশে পরিষ্কার কর</string>
-  <string name="pref_title_CacheImagesOffline">অফলাইনে ইমেজ ক্যাশে কর</string>
-  <string name="pref_title_Max_Cache_Size">সর্বোচ্চ ক্যাশে আকার</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutes</item>
-    <item>15 Minutes</item>
-    <item>30 Minutes</item>
-    <item>45 Minutes</item>
-    <item>1 Hour</item>
-    <item>2 Hours</item>
-    <item>3 Hours</item>
-    <item>6 Hours</item>
-    <item>12 Hours</item>
-    <item>24 Hours</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">মুছে ফেল</string>
-</resources>
+
+    <string name="auto_sync_string">স্বয়ংক্রিয় sync</string>
+    <string name="title_activity_sync_interval_selector">Sync Interval নির্বাচনকারী</string>
+    <string name="title_activity_news_detail">বিস্তারিত সংবাদ কার্যক্রম</string>
+    <string name="empty_view_content">এখানে কিছু নেই</string>
+    <string name="no_wifi_available">WiFi সংযুক্ত নয়</string>
+    <string name="do_you_want_to_download_without_wifi">আপনি কি WiFi সংযোগ ছাড়াই ইমেজ ডা্‌উনলোড করতে চান </string>
+    <string name="widget_header">ownCloud সংবাদ</string>
+    <string name="message_bar_reload">পূনরায় লোড কর</string>
+    <string name="allUnreadFeeds">অপঠিত সকল আইটেম</string>
+    <string name="starredFeeds">তারকাচিহ্নিত আইটেম</string>
+    <string name="title_activity_new_feed">নতুন feed যোগ কর</string>
+
+    <string name="menu_update">নবোদ্যম</string>
+    <string name="menu_About_Changelog">সম্পর্কে / লগপরিবর্তন</string>
+    <string name="menu_markAllAsRead">সব পঠিত হিসেবে চিহ্নিত কর</string>
+    <string name="menu_StartImageCaching">ইমেজ ডাউনলোড কর</string>
+    <string name="menu_downloadMoreItems">আরো আইটেম ডাউনলোড কর</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">তারা চিহ্নিত</string>
+    <string name="action_read">পড়</string>
+    <string name="action_playPodacst">পডকাস্ট চালাও</string>
+    <string name="action_openInBrowser">ব্রাউজারে খোল</string>
+    <string name="action_Share">ভাগাভাগি কর</string>
+    <string name="action_login">সার্ভার নিয়ামকসমূহ</string>
+    <string name="action_save">সংরক্ষণ</string>
+    <string name="action_settings">নিয়ামকসমূহ</string>
+    <string name="action_sync_settings">Sync নিয়ামকসমূহ</string>
+    <string name="action_add_new_feed">নতুন feed যোগ কর</string>
+    <string name="action_add_feed">ফিড যোগ কর</string>
+
+
+    <string name="toast_copied_to_clipboard">ক্লিপবোর্ডে কপি করা হলো</string>
+    <string name="error_download_failed">ডাউনলোড হয়নি</string>
+    <string name="feed_remove_button">অপসারণ</string>
+    <string name="feed_rename_button">পূনঃনামকরণ</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">ব্যবহারকারী</string>
+    <string name="pref_title_password">কূটশব্দ</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">সাইন ইন</string>
+    <string name="login_progress_signing_in">সাইনিং ইন</string>
+    <string name="error_field_required">এই ফিল্ডটি প্রয়োজন</string>
+    <string name="error_invalid_url">ভুল url</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">একাউন্ট আমদানি</string>
+
+
+    <string name="toast_no_more_downloads_available">আর কোন আইটেম নেই </string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">নিয়ামকসমূহ</string>
+    <!-- General settings -->
+    <string name="pref_header_general">সাধারণ</string>
+    <string name="pref_title_general_sort_order">গোছাও</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>নতুন -&gt; পুরনো</item>
+        <item>পুরনো -&gt; নতুন</item>
+    </string-array>
+    <string name="dialog_clearing_cache">ক্যাশে খালি করা হচ্ছে</string>
+    <string name="reset_cache_unsaved_changes">সমন্বয়হীন পরিবর্তন রয়েছে। আপনি কি তবু ক্যাশে রিসেট করতে চান?</string>
+    <string name="warning">সতর্কবাণী</string>
+    <string name="pref_title_AutoSyncOnStart">শুরুতেই সমন্বয় কর</string>
+    <string name="pref_title_ShowOnlyUnread">শুধু অপঠিত লেখা প্রদর্শন করুন</string>
+    <string name="pref_title_DisableHostnameVerification">হোস্টনেম প্রমাণ বন্ধ কর</string>
+    <string name="pref_title_NavigateWithVolumeButtons">শব্দ নিয়ণ্ত্রক বোতামের সাহায্যে নেভিগেট কর</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">স্ক্রল করাকালে পঠিত হিসেবে চিহ্নিত কর</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">অজানা প্রত্যয়নপত্র গ্রহণ করবো?</string>
+    <string name="mtm_decision_always">সর্বদা</string>
+    <string name="mtm_decision_abort">বাতিল কর</string>
+    <string name="mtm_notification">প্রত্যয়নপত্র প্রমাণ</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">কোন পডকাস্ট নির্বাচন করা হয়নি</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">প্রদর্শন কর</string>
+    <string name="pref_title_app_theme">অ্যাপ থিম</string>
+    <string name="pref_title_feed_list_layout">ফিডলিস্ট প্রদর্শনী</string>
+    <string-array name="pref_display_apptheme">
+        <item>গাঢ়</item>
+        <item>হাল্কা</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">বার্তাসমূহ</string>
+    <string name="pref_title_notification_new_articles_available">নতুন লেখা পাওয়া গেলে বার্তা প্রদর্শন কর</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">সমস্যা</string>
+    <string name="login_dialog_text_something_went_wrong">কিছু একটা ভুল হয়েছে :(</string>
+    <string name="login_dialog_text_not_compatible">এই অ্যাপ সংষ্করণ আপনার ownCloud News অ্যাপের সম্পূরক নয়। আপনার নিউজ অ্যাপ ও appframework নবায়ন করুন। </string>
+    <string name="login_dialog_title_security_warning">নিরাপত্তাজনিত সতর্কতা</string>
+    <string name="login_dialog_text_security_warning">আপনি https ব্যবহার করছেননা। কোন আক্রমণকারী আপনার ডাটাপথে প্রবেশ করে আপনার গুরুত্বপূর্ণ ডাটা পেয়ে যাবে যেমন: আপনার কুটশব্দ)। এজন্য আপনাকে https ব্যবহারের জন্য জোর সুপারিশ করা হলো!  </string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">ডাটা &amp; sync</string>
+    <string name="pref_title_clearCache">ক্যাশে পরিষ্কার কর</string>
+    <string name="pref_title_CacheImagesOffline">অফলাইনে ইমেজ ক্যাশে কর</string>
+    <string name="pref_title_Max_Cache_Size">সর্বোচ্চ ক্যাশে আকার</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutes</item>
+        <item>15 Minutes</item>
+        <item>30 Minutes</item>
+        <item>45 Minutes</item>
+        <item>1 Hour</item>
+        <item>2 Hours</item>
+        <item>3 Hours</item>
+        <item>6 Hours</item>
+        <item>12 Hours</item>
+        <item>24 Hours</item>
+    </string-array>
+    <string name="content_desc_delete">মুছে ফেল</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-ca/strings.xml b/News-Android-App/src/main/res/values-ca/strings.xml
index f61e34da..470ec434 100644
--- a/News-Android-App/src/main/res/values-ca/strings.xml
+++ b/News-Android-App/src/main/res/values-ca/strings.xml
@@ -1,127 +1,140 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sincronitza automàticament</string>
-  <string name="app_name">Lector de notícies d\'ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Selector d\'interval de sincronització</string>
-  <string name="title_activity_news_detail">DetallActivitatNotícies</string>
-  <string name="empty_view_content">Cap element</string>
-  <string name="no_wifi_available">Sense connexió WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Voleu baixar les imatges sense una connexió WiFi</string>
-  <string name="widget_header">Notícies ownCloud</string>
-  <string name="message_bar_reload">Carrega de nou</string>
-  <string name="allUnreadFeeds">Tots els elements no llegits</string>
-  <string name="starredFeeds">Elements amb estrelles</string>
-  <string name="title_activity_new_feed">Afegeix una font nova</string>
-  <string name="menu_update">Refresca</string>
-  <string name="menu_About_Changelog">Quant a / Registre de canvis</string>
-  <string name="menu_markAllAsRead">Marca-ho tot com a llegit</string>
-  <string name="menu_StartImageCaching">Baixa imatges</string>
-  <string name="menu_downloadMoreItems">Baixa més elements</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Estrellat</string>
-  <string name="action_read">Llegeix</string>
-  <string name="action_playPodacst">Reprodueix el Podcast</string>
-  <string name="action_openInBrowser">Obre al navegador</string>
-  <string name="action_Share">Comparteix</string>
-  <string name="action_login">Arranjament del sevidor</string>
-  <string name="action_save">Desa</string>
-  <string name="action_settings">Arranjament</string>
-  <string name="action_sync_settings">Arranjament de sincronització</string>
-  <string name="action_add_new_feed">Afegeix una font nova</string>
-  <string name="action_textToSpeech">De lectura</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Afegeix font</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">S\'ha copiat al porta-retalls</string>
-  <string name="error_download_failed">La baixada ha fallat</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Elimina</string>
-  <string name="feed_rename_button">Reanomena</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nom d\'usuari</string>
-  <string name="pref_title_password">Contrasenya</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Inicia la sessió</string>
-  <string name="login_progress_signing_in">Iniciant la sessió...</string>
-  <string name="error_field_required">Es requereix aquest camp</string>
-  <string name="error_invalid_url">La URL és incorrecta</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importa compte</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">No hi ha més elements disponibles</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Arranjament</string>
-  <!--General settings-->
-  <string name="pref_header_general">General</string>
-  <string name="pref_title_general_sort_order">Ordena</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nou -&gt; Antic</item>
-    <item>Antic -&gt; Nou</item>
-  </string-array>
-  <string name="dialog_clearing_cache">S\'està esborrant la memòria cau</string>
-  <string name="reset_cache_unsaved_changes">Hi ha canvis no sincronitzats. Voleu eliminar la memòria cau igualment?</string>
-  <string name="warning">Avís</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronitza en inicialitzar</string>
-  <string name="pref_title_ShowOnlyUnread">Mostra només articles sense llegir</string>
-  <string name="pref_title_DisableHostnameVerification">Desactiva la verificació del nom del servidor</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navega amb els botons del volum</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marca com a llegits en desplaçar-vos</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Accepta certificats de desconeguts?</string>
-  <string name="mtm_decision_always">Sempre</string>
-  <string name="mtm_decision_abort">Cancel·la</string>
-  <string name="mtm_notification">Verificació del certificat</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">No heu seleccionat cap podcast</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Pantalla</string>
-  <string name="pref_title_app_theme">Tema de l\'aplicació</string>
-  <string name="pref_title_feed_list_layout">Format de llista de fonts</string>
-  <string-array name="pref_display_apptheme">
-    <item>Fosc</item>
-    <item>Clar</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificacions</string>
-  <string name="pref_title_notification_new_articles_available">Mostra notificacions quan hi hagi nous articles disponibles</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Error</string>
-  <string name="login_dialog_text_something_went_wrong">Alguna cosa ha fallat :(</string>
-  <string name="login_dialog_text_not_compatible">Aquesta versió de l\'aplicació no és compatible amb l\'aplicació News de ownCloud. Actualitzeu l\'aplicació News i la appframework.</string>
-  <string name="login_dialog_title_security_warning">Avís de seguretat</string>
-  <string name="login_dialog_text_security_warning">No esteu usant https. Un atacant podria interceptar el transit i guanyar accés a dades sensibles (Per exemple la vostra contrasenya). Es recomana usar https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Sincronització &amp; de dades </string>
-  <string name="pref_title_clearCache">Esborra la memòria cau</string>
-  <string name="pref_title_CacheImagesOffline">Comprimeix imatges fora de línia</string>
-  <string name="pref_title_Max_Cache_Size">Memòria cau màxima</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Mai</item>
-    <item>Només via WIFI</item>
-    <item>Via WiFi &amp; Mòbil</item>
-    <item>Pregunta quan no està conectat al WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minuts</item>
-    <item>15 minuts</item>
-    <item>30 minuts</item>
-    <item>45 minuts</item>
-    <item>1 hora</item>
-    <item>2 hores</item>
-    <item>3 hores</item>
-    <item>6 hores</item>
-    <item>12 hores</item>
-    <item>24 hores</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">elimina</string>
-</resources>
+
+    <string name="auto_sync_string">Sincronitza automàticament</string>
+    <string name="title_activity_sync_interval_selector">Selector d\'interval de sincronització</string>
+    <string name="title_activity_news_detail">DetallActivitatNotícies</string>
+    <string name="empty_view_content">Cap element</string>
+    <string name="no_wifi_available">Sense connexió WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Voleu baixar les imatges sense una connexió WiFi</string>
+    <string name="widget_header">Notícies ownCloud</string>
+    <string name="message_bar_reload">Carrega de nou</string>
+    <string name="allUnreadFeeds">Tots els elements no llegits</string>
+    <string name="starredFeeds">Elements amb estrelles</string>
+    <string name="title_activity_new_feed">Afegeix una font nova</string>
+
+    <string name="menu_update">Refresca</string>
+    <string name="menu_About_Changelog">Quant a / Registre de canvis</string>
+    <string name="menu_markAllAsRead">Marca-ho tot com a llegit</string>
+    <string name="menu_StartImageCaching">Baixa imatges</string>
+    <string name="menu_downloadMoreItems">Baixa més elements</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Estrellat</string>
+    <string name="action_read">Llegeix</string>
+    <string name="action_playPodacst">Reprodueix el Podcast</string>
+    <string name="action_openInBrowser">Obre al navegador</string>
+    <string name="action_Share">Comparteix</string>
+    <string name="action_login">Arranjament del sevidor</string>
+    <string name="action_save">Desa</string>
+    <string name="action_settings">Arranjament</string>
+    <string name="action_sync_settings">Arranjament de sincronització</string>
+    <string name="action_add_new_feed">Afegeix una font nova</string>
+    <string name="action_textToSpeech">De lectura</string>
+    <string name="action_add_feed">Afegeix font</string>
+
+
+    <string name="toast_copied_to_clipboard">S\'ha copiat al porta-retalls</string>
+    <string name="error_download_failed">La baixada ha fallat</string>
+    <string name="feed_remove_button">Elimina</string>
+    <string name="feed_rename_button">Reanomena</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nom d\'usuari</string>
+    <string name="pref_title_password">Contrasenya</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Inicia la sessió</string>
+    <string name="login_progress_signing_in">Iniciant la sessió...</string>
+    <string name="error_field_required">Es requereix aquest camp</string>
+    <string name="error_invalid_url">La URL és incorrecta</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importa compte</string>
+
+
+    <string name="toast_no_more_downloads_available">No hi ha més elements disponibles</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Arranjament</string>
+    <!-- General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_general_sort_order">Ordena</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nou -&gt; Antic</item>
+        <item>Antic -&gt; Nou</item>
+    </string-array>
+    <string name="dialog_clearing_cache">S\'està esborrant la memòria cau</string>
+    <string name="reset_cache_unsaved_changes">Hi ha canvis no sincronitzats. Voleu eliminar la memòria cau igualment?</string>
+    <string name="warning">Avís</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronitza en inicialitzar</string>
+    <string name="pref_title_ShowOnlyUnread">Mostra només articles sense llegir</string>
+    <string name="pref_title_DisableHostnameVerification">Desactiva la verificació del nom del servidor</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navega amb els botons del volum</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marca com a llegits en desplaçar-vos</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Accepta certificats de desconeguts?</string>
+    <string name="mtm_decision_always">Sempre</string>
+    <string name="mtm_decision_abort">Cancel·la</string>
+    <string name="mtm_notification">Verificació del certificat</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">No heu seleccionat cap podcast</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Pantalla</string>
+    <string name="pref_title_app_theme">Tema de l\'aplicació</string>
+    <string name="pref_title_feed_list_layout">Format de llista de fonts</string>
+    <string-array name="pref_display_apptheme">
+        <item>Fosc</item>
+        <item>Clar</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificacions</string>
+    <string name="pref_title_notification_new_articles_available">Mostra notificacions quan hi hagi nous articles disponibles</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Error</string>
+    <string name="login_dialog_text_something_went_wrong">Alguna cosa ha fallat :(</string>
+    <string name="login_dialog_text_not_compatible">Aquesta versió de l\'aplicació no és compatible amb l\'aplicació News de ownCloud. Actualitzeu l\'aplicació News i la appframework.</string>
+    <string name="login_dialog_title_security_warning">Avís de seguretat</string>
+    <string name="login_dialog_text_security_warning">No esteu usant https. Un atacant podria interceptar el transit i guanyar accés a dades sensibles (Per exemple la vostra contrasenya). Es recomana usar https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Sincronització &amp; de dades </string>
+    <string name="pref_title_clearCache">Esborra la memòria cau</string>
+    <string name="pref_title_CacheImagesOffline">Comprimeix imatges fora de línia</string>
+    <string name="pref_title_Max_Cache_Size">Memòria cau màxima</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Mai</item>
+        <item>Només via WIFI</item>
+        <item>Via WiFi &amp; Mòbil</item>
+        <item>Pregunta quan no està conectat al WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minuts</item>
+        <item>15 minuts</item>
+        <item>30 minuts</item>
+        <item>45 minuts</item>
+        <item>1 hora</item>
+        <item>2 hores</item>
+        <item>3 hores</item>
+        <item>6 hores</item>
+        <item>12 hores</item>
+        <item>24 hores</item>
+    </string-array>
+    <string name="content_desc_delete">elimina</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-cs-rCZ/strings.xml b/News-Android-App/src/main/res/values-cs-rCZ/strings.xml
index 00e6ebfe..24695fe0 100644
--- a/News-Android-App/src/main/res/values-cs-rCZ/strings.xml
+++ b/News-Android-App/src/main/res/values-cs-rCZ/strings.xml
@@ -1,200 +1,230 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automatická synchronizace</string>
-  <string name="app_name">Čtečka zpráv ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Volba intervalu synchronizace</string>
-  <string name="title_activity_news_detail">Podrobná aktivita zpráv</string>
-  <string name="empty_view_content">Žádné položky</string>
-  <string name="toast_GettingMoreItems">Probíhá stahování dalších položek... Chvíli strpení.</string>
-  <string name="no_wifi_available">Wi-Fi není připojeno</string>
-  <string name="do_you_want_to_download_without_wifi">Chcete stáhnout obrázky bez použití Wi-Fi připojení</string>
-  <string name="current_version">Používáte verzi %s</string>
-  <string name="widget_header">ownCloud Novinky</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nová položka k dispozici</item>
-    <item quantity="few">%d nové položky k dispozici</item>
-    <item quantity="other">%d nových položek k dispozici</item>
-  </plurals>
-  <string name="message_bar_reload">Obnovit</string>
-  <string name="allUnreadFeeds">Všechny nepřečtené položky</string>
-  <string name="starredFeeds">Položky s hvězdičkou</string>
-  <string name="title_activity_new_feed">Přidat nový kanál</string>
-  <string name="menu_update">Obnovit</string>
-  <string name="menu_About_Changelog">O aplikaci / Seznam změn</string>
-  <string name="menu_markAllAsRead">Označit vše jako přečtené</string>
-  <string name="menu_StartImageCaching">Stáhnout obrázky</string>
-  <string name="menu_downloadMoreItems">Stáhnout další položky</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">S hvězdičkou</string>
-  <string name="action_read">Číst</string>
-  <string name="action_playPodacst">Přehrát podcast</string>
-  <string name="action_openInBrowser">Otevřít v prohlížeči</string>
-  <string name="action_Share">Sdílet</string>
-  <string name="action_login">Nastavení serveru</string>
-  <string name="action_save">Uložit</string>
-  <string name="action_settings">Nastavení</string>
-  <string name="action_sync_settings">Nastavení synchronizace</string>
-  <string name="action_add_new_feed">Přidat nový kanál</string>
-  <string name="action_textToSpeech">Přečíst</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Máte %d novou nepřečtenou položku</item>
-    <item quantity="few">Máte %d nové nepřečtené položky</item>
-    <item quantity="other">Máte %d nových nepřečtených položek</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d nová nepřečtená položka k dispozici</item>
-    <item quantity="few">%d nové nepřečtené položky k dispozici</item>
-    <item quantity="other">%d nových nepřečtených položek k dispozici</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">URL kanálu</string>
-  <string name="action_add_feed">Přidat kanál</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Stáhnout obrázek</string>
-  <string name="action_img_sharelink">Sdílet odkaz na obrázek</string>
-  <string name="action_img_open">Otevřít obrázek v prohlížeči</string>
-  <string name="action_img_copylink">Kopírovat odkaz na obrázek</string>
-  <string name="action_link_share">Sdílet odkaz</string>
-  <string name="action_link_open">Otevřít odkaz v prohlížeči</string>
-  <string name="action_link_copy">Zkopírovat odkaz</string>
-  <string name="toast_img_download_wait">Stahování... chvíli strpení</string>
-  <string name="toast_img_saved">Obrázek uložen.</string>
-  <string name="toast_img_notwriteable">Selhalo zapsání obrázku.</string>
-  <string name="toast_copied_to_clipboard">Zkopírováno do schránky</string>
-  <string name="error_download_failed">Stažení selhalo</string>
-  <string name="intent_title_share">Sdílet pomocí</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Odstranit kanál</string>
-  <string name="action_feed_rename">Přejmenovat kanál</string>
-  <string name="feed_remove_button">Odstranit</string>
-  <string name="feed_rename_button">Přejmenovat</string>
-  <string name="confirm_feed_remove">Opravdu chcete odstranit tento kanál? Toto nelze vrátit zpět!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Uživatelské jméno</string>
-  <string name="pref_title_password">Heslo</string>
-  <string name="pref_title_owncloudRootPath">ownCloud kořenová adresa</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Přihlásit</string>
-  <string name="login_progress_signing_in">Přihlašuji...</string>
-  <string name="error_field_required">Tato položka je povinná</string>
-  <string name="error_invalid_url">Tato URL je nesprávná</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importovat účet</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Stažena %d stará položka</item>
-    <item quantity="few">Staženo %d staré položky</item>
-    <item quantity="other">Staženo %d starých položek</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">K dispozici nejsou žádné další položky</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Stažena %d položka...</item>
-    <item quantity="few">Staženy %d položky...</item>
-    <item quantity="other">Staženo %d položek...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Nastavení</string>
-  <string name="cache_is_cleared">Odkládací paměť vyčištěna!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Hlavní</string>
-  <string name="pref_title_general_sort_order">Řazení</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nové -&gt; Staré</item>
-    <item>Staré -&gt; Nové</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Vyprazdňování mezipaměťi</string>
-  <string name="dialog_clearing_cache_please_wait">Mazání odkládací paměti... Chvíli strpení.</string>
-  <string name="reset_cache_unsaved_changes">Existují nesesynchronizované změny. Přejete si přesto vyprázdnit mezipaměť?</string>
-  <string name="warning">Varování</string>
-  <string name="pref_title_AutoSyncOnStart">Synchronizovat při spuštění</string>
-  <string name="pref_title_ShowOnlyUnread">Zobrazit pouze nepřečtené články</string>
-  <string name="pref_title_DisableHostnameVerification">Vypnout ověřování názvu hostitele</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigace pomocí tlačítek hlasitosti</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Označit jako přečtené při rolování stránky</string>
-  <string name="pref_title_OpenInBrowserDirectly">Použít externí prohlížeč pro zobrazení článků</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Přijmout neznámý certifikát?</string>
-  <string name="mtm_decision_always">Vždy</string>
-  <string name="mtm_decision_abort">Přerušit</string>
-  <string name="mtm_notification">Ověření certifikátu</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nebyl vybrán žádný podcast</string>
-  <string name="no_chapters_available">Žádné dostupné kapitoly</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Zobrazení</string>
-  <string name="pref_title_app_theme">Vzhled aplikace</string>
-  <string name="pref_title_feed_list_layout">Rozvržení seznamu kanálů</string>
-  <string name="pref_display_title_lines_count">Počet řádek pro nadpis</string>
-  <string-array name="pref_display_apptheme">
-    <item>Tmavý</item>
-    <item>Světlý</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Jednoduchý</item>
-    <item>Rozšířený</item>
-    <item>Rozšířený (plný text)</item>
-    <item>Rozšířený s webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Upozornění</string>
-  <string name="pref_title_notification_new_articles_available">Zobraz upozornění pokud jsou dostupné nové články</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Chyba</string>
-  <string name="login_dialog_text_something_went_wrong">Něco se pokazilo :(</string>
-  <string name="login_dialog_text_not_compatible">Verze této aplikace není kompatibilní s vaší aplikací ownCloud News. Proveďte prosím aktualizaci aplikací News a appFramework.</string>
-  <string name="login_dialog_title_security_warning">Bezpečnostní upozornění</string>
-  <string name="login_dialog_text_security_warning">Nepoužíváte HTTPS. Útočník může zachytit vaši komunikaci a získat přístup k některým citlivým datům (např. vaše heslo). Důrazně doporučujeme používat HTTPS.</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; synchronizace</string>
-  <string name="pref_title_clearCache">Vyprázdnit mezipaměť</string>
-  <string name="pref_title_CacheImagesOffline">Ukládat obrázky do offline mezipaměti</string>
-  <string name="pref_title_Max_Cache_Size">Maximální velikost mezipaměti</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nikdy</item>
-    <item>Pouze přes WiFi</item>
-    <item>Přes WiFi &amp; Mobilní síť</item>
-    <item>Dotázat se pokud bez WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minut</item>
-    <item>15 minut</item>
-    <item>30 minut</item>
-    <item>45 minut</item>
-    <item>1 hodina</item>
-    <item>2 hodiny</item>
-    <item>3 hodiny</item>
-    <item>6 hodin</item>
-    <item>12 hodin</item>
-    <item>24 hodin</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">přehrát</string>
-  <string name="content_desc_pause">pozastavit</string>
-  <string name="content_desc_rewind">přetočit</string>
-  <string name="content_desc_forward">vpřed</string>
-  <string name="content_desc_expand">rozbalit</string>
-  <string name="content_desc_collapse">sbalit</string>
-  <string name="content_desc_mark_as_read">označit jako přečtené</string>
-  <string name="content_desc_mark_as_unread">označit jako nepřečtené</string>
-  <string name="content_desc_tap_to_refresh">ťuknout pro obnovení</string>
-  <string name="content_desc_add_to_favorites">přidat k obíbeným</string>
-  <string name="content_desc_remove_from_favorites">odstranit z oblíbených</string>
-  <string name="content_desc_show_password">zobrazit heslo</string>
-  <string name="content_desc_delete">smazat</string>
-  <string name="content_desc_download">stažené</string>
+
+    <string name="auto_sync_string">Automatická synchronizace</string>
+    <string name="title_activity_sync_interval_selector">Volba intervalu synchronizace</string>
+    <string name="title_activity_news_detail">Podrobná aktivita zpráv</string>
+    <string name="empty_view_content">Žádné položky</string>
+    <string name="toast_GettingMoreItems">Probíhá stahování dalších položek... Chvíli strpení.</string>
+    <string name="no_wifi_available">Wi-Fi není připojeno</string>
+    <string name="do_you_want_to_download_without_wifi">Chcete stáhnout obrázky bez použití Wi-Fi připojení</string>
+    <string name="current_version">Používáte verzi %s</string>
+    <string name="widget_header">ownCloud Novinky</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nová položka k dispozici</item>
+        <item quantity="few">%d nové položky k dispozici</item>
+        <item quantity="other">%d nových položek k dispozici</item>
+    </plurals>
+    <string name="message_bar_reload">Obnovit</string>
+    <string name="allUnreadFeeds">Všechny nepřečtené položky</string>
+    <string name="starredFeeds">Položky s hvězdičkou</string>
+    <string name="title_activity_new_feed">Přidat nový kanál</string>
+
+    <string name="menu_update">Obnovit</string>
+    <string name="menu_About_Changelog">O aplikaci / Seznam změn</string>
+    <string name="menu_markAllAsRead">Označit vše jako přečtené</string>
+    <string name="menu_StartImageCaching">Stáhnout obrázky</string>
+    <string name="menu_downloadMoreItems">Stáhnout další položky</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">S hvězdičkou</string>
+    <string name="action_read">Číst</string>
+    <string name="action_playPodacst">Přehrát podcast</string>
+    <string name="action_openInBrowser">Otevřít v prohlížeči</string>
+    <string name="action_Share">Sdílet</string>
+    <string name="action_login">Nastavení serveru</string>
+    <string name="action_save">Uložit</string>
+    <string name="action_settings">Nastavení</string>
+    <string name="action_sync_settings">Nastavení synchronizace</string>
+    <string name="action_add_new_feed">Přidat nový kanál</string>
+    <string name="action_textToSpeech">Přečíst</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Máte %d novou nepřečtenou položku</item>
+        <item quantity="few">Máte %d nové nepřečtené položky</item>
+        <item quantity="other">Máte %d nových nepřečtených položek</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d nová nepřečtená položka k dispozici</item>
+        <item quantity="few">%d nové nepřečtené položky k dispozici</item>
+        <item quantity="other">%d nových nepřečtených položek k dispozici</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">URL kanálu</string>
+    <string name="action_add_feed">Přidat kanál</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Stáhnout obrázek</string>
+    <string name="action_img_sharelink">Sdílet odkaz na obrázek</string>
+    <string name="action_img_open">Otevřít obrázek v prohlížeči</string>
+    <string name="action_img_copylink">Kopírovat odkaz na obrázek</string>
+    <string name="action_link_share">Sdílet odkaz</string>
+    <string name="action_link_open">Otevřít odkaz v prohlížeči</string>
+    <string name="action_link_copy">Zkopírovat odkaz</string>
+    <string name="toast_img_download_wait">Stahování... chvíli strpení</string>
+    <string name="toast_img_saved">Obrázek uložen.</string>
+    <string name="toast_img_notwriteable">Selhalo zapsání obrázku.</string>
+    <string name="toast_copied_to_clipboard">Zkopírováno do schránky</string>
+    <string name="error_download_failed">Stažení selhalo</string>
+    <string name="intent_title_share">Sdílet pomocí</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Odstranit kanál</string>
+    <string name="action_feed_rename">Přejmenovat kanál</string>
+    <string name="feed_remove_button">Odstranit</string>
+    <string name="feed_rename_button">Přejmenovat</string>
+    <string name="confirm_feed_remove">Opravdu chcete odstranit tento kanál? Toto nelze vrátit zpět!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Uživatelské jméno</string>
+    <string name="pref_title_password">Heslo</string>
+    <string name="pref_title_owncloudRootPath">ownCloud kořenová adresa</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Přihlásit</string>
+    <string name="login_progress_signing_in">Přihlašuji...</string>
+    <string name="error_field_required">Tato položka je povinná</string>
+    <string name="error_invalid_url">Tato URL je nesprávná</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importovat účet</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Stažena %d stará položka</item>
+        <item quantity="few">Staženo %d staré položky</item>
+        <item quantity="other">Staženo %d starých položek</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">K dispozici nejsou žádné další položky</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Stažena %d položka...</item>
+        <item quantity="few">Staženy %d položky...</item>
+        <item quantity="other">Staženo %d položek...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Nastavení</string>
+    <string name="cache_is_cleared">Odkládací paměť vyčištěna!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Hlavní</string>
+    <string name="pref_title_general_sort_order">Řazení</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nové -&gt; Staré</item>
+        <item>Staré -&gt; Nové</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Vyprazdňování mezipaměťi</string>
+    <string name="dialog_clearing_cache_please_wait">Mazání odkládací paměti... Chvíli strpení.</string>
+    <string name="reset_cache_unsaved_changes">Existují nesesynchronizované změny. Přejete si přesto vyprázdnit mezipaměť?</string>
+    <string name="warning">Varování</string>
+    <string name="pref_title_AutoSyncOnStart">Synchronizovat při spuštění</string>
+    <string name="pref_title_ShowOnlyUnread">Zobrazit pouze nepřečtené články</string>
+    <string name="pref_title_DisableHostnameVerification">Vypnout ověřování názvu hostitele</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigace pomocí tlačítek hlasitosti</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Označit jako přečtené při rolování stránky</string>
+    <string name="pref_title_OpenInBrowserDirectly">Použít externí prohlížeč pro zobrazení článků</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Přijmout neznámý certifikát?</string>
+    <string name="mtm_decision_always">Vždy</string>
+    <string name="mtm_decision_abort">Přerušit</string>
+    <string name="mtm_notification">Ověření certifikátu</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nebyl vybrán žádný podcast</string>
+    <string name="no_chapters_available">Žádné dostupné kapitoly</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Zobrazení</string>
+    <string name="pref_title_app_theme">Vzhled aplikace</string>
+    <string name="pref_title_feed_list_layout">Rozvržení seznamu kanálů</string>
+    <string name="pref_display_title_lines_count">Počet řádek pro nadpis</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Tmavý</item>
+        <item>Světlý</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Jednoduchý</item>
+        <item>Rozšířený</item>
+        <item>Rozšířený (plný text)</item>
+        <item>Rozšířený s webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Upozornění</string>
+    <string name="pref_title_notification_new_articles_available">Zobraz upozornění pokud jsou dostupné nové články</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Chyba</string>
+    <string name="login_dialog_text_something_went_wrong">Něco se pokazilo :(</string>
+    <string name="login_dialog_text_not_compatible">Verze této aplikace není kompatibilní s vaší aplikací ownCloud News. Proveďte prosím aktualizaci aplikací News a appFramework.</string>
+    <string name="login_dialog_title_security_warning">Bezpečnostní upozornění</string>
+    <string name="login_dialog_text_security_warning">Nepoužíváte HTTPS. Útočník může zachytit vaši komunikaci a získat přístup k některým citlivým datům (např. vaše heslo). Důrazně doporučujeme používat HTTPS.</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; synchronizace</string>
+    <string name="pref_title_clearCache">Vyprázdnit mezipaměť</string>
+    <string name="pref_title_CacheImagesOffline">Ukládat obrázky do offline mezipaměti</string>
+    <string name="pref_title_Max_Cache_Size">Maximální velikost mezipaměti</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nikdy</item>
+        <item>Pouze přes WiFi</item>
+        <item>Přes WiFi &amp; Mobilní síť</item>
+        <item>Dotázat se pokud bez WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minut</item>
+        <item>15 minut</item>
+        <item>30 minut</item>
+        <item>45 minut</item>
+        <item>1 hodina</item>
+        <item>2 hodiny</item>
+        <item>3 hodiny</item>
+        <item>6 hodin</item>
+        <item>12 hodin</item>
+        <item>24 hodin</item>
+    </string-array>
+    <string name="content_desc_play">přehrát</string>
+    <string name="content_desc_pause">pozastavit</string>
+    <string name="content_desc_rewind">přetočit</string>
+    <string name="content_desc_forward">vpřed</string>
+    <string name="content_desc_expand">rozbalit</string>
+    <string name="content_desc_collapse">sbalit</string>
+    <string name="content_desc_mark_as_read">označit jako přečtené</string>
+    <string name="content_desc_mark_as_unread">označit jako nepřečtené</string>
+    <string name="content_desc_tap_to_refresh">ťuknout pro obnovení</string>
+    <string name="content_desc_add_to_favorites">přidat k obíbeným</string>
+    <string name="content_desc_remove_from_favorites">odstranit z oblíbených</string>
+    <string name="content_desc_show_password">zobrazit heslo</string>
+    <string name="content_desc_delete">smazat</string>
+    <string name="content_desc_download">stažené</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-da/strings.xml b/News-Android-App/src/main/res/values-da/strings.xml
index f922c122..15a9a445 100644
--- a/News-Android-App/src/main/res/values-da/strings.xml
+++ b/News-Android-App/src/main/res/values-da/strings.xml
@@ -1,161 +1,181 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automatisk synkronisering </string>
-  <string name="app_name">ownCloud Nyheds Læser</string>
-  <string name="title_activity_sync_interval_selector">Synkroniseringsinterval vælger</string>
-  <string name="title_activity_news_detail">DetaljeretNyhedsAktivitet</string>
-  <string name="empty_view_content">Her er ingen artikler</string>
-  <string name="toast_GettingMoreItems">Påbegyndte download af flere elementer... Vent venligst.</string>
-  <string name="no_wifi_available">Ingen WiFi-forbindelse</string>
-  <string name="do_you_want_to_download_without_wifi">Ønsker du at hente billeder uden brug af WiFi-forbindelse</string>
-  <string name="widget_header">ownCloud Nyheder</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nyt element er tilgængeligt</item>
-    <item quantity="other">%d nye elementer er tilgængelige</item>
-  </plurals>
-  <string name="message_bar_reload">Genindlæs</string>
-  <string name="allUnreadFeeds">Alle ulæste artikler</string>
-  <string name="starredFeeds">Markerede artikler</string>
-  <string name="title_activity_new_feed">Tilføj nyt feed</string>
-  <string name="menu_update">Opdatér</string>
-  <string name="menu_About_Changelog">Om / Ændringslog</string>
-  <string name="menu_markAllAsRead">Markér alle som læst</string>
-  <string name="menu_StartImageCaching">Hent billeder</string>
-  <string name="menu_downloadMoreItems">Hent flere artikler</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Stjernemarkéret</string>
-  <string name="action_read">Læst</string>
-  <string name="action_playPodacst">Afspil podcast</string>
-  <string name="action_openInBrowser">Åbn i browser</string>
-  <string name="action_Share">Del</string>
-  <string name="action_login">Server-indstillinger</string>
-  <string name="action_save">Gem</string>
-  <string name="action_settings">Indstillinger</string>
-  <string name="action_sync_settings">Synkroniseringsindstillinger</string>
-  <string name="action_add_new_feed">Tilføj nyt feed</string>
-  <string name="action_textToSpeech">Læs højt</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Du har %d nyt, ulæst element</item>
-    <item quantity="other">Du har %d nye, ulæste elementer</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d nyt, ulæst element er tilgængeligt</item>
-    <item quantity="other">%d nye, ulæste elementer er tilgængelige</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="action_add_feed">Tilføj feed</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Kopieret til udklipsholder</string>
-  <string name="error_download_failed">Download fejlede</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Fjern</string>
-  <string name="feed_rename_button">Omdøb</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Brugernavn</string>
-  <string name="pref_title_password">Kodeord</string>
-  <string name="pref_title_owncloudRootPath">rodadressen for ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Log ind</string>
-  <string name="login_progress_signing_in">Logger ind...</string>
-  <string name="error_field_required">Dette felt er påkrævet</string>
-  <string name="error_invalid_url">Denne URL er ikke korrekt</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importér brugerkonto</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Hentede %d gammelt element</item>
-    <item quantity="other">Hentede %d gamle elementer</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Der er ikke flere artikler tilgængelig</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Indstillinger</string>
-  <string name="cache_is_cleared">Cachen er ryddet!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Generelt</string>
-  <string name="pref_title_general_sort_order">Rækkefølge for sortering</string>
-  <string-array name="pref_general_sort_order">
-    <item>Ny -&gt; Gammel</item>
-    <item>Gammel -&gt; Ny</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Nulstil mellemlager</string>
-  <string name="dialog_clearing_cache_please_wait">Rydder mellemlageret... Vent venligst.</string>
-  <string name="reset_cache_unsaved_changes">Der er ændringer som ikke er synkroniseret. Vil du nulstille mellemlageret alligevel?</string>
-  <string name="warning">Advarsel</string>
-  <string name="pref_title_AutoSyncOnStart">Synkroniserer ved opstart</string>
-  <string name="pref_title_ShowOnlyUnread">Vis kun ulæste artikler</string>
-  <string name="pref_title_DisableHostnameVerification">Deaktivér verifikation af værtsnavn</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigér med lydknapper</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Markér som læst når der rulles</string>
-  <string name="pref_title_OpenInBrowserDirectly">Benyt en ekstern browser for at se artiklerne</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Acceptér ukendt certifikat? </string>
-  <string name="mtm_decision_always">Altid</string>
-  <string name="mtm_decision_abort">Afbryd</string>
-  <string name="mtm_notification">Verificering af certifikat</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Der er ikke valgt podcasts</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Vis</string>
-  <string name="pref_title_app_theme">App-tema</string>
-  <string name="pref_title_feed_list_layout">Layout for feed-liste</string>
-  <string name="pref_display_title_lines_count">Linjeantal for titel</string>
-  <string-array name="pref_display_apptheme">
-    <item>Mørk</item>
-    <item>Lys</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simpel</item>
-    <item>Udvidet</item>
-    <item>Udvidet (fuld tekst)</item>
-    <item>Udvidet med Webvisning</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notifikationer</string>
-  <string name="pref_title_notification_new_articles_available">Vis notifikation når der er nye artikler tilgængelige</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Fejl</string>
-  <string name="login_dialog_text_something_went_wrong">Noget gik galt :(</string>
-  <string name="login_dialog_text_not_compatible">Denne app-version er ikke kompatibel med din ownCloud News App. Opdatér venligst nyheds-app\'en og appframework.</string>
-  <string name="login_dialog_title_security_warning">Sikkerhedsadvarsel</string>
-  <string name="login_dialog_text_security_warning">Du benytter ikke https. En ondsindet person kan opsnappe din trafik og få adgang til følsomme data (f.eks. dit kodeord). Derfor er det stærkt anbefalet at bruge https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; sync</string>
-  <string name="pref_title_clearCache">Ryd mellemlageret</string>
-  <string name="pref_title_CacheImagesOffline">Foretag mellemlagring af billeder offline</string>
-  <string name="pref_title_Max_Cache_Size">Maksimumstørrelse på mellemlageret</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Aldrig</item>
-    <item>Kun via wifi</item>
-    <item>Via wifi &amp; mobil</item>
-    <item>Spørg når der ikke er wifi-forbindelse</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minutter</item>
-    <item>15 minutter</item>
-    <item>30 minutter</item>
-    <item>45 minutter</item>
-    <item>1 time</item>
-    <item>2 timer</item>
-    <item>3 timer</item>
-    <item>6 timer</item>
-    <item>12 timer</item>
-    <item>24 timer</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">slet</string>
-</resources>
+
+    <string name="auto_sync_string">Automatisk synkronisering </string>
+    <string name="title_activity_sync_interval_selector">Synkroniseringsinterval vælger</string>
+    <string name="title_activity_news_detail">DetaljeretNyhedsAktivitet</string>
+    <string name="empty_view_content">Her er ingen artikler</string>
+    <string name="toast_GettingMoreItems">Påbegyndte download af flere elementer... Vent venligst.</string>
+    <string name="no_wifi_available">Ingen WiFi-forbindelse</string>
+    <string name="do_you_want_to_download_without_wifi">Ønsker du at hente billeder uden brug af WiFi-forbindelse</string>
+    <string name="widget_header">ownCloud Nyheder</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nyt element er tilgængeligt</item>
+        <item quantity="other">%d nye elementer er tilgængelige</item>
+    </plurals>
+    <string name="message_bar_reload">Genindlæs</string>
+    <string name="allUnreadFeeds">Alle ulæste artikler</string>
+    <string name="starredFeeds">Markerede artikler</string>
+    <string name="title_activity_new_feed">Tilføj nyt feed</string>
+
+    <string name="menu_update">Opdatér</string>
+    <string name="menu_About_Changelog">Om / Ændringslog</string>
+    <string name="menu_markAllAsRead">Markér alle som læst</string>
+    <string name="menu_StartImageCaching">Hent billeder</string>
+    <string name="menu_downloadMoreItems">Hent flere artikler</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Stjernemarkéret</string>
+    <string name="action_read">Læst</string>
+    <string name="action_playPodacst">Afspil podcast</string>
+    <string name="action_openInBrowser">Åbn i browser</string>
+    <string name="action_Share">Del</string>
+    <string name="action_login">Server-indstillinger</string>
+    <string name="action_save">Gem</string>
+    <string name="action_settings">Indstillinger</string>
+    <string name="action_sync_settings">Synkroniseringsindstillinger</string>
+    <string name="action_add_new_feed">Tilføj nyt feed</string>
+    <string name="action_textToSpeech">Læs højt</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Du har %d nyt, ulæst element</item>
+        <item quantity="other">Du har %d nye, ulæste elementer</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d nyt, ulæst element er tilgængeligt</item>
+        <item quantity="other">%d nye, ulæste elementer er tilgængelige</item>
+    </plurals>
+
+
+    <string name="action_add_feed">Tilføj feed</string>
+
+
+    <string name="toast_copied_to_clipboard">Kopieret til udklipsholder</string>
+    <string name="error_download_failed">Download fejlede</string>
+    <string name="feed_remove_button">Fjern</string>
+    <string name="feed_rename_button">Omdøb</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Brugernavn</string>
+    <string name="pref_title_password">Kodeord</string>
+    <string name="pref_title_owncloudRootPath">rodadressen for ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Log ind</string>
+    <string name="login_progress_signing_in">Logger ind...</string>
+    <string name="error_field_required">Dette felt er påkrævet</string>
+    <string name="error_invalid_url">Denne URL er ikke korrekt</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importér brugerkonto</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Hentede %d gammelt element</item>
+        <item quantity="other">Hentede %d gamle elementer</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Der er ikke flere artikler tilgængelig</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Indstillinger</string>
+    <string name="cache_is_cleared">Cachen er ryddet!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Generelt</string>
+    <string name="pref_title_general_sort_order">Rækkefølge for sortering</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Ny -&gt; Gammel</item>
+        <item>Gammel -&gt; Ny</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Nulstil mellemlager</string>
+    <string name="dialog_clearing_cache_please_wait">Rydder mellemlageret... Vent venligst.</string>
+    <string name="reset_cache_unsaved_changes">Der er ændringer som ikke er synkroniseret. Vil du nulstille mellemlageret alligevel?</string>
+    <string name="warning">Advarsel</string>
+    <string name="pref_title_AutoSyncOnStart">Synkroniserer ved opstart</string>
+    <string name="pref_title_ShowOnlyUnread">Vis kun ulæste artikler</string>
+    <string name="pref_title_DisableHostnameVerification">Deaktivér verifikation af værtsnavn</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigér med lydknapper</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Markér som læst når der rulles</string>
+    <string name="pref_title_OpenInBrowserDirectly">Benyt en ekstern browser for at se artiklerne</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Acceptér ukendt certifikat? </string>
+    <string name="mtm_decision_always">Altid</string>
+    <string name="mtm_decision_abort">Afbryd</string>
+    <string name="mtm_notification">Verificering af certifikat</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Der er ikke valgt podcasts</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Vis</string>
+    <string name="pref_title_app_theme">App-tema</string>
+    <string name="pref_title_feed_list_layout">Layout for feed-liste</string>
+    <string name="pref_display_title_lines_count">Linjeantal for titel</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Mørk</item>
+        <item>Lys</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simpel</item>
+        <item>Udvidet</item>
+        <item>Udvidet (fuld tekst)</item>
+        <item>Udvidet med Webvisning</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notifikationer</string>
+    <string name="pref_title_notification_new_articles_available">Vis notifikation når der er nye artikler tilgængelige</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Fejl</string>
+    <string name="login_dialog_text_something_went_wrong">Noget gik galt :(</string>
+    <string name="login_dialog_text_not_compatible">Denne app-version er ikke kompatibel med din ownCloud News App. Opdatér venligst nyheds-app\'en og appframework.</string>
+    <string name="login_dialog_title_security_warning">Sikkerhedsadvarsel</string>
+    <string name="login_dialog_text_security_warning">Du benytter ikke https. En ondsindet person kan opsnappe din trafik og få adgang til følsomme data (f.eks. dit kodeord). Derfor er det stærkt anbefalet at bruge https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; sync</string>
+    <string name="pref_title_clearCache">Ryd mellemlageret</string>
+    <string name="pref_title_CacheImagesOffline">Foretag mellemlagring af billeder offline</string>
+    <string name="pref_title_Max_Cache_Size">Maksimumstørrelse på mellemlageret</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Aldrig</item>
+        <item>Kun via wifi</item>
+        <item>Via wifi &amp; mobil</item>
+        <item>Spørg når der ikke er wifi-forbindelse</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minutter</item>
+        <item>15 minutter</item>
+        <item>30 minutter</item>
+        <item>45 minutter</item>
+        <item>1 time</item>
+        <item>2 timer</item>
+        <item>3 timer</item>
+        <item>6 timer</item>
+        <item>12 timer</item>
+        <item>24 timer</item>
+    </string-array>
+    <string name="content_desc_delete">slet</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-de-rDE/strings.xml b/News-Android-App/src/main/res/values-de-rDE/strings.xml
index 7f180d1c..9e1c686f 100644
--- a/News-Android-App/src/main/res/values-de-rDE/strings.xml
+++ b/News-Android-App/src/main/res/values-de-rDE/strings.xml
@@ -1,178 +1,201 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automatisch synchronisieren</string>
-  <string name="app_name">ownCloud News Reader</string>
-  <string name="title_activity_sync_interval_selector">Auswahl des Synchronisationsintervalls</string>
-  <string name="title_activity_news_detail">NewsDetailAktivität</string>
-  <string name="empty_view_content">Keine Artikel vorhanden</string>
-  <string name="toast_GettingMoreItems">Herunterladen weiterer Elemente gestartet... Bitte warten.</string>
-  <string name="no_wifi_available">Keine WLAN-Verbindung</string>
-  <string name="do_you_want_to_download_without_wifi">Wollen Sie die Bilder ohne WLAN-Verbindung herunterladen</string>
-  <string name="current_version">Sie benutzen die Version %s</string>
-  <string name="widget_header">ownCloud-News</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d neuer Artikel verfügbar</item>
-    <item quantity="other">%d neue Artikel verfügbar</item>
-  </plurals>
-  <string name="message_bar_reload">Aktualisieren</string>
-  <string name="allUnreadFeeds">Alle ungelesenen Artikel</string>
-  <string name="starredFeeds">Favorisierte Artikel</string>
-  <string name="title_activity_new_feed">Einen neuen Feed hinzufügen</string>
-  <string name="menu_update">Aktualisieren</string>
-  <string name="menu_About_Changelog">Über / Änderungen</string>
-  <string name="menu_markAllAsRead">Alles als gelesen kennzeichnen</string>
-  <string name="menu_StartImageCaching">Bilder herunterladen</string>
-  <string name="menu_downloadMoreItems">Weitere Artikel herunterladen.</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Favorisiert</string>
-  <string name="action_read">Gelesen</string>
-  <string name="action_playPodacst">Podcast wiedergeben</string>
-  <string name="action_openInBrowser">Im Browser öffnen</string>
-  <string name="action_Share">Teilen</string>
-  <string name="action_login">Servereinstellungen</string>
-  <string name="action_save">Speichern</string>
-  <string name="action_settings">Einstellungen</string>
-  <string name="action_sync_settings">Einstellungen zur Synchronisation</string>
-  <string name="action_add_new_feed">Einen neuen Feed hinzufügen</string>
-  <string name="action_textToSpeech">Vorlesen</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Sie haben %d neuen ungelesenen Eintrag</item>
-    <item quantity="other">Sie haben %d neue ungelesene Einträge</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d neuer ungelesener Eintrag verfügbar</item>
-    <item quantity="other">%d neue ungelesene Einträge verfügbar</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="action_add_feed">Feed hinzufügen</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Bild herunterladen</string>
-  <string name="action_link_share">Link teilen</string>
-  <string name="action_link_open">Link im Browser öffnen</string>
-  <string name="action_link_copy">Link kopieren</string>
-  <string name="toast_img_saved">Bild gespeichert.</string>
-  <string name="toast_img_notwriteable">Fehler beim Schreiben des Bildes.</string>
-  <string name="toast_copied_to_clipboard">In die Zwischenablage kopiert</string>
-  <string name="error_download_failed">Herunterladen fehlgeschlagen</string>
-  <string name="intent_title_share">Teilen mittels</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Entfernen</string>
-  <string name="feed_rename_button">Umbenennen</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Benutzername</string>
-  <string name="pref_title_password">Passwort</string>
-  <string name="pref_title_owncloudRootPath">ownCloud Wurzeladresse</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Einloggen</string>
-  <string name="login_progress_signing_in">Logge ein...</string>
-  <string name="error_field_required">Dieses Feld ist erforderlich.</string>
-  <string name="error_invalid_url">Diese URL ist falsch.</string>
-  <!--Import Accounts-->
-  <string name="import_account">Benutzerkonto importieren</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">%d alten Artikel heruntergeladen</item>
-    <item quantity="other">%d alte Artikel heruntergeladen</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Keine weiteren Elemente verfügbar</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Einstellungen</string>
-  <string name="cache_is_cleared">Zwischenspeicher wurde gelöscht!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Allgemein</string>
-  <string name="pref_title_general_sort_order">Sortierung</string>
-  <string-array name="pref_general_sort_order">
-    <item>Neu -&gt; Alt</item>
-    <item>Alt -&gt; Neu</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Zwischenspeicher löschen</string>
-  <string name="dialog_clearing_cache_please_wait">Zwischenspeicher wird geleert … Bitte warten.</string>
-  <string name="reset_cache_unsaved_changes">Es gibt nicht synchronisierte Änderungen. Möchten Sie dennoch den Zwischenspeicher leeren?</string>
-  <string name="warning">Warnung</string>
-  <string name="pref_title_AutoSyncOnStart">Beim Start synchronisieren</string>
-  <string name="pref_title_ShowOnlyUnread">Nur ungelesene Artikel anzeigen</string>
-  <string name="pref_title_DisableHostnameVerification">Hostnamen-Nachweis deaktivieren</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Mit Lautstärketasten navigieren</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Beim Bildlauf als gelesen markieren</string>
-  <string name="pref_title_OpenInBrowserDirectly">Externen Browser zum Anzeigen der Artikel verwenden</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
-  <string name="mtm_decision_always">Immer</string>
-  <string name="mtm_decision_abort">Abbrechen</string>
-  <string name="mtm_notification">Zertifikatsnachweis</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Kein Podcast ausgewählt</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Anzeige</string>
-  <string name="pref_title_app_theme">App-Thema</string>
-  <string name="pref_title_feed_list_layout">Feed-Listenlayout</string>
-  <string name="pref_display_title_lines_count">Zeilenanzahl des Titels</string>
-  <string-array name="pref_display_apptheme">
-    <item>Dunkel</item>
-    <item>Hell</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Einfach</item>
-    <item>Erweitert</item>
-    <item>Erweitert (Volltext)</item>
-    <item>Erweitert mit Webansicht</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Benachrichtigungen</string>
-  <string name="pref_title_notification_new_articles_available">Benachrichtigungen anzeigen, wenn neue Artikel verfügbar sind</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Fehler</string>
-  <string name="login_dialog_text_something_went_wrong">Etwas ist schiefgelaufen :(</string>
-  <string name="login_dialog_text_not_compatible">Diese App-Version ist nicht mit Ihrer ownCloud News App kompatibel. Bitte aktualisieren Sie die News App und das App Framework.</string>
-  <string name="login_dialog_title_security_warning">Sicherheitswarnung</string>
-  <string name="login_dialog_text_security_warning">Sie nutzen kein https. Ein Angreifer könnte Ihren Datenverkehr mitschneiden und dadurch Zugang zu sensiblen Daten (z.B. Ihrem Passwort) erhalten. Wir empfehlen dringend die Nutzung von https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Daten &amp; Synchronisation</string>
-  <string name="pref_title_clearCache">Zwischenspeicher leeren</string>
-  <string name="pref_title_CacheImagesOffline">Bilder Offline zwischenspeichern</string>
-  <string name="pref_title_Max_Cache_Size">Maximale Cachegröße</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Niemals</item>
-    <item>Nur über WLAN</item>
-    <item>Über WLAN &amp; Mobil</item>
-    <item>Bei nicht verbundenem WLAN fragen</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minuten</item>
-    <item>15 Minuten</item>
-    <item>30 Minuten</item>
-    <item>45 Minuten</item>
-    <item>1 Stunde</item>
-    <item>2 Stunden</item>
-    <item>3 Stunden</item>
-    <item>6 Stunden</item>
-    <item>12 Stunden</item>
-    <item>24 Stunden</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_forward">weiterleiten</string>
-  <string name="content_desc_expand">erweitern</string>
-  <string name="content_desc_mark_as_read">als gelesen markieren</string>
-  <string name="content_desc_mark_as_unread">als ungelesen markieren</string>
-  <string name="content_desc_tap_to_refresh">zum aktualisieren antippen</string>
-  <string name="content_desc_add_to_favorites">zu Favoriten hinzufügen</string>
-  <string name="content_desc_remove_from_favorites">von Favoriten entfernen</string>
-  <string name="content_desc_show_password">Passwort anzeigen</string>
-  <string name="content_desc_delete">löschen</string>
-  <string name="content_desc_download">runterladen</string>
+
+    <string name="auto_sync_string">Automatisch synchronisieren</string>
+    <string name="title_activity_sync_interval_selector">Auswahl des Synchronisationsintervalls</string>
+    <string name="title_activity_news_detail">NewsDetailAktivität</string>
+    <string name="empty_view_content">Keine Artikel vorhanden</string>
+    <string name="toast_GettingMoreItems">Herunterladen weiterer Elemente gestartet... Bitte warten.</string>
+    <string name="no_wifi_available">Keine WLAN-Verbindung</string>
+    <string name="do_you_want_to_download_without_wifi">Wollen Sie die Bilder ohne WLAN-Verbindung herunterladen</string>
+    <string name="current_version">Sie benutzen die Version %s</string>
+    <string name="widget_header">ownCloud-News</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d neuer Artikel verfügbar</item>
+        <item quantity="other">%d neue Artikel verfügbar</item>
+    </plurals>
+    <string name="message_bar_reload">Aktualisieren</string>
+    <string name="allUnreadFeeds">Alle ungelesenen Artikel</string>
+    <string name="starredFeeds">Favorisierte Artikel</string>
+    <string name="title_activity_new_feed">Einen neuen Feed hinzufügen</string>
+
+    <string name="menu_update">Aktualisieren</string>
+    <string name="menu_About_Changelog">Über / Änderungen</string>
+    <string name="menu_markAllAsRead">Alles als gelesen kennzeichnen</string>
+    <string name="menu_StartImageCaching">Bilder herunterladen</string>
+    <string name="menu_downloadMoreItems">Weitere Artikel herunterladen.</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Favorisiert</string>
+    <string name="action_read">Gelesen</string>
+    <string name="action_playPodacst">Podcast wiedergeben</string>
+    <string name="action_openInBrowser">Im Browser öffnen</string>
+    <string name="action_Share">Teilen</string>
+    <string name="action_login">Servereinstellungen</string>
+    <string name="action_save">Speichern</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="action_sync_settings">Einstellungen zur Synchronisation</string>
+    <string name="action_add_new_feed">Einen neuen Feed hinzufügen</string>
+    <string name="action_textToSpeech">Vorlesen</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Sie haben %d neuen ungelesenen Eintrag</item>
+        <item quantity="other">Sie haben %d neue ungelesene Einträge</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d neuer ungelesener Eintrag verfügbar</item>
+        <item quantity="other">%d neue ungelesene Einträge verfügbar</item>
+    </plurals>
+
+
+    <string name="action_add_feed">Feed hinzufügen</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Bild herunterladen</string>
+    <string name="action_link_share">Link teilen</string>
+    <string name="action_link_open">Link im Browser öffnen</string>
+    <string name="action_link_copy">Link kopieren</string>
+    <string name="toast_img_saved">Bild gespeichert.</string>
+    <string name="toast_img_notwriteable">Fehler beim Schreiben des Bildes.</string>
+    <string name="toast_copied_to_clipboard">In die Zwischenablage kopiert</string>
+    <string name="error_download_failed">Herunterladen fehlgeschlagen</string>
+    <string name="intent_title_share">Teilen mittels</string>
+
+
+    <string name="feed_remove_button">Entfernen</string>
+    <string name="feed_rename_button">Umbenennen</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Benutzername</string>
+    <string name="pref_title_password">Passwort</string>
+    <string name="pref_title_owncloudRootPath">ownCloud Wurzeladresse</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Einloggen</string>
+    <string name="login_progress_signing_in">Logge ein...</string>
+    <string name="error_field_required">Dieses Feld ist erforderlich.</string>
+    <string name="error_invalid_url">Diese URL ist falsch.</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Benutzerkonto importieren</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">%d alten Artikel heruntergeladen</item>
+        <item quantity="other">%d alte Artikel heruntergeladen</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Keine weiteren Elemente verfügbar</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Einstellungen</string>
+    <string name="cache_is_cleared">Zwischenspeicher wurde gelöscht!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Allgemein</string>
+    <string name="pref_title_general_sort_order">Sortierung</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Neu -&gt; Alt</item>
+        <item>Alt -&gt; Neu</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Zwischenspeicher löschen</string>
+    <string name="dialog_clearing_cache_please_wait">Zwischenspeicher wird geleert … Bitte warten.</string>
+    <string name="reset_cache_unsaved_changes">Es gibt nicht synchronisierte Änderungen. Möchten Sie dennoch den Zwischenspeicher leeren?</string>
+    <string name="warning">Warnung</string>
+    <string name="pref_title_AutoSyncOnStart">Beim Start synchronisieren</string>
+    <string name="pref_title_ShowOnlyUnread">Nur ungelesene Artikel anzeigen</string>
+    <string name="pref_title_DisableHostnameVerification">Hostnamen-Nachweis deaktivieren</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Mit Lautstärketasten navigieren</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Beim Bildlauf als gelesen markieren</string>
+    <string name="pref_title_OpenInBrowserDirectly">Externen Browser zum Anzeigen der Artikel verwenden</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
+    <string name="mtm_decision_always">Immer</string>
+    <string name="mtm_decision_abort">Abbrechen</string>
+    <string name="mtm_notification">Zertifikatsnachweis</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Kein Podcast ausgewählt</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Anzeige</string>
+    <string name="pref_title_app_theme">App-Thema</string>
+    <string name="pref_title_feed_list_layout">Feed-Listenlayout</string>
+    <string name="pref_display_title_lines_count">Zeilenanzahl des Titels</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Dunkel</item>
+        <item>Hell</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Einfach</item>
+        <item>Erweitert</item>
+        <item>Erweitert (Volltext)</item>
+        <item>Erweitert mit Webansicht</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Benachrichtigungen</string>
+    <string name="pref_title_notification_new_articles_available">Benachrichtigungen anzeigen, wenn neue Artikel verfügbar sind</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Fehler</string>
+    <string name="login_dialog_text_something_went_wrong">Etwas ist schiefgelaufen :(</string>
+    <string name="login_dialog_text_not_compatible">Diese App-Version ist nicht mit Ihrer ownCloud News App kompatibel. Bitte aktualisieren Sie die News App und das App Framework.</string>
+    <string name="login_dialog_title_security_warning">Sicherheitswarnung</string>
+    <string name="login_dialog_text_security_warning">Sie nutzen kein https. Ein Angreifer könnte Ihren Datenverkehr mitschneiden und dadurch Zugang zu sensiblen Daten (z.B. Ihrem Passwort) erhalten. Wir empfehlen dringend die Nutzung von https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Daten &amp; Synchronisation</string>
+    <string name="pref_title_clearCache">Zwischenspeicher leeren</string>
+    <string name="pref_title_CacheImagesOffline">Bilder Offline zwischenspeichern</string>
+    <string name="pref_title_Max_Cache_Size">Maximale Cachegröße</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Niemals</item>
+        <item>Nur über WLAN</item>
+        <item>Über WLAN &amp; Mobil</item>
+        <item>Bei nicht verbundenem WLAN fragen</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minuten</item>
+        <item>15 Minuten</item>
+        <item>30 Minuten</item>
+        <item>45 Minuten</item>
+        <item>1 Stunde</item>
+        <item>2 Stunden</item>
+        <item>3 Stunden</item>
+        <item>6 Stunden</item>
+        <item>12 Stunden</item>
+        <item>24 Stunden</item>
+    </string-array>
+    <string name="content_desc_forward">weiterleiten</string>
+    <string name="content_desc_expand">erweitern</string>
+    <string name="content_desc_mark_as_read">als gelesen markieren</string>
+    <string name="content_desc_mark_as_unread">als ungelesen markieren</string>
+    <string name="content_desc_tap_to_refresh">zum aktualisieren antippen</string>
+    <string name="content_desc_add_to_favorites">zu Favoriten hinzufügen</string>
+    <string name="content_desc_remove_from_favorites">von Favoriten entfernen</string>
+    <string name="content_desc_show_password">Passwort anzeigen</string>
+    <string name="content_desc_delete">löschen</string>
+    <string name="content_desc_download">runterladen</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-de/strings.xml b/News-Android-App/src/main/res/values-de/strings.xml
index e35c24f7..7669621a 100644
--- a/News-Android-App/src/main/res/values-de/strings.xml
+++ b/News-Android-App/src/main/res/values-de/strings.xml
@@ -1,187 +1,213 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automatisch synchronisieren</string>
-  <string name="app_name">ownCloud Newsreader</string>
-  <string name="title_activity_sync_interval_selector">Auswahl des Synchronisationsintervalls</string>
-  <string name="title_activity_news_detail">Newsdetailaktivität</string>
-  <string name="empty_view_content">Keine Artikel vorhanden</string>
-  <string name="toast_GettingMoreItems">Herunterladen weiterer Elemente gestartet... Bitte warten.</string>
-  <string name="no_wifi_available">Keine WLAN-Verbindung</string>
-  <string name="do_you_want_to_download_without_wifi">Willst du die Bilder ohne W-LAN-Verbindung herunterladen</string>
-  <string name="current_version">Du benutzt die Version %s</string>
-  <string name="widget_header">ownCloud-News</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d neuer Artikel verfügbar</item>
-    <item quantity="other">%d neue Artikel verfügbar</item>
-  </plurals>
-  <string name="message_bar_reload">Aktualisieren</string>
-  <string name="allUnreadFeeds">Alle ungelesenen Artikel</string>
-  <string name="starredFeeds">Favorisierte Artikel</string>
-  <string name="title_activity_new_feed">Einen neuen Feed hinzufügen</string>
-  <string name="menu_update">Aktualisieren</string>
-  <string name="menu_About_Changelog">Über / Änderungen</string>
-  <string name="menu_markAllAsRead">Alle als gelesen markieren</string>
-  <string name="menu_StartImageCaching">Lade Bilder herunter</string>
-  <string name="menu_downloadMoreItems">Weitere Artikel herunterladen</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Favorisiert</string>
-  <string name="action_read">Gelesen</string>
-  <string name="action_playPodacst">Podcast wiedergeben</string>
-  <string name="action_openInBrowser">Im Browser öffnen</string>
-  <string name="action_Share">Teilen</string>
-  <string name="action_login">Servereinstellungen</string>
-  <string name="action_save">Speichern</string>
-  <string name="action_settings">Einstellungen</string>
-  <string name="action_sync_settings">Einstellungen zur Synchronisation</string>
-  <string name="action_add_new_feed">Einen neuen Feed hinzufügen</string>
-  <string name="action_textToSpeech">Vorlesen</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Du hast %d neuen ungelesenen Eintrag</item>
-    <item quantity="other">Du hast %d neue ungelesene Einträge</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d neuen ungelesenen Eintrag verfügbar</item>
-    <item quantity="other">%d neue ungelesene Einträge verfügbar</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Feed URL</string>
-  <string name="action_add_feed">Feed hinzufügen</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Lade Bild herunter</string>
-  <string name="action_img_sharelink">Teile den Link zum Bild</string>
-  <string name="action_img_open">Bild im Browser öffnen</string>
-  <string name="action_img_copylink">Link zum Bild kopieren</string>
-  <string name="action_link_share">Link teilen</string>
-  <string name="action_link_open">Öffne den Link im Browser</string>
-  <string name="action_link_copy">Link kopieren</string>
-  <string name="toast_img_download_wait">Herunterladen... bitte warten</string>
-  <string name="toast_img_saved">Bild gespeichert.</string>
-  <string name="toast_img_notwriteable">Beim Schreiben des Images ist ein Fehler aufgetreten.</string>
-  <string name="toast_copied_to_clipboard">In die Zwischenablage kopiert</string>
-  <string name="error_download_failed">Herunterladen fehlgeschlagen</string>
-  <string name="intent_title_share">Teilen über</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Entfernen</string>
-  <string name="feed_rename_button">Umbenennen</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Benutzername</string>
-  <string name="pref_title_password">Passwort</string>
-  <string name="pref_title_owncloudRootPath">ownCloud Wurzeladresse</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Einloggen</string>
-  <string name="login_progress_signing_in">Anmeldung…</string>
-  <string name="error_field_required">Dieses Feld ist erforderlich</string>
-  <string name="error_invalid_url">Diese URL ist falsch</string>
-  <!--Import Accounts-->
-  <string name="import_account">Benutzerkonto importieren</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">%d alter Artikel heruntergeladen</item>
-    <item quantity="other">%d alte Artikel heruntergeladen</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Keine weiteren Artikel verfügbar</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Einstellungen</string>
-  <string name="cache_is_cleared">Zwischenspeicher wurde gelöscht!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Allgemein</string>
-  <string name="pref_title_general_sort_order">Sortierung</string>
-  <string-array name="pref_general_sort_order">
-    <item>Neu -&gt; Alt</item>
-    <item>Alt -&gt; Neu</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Cache löschen</string>
-  <string name="dialog_clearing_cache_please_wait">Zwischenspeicher wird geleert … Bitte warten.</string>
-  <string name="reset_cache_unsaved_changes">Es gibt nicht synchronisierte Änderungen. Möchtest Du dennoch den Cache leeren?</string>
-  <string name="warning">Warnung</string>
-  <string name="pref_title_AutoSyncOnStart">Beim Starten synchronisieren</string>
-  <string name="pref_title_ShowOnlyUnread">Nur ungelesene Artikel anzeigen</string>
-  <string name="pref_title_DisableHostnameVerification">Hostnamen-Nachweis deaktivieren</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Mit Lautstärketasten navigieren</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Während des Scrollens als gelesen markieren</string>
-  <string name="pref_title_OpenInBrowserDirectly">Externen Browser zum Anzeigen der Artikel verwenden</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
-  <string name="mtm_decision_always">Immer</string>
-  <string name="mtm_decision_abort">Abbrechen</string>
-  <string name="mtm_notification">Zertifikatsnachweis</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Kein Podcast ausgewählt</string>
-  <string name="no_chapters_available">Es sind keine Kapitel verfügbar</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Anzeige</string>
-  <string name="pref_title_app_theme">App-Thema</string>
-  <string name="pref_title_feed_list_layout">Feed-Listen-Layout</string>
-  <string name="pref_display_title_lines_count">Zeilenanzahl des Titels</string>
-  <string-array name="pref_display_apptheme">
-    <item>Dunkel</item>
-    <item>Hell</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Einfach</item>
-    <item>Erweitert</item>
-    <item>Erweitert(Volltext)</item>
-    <item>Erweitert mit Webansicht</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Benachrichtigungen</string>
-  <string name="pref_title_notification_new_articles_available">Benachrichtigungen anzeigen, wenn neue Artikel verfügbar sind</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Fehler</string>
-  <string name="login_dialog_text_something_went_wrong">Etwas ist schiefgelaufen :(</string>
-  <string name="login_dialog_text_not_compatible">Diese App-Version ist nicht mit Deiner ownCloud News App kompatibel. Bitte aktualisiere die News App und das App Framework.</string>
-  <string name="login_dialog_title_security_warning">Sicherheitswarnung</string>
-  <string name="login_dialog_text_security_warning">Du nutzt kein https. Ein Angreifer könnte Deinen Datenverkehr mitschneiden und dadurch Zugang zu sensiblen Daten (z.B. Deinem Passwort) erhalten. Wir empfehlen dringend die Nutzung von https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Daten &amp; Synchronisation</string>
-  <string name="pref_title_clearCache">Cache leeren</string>
-  <string name="pref_title_CacheImagesOffline">Bilder offline zwischenspeichern</string>
-  <string name="pref_title_Max_Cache_Size">Maximale Cachegröße</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Niemals</item>
-    <item>Nur über WLAN</item>
-    <item>Über WLAN &amp; Mobil</item>
-    <item>Bei nicht verbundenem WLAN fragen</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minuten</item>
-    <item>15 Minuten</item>
-    <item>30 Minuten</item>
-    <item>45 Minuten</item>
-    <item>1 Stunde</item>
-    <item>2 Stunden</item>
-    <item>3 Stunden</item>
-    <item>6 Stunden</item>
-    <item>12 Stunden</item>
-    <item>24 Stunden</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">spielen</string>
-  <string name="content_desc_pause">Pause</string>
-  <string name="content_desc_rewind">rückwärts</string>
-  <string name="content_desc_forward">vorwärts</string>
-  <string name="content_desc_expand">erweitern</string>
-  <string name="content_desc_mark_as_read">Als gelesen markieren</string>
-  <string name="content_desc_mark_as_unread">Als ungelesen markieren</string>
-  <string name="content_desc_tap_to_refresh">Zum Aktualisieren antippen</string>
-  <string name="content_desc_add_to_favorites">Zu den Favoriten hinzufügen</string>
-  <string name="content_desc_remove_from_favorites">Aus den Favoriten entfernen</string>
-  <string name="content_desc_show_password">Passwort anzeigen</string>
-  <string name="content_desc_delete">löschen</string>
-  <string name="content_desc_download">Herunterladen</string>
+
+    <string name="auto_sync_string">Automatisch synchronisieren</string>
+    <string name="title_activity_sync_interval_selector">Auswahl des Synchronisationsintervalls</string>
+    <string name="title_activity_news_detail">Newsdetailaktivität</string>
+    <string name="empty_view_content">Keine Artikel vorhanden</string>
+    <string name="toast_GettingMoreItems">Herunterladen weiterer Elemente gestartet... Bitte warten.</string>
+    <string name="no_wifi_available">Keine WLAN-Verbindung</string>
+    <string name="do_you_want_to_download_without_wifi">Willst du die Bilder ohne W-LAN-Verbindung herunterladen</string>
+    <string name="current_version">Du benutzt die Version %s</string>
+    <string name="widget_header">ownCloud-News</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d neuer Artikel verfügbar</item>
+        <item quantity="other">%d neue Artikel verfügbar</item>
+    </plurals>
+    <string name="message_bar_reload">Aktualisieren</string>
+    <string name="allUnreadFeeds">Alle ungelesenen Artikel</string>
+    <string name="starredFeeds">Favorisierte Artikel</string>
+    <string name="title_activity_new_feed">Einen neuen Feed hinzufügen</string>
+
+    <string name="menu_update">Aktualisieren</string>
+    <string name="menu_About_Changelog">Über / Änderungen</string>
+    <string name="menu_markAllAsRead">Alle als gelesen markieren</string>
+    <string name="menu_StartImageCaching">Lade Bilder herunter</string>
+    <string name="menu_downloadMoreItems">Weitere Artikel herunterladen</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Favorisiert</string>
+    <string name="action_read">Gelesen</string>
+    <string name="action_playPodacst">Podcast wiedergeben</string>
+    <string name="action_openInBrowser">Im Browser öffnen</string>
+    <string name="action_Share">Teilen</string>
+    <string name="action_login">Servereinstellungen</string>
+    <string name="action_save">Speichern</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="action_sync_settings">Einstellungen zur Synchronisation</string>
+    <string name="action_add_new_feed">Einen neuen Feed hinzufügen</string>
+    <string name="action_textToSpeech">Vorlesen</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Du hast %d neuen ungelesenen Eintrag</item>
+        <item quantity="other">Du hast %d neue ungelesene Einträge</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d neuen ungelesenen Eintrag verfügbar</item>
+        <item quantity="other">%d neue ungelesene Einträge verfügbar</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Feed URL</string>
+    <string name="action_add_feed">Feed hinzufügen</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Lade Bild herunter</string>
+    <string name="action_img_sharelink">Teile den Link zum Bild</string>
+    <string name="action_img_open">Bild im Browser öffnen</string>
+    <string name="action_img_copylink">Link zum Bild kopieren</string>
+    <string name="action_link_share">Link teilen</string>
+    <string name="action_link_open">Öffne den Link im Browser</string>
+    <string name="action_link_copy">Link kopieren</string>
+    <string name="toast_img_download_wait">Herunterladen... bitte warten</string>
+    <string name="toast_img_saved">Bild gespeichert.</string>
+    <string name="toast_img_notwriteable">Beim Schreiben des Images ist ein Fehler aufgetreten.</string>
+    <string name="toast_copied_to_clipboard">In die Zwischenablage kopiert</string>
+    <string name="error_download_failed">Herunterladen fehlgeschlagen</string>
+    <string name="intent_title_share">Teilen über</string>
+
+
+    <string name="feed_remove_button">Entfernen</string>
+    <string name="feed_rename_button">Umbenennen</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Benutzername</string>
+    <string name="pref_title_password">Passwort</string>
+    <string name="pref_title_owncloudRootPath">ownCloud Wurzeladresse</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Einloggen</string>
+    <string name="login_progress_signing_in">Anmeldung…</string>
+    <string name="error_field_required">Dieses Feld ist erforderlich</string>
+    <string name="error_invalid_url">Diese URL ist falsch</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Benutzerkonto importieren</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">%d alter Artikel heruntergeladen</item>
+        <item quantity="other">%d alte Artikel heruntergeladen</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Keine weiteren Artikel verfügbar</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Einstellungen</string>
+    <string name="cache_is_cleared">Zwischenspeicher wurde gelöscht!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Allgemein</string>
+    <string name="pref_title_general_sort_order">Sortierung</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Neu -&gt; Alt</item>
+        <item>Alt -&gt; Neu</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Cache löschen</string>
+    <string name="dialog_clearing_cache_please_wait">Zwischenspeicher wird geleert … Bitte warten.</string>
+    <string name="reset_cache_unsaved_changes">Es gibt nicht synchronisierte Änderungen. Möchtest Du dennoch den Cache leeren?</string>
+    <string name="warning">Warnung</string>
+    <string name="pref_title_AutoSyncOnStart">Beim Starten synchronisieren</string>
+    <string name="pref_title_ShowOnlyUnread">Nur ungelesene Artikel anzeigen</string>
+    <string name="pref_title_DisableHostnameVerification">Hostnamen-Nachweis deaktivieren</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Mit Lautstärketasten navigieren</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Während des Scrollens als gelesen markieren</string>
+    <string name="pref_title_OpenInBrowserDirectly">Externen Browser zum Anzeigen der Artikel verwenden</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
+    <string name="mtm_decision_always">Immer</string>
+    <string name="mtm_decision_abort">Abbrechen</string>
+    <string name="mtm_notification">Zertifikatsnachweis</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Kein Podcast ausgewählt</string>
+    <string name="no_chapters_available">Es sind keine Kapitel verfügbar</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Anzeige</string>
+    <string name="pref_title_app_theme">App-Thema</string>
+    <string name="pref_title_feed_list_layout">Feed-Listen-Layout</string>
+    <string name="pref_display_title_lines_count">Zeilenanzahl des Titels</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Dunkel</item>
+        <item>Hell</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Einfach</item>
+        <item>Erweitert</item>
+        <item>Erweitert(Volltext)</item>
+        <item>Erweitert mit Webansicht</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Benachrichtigungen</string>
+    <string name="pref_title_notification_new_articles_available">Benachrichtigungen anzeigen, wenn neue Artikel verfügbar sind</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Fehler</string>
+    <string name="login_dialog_text_something_went_wrong">Etwas ist schiefgelaufen :(</string>
+    <string name="login_dialog_text_not_compatible">Diese App-Version ist nicht mit Deiner ownCloud News App kompatibel. Bitte aktualisiere die News App und das App Framework.</string>
+    <string name="login_dialog_title_security_warning">Sicherheitswarnung</string>
+    <string name="login_dialog_text_security_warning">Du nutzt kein https. Ein Angreifer könnte Deinen Datenverkehr mitschneiden und dadurch Zugang zu sensiblen Daten (z.B. Deinem Passwort) erhalten. Wir empfehlen dringend die Nutzung von https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Daten &amp; Synchronisation</string>
+    <string name="pref_title_clearCache">Cache leeren</string>
+    <string name="pref_title_CacheImagesOffline">Bilder offline zwischenspeichern</string>
+    <string name="pref_title_Max_Cache_Size">Maximale Cachegröße</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Niemals</item>
+        <item>Nur über WLAN</item>
+        <item>Über WLAN &amp; Mobil</item>
+        <item>Bei nicht verbundenem WLAN fragen</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minuten</item>
+        <item>15 Minuten</item>
+        <item>30 Minuten</item>
+        <item>45 Minuten</item>
+        <item>1 Stunde</item>
+        <item>2 Stunden</item>
+        <item>3 Stunden</item>
+        <item>6 Stunden</item>
+        <item>12 Stunden</item>
+        <item>24 Stunden</item>
+    </string-array>
+    <string name="content_desc_play">spielen</string>
+    <string name="content_desc_pause">Pause</string>
+    <string name="content_desc_rewind">rückwärts</string>
+    <string name="content_desc_forward">vorwärts</string>
+    <string name="content_desc_expand">erweitern</string>
+    <string name="content_desc_mark_as_read">Als gelesen markieren</string>
+    <string name="content_desc_mark_as_unread">Als ungelesen markieren</string>
+    <string name="content_desc_tap_to_refresh">Zum Aktualisieren antippen</string>
+    <string name="content_desc_add_to_favorites">Zu den Favoriten hinzufügen</string>
+    <string name="content_desc_remove_from_favorites">Aus den Favoriten entfernen</string>
+    <string name="content_desc_show_password">Passwort anzeigen</string>
+    <string name="content_desc_delete">löschen</string>
+    <string name="content_desc_download">Herunterladen</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-el/strings.xml b/News-Android-App/src/main/res/values-el/strings.xml
index bbf2c200..3d155ec2 100644
--- a/News-Android-App/src/main/res/values-el/strings.xml
+++ b/News-Android-App/src/main/res/values-el/strings.xml
@@ -1,169 +1,190 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Αυτόματος συγχρονισμός</string>
-  <string name="app_name">Ανάγνωση Ειδήσεων ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Επιλογέας διαστήματος συγχρονισμού</string>
-  <string name="title_activity_news_detail">Λεπτομέρειες Δραστηριότητας Ειδήσεων</string>
-  <string name="empty_view_content">Κανένα στοιχείο</string>
-  <string name="toast_GettingMoreItems">Γίνεται λήψη περισσότερων αντικειμένων... Παρακαλώ περιμένετε.</string>
-  <string name="no_wifi_available">Δεν υπάρχει ασύρματη σύνδεση</string>
-  <string name="do_you_want_to_download_without_wifi">Θα θέλατε να κατέβουν οι εικόνες χωρίς σύνδεση WiFi</string>
-  <string name="current_version">Χρησιμοποιείτε την έκδοση %s</string>
-  <string name="widget_header">Νέα ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d νέο αντικείμενο διαθέσιμο</item>
-    <item quantity="other">%d νέα αντικείμενα διαθέσιμα</item>
-  </plurals>
-  <string name="message_bar_reload">Επαναφόρτωση</string>
-  <string name="allUnreadFeeds">Όλα τα μη ανεγνωσμένα</string>
-  <string name="starredFeeds">Επισημασμένα αντικείμενα</string>
-  <string name="title_activity_new_feed">Προσθήκη νέας ροής</string>
-  <string name="menu_update">Ανανέωση </string>
-  <string name="menu_About_Changelog">Περί / Αλλαγές</string>
-  <string name="menu_markAllAsRead">Σημείωση όλων ως ανεγνωσμένων</string>
-  <string name="menu_StartImageCaching">Λήψη εικόνων</string>
-  <string name="menu_downloadMoreItems">Λήψη περισσότερων αντικειμένων</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Με αστέρι</string>
-  <string name="action_read">Ανάγνωση</string>
-  <string name="action_playPodacst">Αναπαραγωγή Podcast</string>
-  <string name="action_openInBrowser">Άνοιγμα στον Περιηγητή</string>
-  <string name="action_Share">Διαμοιρασμός</string>
-  <string name="action_login">Ρυθμίσεις Διακομιστή</string>
-  <string name="action_save">Αποθήκευση</string>
-  <string name="action_settings">Ρυθμίσεις</string>
-  <string name="action_sync_settings">Επιλογές συγχρονισμού</string>
-  <string name="action_add_new_feed">Προσθήκη νέας ροής</string>
-  <string name="action_textToSpeech">Ανάγνωση από</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Έχετε %d νέο αδιάβαστο αντικείμενο</item>
-    <item quantity="other">Έχετε %d νέα αδιάβαστα αντικείμενα</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d νέο αντικείμενο διαθέσιμο</item>
-    <item quantity="other">%d νέα αδιάβαστα αντικείμενα διαθέσιμα</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="action_add_feed">Προσθήκη ροής</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Λήψη εικόνας</string>
-  <string name="action_img_open">Άνοιγμα εικόνας στον περιηγητή</string>
-  <string name="action_img_copylink">Αντιγραφή συνδέσμου εικόνας</string>
-  <string name="action_link_share">Διαμοιρασμός συνδέσμου</string>
-  <string name="action_link_open">Άνοιγμα συνδέσμου στον περιηγητή</string>
-  <string name="action_link_copy">Αντιγραφή συνδέσμου</string>
-  <string name="toast_img_saved">Η εικόνα αποθηκεύτηκε.</string>
-  <string name="toast_copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
-  <string name="error_download_failed">Η λήψη απέτυχε</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Αφαίρεση</string>
-  <string name="feed_rename_button">Μετονομασία</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Όνομα χρήστη</string>
-  <string name="pref_title_password">Συνθηματικό</string>
-  <string name="pref_title_owncloudRootPath">Διεύθυνση ριζικού καταλόγου ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Είσοδος</string>
-  <string name="login_progress_signing_in">Είσοδος...</string>
-  <string name="error_field_required">Αυτό το πεδίο είναι απαραίτητο</string>
-  <string name="error_invalid_url">Αυτός ο σύνδεσμος είναι εσφαλμένος</string>
-  <!--Import Accounts-->
-  <string name="import_account">Εισαγωγή λογαριασμού</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Λήφθηκε %d παλαιό αντικείμενο</item>
-    <item quantity="other">Λήφθηκαν %d παλαιά αντικείμενα</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Δεν υπάρχουν επιπλέον στοιχεία διαθέσιμα</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Ρυθμίσεις</string>
-  <string name="cache_is_cleared">Η προσωρινή μνήμη εκκαθαρίστηκε!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Γενικά</string>
-  <string name="pref_title_general_sort_order">Σειρά ταξινόμησης</string>
-  <string-array name="pref_general_sort_order">
-    <item>Νέα-&gt; Παλιά</item>
-    <item>Παλιά -&gt; Νέα</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Εκκαθάριση προσωρινής μνήμης</string>
-  <string name="dialog_clearing_cache_please_wait">Εκκαθάριση προσωρινής μνήμης... Παρακαλώ περιμένετε.</string>
-  <string name="reset_cache_unsaved_changes">Υπάρχουν αλλαγές που δεν έχουν συγχρονιστεί. Θα θέλατε να επαναφέρετε τα αποθηκευμένα στοιχεία ούτως ή άλλως;</string>
-  <string name="warning">Προειδοποίηση</string>
-  <string name="pref_title_AutoSyncOnStart">Συγχρονισμός κατά την έναρξη</string>
-  <string name="pref_title_ShowOnlyUnread">Εμφάνιση μόνο μη αναγνωσμένων άρθρων</string>
-  <string name="pref_title_DisableHostnameVerification">Απενεργοποίηση επαλήθευσης Ονόματος Υπολογιστή</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Περιήγηση με πλήκτρα έντασης φωνής</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Σημείωση ως αναγνωσμένου κατά την κύλιση</string>
-  <string name="pref_title_OpenInBrowserDirectly">Χρήση εξωτερικού προγράμματος περιήγησης για θέαση άρθρων</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Αποδοχή Άγνωστων Πιστοποιητικών;</string>
-  <string name="mtm_decision_always">Πάντα</string>
-  <string name="mtm_decision_abort">Ματαίωση</string>
-  <string name="mtm_notification">Επαλήθευση Πιστοποιητικού</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Δεν επιλέχθηκε Podcast</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Εμφάνιση</string>
-  <string name="pref_title_app_theme">Θέμα εφαρμογής</string>
-  <string name="pref_title_feed_list_layout">Προβολή λίστας ροών</string>
-  <string name="pref_display_title_lines_count">Απαρίθμηση Γραμμών για τίτλο</string>
-  <string-array name="pref_display_apptheme">
-    <item>Σκοτεινό</item>
-    <item>Φωτεινό</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Απλή</item>
-    <item>Εκτεταμένη</item>
-    <item>Εκτεταμένη (πλήρες κείμενο)</item>
-    <item>Εκτεταμένη με προβολή ιστού</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Ειδοποιήσεις</string>
-  <string name="pref_title_notification_new_articles_available">Προβολή ειδοποίησης όταν νέα άρθρα είναι διαθέσιμα</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Σφάλμα</string>
-  <string name="login_dialog_text_something_went_wrong">Κάτι πήγε στραβά :(</string>
-  <string name="login_dialog_text_not_compatible">Αυτή η έκδοση της εφαρμογής δεν είναι συμβατή με τη δική σας εφαρμογή Ανάγνωσης Ειδήσεων του ownCloud. Παρακαλώ ενημερώστε την εφαρμογή Ανάγνωσης Ειδήσεων και την εφαρμογή Πλαίσιο Εφαρμογών.</string>
-  <string name="login_dialog_title_security_warning">Προειδοποίηση Ασφαλείας</string>
-  <string name="login_dialog_text_security_warning">Δεν χρησιμοποιείτε htpps. Κάποιος εισβολέας θα μπορούσε να παρεμβληθεί στη σύνδεσή σας και να αποκτήσει πρόσβαση σε ευαίσθητα δεδομένα (π.χ. τον κωδικό σας). Επομένως προτείνεται σοβαρά η χρήση htpps!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Δεδομένα &amp; συγχρονισμός</string>
-  <string name="pref_title_clearCache">Εκκαθάριση προσωρινής μνήμης</string>
-  <string name="pref_title_CacheImagesOffline">Αποθήκευση εικόνων για χρήση χωρίς σύνδεση</string>
-  <string name="pref_title_Max_Cache_Size">Μέγιστο μέγεθος στοιχείων προς αποθήκευση</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Λεπτά</item>
-    <item>15 Λεπτά</item>
-    <item>30 Λεπτά</item>
-    <item>45 Λεπτά</item>
-    <item>1 Ώρα</item>
-    <item>2 Ώρες</item>
-    <item>3 Ώρες</item>
-    <item>6 Ώρες</item>
-    <item>12 Ώρες</item>
-    <item>24 Ώρες</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">αναπαραγωγή</string>
-  <string name="content_desc_pause">παύση</string>
-  <string name="content_desc_add_to_favorites">προσθήκη στα αγαπημένα</string>
-  <string name="content_desc_remove_from_favorites">αφαίρεση από τα αγαπημένα</string>
-  <string name="content_desc_show_password">εμφάνιση συνθηματικού</string>
-  <string name="content_desc_delete">διαγραφή</string>
-  <string name="content_desc_download">λήψη</string>
+
+    <string name="auto_sync_string">Αυτόματος συγχρονισμός</string>
+    <string name="title_activity_sync_interval_selector">Επιλογέας διαστήματος συγχρονισμού</string>
+    <string name="title_activity_news_detail">Λεπτομέρειες Δραστηριότητας Ειδήσεων</string>
+    <string name="empty_view_content">Κανένα στοιχείο</string>
+    <string name="toast_GettingMoreItems">Γίνεται λήψη περισσότερων αντικειμένων... Παρακαλώ περιμένετε.</string>
+    <string name="no_wifi_available">Δεν υπάρχει ασύρματη σύνδεση</string>
+    <string name="do_you_want_to_download_without_wifi">Θα θέλατε να κατέβουν οι εικόνες χωρίς σύνδεση WiFi</string>
+    <string name="current_version">Χρησιμοποιείτε την έκδοση %s</string>
+    <string name="widget_header">Νέα ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d νέο αντικείμενο διαθέσιμο</item>
+        <item quantity="other">%d νέα αντικείμενα διαθέσιμα</item>
+    </plurals>
+    <string name="message_bar_reload">Επαναφόρτωση</string>
+    <string name="allUnreadFeeds">Όλα τα μη ανεγνωσμένα</string>
+    <string name="starredFeeds">Επισημασμένα αντικείμενα</string>
+    <string name="title_activity_new_feed">Προσθήκη νέας ροής</string>
+
+    <string name="menu_update">Ανανέωση </string>
+    <string name="menu_About_Changelog">Περί / Αλλαγές</string>
+    <string name="menu_markAllAsRead">Σημείωση όλων ως ανεγνωσμένων</string>
+    <string name="menu_StartImageCaching">Λήψη εικόνων</string>
+    <string name="menu_downloadMoreItems">Λήψη περισσότερων αντικειμένων</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Με αστέρι</string>
+    <string name="action_read">Ανάγνωση</string>
+    <string name="action_playPodacst">Αναπαραγωγή Podcast</string>
+    <string name="action_openInBrowser">Άνοιγμα στον Περιηγητή</string>
+    <string name="action_Share">Διαμοιρασμός</string>
+    <string name="action_login">Ρυθμίσεις Διακομιστή</string>
+    <string name="action_save">Αποθήκευση</string>
+    <string name="action_settings">Ρυθμίσεις</string>
+    <string name="action_sync_settings">Επιλογές συγχρονισμού</string>
+    <string name="action_add_new_feed">Προσθήκη νέας ροής</string>
+    <string name="action_textToSpeech">Ανάγνωση από</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Έχετε %d νέο αδιάβαστο αντικείμενο</item>
+        <item quantity="other">Έχετε %d νέα αδιάβαστα αντικείμενα</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d νέο αντικείμενο διαθέσιμο</item>
+        <item quantity="other">%d νέα αδιάβαστα αντικείμενα διαθέσιμα</item>
+    </plurals>
+
+
+    <string name="action_add_feed">Προσθήκη ροής</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Λήψη εικόνας</string>
+    <string name="action_img_open">Άνοιγμα εικόνας στον περιηγητή</string>
+    <string name="action_img_copylink">Αντιγραφή συνδέσμου εικόνας</string>
+    <string name="action_link_share">Διαμοιρασμός συνδέσμου</string>
+    <string name="action_link_open">Άνοιγμα συνδέσμου στον περιηγητή</string>
+    <string name="action_link_copy">Αντιγραφή συνδέσμου</string>
+    <string name="toast_img_saved">Η εικόνα αποθηκεύτηκε.</string>
+    <string name="toast_copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
+    <string name="error_download_failed">Η λήψη απέτυχε</string>
+    <string name="feed_remove_button">Αφαίρεση</string>
+    <string name="feed_rename_button">Μετονομασία</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Όνομα χρήστη</string>
+    <string name="pref_title_password">Συνθηματικό</string>
+    <string name="pref_title_owncloudRootPath">Διεύθυνση ριζικού καταλόγου ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Είσοδος</string>
+    <string name="login_progress_signing_in">Είσοδος...</string>
+    <string name="error_field_required">Αυτό το πεδίο είναι απαραίτητο</string>
+    <string name="error_invalid_url">Αυτός ο σύνδεσμος είναι εσφαλμένος</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Εισαγωγή λογαριασμού</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Λήφθηκε %d παλαιό αντικείμενο</item>
+        <item quantity="other">Λήφθηκαν %d παλαιά αντικείμενα</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Δεν υπάρχουν επιπλέον στοιχεία διαθέσιμα</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Ρυθμίσεις</string>
+    <string name="cache_is_cleared">Η προσωρινή μνήμη εκκαθαρίστηκε!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Γενικά</string>
+    <string name="pref_title_general_sort_order">Σειρά ταξινόμησης</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Νέα-&gt; Παλιά</item>
+        <item>Παλιά -&gt; Νέα</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Εκκαθάριση προσωρινής μνήμης</string>
+    <string name="dialog_clearing_cache_please_wait">Εκκαθάριση προσωρινής μνήμης... Παρακαλώ περιμένετε.</string>
+    <string name="reset_cache_unsaved_changes">Υπάρχουν αλλαγές που δεν έχουν συγχρονιστεί. Θα θέλατε να επαναφέρετε τα αποθηκευμένα στοιχεία ούτως ή άλλως;</string>
+    <string name="warning">Προειδοποίηση</string>
+    <string name="pref_title_AutoSyncOnStart">Συγχρονισμός κατά την έναρξη</string>
+    <string name="pref_title_ShowOnlyUnread">Εμφάνιση μόνο μη αναγνωσμένων άρθρων</string>
+    <string name="pref_title_DisableHostnameVerification">Απενεργοποίηση επαλήθευσης Ονόματος Υπολογιστή</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Περιήγηση με πλήκτρα έντασης φωνής</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Σημείωση ως αναγνωσμένου κατά την κύλιση</string>
+    <string name="pref_title_OpenInBrowserDirectly">Χρήση εξωτερικού προγράμματος περιήγησης για θέαση άρθρων</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Αποδοχή Άγνωστων Πιστοποιητικών;</string>
+    <string name="mtm_decision_always">Πάντα</string>
+    <string name="mtm_decision_abort">Ματαίωση</string>
+    <string name="mtm_notification">Επαλήθευση Πιστοποιητικού</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Δεν επιλέχθηκε Podcast</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Εμφάνιση</string>
+    <string name="pref_title_app_theme">Θέμα εφαρμογής</string>
+    <string name="pref_title_feed_list_layout">Προβολή λίστας ροών</string>
+    <string name="pref_display_title_lines_count">Απαρίθμηση Γραμμών για τίτλο</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Σκοτεινό</item>
+        <item>Φωτεινό</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Απλή</item>
+        <item>Εκτεταμένη</item>
+        <item>Εκτεταμένη (πλήρες κείμενο)</item>
+        <item>Εκτεταμένη με προβολή ιστού</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Ειδοποιήσεις</string>
+    <string name="pref_title_notification_new_articles_available">Προβολή ειδοποίησης όταν νέα άρθρα είναι διαθέσιμα</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Σφάλμα</string>
+    <string name="login_dialog_text_something_went_wrong">Κάτι πήγε στραβά :(</string>
+    <string name="login_dialog_text_not_compatible">Αυτή η έκδοση της εφαρμογής δεν είναι συμβατή με τη δική σας εφαρμογή Ανάγνωσης Ειδήσεων του ownCloud. Παρακαλώ ενημερώστε την εφαρμογή Ανάγνωσης Ειδήσεων και την εφαρμογή Πλαίσιο Εφαρμογών.</string>
+    <string name="login_dialog_title_security_warning">Προειδοποίηση Ασφαλείας</string>
+    <string name="login_dialog_text_security_warning">Δεν χρησιμοποιείτε htpps. Κάποιος εισβολέας θα μπορούσε να παρεμβληθεί στη σύνδεσή σας και να αποκτήσει πρόσβαση σε ευαίσθητα δεδομένα (π.χ. τον κωδικό σας). Επομένως προτείνεται σοβαρά η χρήση htpps!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Δεδομένα &amp; συγχρονισμός</string>
+    <string name="pref_title_clearCache">Εκκαθάριση προσωρινής μνήμης</string>
+    <string name="pref_title_CacheImagesOffline">Αποθήκευση εικόνων για χρήση χωρίς σύνδεση</string>
+    <string name="pref_title_Max_Cache_Size">Μέγιστο μέγεθος στοιχείων προς αποθήκευση</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Λεπτά</item>
+        <item>15 Λεπτά</item>
+        <item>30 Λεπτά</item>
+        <item>45 Λεπτά</item>
+        <item>1 Ώρα</item>
+        <item>2 Ώρες</item>
+        <item>3 Ώρες</item>
+        <item>6 Ώρες</item>
+        <item>12 Ώρες</item>
+        <item>24 Ώρες</item>
+    </string-array>
+    <string name="content_desc_play">αναπαραγωγή</string>
+    <string name="content_desc_pause">παύση</string>
+    <string name="content_desc_add_to_favorites">προσθήκη στα αγαπημένα</string>
+    <string name="content_desc_remove_from_favorites">αφαίρεση από τα αγαπημένα</string>
+    <string name="content_desc_show_password">εμφάνιση συνθηματικού</string>
+    <string name="content_desc_delete">διαγραφή</string>
+    <string name="content_desc_download">λήψη</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-en-rGB/strings.xml b/News-Android-App/src/main/res/values-en-rGB/strings.xml
index 39c66678..fd62cb9e 100644
--- a/News-Android-App/src/main/res/values-en-rGB/strings.xml
+++ b/News-Android-App/src/main/res/values-en-rGB/strings.xml
@@ -1,126 +1,137 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Auto sync</string>
-  <string name="app_name">ownCloud News Reader</string>
-  <string name="title_activity_sync_interval_selector">Sync Interval Selector</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">No items here</string>
-  <string name="no_wifi_available">No WiFi connection</string>
-  <string name="do_you_want_to_download_without_wifi">Do you want to download the images without a WiFi connection</string>
-  <string name="widget_header">ownCloud News</string>
-  <string name="message_bar_reload">Reload</string>
-  <string name="allUnreadFeeds">All unread items</string>
-  <string name="starredFeeds">Starred items</string>
-  <string name="title_activity_new_feed">Add new feed</string>
-  <string name="menu_update">Refresh</string>
-  <string name="menu_About_Changelog">About / Changelog</string>
-  <string name="menu_markAllAsRead">Mark all as read</string>
-  <string name="menu_StartImageCaching">Download images</string>
-  <string name="menu_downloadMoreItems">Download more items</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Starred</string>
-  <string name="action_read">Read</string>
-  <string name="action_playPodacst">Play Podcast</string>
-  <string name="action_openInBrowser">Open in Browser</string>
-  <string name="action_Share">Share</string>
-  <string name="action_login">Server Settings</string>
-  <string name="action_save">Save</string>
-  <string name="action_settings">Settings</string>
-  <string name="action_sync_settings">Sync Settings</string>
-  <string name="action_add_new_feed">Add new feed</string>
-  <string name="action_textToSpeech">Read out</string>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Copied to clipboard</string>
-  <string name="error_download_failed">Download failed</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Remove</string>
-  <string name="feed_rename_button">Rename</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Username</string>
-  <string name="pref_title_password">Password</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Sign in</string>
-  <string name="login_progress_signing_in">Signing in…</string>
-  <string name="error_field_required">This field is required</string>
-  <string name="error_invalid_url">This URL is incorrect</string>
-  <!--Import Accounts-->
-  <string name="import_account">Import Account</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">No further items available</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Settings</string>
-  <!--General settings-->
-  <string name="pref_header_general">General</string>
-  <string name="pref_title_general_sort_order">Sort Order</string>
-  <string-array name="pref_general_sort_order">
-    <item>New -&gt; Old</item>
-    <item>Old -&gt; New</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Clearing cache</string>
-  <string name="reset_cache_unsaved_changes">There are unsynchronised changes. Would you like to reset the cache anyway?</string>
-  <string name="warning">Warning</string>
-  <string name="pref_title_AutoSyncOnStart">Sync on startup</string>
-  <string name="pref_title_ShowOnlyUnread">Show only unread articles</string>
-  <string name="pref_title_DisableHostnameVerification">Disable Hostname Verification</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigate with volume buttons</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Mark as read whilst scrolling</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
-  <string name="mtm_decision_always">Always</string>
-  <string name="mtm_decision_abort">Abort</string>
-  <string name="mtm_notification">Certificate Verification</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">No podcast selected</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Display</string>
-  <string name="pref_title_app_theme">App theme</string>
-  <string name="pref_title_feed_list_layout">Feed list layout</string>
-  <string-array name="pref_display_apptheme">
-    <item>Dark</item>
-    <item>Light</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notifications</string>
-  <string name="pref_title_notification_new_articles_available">Show notification when new articles are available</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Error</string>
-  <string name="login_dialog_text_something_went_wrong">Something went wrong :(</string>
-  <string name="login_dialog_text_not_compatible">This App version is not compatible with your ownCloud News App. Please update the news app and the appframework.</string>
-  <string name="login_dialog_title_security_warning">Security Warning</string>
-  <string name="login_dialog_text_security_warning">You\'re not using https. An attacker could intercept your traffic and gain access to some sensitive data (e.g. your password). So it\'s strongly recommend that you use https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; sync</string>
-  <string name="pref_title_clearCache">Clear cache</string>
-  <string name="pref_title_CacheImagesOffline">Cache images offline</string>
-  <string name="pref_title_Max_Cache_Size">Max Cache Size</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Never</item>
-    <item>Over WiFi only</item>
-    <item>Over WiFi &amp; Mobile</item>
-    <item>Ask when not connected to WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutes</item>
-    <item>15 Minutes</item>
-    <item>30 Minutes</item>
-    <item>45 Minutes</item>
-    <item>1 Hour</item>
-    <item>2 Hours</item>
-    <item>3 Hours</item>
-    <item>6 Hours</item>
-    <item>12 Hours</item>
-    <item>24 Hours</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">delete</string>
-</resources>
+
+    <string name="auto_sync_string">Auto sync</string>
+    <string name="title_activity_sync_interval_selector">Sync Interval Selector</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">No items here</string>
+    <string name="no_wifi_available">No WiFi connection</string>
+    <string name="do_you_want_to_download_without_wifi">Do you want to download the images without a WiFi connection</string>
+    <string name="widget_header">ownCloud News</string>
+    <string name="message_bar_reload">Reload</string>
+    <string name="allUnreadFeeds">All unread items</string>
+    <string name="starredFeeds">Starred items</string>
+    <string name="title_activity_new_feed">Add new feed</string>
+
+    <string name="menu_update">Refresh</string>
+    <string name="menu_About_Changelog">About / Changelog</string>
+    <string name="menu_markAllAsRead">Mark all as read</string>
+    <string name="menu_StartImageCaching">Download images</string>
+    <string name="menu_downloadMoreItems">Download more items</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Starred</string>
+    <string name="action_read">Read</string>
+    <string name="action_playPodacst">Play Podcast</string>
+    <string name="action_openInBrowser">Open in Browser</string>
+    <string name="action_Share">Share</string>
+    <string name="action_login">Server Settings</string>
+    <string name="action_save">Save</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_sync_settings">Sync Settings</string>
+    <string name="action_add_new_feed">Add new feed</string>
+    <string name="action_textToSpeech">Read out</string>
+    <string name="toast_copied_to_clipboard">Copied to clipboard</string>
+    <string name="error_download_failed">Download failed</string>
+    <string name="feed_remove_button">Remove</string>
+    <string name="feed_rename_button">Rename</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Username</string>
+    <string name="pref_title_password">Password</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Sign in</string>
+    <string name="login_progress_signing_in">Signing in…</string>
+    <string name="error_field_required">This field is required</string>
+    <string name="error_invalid_url">This URL is incorrect</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Import Account</string>
+
+
+    <string name="toast_no_more_downloads_available">No further items available</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Settings</string>
+    <!-- General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_general_sort_order">Sort Order</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>New -&gt; Old</item>
+        <item>Old -&gt; New</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Clearing cache</string>
+    <string name="reset_cache_unsaved_changes">There are unsynchronised changes. Would you like to reset the cache anyway?</string>
+    <string name="warning">Warning</string>
+    <string name="pref_title_AutoSyncOnStart">Sync on startup</string>
+    <string name="pref_title_ShowOnlyUnread">Show only unread articles</string>
+    <string name="pref_title_DisableHostnameVerification">Disable Hostname Verification</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigate with volume buttons</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Mark as read whilst scrolling</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
+    <string name="mtm_decision_always">Always</string>
+    <string name="mtm_decision_abort">Abort</string>
+    <string name="mtm_notification">Certificate Verification</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">No podcast selected</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Display</string>
+    <string name="pref_title_app_theme">App theme</string>
+    <string name="pref_title_feed_list_layout">Feed list layout</string>
+    <string-array name="pref_display_apptheme">
+        <item>Dark</item>
+        <item>Light</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notifications</string>
+    <string name="pref_title_notification_new_articles_available">Show notification when new articles are available</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Error</string>
+    <string name="login_dialog_text_something_went_wrong">Something went wrong :(</string>
+    <string name="login_dialog_text_not_compatible">This App version is not compatible with your ownCloud News App. Please update the news app and the appframework.</string>
+    <string name="login_dialog_title_security_warning">Security Warning</string>
+    <string name="login_dialog_text_security_warning">You\'re not using https. An attacker could intercept your traffic and gain access to some sensitive data (e.g. your password). So it\'s strongly recommend that you use https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; sync</string>
+    <string name="pref_title_clearCache">Clear cache</string>
+    <string name="pref_title_CacheImagesOffline">Cache images offline</string>
+    <string name="pref_title_Max_Cache_Size">Max Cache Size</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Never</item>
+        <item>Over WiFi only</item>
+        <item>Over WiFi &amp; Mobile</item>
+        <item>Ask when not connected to WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutes</item>
+        <item>15 Minutes</item>
+        <item>30 Minutes</item>
+        <item>45 Minutes</item>
+        <item>1 Hour</item>
+        <item>2 Hours</item>
+        <item>3 Hours</item>
+        <item>6 Hours</item>
+        <item>12 Hours</item>
+        <item>24 Hours</item>
+    </string-array>
+    <string name="content_desc_delete">delete</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-es-rAR/strings.xml b/News-Android-App/src/main/res/values-es-rAR/strings.xml
index 9bc04111..1ba809d2 100644
--- a/News-Android-App/src/main/res/values-es-rAR/strings.xml
+++ b/News-Android-App/src/main/res/values-es-rAR/strings.xml
@@ -1,116 +1,125 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sincronizar automáticamente</string>
-  <string name="app_name">Lector de Noticias ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Selector de intervalo de sincro. </string>
-  <string name="title_activity_news_detail">ActividadDetallesNoticias</string>
-  <string name="empty_view_content">No hay artículos aquí</string>
-  <string name="no_wifi_available">No estás conectado a WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Querés bajar las imágenes sin conexión WiFi</string>
-  <string name="widget_header">Noticias de ownCloud</string>
-  <string name="message_bar_reload">Recargar</string>
-  <string name="allUnreadFeeds">Todos los artículos sin leer</string>
-  <string name="starredFeeds">Artículos destacados</string>
-  <string name="title_activity_new_feed">Agregar nueva fuente</string>
-  <string name="menu_update">Recargar</string>
-  <string name="menu_About_Changelog">Acerca de / Actualizaciones</string>
-  <string name="menu_markAllAsRead">Marcar todos como leídos</string>
-  <string name="menu_StartImageCaching">Descargar imágenes</string>
-  <string name="menu_downloadMoreItems">Descargar más artículos</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Favoritos</string>
-  <string name="action_read">Leer</string>
-  <string name="action_openInBrowser">Abrir en Navegador</string>
-  <string name="action_Share">Compartir</string>
-  <string name="action_login">Ajustes del servidor</string>
-  <string name="action_save">Guardar</string>
-  <string name="action_settings">Configuración</string>
-  <string name="action_sync_settings">Configuración de sincro. </string>
-  <string name="action_add_new_feed">Agregar nueva fuente</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Agregar fuente</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Copiado al portapapeles</string>
-  <string name="error_download_failed">Error al descargar</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Borrar</string>
-  <string name="feed_rename_button">Cambiar nombre</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nombre de usuario</string>
-  <string name="pref_title_password">Contraseña</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Entrar</string>
-  <string name="login_progress_signing_in">Entrando...</string>
-  <string name="error_field_required">Este campo es requerido</string>
-  <string name="error_invalid_url">Esta URL es incorrecta</string>
-  <!--Import Accounts-->
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">No hay elementos disponibles</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Configuración</string>
-  <!--General settings-->
-  <string name="pref_header_general">General</string>
-  <string name="pref_title_general_sort_order">Ordenar por</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nuevo -&gt; Antiguo</item>
-    <item>Antiguo -&gt; Nuevo</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Borrando la caché</string>
-  <string name="reset_cache_unsaved_changes">Hay cambios que no fueron sincronizados. ¿Querés vaciar la caché de todas formas?</string>
-  <string name="warning">Atención</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizar al comenzar</string>
-  <string name="pref_title_ShowOnlyUnread">Mostrar solamente artículos no leídos</string>
-  <string name="pref_title_DisableHostnameVerification">Deshabilitar verificación del hostname</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navegar con los botones de volumen</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar como leído al desplazar</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">¿Aceptar certificados desconocidos?</string>
-  <string name="mtm_decision_always">Siempre</string>
-  <string name="mtm_decision_abort">Abortar</string>
-  <string name="mtm_notification">Verificación del certificado</string>
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <string name="pref_header_display">Mostrar</string>
-  <string name="pref_title_feed_list_layout">Presentación de la lista de orígenes</string>
-  <string-array name="pref_display_apptheme">
-    <item>Oscuro</item>
-    <item>Claro</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificaciones</string>
-  <string name="pref_title_notification_new_articles_available">Mostrar notificacion cuando nuevos artículos estén disponibles</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Error</string>
-  <string name="login_dialog_text_something_went_wrong">Algo salió mal :(</string>
-  <string name="login_dialog_text_not_compatible">La versión de esta App no es compatible con tu App de ownCloud News. Actualizá la News App y sus depencencias.</string>
-  <string name="login_dialog_title_security_warning">Advertencia de seguridad</string>
-  <string name="login_dialog_text_security_warning">No estás usando https. Un atacante podría interceptar tu tráfico y obtener acceso a datos importantes (p. ej. tu contraseña). ¡Te recomendamos que usés https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Sincronización de datos</string>
-  <string name="pref_title_clearCache">Limpiar caché</string>
-  <string name="pref_title_CacheImagesOffline">Hacer caché de imágenes fuera de línea</string>
-  <string name="pref_title_Max_Cache_Size">Tamaño máximo de la caché</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutos</item>
-    <item>15 Minutos</item>
-    <item>30 Minutos</item>
-    <item>45 Minutos</item>
-    <item>1 Hora</item>
-    <item>2 Horas</item>
-    <item>3 Horas</item>
-    <item>6 Horas</item>
-    <item>12 Horas</item>
-    <item>24 Horas</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">borrar</string>
-</resources>
+
+    <string name="auto_sync_string">Sincronizar automáticamente</string>
+    <string name="title_activity_sync_interval_selector">Selector de intervalo de sincro. </string>
+    <string name="title_activity_news_detail">ActividadDetallesNoticias</string>
+    <string name="empty_view_content">No hay artículos aquí</string>
+    <string name="no_wifi_available">No estás conectado a WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Querés bajar las imágenes sin conexión WiFi</string>
+    <string name="widget_header">Noticias de ownCloud</string>
+    <string name="message_bar_reload">Recargar</string>
+    <string name="allUnreadFeeds">Todos los artículos sin leer</string>
+    <string name="starredFeeds">Artículos destacados</string>
+    <string name="title_activity_new_feed">Agregar nueva fuente</string>
+
+    <string name="menu_update">Recargar</string>
+    <string name="menu_About_Changelog">Acerca de / Actualizaciones</string>
+    <string name="menu_markAllAsRead">Marcar todos como leídos</string>
+    <string name="menu_StartImageCaching">Descargar imágenes</string>
+    <string name="menu_downloadMoreItems">Descargar más artículos</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Favoritos</string>
+    <string name="action_read">Leer</string>
+    <string name="action_openInBrowser">Abrir en Navegador</string>
+    <string name="action_Share">Compartir</string>
+    <string name="action_login">Ajustes del servidor</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_settings">Configuración</string>
+    <string name="action_sync_settings">Configuración de sincro. </string>
+    <string name="action_add_new_feed">Agregar nueva fuente</string>
+    <string name="action_add_feed">Agregar fuente</string>
+
+
+    <string name="toast_copied_to_clipboard">Copiado al portapapeles</string>
+    <string name="error_download_failed">Error al descargar</string>
+    <string name="feed_remove_button">Borrar</string>
+    <string name="feed_rename_button">Cambiar nombre</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nombre de usuario</string>
+    <string name="pref_title_password">Contraseña</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Entrar</string>
+    <string name="login_progress_signing_in">Entrando...</string>
+    <string name="error_field_required">Este campo es requerido</string>
+    <string name="error_invalid_url">Esta URL es incorrecta</string>
+
+
+    <string name="toast_no_more_downloads_available">No hay elementos disponibles</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Configuración</string>
+    <!-- General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_general_sort_order">Ordenar por</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nuevo -&gt; Antiguo</item>
+        <item>Antiguo -&gt; Nuevo</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Borrando la caché</string>
+    <string name="reset_cache_unsaved_changes">Hay cambios que no fueron sincronizados. ¿Querés vaciar la caché de todas formas?</string>
+    <string name="warning">Atención</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizar al comenzar</string>
+    <string name="pref_title_ShowOnlyUnread">Mostrar solamente artículos no leídos</string>
+    <string name="pref_title_DisableHostnameVerification">Deshabilitar verificación del hostname</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navegar con los botones de volumen</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marcar como leído al desplazar</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">¿Aceptar certificados desconocidos?</string>
+    <string name="mtm_decision_always">Siempre</string>
+    <string name="mtm_decision_abort">Abortar</string>
+    <string name="mtm_notification">Verificación del certificado</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Mostrar</string>
+    <string name="pref_title_feed_list_layout">Presentación de la lista de orígenes</string>
+    <string-array name="pref_display_apptheme">
+        <item>Oscuro</item>
+        <item>Claro</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificaciones</string>
+    <string name="pref_title_notification_new_articles_available">Mostrar notificacion cuando nuevos artículos estén disponibles</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Error</string>
+    <string name="login_dialog_text_something_went_wrong">Algo salió mal :(</string>
+    <string name="login_dialog_text_not_compatible">La versión de esta App no es compatible con tu App de ownCloud News. Actualizá la News App y sus depencencias.</string>
+    <string name="login_dialog_title_security_warning">Advertencia de seguridad</string>
+    <string name="login_dialog_text_security_warning">No estás usando https. Un atacante podría interceptar tu tráfico y obtener acceso a datos importantes (p. ej. tu contraseña). ¡Te recomendamos que usés https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Sincronización de datos</string>
+    <string name="pref_title_clearCache">Limpiar caché</string>
+    <string name="pref_title_CacheImagesOffline">Hacer caché de imágenes fuera de línea</string>
+    <string name="pref_title_Max_Cache_Size">Tamaño máximo de la caché</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutos</item>
+        <item>15 Minutos</item>
+        <item>30 Minutos</item>
+        <item>45 Minutos</item>
+        <item>1 Hora</item>
+        <item>2 Horas</item>
+        <item>3 Horas</item>
+        <item>6 Horas</item>
+        <item>12 Horas</item>
+        <item>24 Horas</item>
+    </string-array>
+    <string name="content_desc_delete">borrar</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-es/strings.xml b/News-Android-App/src/main/res/values-es/strings.xml
index 84adc830..91c4605b 100644
--- a/News-Android-App/src/main/res/values-es/strings.xml
+++ b/News-Android-App/src/main/res/values-es/strings.xml
@@ -1,195 +1,225 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Autosincronizar</string>
-  <string name="app_name">Lector de noticias ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Sincronizar Selector de Intervalo</string>
-  <string name="title_activity_news_detail">ActividadDetallesNoticias</string>
-  <string name="empty_view_content">No hay artículos aquí</string>
-  <string name="toast_GettingMoreItems">Inició la descarga de más elementos... Por favor espere.</string>
-  <string name="no_wifi_available">No hay una conexión WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Desea descargar las imágenes sin conexión WiFi</string>
-  <string name="current_version">Está utilizando la versión %s</string>
-  <string name="widget_header">Noticias de ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nuevo elemento disponible</item>
-    <item quantity="other">%d nuevos elementos disponibles</item>
-  </plurals>
-  <string name="message_bar_reload">Recargar</string>
-  <string name="allUnreadFeeds">Todos los artículos sin leer</string>
-  <string name="starredFeeds">Artículos destacados</string>
-  <string name="title_activity_new_feed">Añadir nueva fuente</string>
-  <string name="menu_update">Actualizar</string>
-  <string name="menu_About_Changelog">Acerca de / Changelog</string>
-  <string name="menu_markAllAsRead">Marcar todo como leído</string>
-  <string name="menu_StartImageCaching">Descargar imágenes</string>
-  <string name="menu_downloadMoreItems">Descargar más artículos</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Destacado</string>
-  <string name="action_read">Leer</string>
-  <string name="action_playPodacst">Reproducir podcast</string>
-  <string name="action_openInBrowser">Abrir en navegador</string>
-  <string name="action_Share">Compartir</string>
-  <string name="action_login">Ajustes del Servidor</string>
-  <string name="action_save">Guardar</string>
-  <string name="action_settings">Ajustes</string>
-  <string name="action_sync_settings">Ajustes de Sincronización</string>
-  <string name="action_add_new_feed">Añadir nueva fuente</string>
-  <string name="action_textToSpeech">Recopilar información</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Tienes %d elementos nuevos sin leer</item>
-    <item quantity="other">Tienes %d elementos nuevos sin leer</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d elementos nuevos sin leer</item>
-    <item quantity="other">%d elementos nuevos sin leer</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">URL para el canal</string>
-  <string name="action_add_feed">Añadir fuente</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Descargar imagen</string>
-  <string name="action_img_sharelink">Compartir enlace de imagen</string>
-  <string name="action_img_open">Abrir imagen en el navegador de internet</string>
-  <string name="action_img_copylink">Copiar imagen enlace</string>
-  <string name="action_link_share">Compartir enlace</string>
-  <string name="action_link_open">Abrir enlace en el navegador de internet</string>
-  <string name="action_link_copy">Copiar enlace</string>
-  <string name="toast_img_download_wait">Descargando... Por favor espera</string>
-  <string name="toast_img_saved">Imagen guardada</string>
-  <string name="toast_img_notwriteable">Error al escribir Imagen.</string>
-  <string name="toast_copied_to_clipboard">Copiado al portapapeles</string>
-  <string name="error_download_failed">Falló la descarga</string>
-  <string name="intent_title_share">Compartir vía</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Eliminar Fuente</string>
-  <string name="action_feed_rename">Renombrar Fuente</string>
-  <string name="feed_remove_button">Eliminar</string>
-  <string name="feed_rename_button">Renombrar</string>
-  <string name="confirm_feed_remove">¿Realmente desea eliminar esta Fuente? ¡Esto no se puede deshacer!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nombre de usuario</string>
-  <string name="pref_title_password">Contraseña</string>
-  <string name="pref_title_owncloudRootPath">Dirección de la raíz de OwnCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Registrarse</string>
-  <string name="login_progress_signing_in">Registrándose...</string>
-  <string name="error_field_required">Este campo es necesario</string>
-  <string name="error_invalid_url">Esta url es incorrecta</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importar cuenta de usuario</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Descargó %d ítem elemento</item>
-    <item quantity="other">Descargó %d antiguos elementos</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">No hay elementos disponibles</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Descabellada %d artículo hasta ahora</item>
-    <item quantity="other">Descabellada %d artículo hasta ahora</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Ajustes</string>
-  <string name="cache_is_cleared">¡La caché está vacía!</string>
-  <!--General settings-->
-  <string name="pref_header_general">General</string>
-  <string name="pref_title_general_sort_order">Ordenar</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nuevo -&gt; Antiguo</item>
-    <item>Antiguo -&gt; Nuevo</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Vaciando el caché</string>
-  <string name="dialog_clearing_cache_please_wait">Limpiando cache... Por favor espere.</string>
-  <string name="reset_cache_unsaved_changes">Hay cambios no sincronizados. ¿Quiere vaciar la caché igualmente?</string>
-  <string name="warning">Precaución</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizar al inicio</string>
-  <string name="pref_title_ShowOnlyUnread">Mostrar sólo artículos no leídos</string>
-  <string name="pref_title_DisableHostnameVerification">Deshabilitar verificación del hostname</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navegar con los botones de volumen</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar como leído mientras se desplaza</string>
-  <string name="pref_title_OpenInBrowserDirectly">Usar un navegador externo para ver los artículos</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">¿Aceptar certificados desconocidos?</string>
-  <string name="mtm_decision_always">Siempre</string>
-  <string name="mtm_decision_abort">Abortar</string>
-  <string name="mtm_notification">Verificación del certificado</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Ningún podcast seleccionado</string>
-  <string name="no_chapters_available">No hay capítulos disponibles</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Mostrar</string>
-  <string name="pref_title_app_theme">Tema de la aplicación</string>
-  <string name="pref_title_feed_list_layout">Lista de fuentes</string>
-  <string name="pref_display_title_lines_count">Contar línea por título</string>
-  <string-array name="pref_display_apptheme">
-    <item>Oscuro</item>
-    <item>Brillante</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simple</item>
-    <item>Extendida</item>
-    <item>Extendida (texto completo)</item>
-    <item>Extendida con Visor web</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificaciones</string>
-  <string name="pref_title_notification_new_articles_available">Mostrar notificación cuando nuevos artículos estén disponibles</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Error</string>
-  <string name="login_dialog_text_something_went_wrong">Algo salió mal :(</string>
-  <string name="login_dialog_text_not_compatible">Esta versión de App no es compatible con su App de Noticias ownCloud. Por favor actualice la app de Noticias y el appframework.</string>
-  <string name="login_dialog_title_security_warning">Advertencia de seguridad</string>
-  <string name="login_dialog_text_security_warning">No está usando https. Un atacante podría interceptar su tráfico y obtener acceso a algún dato sensible (ej. su contraseña). ¡Es muy recomendable utilizar https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Datos &amp; sincronización</string>
-  <string name="pref_title_clearCache">Vaciar caché</string>
-  <string name="pref_title_CacheImagesOffline">Cachear imágenes offline</string>
-  <string name="pref_title_Max_Cache_Size">Tamaño máximo de la caché</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nunca</item>
-    <item>Sólo por WiFi</item>
-    <item>Por WiFi y datos móviles</item>
-    <item>Preguntar cuando no esté conectado a WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minutos</item>
-    <item>15 Minutes</item>
-    <item>30 Minutes</item>
-    <item>45 Minutes</item>
-    <item>1 Hour</item>
-    <item>2 Hours</item>
-    <item>3 Hours</item>
-    <item>6 Hours</item>
-    <item>12 Hours</item>
-    <item>24 Hours</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">reproducir</string>
-  <string name="content_desc_pause">pausar</string>
-  <string name="content_desc_rewind">rebobinar</string>
-  <string name="content_desc_forward">avance</string>
-  <string name="content_desc_expand">expandir</string>
-  <string name="content_desc_collapse">colapsar</string>
-  <string name="content_desc_mark_as_read">marcar como leído</string>
-  <string name="content_desc_mark_as_unread">marcar como no leído</string>
-  <string name="content_desc_tap_to_refresh">toque para refrescar</string>
-  <string name="content_desc_add_to_favorites">agregar a los favoritos</string>
-  <string name="content_desc_remove_from_favorites">eliminarlo de favoritos</string>
-  <string name="content_desc_show_password">mostrar contraseña</string>
-  <string name="content_desc_delete">borrar</string>
-  <string name="content_desc_download">descargar</string>
+
+    <string name="auto_sync_string">Autosincronizar</string>
+    <string name="title_activity_sync_interval_selector">Sincronizar Selector de Intervalo</string>
+    <string name="title_activity_news_detail">ActividadDetallesNoticias</string>
+    <string name="empty_view_content">No hay artículos aquí</string>
+    <string name="toast_GettingMoreItems">Inició la descarga de más elementos... Por favor espere.</string>
+    <string name="no_wifi_available">No hay una conexión WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Desea descargar las imágenes sin conexión WiFi</string>
+    <string name="current_version">Está utilizando la versión %s</string>
+    <string name="widget_header">Noticias de ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nuevo elemento disponible</item>
+        <item quantity="other">%d nuevos elementos disponibles</item>
+    </plurals>
+    <string name="message_bar_reload">Recargar</string>
+    <string name="allUnreadFeeds">Todos los artículos sin leer</string>
+    <string name="starredFeeds">Artículos destacados</string>
+    <string name="title_activity_new_feed">Añadir nueva fuente</string>
+
+    <string name="menu_update">Actualizar</string>
+    <string name="menu_About_Changelog">Acerca de / Changelog</string>
+    <string name="menu_markAllAsRead">Marcar todo como leído</string>
+    <string name="menu_StartImageCaching">Descargar imágenes</string>
+    <string name="menu_downloadMoreItems">Descargar más artículos</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Destacado</string>
+    <string name="action_read">Leer</string>
+    <string name="action_playPodacst">Reproducir podcast</string>
+    <string name="action_openInBrowser">Abrir en navegador</string>
+    <string name="action_Share">Compartir</string>
+    <string name="action_login">Ajustes del Servidor</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_settings">Ajustes</string>
+    <string name="action_sync_settings">Ajustes de Sincronización</string>
+    <string name="action_add_new_feed">Añadir nueva fuente</string>
+    <string name="action_textToSpeech">Recopilar información</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Tienes %d elementos nuevos sin leer</item>
+        <item quantity="other">Tienes %d elementos nuevos sin leer</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d elementos nuevos sin leer</item>
+        <item quantity="other">%d elementos nuevos sin leer</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">URL para el canal</string>
+    <string name="action_add_feed">Añadir fuente</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Descargar imagen</string>
+    <string name="action_img_sharelink">Compartir enlace de imagen</string>
+    <string name="action_img_open">Abrir imagen en el navegador de internet</string>
+    <string name="action_img_copylink">Copiar imagen enlace</string>
+    <string name="action_link_share">Compartir enlace</string>
+    <string name="action_link_open">Abrir enlace en el navegador de internet</string>
+    <string name="action_link_copy">Copiar enlace</string>
+    <string name="toast_img_download_wait">Descargando... Por favor espera</string>
+    <string name="toast_img_saved">Imagen guardada</string>
+    <string name="toast_img_notwriteable">Error al escribir Imagen.</string>
+    <string name="toast_copied_to_clipboard">Copiado al portapapeles</string>
+    <string name="error_download_failed">Falló la descarga</string>
+    <string name="intent_title_share">Compartir vía</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Eliminar Fuente</string>
+    <string name="action_feed_rename">Renombrar Fuente</string>
+    <string name="feed_remove_button">Eliminar</string>
+    <string name="feed_rename_button">Renombrar</string>
+    <string name="confirm_feed_remove">¿Realmente desea eliminar esta Fuente? ¡Esto no se puede deshacer!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nombre de usuario</string>
+    <string name="pref_title_password">Contraseña</string>
+    <string name="pref_title_owncloudRootPath">Dirección de la raíz de OwnCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Registrarse</string>
+    <string name="login_progress_signing_in">Registrándose...</string>
+    <string name="error_field_required">Este campo es necesario</string>
+    <string name="error_invalid_url">Esta url es incorrecta</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importar cuenta de usuario</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Descargó %d ítem elemento</item>
+        <item quantity="other">Descargó %d antiguos elementos</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">No hay elementos disponibles</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Descabellada %d artículo hasta ahora</item>
+        <item quantity="other">Descabellada %d artículo hasta ahora</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Ajustes</string>
+    <string name="cache_is_cleared">¡La caché está vacía!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_general_sort_order">Ordenar</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nuevo -&gt; Antiguo</item>
+        <item>Antiguo -&gt; Nuevo</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Vaciando el caché</string>
+    <string name="dialog_clearing_cache_please_wait">Limpiando cache... Por favor espere.</string>
+    <string name="reset_cache_unsaved_changes">Hay cambios no sincronizados. ¿Quiere vaciar la caché igualmente?</string>
+    <string name="warning">Precaución</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizar al inicio</string>
+    <string name="pref_title_ShowOnlyUnread">Mostrar sólo artículos no leídos</string>
+    <string name="pref_title_DisableHostnameVerification">Deshabilitar verificación del hostname</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navegar con los botones de volumen</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marcar como leído mientras se desplaza</string>
+    <string name="pref_title_OpenInBrowserDirectly">Usar un navegador externo para ver los artículos</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">¿Aceptar certificados desconocidos?</string>
+    <string name="mtm_decision_always">Siempre</string>
+    <string name="mtm_decision_abort">Abortar</string>
+    <string name="mtm_notification">Verificación del certificado</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Ningún podcast seleccionado</string>
+    <string name="no_chapters_available">No hay capítulos disponibles</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Mostrar</string>
+    <string name="pref_title_app_theme">Tema de la aplicación</string>
+    <string name="pref_title_feed_list_layout">Lista de fuentes</string>
+    <string name="pref_display_title_lines_count">Contar línea por título</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Oscuro</item>
+        <item>Brillante</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simple</item>
+        <item>Extendida</item>
+        <item>Extendida (texto completo)</item>
+        <item>Extendida con Visor web</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificaciones</string>
+    <string name="pref_title_notification_new_articles_available">Mostrar notificación cuando nuevos artículos estén disponibles</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Error</string>
+    <string name="login_dialog_text_something_went_wrong">Algo salió mal :(</string>
+    <string name="login_dialog_text_not_compatible">Esta versión de App no es compatible con su App de Noticias ownCloud. Por favor actualice la app de Noticias y el appframework.</string>
+    <string name="login_dialog_title_security_warning">Advertencia de seguridad</string>
+    <string name="login_dialog_text_security_warning">No está usando https. Un atacante podría interceptar su tráfico y obtener acceso a algún dato sensible (ej. su contraseña). ¡Es muy recomendable utilizar https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Datos &amp; sincronización</string>
+    <string name="pref_title_clearCache">Vaciar caché</string>
+    <string name="pref_title_CacheImagesOffline">Cachear imágenes offline</string>
+    <string name="pref_title_Max_Cache_Size">Tamaño máximo de la caché</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nunca</item>
+        <item>Sólo por WiFi</item>
+        <item>Por WiFi y datos móviles</item>
+        <item>Preguntar cuando no esté conectado a WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minutos</item>
+        <item>15 Minutes</item>
+        <item>30 Minutes</item>
+        <item>45 Minutes</item>
+        <item>1 Hour</item>
+        <item>2 Hours</item>
+        <item>3 Hours</item>
+        <item>6 Hours</item>
+        <item>12 Hours</item>
+        <item>24 Hours</item>
+    </string-array>
+    <string name="content_desc_play">reproducir</string>
+    <string name="content_desc_pause">pausar</string>
+    <string name="content_desc_rewind">rebobinar</string>
+    <string name="content_desc_forward">avance</string>
+    <string name="content_desc_expand">expandir</string>
+    <string name="content_desc_collapse">colapsar</string>
+    <string name="content_desc_mark_as_read">marcar como leído</string>
+    <string name="content_desc_mark_as_unread">marcar como no leído</string>
+    <string name="content_desc_tap_to_refresh">toque para refrescar</string>
+    <string name="content_desc_add_to_favorites">agregar a los favoritos</string>
+    <string name="content_desc_remove_from_favorites">eliminarlo de favoritos</string>
+    <string name="content_desc_show_password">mostrar contraseña</string>
+    <string name="content_desc_delete">borrar</string>
+    <string name="content_desc_download">descargar</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-et-rEE/strings.xml b/News-Android-App/src/main/res/values-et-rEE/strings.xml
index a740871e..c5ea3dfc 100644
--- a/News-Android-App/src/main/res/values-et-rEE/strings.xml
+++ b/News-Android-App/src/main/res/values-et-rEE/strings.xml
@@ -1,182 +1,208 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Auto sünk</string>
-  <string name="app_name">ownCloud Uudiste Lugeja</string>
-  <string name="title_activity_sync_interval_selector">Sync sageduse valik</string>
-  <string name="title_activity_news_detail">UudisteÜksikasjadeTegevused</string>
-  <string name="empty_view_content">Siin pole üksusi</string>
-  <string name="toast_GettingMoreItems">Rohkemate kirjete allaladaimist on alustatud... Palun oota.</string>
-  <string name="no_wifi_available">WiFi pole ühendatud</string>
-  <string name="do_you_want_to_download_without_wifi">Kas soovid pildid alla laadida WiFi ühendust kasutamata</string>
-  <string name="current_version">Sa kasutad versioon %s</string>
-  <string name="widget_header">ownCloud Uudised</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">Saadaval on %d uus kirjet</item>
-    <item quantity="other">Saadaval on %d uut kirjet</item>
-  </plurals>
-  <string name="message_bar_reload">Lae uuesti</string>
-  <string name="allUnreadFeeds">Kõik lugemata üksused</string>
-  <string name="starredFeeds">Tärniga märgitud üksused</string>
-  <string name="title_activity_new_feed">Lisa uudisvoog</string>
-  <string name="menu_update">Värskenda</string>
-  <string name="menu_About_Changelog">Teave / Muudatused</string>
-  <string name="menu_markAllAsRead">Märgi loetuks</string>
-  <string name="menu_StartImageCaching">Laadi pildid alla</string>
-  <string name="menu_downloadMoreItems">Laadi alla rohkem üksusi</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Tärniga märgitud</string>
-  <string name="action_read">Lugemine</string>
-  <string name="action_playPodacst">Mängi podcast</string>
-  <string name="action_openInBrowser">Ava veebilehitsejas</string>
-  <string name="action_Share">Jaga</string>
-  <string name="action_login">Serveri seaded</string>
-  <string name="action_save">Salvesta</string>
-  <string name="action_settings">Seaded</string>
-  <string name="action_sync_settings">Sync seaded</string>
-  <string name="action_add_new_feed">Lisa uudisvoog</string>
-  <string name="action_textToSpeech">Loe ette</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Sul on %d uus lugemata kirje</item>
-    <item quantity="other">Sul on %d uut lugemata kirjet</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">Saadaval on %d uus lugemata kirje</item>
-    <item quantity="other">Saadaval on %d uut lugemata kirjet</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Uudisvoo URL</string>
-  <string name="action_add_feed">Lisa uudivoog</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Laadi pilt alla</string>
-  <string name="action_img_sharelink">Jaga pildi linki</string>
-  <string name="action_img_open">Ava pilt veebilehitsejas</string>
-  <string name="action_img_copylink">Kopeeri pildi link</string>
-  <string name="action_link_share">Jaga linki</string>
-  <string name="action_link_open">Ava link veebilehitsejas</string>
-  <string name="action_link_copy">Kopeeri link</string>
-  <string name="toast_img_download_wait">Allalaadimine... palun oota</string>
-  <string name="toast_img_saved">Pilt on salvestatud.</string>
-  <string name="toast_img_notwriteable">Pildi kirjutamine ebaõnnestus.</string>
-  <string name="toast_copied_to_clipboard">Kopeeritud lõikepuhvrisse</string>
-  <string name="error_download_failed">Allalaadimine ebaõnnestus</string>
-  <string name="intent_title_share">Jaga kasutades</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Eemalda</string>
-  <string name="feed_rename_button">Nimeta ümber</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Kasutajanimi</string>
-  <string name="pref_title_password">Parool</string>
-  <string name="pref_title_owncloudRootPath">ownCloud juur address</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Logi sisse</string>
-  <string name="login_progress_signing_in">Sisselogimine...</string>
-  <string name="error_field_required">See väli on kohustuslik</string>
-  <string name="error_invalid_url">URL pole korrektne</string>
-  <!--Import Accounts-->
-  <string name="import_account">Impordi konto</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Alla on laaditud %d vana kirje</item>
-    <item quantity="other">Alla on laaditud %d vana kirjet</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Rohkem üksusi pole saadaval</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Seaded</string>
-  <string name="cache_is_cleared">Vahemälu on tühjendatud!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Üldine</string>
-  <string name="pref_title_general_sort_order">Sorteerimise järjekord</string>
-  <string-array name="pref_general_sort_order">
-    <item>Uus -&gt; Vana</item>
-    <item>Vana -&gt; Uus</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Tühjendan puhvrit</string>
-  <string name="dialog_clearing_cache_please_wait">Vahemälu tühjendamine... palun oota</string>
-  <string name="reset_cache_unsaved_changes">Esineb sünkroniseerimata muudatusi. Kas soovid puhvri sellegipoolest lähtestada?</string>
-  <string name="warning">Hoiatus</string>
-  <string name="pref_title_AutoSyncOnStart">Sünkroniseeri käivitamisel</string>
-  <string name="pref_title_ShowOnlyUnread">Näita ainult lugemata artikleid</string>
-  <string name="pref_title_DisableHostnameVerification">Keela serveri nime kontroll</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigeeri häälevaljuse nuppudega</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Märgi kerides loetuks</string>
-  <string name="pref_title_OpenInBrowserDirectly">Kasuta artiklite vaatamiseks välist lehitsejat</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Nõustu tundmatu sertifikaadiga?</string>
-  <string name="mtm_decision_always">Alati</string>
-  <string name="mtm_decision_abort">Katkesta</string>
-  <string name="mtm_notification">Sertifikaadi kontroll</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Ühtegi podcasti pole valitud</string>
-  <string name="no_chapters_available">Ühtegi peatükki pole saadaval</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Vaade</string>
-  <string name="pref_title_app_theme">Rakendi teema</string>
-  <string name="pref_title_feed_list_layout">Uudisvoo nimekirja paigutus</string>
-  <string name="pref_display_title_lines_count">Pealkirja ridade arv</string>
-  <string-array name="pref_display_apptheme">
-    <item>Hele</item>
-    <item>Tume</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Teavitused</string>
-  <string name="pref_title_notification_new_articles_available">Näita teavitusi kui on saadaval uusi arikleid</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Viga</string>
-  <string name="login_dialog_text_something_went_wrong">Midagi läks valesti :(</string>
-  <string name="login_dialog_text_not_compatible">See App versioon pole ühilduv sinu ownCloud News App-iga. Palun uuenda oma uudiste app-i ning app-i raamistikku.</string>
-  <string name="login_dialog_title_security_warning">Turvahoiatus</string>
-  <string name="login_dialog_text_security_warning">Sa ei kasuta https-i. Ründaja võib jälgida sinu liiklust ning saavutada ligipääsu tundlikele andmetele (näiteks sinu parooli). Seega on tungivalt soovitatav https kasutamine!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Andmed &amp; sünkroniseerimine</string>
-  <string name="pref_title_clearCache">Tühjenda puhver</string>
-  <string name="pref_title_CacheImagesOffline">Puhverda pildid võrguta seisu</string>
-  <string name="pref_title_Max_Cache_Size">Maksimaalne puhvri suurus</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Mitte kunagi</item>
-    <item>Ainult üle WiFi</item>
-    <item>WiFi &amp; andmeside</item>
-    <item>Küsi, kui pole WiFisse ühendatud</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minutit</item>
-    <item>15 minutit</item>
-    <item>30 minutit</item>
-    <item>45 minutit</item>
-    <item>1 tund</item>
-    <item>2 tundi</item>
-    <item>3 tundi</item>
-    <item>6 tundi</item>
-    <item>12 tundi</item>
-    <item>24 tundi</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">esita</string>
-  <string name="content_desc_pause">peata</string>
-  <string name="content_desc_rewind">keri tagasi</string>
-  <string name="content_desc_forward">edasi</string>
-  <string name="content_desc_expand">laienda</string>
-  <string name="content_desc_collapse">sulge</string>
-  <string name="content_desc_mark_as_read">märgi loetuks</string>
-  <string name="content_desc_mark_as_unread">märgi mitteloetuks</string>
-  <string name="content_desc_tap_to_refresh">värskendamiseks vajuta</string>
-  <string name="content_desc_add_to_favorites">lisa lemmikutesse</string>
-  <string name="content_desc_remove_from_favorites">eelamda lemmikutest</string>
-  <string name="content_desc_show_password">näita parooli</string>
-  <string name="content_desc_delete">kustuta</string>
-  <string name="content_desc_download">laadi alla</string>
+
+    <string name="auto_sync_string">Auto sünk</string>
+    <string name="title_activity_sync_interval_selector">Sync sageduse valik</string>
+    <string name="title_activity_news_detail">UudisteÜksikasjadeTegevused</string>
+    <string name="empty_view_content">Siin pole üksusi</string>
+    <string name="toast_GettingMoreItems">Rohkemate kirjete allaladaimist on alustatud... Palun oota.</string>
+    <string name="no_wifi_available">WiFi pole ühendatud</string>
+    <string name="do_you_want_to_download_without_wifi">Kas soovid pildid alla laadida WiFi ühendust kasutamata</string>
+    <string name="current_version">Sa kasutad versioon %s</string>
+    <string name="widget_header">ownCloud Uudised</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">Saadaval on %d uus kirjet</item>
+        <item quantity="other">Saadaval on %d uut kirjet</item>
+    </plurals>
+    <string name="message_bar_reload">Lae uuesti</string>
+    <string name="allUnreadFeeds">Kõik lugemata üksused</string>
+    <string name="starredFeeds">Tärniga märgitud üksused</string>
+    <string name="title_activity_new_feed">Lisa uudisvoog</string>
+
+    <string name="menu_update">Värskenda</string>
+    <string name="menu_About_Changelog">Teave / Muudatused</string>
+    <string name="menu_markAllAsRead">Märgi loetuks</string>
+    <string name="menu_StartImageCaching">Laadi pildid alla</string>
+    <string name="menu_downloadMoreItems">Laadi alla rohkem üksusi</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Tärniga märgitud</string>
+    <string name="action_read">Lugemine</string>
+    <string name="action_playPodacst">Mängi podcast</string>
+    <string name="action_openInBrowser">Ava veebilehitsejas</string>
+    <string name="action_Share">Jaga</string>
+    <string name="action_login">Serveri seaded</string>
+    <string name="action_save">Salvesta</string>
+    <string name="action_settings">Seaded</string>
+    <string name="action_sync_settings">Sync seaded</string>
+    <string name="action_add_new_feed">Lisa uudisvoog</string>
+    <string name="action_textToSpeech">Loe ette</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Sul on %d uus lugemata kirje</item>
+        <item quantity="other">Sul on %d uut lugemata kirjet</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">Saadaval on %d uus lugemata kirje</item>
+        <item quantity="other">Saadaval on %d uut lugemata kirjet</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Uudisvoo URL</string>
+    <string name="action_add_feed">Lisa uudivoog</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Laadi pilt alla</string>
+    <string name="action_img_sharelink">Jaga pildi linki</string>
+    <string name="action_img_open">Ava pilt veebilehitsejas</string>
+    <string name="action_img_copylink">Kopeeri pildi link</string>
+    <string name="action_link_share">Jaga linki</string>
+    <string name="action_link_open">Ava link veebilehitsejas</string>
+    <string name="action_link_copy">Kopeeri link</string>
+    <string name="toast_img_download_wait">Allalaadimine... palun oota</string>
+    <string name="toast_img_saved">Pilt on salvestatud.</string>
+    <string name="toast_img_notwriteable">Pildi kirjutamine ebaõnnestus.</string>
+    <string name="toast_copied_to_clipboard">Kopeeritud lõikepuhvrisse</string>
+    <string name="error_download_failed">Allalaadimine ebaõnnestus</string>
+    <string name="intent_title_share">Jaga kasutades</string>
+
+
+    <string name="feed_remove_button">Eemalda</string>
+    <string name="feed_rename_button">Nimeta ümber</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Kasutajanimi</string>
+    <string name="pref_title_password">Parool</string>
+    <string name="pref_title_owncloudRootPath">ownCloud juur address</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Logi sisse</string>
+    <string name="login_progress_signing_in">Sisselogimine...</string>
+    <string name="error_field_required">See väli on kohustuslik</string>
+    <string name="error_invalid_url">URL pole korrektne</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Impordi konto</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Alla on laaditud %d vana kirje</item>
+        <item quantity="other">Alla on laaditud %d vana kirjet</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Rohkem üksusi pole saadaval</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Seaded</string>
+    <string name="cache_is_cleared">Vahemälu on tühjendatud!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Üldine</string>
+    <string name="pref_title_general_sort_order">Sorteerimise järjekord</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Uus -&gt; Vana</item>
+        <item>Vana -&gt; Uus</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Tühjendan puhvrit</string>
+    <string name="dialog_clearing_cache_please_wait">Vahemälu tühjendamine... palun oota</string>
+    <string name="reset_cache_unsaved_changes">Esineb sünkroniseerimata muudatusi. Kas soovid puhvri sellegipoolest lähtestada?</string>
+    <string name="warning">Hoiatus</string>
+    <string name="pref_title_AutoSyncOnStart">Sünkroniseeri käivitamisel</string>
+    <string name="pref_title_ShowOnlyUnread">Näita ainult lugemata artikleid</string>
+    <string name="pref_title_DisableHostnameVerification">Keela serveri nime kontroll</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigeeri häälevaljuse nuppudega</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Märgi kerides loetuks</string>
+    <string name="pref_title_OpenInBrowserDirectly">Kasuta artiklite vaatamiseks välist lehitsejat</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Nõustu tundmatu sertifikaadiga?</string>
+    <string name="mtm_decision_always">Alati</string>
+    <string name="mtm_decision_abort">Katkesta</string>
+    <string name="mtm_notification">Sertifikaadi kontroll</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Ühtegi podcasti pole valitud</string>
+    <string name="no_chapters_available">Ühtegi peatükki pole saadaval</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Vaade</string>
+    <string name="pref_title_app_theme">Rakendi teema</string>
+    <string name="pref_title_feed_list_layout">Uudisvoo nimekirja paigutus</string>
+    <string name="pref_display_title_lines_count">Pealkirja ridade arv</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Hele</item>
+        <item>Tume</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Teavitused</string>
+    <string name="pref_title_notification_new_articles_available">Näita teavitusi kui on saadaval uusi arikleid</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Viga</string>
+    <string name="login_dialog_text_something_went_wrong">Midagi läks valesti :(</string>
+    <string name="login_dialog_text_not_compatible">See App versioon pole ühilduv sinu ownCloud News App-iga. Palun uuenda oma uudiste app-i ning app-i raamistikku.</string>
+    <string name="login_dialog_title_security_warning">Turvahoiatus</string>
+    <string name="login_dialog_text_security_warning">Sa ei kasuta https-i. Ründaja võib jälgida sinu liiklust ning saavutada ligipääsu tundlikele andmetele (näiteks sinu parooli). Seega on tungivalt soovitatav https kasutamine!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Andmed &amp; sünkroniseerimine</string>
+    <string name="pref_title_clearCache">Tühjenda puhver</string>
+    <string name="pref_title_CacheImagesOffline">Puhverda pildid võrguta seisu</string>
+    <string name="pref_title_Max_Cache_Size">Maksimaalne puhvri suurus</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Mitte kunagi</item>
+        <item>Ainult üle WiFi</item>
+        <item>WiFi &amp; andmeside</item>
+        <item>Küsi, kui pole WiFisse ühendatud</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minutit</item>
+        <item>15 minutit</item>
+        <item>30 minutit</item>
+        <item>45 minutit</item>
+        <item>1 tund</item>
+        <item>2 tundi</item>
+        <item>3 tundi</item>
+        <item>6 tundi</item>
+        <item>12 tundi</item>
+        <item>24 tundi</item>
+    </string-array>
+    <string name="content_desc_play">esita</string>
+    <string name="content_desc_pause">peata</string>
+    <string name="content_desc_rewind">keri tagasi</string>
+    <string name="content_desc_forward">edasi</string>
+    <string name="content_desc_expand">laienda</string>
+    <string name="content_desc_collapse">sulge</string>
+    <string name="content_desc_mark_as_read">märgi loetuks</string>
+    <string name="content_desc_mark_as_unread">märgi mitteloetuks</string>
+    <string name="content_desc_tap_to_refresh">värskendamiseks vajuta</string>
+    <string name="content_desc_add_to_favorites">lisa lemmikutesse</string>
+    <string name="content_desc_remove_from_favorites">eelamda lemmikutest</string>
+    <string name="content_desc_show_password">näita parooli</string>
+    <string name="content_desc_delete">kustuta</string>
+    <string name="content_desc_download">laadi alla</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-eu/strings.xml b/News-Android-App/src/main/res/values-eu/strings.xml
index cf608c37..7e973653 100644
--- a/News-Android-App/src/main/res/values-eu/strings.xml
+++ b/News-Android-App/src/main/res/values-eu/strings.xml
@@ -1,121 +1,134 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sinkronizazio Automatikoa</string>
-  <string name="app_name">ownCloud berri rakurlea</string>
-  <string name="title_activity_sync_interval_selector">Sinkronizazio Tartearen Hautatzailea</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">Ez dago elementurik hemen</string>
-  <string name="no_wifi_available">Ez dago WiFira konektatuta</string>
-  <string name="do_you_want_to_download_without_wifi">Irudiak WiFi konexioa gabe deskargatu nahi dituzu</string>
-  <string name="widget_header">ownCloud Berriak</string>
-  <string name="message_bar_reload">Birkargatu</string>
-  <string name="allUnreadFeeds">Irakurri gabeko elementu guztiak</string>
-  <string name="starredFeeds">Izardun elementuak</string>
-  <string name="title_activity_new_feed">Gehitu iturburu  berria</string>
-  <string name="menu_update">Birkargatu</string>
-  <string name="menu_About_Changelog">Honi Buruz / Aldaketak</string>
-  <string name="menu_markAllAsRead">Markatu guztiak irakurria gisa</string>
-  <string name="menu_StartImageCaching">Deskargatu irudiak</string>
-  <string name="menu_downloadMoreItems">Deskargatu elementu gehiago</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Izarduna</string>
-  <string name="action_read">Irakurri</string>
-  <string name="action_playPodacst">Erreproduzitu podcasta</string>
-  <string name="action_openInBrowser">Ireki nabigatzailean</string>
-  <string name="action_Share">Partekatu</string>
-  <string name="action_login">Zerbitzariaren ezarpenak</string>
-  <string name="action_save">Gorde</string>
-  <string name="action_settings">Ezarpenak</string>
-  <string name="action_sync_settings">Sinkronizazio Ezarpenak</string>
-  <string name="action_add_new_feed">Gehitu iturburu  berria</string>
-  <string name="action_textToSpeech">Iraukurri ozenki</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Gehitu iturburua</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Arbelera kopiatua</string>
-  <string name="error_download_failed">Deskargak huts egin du</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Ezabatu</string>
-  <string name="feed_rename_button">Berrizendatu</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Erabiltzaile izena</string>
-  <string name="pref_title_password">Pasahitza</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Izena eman</string>
-  <string name="login_progress_signing_in">Izena ematen...</string>
-  <string name="error_field_required">Eremu hau beharrezkoa da</string>
-  <string name="error_invalid_url">URL-a baliogabea da</string>
-  <!--Import Accounts-->
-  <string name="import_account">Inportatu Kontua</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Ez dago datu gehigarri eskuragarririk</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Ezarpenak</string>
-  <!--General settings-->
-  <string name="pref_header_general">Orokorra</string>
-  <string name="pref_title_general_sort_order">Antolatzeko Ordena</string>
-  <string-array name="pref_general_sort_order">
-    <item>Berria -&gt; Zaharra</item>
-    <item>Zaharra -&gt; Berria</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Cachea garbitzen</string>
-  <string name="reset_cache_unsaved_changes">Sinkronizatu gabeko datuak daude. Nahi duzu hala ere cachea berrabiaraztea?</string>
-  <string name="warning">Abisua</string>
-  <string name="pref_title_AutoSyncOnStart">Sinkronizatu abioan</string>
-  <string name="pref_title_ShowOnlyUnread">Erakutsi irakurri gabeko artikuluak bakarrik</string>
-  <string name="pref_title_DisableHostnameVerification">Ezgaitu Hostalari Izenaren Egiaztapena</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Mugitu bolumen botoiekin</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Markatu irakurrita gisa korritzean</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Onartu Ziurtagiri Ezezaguna</string>
-  <string name="mtm_decision_always">Beti</string>
-  <string name="mtm_decision_abort">Bertan-behera utzi</string>
-  <string name="mtm_notification">Ziurtagiriaren Egiaztapena</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Ez dago podcast hautatua</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Bistaratzea</string>
-  <string name="pref_title_app_theme">Aplikazioaren gaia</string>
-  <string name="pref_title_feed_list_layout">Eremu zerrenda ingurunea</string>
-  <string-array name="pref_display_apptheme">
-    <item>Iluna</item>
-    <item>Argia</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Jakinarazpenak</string>
-  <string name="pref_title_notification_new_articles_available">Bistaratu jakinarazpenak artikulu berriak daudenean</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Errorea</string>
-  <string name="login_dialog_text_something_went_wrong">Zerbait oker joan da :(</string>
-  <string name="login_dialog_text_not_compatible">Aplikazio hau ez da zure ownCloud berri aplikazioaren bateragarria. Eguneratu berri aplikazioa.</string>
-  <string name="login_dialog_title_security_warning">Segurtasun abisua</string>
-  <string name="login_dialog_text_security_warning">Ez zaude https erabiltzen. Edozein erasotzailek zure trafikoa eskuratu eta datu sentsibleei sarrera eduki dezake (adib. pasahitza). Beraz https erabiltzea gomendatzen da!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; sink</string>
-  <string name="pref_title_clearCache">Garbitu cachea</string>
-  <string name="pref_title_CacheImagesOffline">Irudiak sare-kanporako cacheatu</string>
-  <string name="pref_title_Max_Cache_Size">Cache tamaina maximoa</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutu</item>
-    <item>15 Minutu</item>
-    <item>30 Minutu</item>
-    <item>45 Minutu</item>
-    <item>1 Ordu</item>
-    <item>2 Ordu</item>
-    <item>3 Ordu</item>
-    <item>6 Ordu</item>
-    <item>12 Ordu</item>
-    <item>24 Ordu</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">ezabatu</string>
-</resources>
+
+    <string name="auto_sync_string">Sinkronizazio Automatikoa</string>
+    <string name="title_activity_sync_interval_selector">Sinkronizazio Tartearen Hautatzailea</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">Ez dago elementurik hemen</string>
+    <string name="no_wifi_available">Ez dago WiFira konektatuta</string>
+    <string name="do_you_want_to_download_without_wifi">Irudiak WiFi konexioa gabe deskargatu nahi dituzu</string>
+    <string name="widget_header">ownCloud Berriak</string>
+    <string name="message_bar_reload">Birkargatu</string>
+    <string name="allUnreadFeeds">Irakurri gabeko elementu guztiak</string>
+    <string name="starredFeeds">Izardun elementuak</string>
+    <string name="title_activity_new_feed">Gehitu iturburu  berria</string>
+
+    <string name="menu_update">Birkargatu</string>
+    <string name="menu_About_Changelog">Honi Buruz / Aldaketak</string>
+    <string name="menu_markAllAsRead">Markatu guztiak irakurria gisa</string>
+    <string name="menu_StartImageCaching">Deskargatu irudiak</string>
+    <string name="menu_downloadMoreItems">Deskargatu elementu gehiago</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Izarduna</string>
+    <string name="action_read">Irakurri</string>
+    <string name="action_playPodacst">Erreproduzitu podcasta</string>
+    <string name="action_openInBrowser">Ireki nabigatzailean</string>
+    <string name="action_Share">Partekatu</string>
+    <string name="action_login">Zerbitzariaren ezarpenak</string>
+    <string name="action_save">Gorde</string>
+    <string name="action_settings">Ezarpenak</string>
+    <string name="action_sync_settings">Sinkronizazio Ezarpenak</string>
+    <string name="action_add_new_feed">Gehitu iturburu  berria</string>
+    <string name="action_textToSpeech">Iraukurri ozenki</string>
+    <string name="action_add_feed">Gehitu iturburua</string>
+
+
+    <string name="toast_copied_to_clipboard">Arbelera kopiatua</string>
+    <string name="error_download_failed">Deskargak huts egin du</string>
+    <string name="feed_remove_button">Ezabatu</string>
+    <string name="feed_rename_button">Berrizendatu</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Erabiltzaile izena</string>
+    <string name="pref_title_password">Pasahitza</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Izena eman</string>
+    <string name="login_progress_signing_in">Izena ematen...</string>
+    <string name="error_field_required">Eremu hau beharrezkoa da</string>
+    <string name="error_invalid_url">URL-a baliogabea da</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Inportatu Kontua</string>
+
+
+    <string name="toast_no_more_downloads_available">Ez dago datu gehigarri eskuragarririk</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Ezarpenak</string>
+    <!-- General settings -->
+    <string name="pref_header_general">Orokorra</string>
+    <string name="pref_title_general_sort_order">Antolatzeko Ordena</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Berria -&gt; Zaharra</item>
+        <item>Zaharra -&gt; Berria</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Cachea garbitzen</string>
+    <string name="reset_cache_unsaved_changes">Sinkronizatu gabeko datuak daude. Nahi duzu hala ere cachea berrabiaraztea?</string>
+    <string name="warning">Abisua</string>
+    <string name="pref_title_AutoSyncOnStart">Sinkronizatu abioan</string>
+    <string name="pref_title_ShowOnlyUnread">Erakutsi irakurri gabeko artikuluak bakarrik</string>
+    <string name="pref_title_DisableHostnameVerification">Ezgaitu Hostalari Izenaren Egiaztapena</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Mugitu bolumen botoiekin</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Markatu irakurrita gisa korritzean</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Onartu Ziurtagiri Ezezaguna</string>
+    <string name="mtm_decision_always">Beti</string>
+    <string name="mtm_decision_abort">Bertan-behera utzi</string>
+    <string name="mtm_notification">Ziurtagiriaren Egiaztapena</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Ez dago podcast hautatua</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Bistaratzea</string>
+    <string name="pref_title_app_theme">Aplikazioaren gaia</string>
+    <string name="pref_title_feed_list_layout">Eremu zerrenda ingurunea</string>
+    <string-array name="pref_display_apptheme">
+        <item>Iluna</item>
+        <item>Argia</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Jakinarazpenak</string>
+    <string name="pref_title_notification_new_articles_available">Bistaratu jakinarazpenak artikulu berriak daudenean</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Errorea</string>
+    <string name="login_dialog_text_something_went_wrong">Zerbait oker joan da :(</string>
+    <string name="login_dialog_text_not_compatible">Aplikazio hau ez da zure ownCloud berri aplikazioaren bateragarria. Eguneratu berri aplikazioa.</string>
+    <string name="login_dialog_title_security_warning">Segurtasun abisua</string>
+    <string name="login_dialog_text_security_warning">Ez zaude https erabiltzen. Edozein erasotzailek zure trafikoa eskuratu eta datu sentsibleei sarrera eduki dezake (adib. pasahitza). Beraz https erabiltzea gomendatzen da!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; sink</string>
+    <string name="pref_title_clearCache">Garbitu cachea</string>
+    <string name="pref_title_CacheImagesOffline">Irudiak sare-kanporako cacheatu</string>
+    <string name="pref_title_Max_Cache_Size">Cache tamaina maximoa</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutu</item>
+        <item>15 Minutu</item>
+        <item>30 Minutu</item>
+        <item>45 Minutu</item>
+        <item>1 Ordu</item>
+        <item>2 Ordu</item>
+        <item>3 Ordu</item>
+        <item>6 Ordu</item>
+        <item>12 Ordu</item>
+        <item>24 Ordu</item>
+    </string-array>
+    <string name="content_desc_delete">ezabatu</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-fi-rFI/strings.xml b/News-Android-App/src/main/res/values-fi-rFI/strings.xml
index 2c1a1086..157df9ae 100644
--- a/News-Android-App/src/main/res/values-fi-rFI/strings.xml
+++ b/News-Android-App/src/main/res/values-fi-rFI/strings.xml
@@ -1,181 +1,211 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automaattinen synkronointi</string>
-  <string name="app_name">ownCloud-uutislukija</string>
-  <string name="title_activity_sync_interval_selector">Synkronointivälin valitsin</string>
-  <string name="empty_view_content">Ei kohteita</string>
-  <string name="toast_GettingMoreItems">Lisäkohteiden lataaminen aloitettu, odota hetki.</string>
-  <string name="no_wifi_available">Ei WiFi-yhteyttä</string>
-  <string name="do_you_want_to_download_without_wifi">Haluatko ladata kuvat ilman wifi-yhteyttä</string>
-  <string name="current_version">Käytössäsi on versio %s</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d uusi kohde saatavilla</item>
-    <item quantity="other">%d uutta kohdetta saatavilla</item>
-  </plurals>
-  <string name="message_bar_reload">Päivitä</string>
-  <string name="allUnreadFeeds">Kaikki lukemattomat kohteet</string>
-  <string name="starredFeeds">Tähdellä varustetut</string>
-  <string name="title_activity_new_feed">Lisää uusi syöte</string>
-  <string name="menu_update">Päivitä</string>
-  <string name="menu_About_Changelog">Tietoja / muutosloki</string>
-  <string name="menu_markAllAsRead">Merkitse kaikki luetuiksi</string>
-  <string name="menu_StartImageCaching">Lataa kuvat</string>
-  <string name="menu_downloadMoreItems">Lataa lisää kohteita</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Varustettu tähdellä</string>
-  <string name="action_read">Luku</string>
-  <string name="action_playPodacst">Toista podcast</string>
-  <string name="action_openInBrowser">Avaa selaimessa</string>
-  <string name="action_Share">Jaa</string>
-  <string name="action_login">Palvelinasetukset</string>
-  <string name="action_save">Tallenna</string>
-  <string name="action_settings">Asetukset</string>
-  <string name="action_sync_settings">Synkronointiasetukset</string>
-  <string name="action_add_new_feed">Lisää uusi syöte</string>
-  <string name="action_textToSpeech">Lue ääneen</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">%d uusi lukematon kohde</item>
-    <item quantity="other">%d uutta lukematonta kohdetta</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d uusi lukematon kohde saatavilla</item>
-    <item quantity="other">%d uutta lukematonta kohdetta saatavilla</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Syötteen osoite</string>
-  <string name="action_add_feed">Lisää syöte</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Lataa kuva</string>
-  <string name="action_img_sharelink">Jaa kuvan linkki</string>
-  <string name="action_img_open">Avaa kuva selaimessa</string>
-  <string name="action_img_copylink">Kopioi kuvan linkki</string>
-  <string name="action_link_share">Jaa linkki</string>
-  <string name="action_link_open">Avaa linkki selaimessa</string>
-  <string name="action_link_copy">Kopioi linkki</string>
-  <string name="toast_img_download_wait">Ladataan, odota hetki…</string>
-  <string name="toast_img_saved">Kuva tallennettu.</string>
-  <string name="toast_img_notwriteable">Kuvan tallennus epäonnistui.</string>
-  <string name="toast_copied_to_clipboard">Kopioitu leikepöydälle</string>
-  <string name="error_download_failed">Lataus epäonnistui</string>
-  <string name="intent_title_share">Jaa käyttäen</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Poista syöte</string>
-  <string name="action_feed_rename">Nimeä syöte uudelleen</string>
-  <string name="feed_remove_button">Poista</string>
-  <string name="feed_rename_button">Nimeä uudelleen</string>
-  <string name="confirm_feed_remove">Haluatko varmasti poistaa tämän syötteen? Toimintoa ei voi perua!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Käyttäjätunnus</string>
-  <string name="pref_title_password">Salasana</string>
-  <string name="pref_title_owncloudRootPath">ownCloudin juuriosoite</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Kirjaudu</string>
-  <string name="login_progress_signing_in">Kirjaudutaan…</string>
-  <string name="error_field_required">Tämä kenttä vaaditaan</string>
-  <string name="error_invalid_url">Osoite on virheellinen</string>
-  <!--Import Accounts-->
-  <string name="import_account">Tuo tili</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Ladattiin %d vanha kohde</item>
-    <item quantity="other">Ladattiin %d vanhaa kohdetta</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Ei enempää kohteita saatavilla</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Toistaiseksi noudettu %d artikkeli…</item>
-    <item quantity="other">Toistaiseksi noudettu %d artikkelia…</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Asetukset</string>
-  <string name="cache_is_cleared">Välimuisti on tyhjennetty!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Yleiset</string>
-  <string name="pref_title_general_sort_order">Lajittelujärjestys</string>
-  <string-array name="pref_general_sort_order">
-    <item>Uusi -&gt; vanha</item>
-    <item>Vanha -&gt; uusi</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Tyhjennetään välimuistia</string>
-  <string name="dialog_clearing_cache_please_wait">Tyhjennetään välimuistia, odota hetki…</string>
-  <string name="reset_cache_unsaved_changes">Havaittiin synkronoimattomia muutoksia. Haluatko silti tyhjentää välimuistin?</string>
-  <string name="warning">Varoitus</string>
-  <string name="pref_title_AutoSyncOnStart">Synkronoi käynnistäessä</string>
-  <string name="pref_title_ShowOnlyUnread">Näytä vain lukemattomat kohteet</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Liiku äänipainikkeilla</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Merkitse luetuiksi vierittäessä</string>
-  <string name="pref_title_OpenInBrowserDirectly">Käytä erillistä selainta artikkelien avaamiseen</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Hyväksytäänkö tuntematon varmenne?</string>
-  <string name="mtm_decision_always">Aina</string>
-  <string name="mtm_decision_abort">Keskeytä</string>
-  <string name="mtm_notification">Varmennevahvistus</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Podcastia ei ole valittu</string>
-  <string name="no_chapters_available">Ei kappaleita saatavilla</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Näyttö</string>
-  <string name="pref_title_app_theme">Sovelluksen teema</string>
-  <string name="pref_title_feed_list_layout">Syöteluettelon asettelu</string>
-  <string name="pref_display_title_lines_count">Otsikon rivimäärä</string>
-  <string-array name="pref_display_apptheme">
-    <item>Tumma</item>
-    <item>Vaalea</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Ilmoitukset</string>
-  <string name="pref_title_notification_new_articles_available">Näytä ilmoitus uusien kohteiden ollessa saatavilla</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Virhe</string>
-  <string name="login_dialog_text_something_went_wrong">Jokin meni pieleen :(</string>
-  <string name="login_dialog_title_security_warning">Turvallisuusvaroitus</string>
-  <string name="login_dialog_text_security_warning">Yhteytesi ei ole salattu. Hyökkääjä voi siepata yhteyden ja saada tärkeää tietoa (esim. salasanasi). Suosittelemme ehdottomasti käyttämään https-yhteyttä!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; synkronointi</string>
-  <string name="pref_title_clearCache">Tyhjennä välimuisti</string>
-  <string name="pref_title_CacheImagesOffline">Varastoi kuvat yhteydetöntä tilaa varten</string>
-  <string name="pref_title_Max_Cache_Size">Välimuistin enimmäiskoko</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Ei koskaan</item>
-    <item>Vain wifissä</item>
-    <item>Wifissä ja mobiiliyhteydessä</item>
-    <item>Kysy kun ei wifi-yhteyttä</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 Mt</item>
-    <item>500 Mt</item>
-    <item>750 Mt</item>
-    <item>1 Gt</item>
-    <item>2 Gt</item>
-    <item>5 Gt</item>
-    <item>10 Gt</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minuuttia</item>
-    <item>15 minuuttia</item>
-    <item>30 minuuttia</item>
-    <item>45 minuuttia</item>
-    <item>1 tunti</item>
-    <item>2 tuntia</item>
-    <item>3 tuntia</item>
-    <item>6 tuntia</item>
-    <item>12 tuntia</item>
-    <item>24 tuntia</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">toistsa</string>
-  <string name="content_desc_pause">keskeytä</string>
-  <string name="content_desc_mark_as_read">merkitse luetuksi</string>
-  <string name="content_desc_mark_as_unread">merkitse lukemattomaksi</string>
-  <string name="content_desc_tap_to_refresh">napauta päivittääksesi</string>
-  <string name="content_desc_add_to_favorites">lisää suosikkeihin</string>
-  <string name="content_desc_remove_from_favorites">poista suosikeista</string>
-  <string name="content_desc_show_password">näytä salasana</string>
-  <string name="content_desc_delete">poista</string>
-  <string name="content_desc_download">lataa</string>
+
+    <string name="auto_sync_string">Automaattinen synkronointi</string>
+    <string name="title_activity_sync_interval_selector">Synkronointivälin valitsin</string>
+    <string name="empty_view_content">Ei kohteita</string>
+    <string name="toast_GettingMoreItems">Lisäkohteiden lataaminen aloitettu, odota hetki.</string>
+    <string name="no_wifi_available">Ei WiFi-yhteyttä</string>
+    <string name="do_you_want_to_download_without_wifi">Haluatko ladata kuvat ilman wifi-yhteyttä</string>
+    <string name="current_version">Käytössäsi on versio %s</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d uusi kohde saatavilla</item>
+        <item quantity="other">%d uutta kohdetta saatavilla</item>
+    </plurals>
+    <string name="message_bar_reload">Päivitä</string>
+    <string name="allUnreadFeeds">Kaikki lukemattomat kohteet</string>
+    <string name="starredFeeds">Tähdellä varustetut</string>
+    <string name="title_activity_new_feed">Lisää uusi syöte</string>
+
+    <string name="menu_update">Päivitä</string>
+    <string name="menu_About_Changelog">Tietoja / muutosloki</string>
+    <string name="menu_markAllAsRead">Merkitse kaikki luetuiksi</string>
+    <string name="menu_StartImageCaching">Lataa kuvat</string>
+    <string name="menu_downloadMoreItems">Lataa lisää kohteita</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Varustettu tähdellä</string>
+    <string name="action_read">Luku</string>
+    <string name="action_playPodacst">Toista podcast</string>
+    <string name="action_openInBrowser">Avaa selaimessa</string>
+    <string name="action_Share">Jaa</string>
+    <string name="action_login">Palvelinasetukset</string>
+    <string name="action_save">Tallenna</string>
+    <string name="action_settings">Asetukset</string>
+    <string name="action_sync_settings">Synkronointiasetukset</string>
+    <string name="action_add_new_feed">Lisää uusi syöte</string>
+    <string name="action_textToSpeech">Lue ääneen</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">%d uusi lukematon kohde</item>
+        <item quantity="other">%d uutta lukematonta kohdetta</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d uusi lukematon kohde saatavilla</item>
+        <item quantity="other">%d uutta lukematonta kohdetta saatavilla</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Syötteen osoite</string>
+    <string name="action_add_feed">Lisää syöte</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Lataa kuva</string>
+    <string name="action_img_sharelink">Jaa kuvan linkki</string>
+    <string name="action_img_open">Avaa kuva selaimessa</string>
+    <string name="action_img_copylink">Kopioi kuvan linkki</string>
+    <string name="action_link_share">Jaa linkki</string>
+    <string name="action_link_open">Avaa linkki selaimessa</string>
+    <string name="action_link_copy">Kopioi linkki</string>
+    <string name="toast_img_download_wait">Ladataan, odota hetki…</string>
+    <string name="toast_img_saved">Kuva tallennettu.</string>
+    <string name="toast_img_notwriteable">Kuvan tallennus epäonnistui.</string>
+    <string name="toast_copied_to_clipboard">Kopioitu leikepöydälle</string>
+    <string name="error_download_failed">Lataus epäonnistui</string>
+    <string name="intent_title_share">Jaa käyttäen</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Poista syöte</string>
+    <string name="action_feed_rename">Nimeä syöte uudelleen</string>
+    <string name="feed_remove_button">Poista</string>
+    <string name="feed_rename_button">Nimeä uudelleen</string>
+    <string name="confirm_feed_remove">Haluatko varmasti poistaa tämän syötteen? Toimintoa ei voi perua!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Käyttäjätunnus</string>
+    <string name="pref_title_password">Salasana</string>
+    <string name="pref_title_owncloudRootPath">ownCloudin juuriosoite</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Kirjaudu</string>
+    <string name="login_progress_signing_in">Kirjaudutaan…</string>
+    <string name="error_field_required">Tämä kenttä vaaditaan</string>
+    <string name="error_invalid_url">Osoite on virheellinen</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Tuo tili</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Ladattiin %d vanha kohde</item>
+        <item quantity="other">Ladattiin %d vanhaa kohdetta</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Ei enempää kohteita saatavilla</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Toistaiseksi noudettu %d artikkeli…</item>
+        <item quantity="other">Toistaiseksi noudettu %d artikkelia…</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Asetukset</string>
+    <string name="cache_is_cleared">Välimuisti on tyhjennetty!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Yleiset</string>
+    <string name="pref_title_general_sort_order">Lajittelujärjestys</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Uusi -&gt; vanha</item>
+        <item>Vanha -&gt; uusi</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Tyhjennetään välimuistia</string>
+    <string name="dialog_clearing_cache_please_wait">Tyhjennetään välimuistia, odota hetki…</string>
+    <string name="reset_cache_unsaved_changes">Havaittiin synkronoimattomia muutoksia. Haluatko silti tyhjentää välimuistin?</string>
+    <string name="warning">Varoitus</string>
+    <string name="pref_title_AutoSyncOnStart">Synkronoi käynnistäessä</string>
+    <string name="pref_title_ShowOnlyUnread">Näytä vain lukemattomat kohteet</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Liiku äänipainikkeilla</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Merkitse luetuiksi vierittäessä</string>
+    <string name="pref_title_OpenInBrowserDirectly">Käytä erillistä selainta artikkelien avaamiseen</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Hyväksytäänkö tuntematon varmenne?</string>
+    <string name="mtm_decision_always">Aina</string>
+    <string name="mtm_decision_abort">Keskeytä</string>
+    <string name="mtm_notification">Varmennevahvistus</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Podcastia ei ole valittu</string>
+    <string name="no_chapters_available">Ei kappaleita saatavilla</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Näyttö</string>
+    <string name="pref_title_app_theme">Sovelluksen teema</string>
+    <string name="pref_title_feed_list_layout">Syöteluettelon asettelu</string>
+    <string name="pref_display_title_lines_count">Otsikon rivimäärä</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Tumma</item>
+        <item>Vaalea</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Ilmoitukset</string>
+    <string name="pref_title_notification_new_articles_available">Näytä ilmoitus uusien kohteiden ollessa saatavilla</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Virhe</string>
+    <string name="login_dialog_text_something_went_wrong">Jokin meni pieleen :(</string>
+    <string name="login_dialog_title_security_warning">Turvallisuusvaroitus</string>
+    <string name="login_dialog_text_security_warning">Yhteytesi ei ole salattu. Hyökkääjä voi siepata yhteyden ja saada tärkeää tietoa (esim. salasanasi). Suosittelemme ehdottomasti käyttämään https-yhteyttä!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; synkronointi</string>
+    <string name="pref_title_clearCache">Tyhjennä välimuisti</string>
+    <string name="pref_title_CacheImagesOffline">Varastoi kuvat yhteydetöntä tilaa varten</string>
+    <string name="pref_title_Max_Cache_Size">Välimuistin enimmäiskoko</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Ei koskaan</item>
+        <item>Vain wifissä</item>
+        <item>Wifissä ja mobiiliyhteydessä</item>
+        <item>Kysy kun ei wifi-yhteyttä</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 Mt</item>
+        <item>500 Mt</item>
+        <item>750 Mt</item>
+        <item>1 Gt</item>
+        <item>2 Gt</item>
+        <item>5 Gt</item>
+        <item>10 Gt</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minuuttia</item>
+        <item>15 minuuttia</item>
+        <item>30 minuuttia</item>
+        <item>45 minuuttia</item>
+        <item>1 tunti</item>
+        <item>2 tuntia</item>
+        <item>3 tuntia</item>
+        <item>6 tuntia</item>
+        <item>12 tuntia</item>
+        <item>24 tuntia</item>
+    </string-array>
+    <string name="content_desc_play">toistsa</string>
+    <string name="content_desc_pause">keskeytä</string>
+    <string name="content_desc_mark_as_read">merkitse luetuksi</string>
+    <string name="content_desc_mark_as_unread">merkitse lukemattomaksi</string>
+    <string name="content_desc_tap_to_refresh">napauta päivittääksesi</string>
+    <string name="content_desc_add_to_favorites">lisää suosikkeihin</string>
+    <string name="content_desc_remove_from_favorites">poista suosikeista</string>
+    <string name="content_desc_show_password">näytä salasana</string>
+    <string name="content_desc_delete">poista</string>
+    <string name="content_desc_download">lataa</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-fr/strings.xml b/News-Android-App/src/main/res/values-fr/strings.xml
index 26f310ac..806612a4 100644
--- a/News-Android-App/src/main/res/values-fr/strings.xml
+++ b/News-Android-App/src/main/res/values-fr/strings.xml
@@ -1,189 +1,219 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Synchronisation auto.</string>
-  <string name="app_name">ownCloud News Reader</string>
-  <string name="title_activity_sync_interval_selector">Sélecteur d\'intervalle de synchronisation</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">Aucun article</string>
-  <string name="toast_GettingMoreItems">Téléchargement d\'articles additionnels en cours... Veuillez patienter.</string>
-  <string name="no_wifi_available">Aucune connexion Wi-Fi</string>
-  <string name="do_you_want_to_download_without_wifi">Télécharger les images sans connexion Wi-Fi ?</string>
-  <string name="current_version">Vous utilisez la version %s</string>
-  <string name="widget_header">Actualités ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nouvel article disponible</item>
-    <item quantity="other">%d nouveaux articles disponibles</item>
-  </plurals>
-  <string name="message_bar_reload">Recharger</string>
-  <string name="allUnreadFeeds">Tous les articles non lus</string>
-  <string name="starredFeeds">Articles favoris</string>
-  <string name="title_activity_new_feed">Ajouter un flux</string>
-  <string name="menu_update">Rafraîchir</string>
-  <string name="menu_About_Changelog">À propos / Journal des modifications</string>
-  <string name="menu_markAllAsRead">Marquer tous comme lus</string>
-  <string name="menu_StartImageCaching">Télécharger les images</string>
-  <string name="menu_downloadMoreItems">+ d\'articles</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Favori</string>
-  <string name="action_read">Lu</string>
-  <string name="action_playPodacst">Lire le Podcast</string>
-  <string name="action_openInBrowser">Afficher dans le navigateur</string>
-  <string name="action_Share">Partager</string>
-  <string name="action_login">Paramètres du serveur</string>
-  <string name="action_save">Sauvegarder</string>
-  <string name="action_settings">Paramètres</string>
-  <string name="action_sync_settings">Paramètres de synchronisation</string>
-  <string name="action_add_new_feed">Ajouter un nouveau flux</string>
-  <string name="action_textToSpeech">Lire à haute voix</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Il y a %d nouvel article non lu</item>
-    <item quantity="other">Il y a %d nouveaux articles non lus</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d nouvel article non lu</item>
-    <item quantity="other">%d nouveaux articles non lus</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Adresse du flux</string>
-  <string name="action_add_feed">Ajouter un flux</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Télécharger l\'Image</string>
-  <string name="action_img_sharelink">Partager le Lien vers l\'Image</string>
-  <string name="action_img_open">Ouvrir l\'Image dans le Navigateur</string>
-  <string name="action_img_copylink">Copier le Lien vers l\'Image</string>
-  <string name="action_link_share">Partager par un Lien</string>
-  <string name="action_link_open">Ouvrir le Lien dans le Navigateur</string>
-  <string name="action_link_copy">Copier le Lien</string>
-  <string name="toast_img_download_wait">Téléchargement... Veuillez patienter</string>
-  <string name="toast_img_saved">Image sauvegardée.</string>
-  <string name="toast_img_notwriteable">Erreur d\'écriture de l\'Image.</string>
-  <string name="toast_copied_to_clipboard">Copié dans le presse-papier</string>
-  <string name="error_download_failed">Le téléchargement a échoué</string>
-  <string name="intent_title_share">Partager via</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Supprimer le Flux</string>
-  <string name="action_feed_rename">Renommer le Flux</string>
-  <string name="feed_remove_button">Supprimer</string>
-  <string name="feed_rename_button">Renommer</string>
-  <string name="confirm_feed_remove">Voulez-vous vraiment supprimer ce Flux ? Cela ne pourra pas être annulé !</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nom d\'utilisateur</string>
-  <string name="pref_title_password">Mot de passe</string>
-  <string name="pref_title_owncloudRootPath">adresse racine d\'ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">S\'identifier</string>
-  <string name="login_progress_signing_in">Connexion en cours…</string>
-  <string name="error_field_required">Ce champs est requis</string>
-  <string name="error_invalid_url">Cette URL est incorrecte</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importer un compte</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">%d ancien article téléchargé</item>
-    <item quantity="other">%d anciens articles téléchargés</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Aucun article supplémentaire disponible</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">%d article trouvé pour l\'instant...</item>
-    <item quantity="other">%d articles trouvés pour l\'instant....</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Paramètres</string>
-  <string name="cache_is_cleared">Cache nettoyé! </string>
-  <!--General settings-->
-  <string name="pref_header_general">Généraux</string>
-  <string name="pref_title_general_sort_order">Ordre de tri</string>
-  <string-array name="pref_general_sort_order">
-    <item>Récent -&gt; Ancien</item>
-    <item>Ancien -&gt; Récent</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Vider le cache</string>
-  <string name="dialog_clearing_cache_please_wait">Purge du cache... Veuillez patienter.</string>
-  <string name="reset_cache_unsaved_changes">Certaines modifications ne sont pas synchronisées. Voulez-vous tout de même réinitialiser le cache ?</string>
-  <string name="warning">Attention</string>
-  <string name="pref_title_AutoSyncOnStart">Synchro. au démarrage</string>
-  <string name="pref_title_ShowOnlyUnread">Masquer les articles lus</string>
-  <string name="pref_title_DisableHostnameVerification">Désactiver la vérification du nom d\'hôte</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Naviguer avec les boutons de volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marquer comme lu lors du défilement</string>
-  <string name="pref_title_OpenInBrowserDirectly">Afficher les articles dans un navigateur externe</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Accepter les certificats non sûrs ?</string>
-  <string name="mtm_decision_always">Toujours</string>
-  <string name="mtm_decision_abort">Annuler</string>
-  <string name="mtm_notification">Vérification du certificat</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Aucun podcast sélectionné</string>
-  <string name="no_chapters_available">Aucun chapitre disponible</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Affichage</string>
-  <string name="pref_title_app_theme">Thème de l\'app</string>
-  <string name="pref_title_feed_list_layout">Disposition de la liste des flux</string>
-  <string name="pref_display_title_lines_count">Nombre de lignes pour le titre</string>
-  <string-array name="pref_display_apptheme">
-    <item>Sombre</item>
-    <item>Clair</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simple</item>
-    <item>Etendue</item>
-    <item>Etendue (texte complet)</item>
-    <item>Etendue avec Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notifications</string>
-  <string name="pref_title_notification_new_articles_available">Afficher une notification lorsque de nouveaux articles sont disponibles</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Erreur</string>
-  <string name="login_dialog_text_something_went_wrong">Quelque chose s\'est mal passé :(</string>
-  <string name="login_dialog_text_not_compatible">La version de cette application n\'est pas compatible avec votre application News de ownCloud. Veuillez mettre à jour l\'application News et le framework d\'applications.</string>
-  <string name="login_dialog_title_security_warning">Avertissement de sécurité</string>
-  <string name="login_dialog_text_security_warning">Vous n\'utilisez pas HTTPS. Une personne malveillante pourrait intercepter votre trafic et obtenir des données sensibles (ex. votre mot de passe). Il est fortement recommandé d\'utiliser HTTPS !</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Données &amp; synchronisation</string>
-  <string name="pref_title_clearCache">Vider le cache</string>
-  <string name="pref_title_CacheImagesOffline">Mise en cache hors-ligne des images</string>
-  <string name="pref_title_Max_Cache_Size">Taille maximale du cache</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 Mo</item>
-    <item>500 Mo</item>
-    <item>750 Mo</item>
-    <item>1 Go</item>
-    <item>2 Go</item>
-    <item>5 Go</item>
-    <item>10 Go</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutes</item>
-    <item>15 Minutes</item>
-    <item>30 Minutes</item>
-    <item>45 Minutes</item>
-    <item>1 Heure</item>
-    <item>2 Heures</item>
-    <item>3 Heures</item>
-    <item>6 Heures</item>
-    <item>12 Heures</item>
-    <item>24 Heures</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">lire</string>
-  <string name="content_desc_pause">pause</string>
-  <string name="content_desc_rewind">rembobiner</string>
-  <string name="content_desc_forward">avancer</string>
-  <string name="content_desc_expand">étendre</string>
-  <string name="content_desc_collapse">replier</string>
-  <string name="content_desc_mark_as_read">marquer comme lu</string>
-  <string name="content_desc_mark_as_unread">marquer comme non-lu</string>
-  <string name="content_desc_tap_to_refresh">Tapoter pour rafraîchir</string>
-  <string name="content_desc_add_to_favorites">ajouter aux favoris</string>
-  <string name="content_desc_remove_from_favorites">retirer des favoris</string>
-  <string name="content_desc_show_password">montrer le mot de passe</string>
-  <string name="content_desc_delete">suppression</string>
-  <string name="content_desc_download">télécharger</string>
+
+    <string name="auto_sync_string">Synchronisation auto.</string>
+    <string name="title_activity_sync_interval_selector">Sélecteur d\'intervalle de synchronisation</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">Aucun article</string>
+    <string name="toast_GettingMoreItems">Téléchargement d\'articles additionnels en cours... Veuillez patienter.</string>
+    <string name="no_wifi_available">Aucune connexion Wi-Fi</string>
+    <string name="do_you_want_to_download_without_wifi">Télécharger les images sans connexion Wi-Fi ?</string>
+    <string name="current_version">Vous utilisez la version %s</string>
+    <string name="widget_header">Actualités ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nouvel article disponible</item>
+        <item quantity="other">%d nouveaux articles disponibles</item>
+    </plurals>
+    <string name="message_bar_reload">Recharger</string>
+    <string name="allUnreadFeeds">Tous les articles non lus</string>
+    <string name="starredFeeds">Articles favoris</string>
+    <string name="title_activity_new_feed">Ajouter un flux</string>
+
+    <string name="menu_update">Rafraîchir</string>
+    <string name="menu_About_Changelog">À propos / Journal des modifications</string>
+    <string name="menu_markAllAsRead">Marquer tous comme lus</string>
+    <string name="menu_StartImageCaching">Télécharger les images</string>
+    <string name="menu_downloadMoreItems">+ d\'articles</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Favori</string>
+    <string name="action_read">Lu</string>
+    <string name="action_playPodacst">Lire le Podcast</string>
+    <string name="action_openInBrowser">Afficher dans le navigateur</string>
+    <string name="action_Share">Partager</string>
+    <string name="action_login">Paramètres du serveur</string>
+    <string name="action_save">Sauvegarder</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="action_sync_settings">Paramètres de synchronisation</string>
+    <string name="action_add_new_feed">Ajouter un nouveau flux</string>
+    <string name="action_textToSpeech">Lire à haute voix</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Il y a %d nouvel article non lu</item>
+        <item quantity="other">Il y a %d nouveaux articles non lus</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d nouvel article non lu</item>
+        <item quantity="other">%d nouveaux articles non lus</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Adresse du flux</string>
+    <string name="action_add_feed">Ajouter un flux</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Télécharger l\'Image</string>
+    <string name="action_img_sharelink">Partager le Lien vers l\'Image</string>
+    <string name="action_img_open">Ouvrir l\'Image dans le Navigateur</string>
+    <string name="action_img_copylink">Copier le Lien vers l\'Image</string>
+    <string name="action_link_share">Partager par un Lien</string>
+    <string name="action_link_open">Ouvrir le Lien dans le Navigateur</string>
+    <string name="action_link_copy">Copier le Lien</string>
+    <string name="toast_img_download_wait">Téléchargement... Veuillez patienter</string>
+    <string name="toast_img_saved">Image sauvegardée.</string>
+    <string name="toast_img_notwriteable">Erreur d\'écriture de l\'Image.</string>
+    <string name="toast_copied_to_clipboard">Copié dans le presse-papier</string>
+    <string name="error_download_failed">Le téléchargement a échoué</string>
+    <string name="intent_title_share">Partager via</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Supprimer le Flux</string>
+    <string name="action_feed_rename">Renommer le Flux</string>
+    <string name="feed_remove_button">Supprimer</string>
+    <string name="feed_rename_button">Renommer</string>
+    <string name="confirm_feed_remove">Voulez-vous vraiment supprimer ce Flux ? Cela ne pourra pas être annulé !</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nom d\'utilisateur</string>
+    <string name="pref_title_password">Mot de passe</string>
+    <string name="pref_title_owncloudRootPath">adresse racine d\'ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">S\'identifier</string>
+    <string name="login_progress_signing_in">Connexion en cours…</string>
+    <string name="error_field_required">Ce champs est requis</string>
+    <string name="error_invalid_url">Cette URL est incorrecte</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importer un compte</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">%d ancien article téléchargé</item>
+        <item quantity="other">%d anciens articles téléchargés</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Aucun article supplémentaire disponible</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">%d article trouvé pour l\'instant...</item>
+        <item quantity="other">%d articles trouvés pour l\'instant....</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="cache_is_cleared">Cache nettoyé! </string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Généraux</string>
+    <string name="pref_title_general_sort_order">Ordre de tri</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Récent -&gt; Ancien</item>
+        <item>Ancien -&gt; Récent</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Vider le cache</string>
+    <string name="dialog_clearing_cache_please_wait">Purge du cache... Veuillez patienter.</string>
+    <string name="reset_cache_unsaved_changes">Certaines modifications ne sont pas synchronisées. Voulez-vous tout de même réinitialiser le cache ?</string>
+    <string name="warning">Attention</string>
+    <string name="pref_title_AutoSyncOnStart">Synchro. au démarrage</string>
+    <string name="pref_title_ShowOnlyUnread">Masquer les articles lus</string>
+    <string name="pref_title_DisableHostnameVerification">Désactiver la vérification du nom d\'hôte</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Naviguer avec les boutons de volume</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marquer comme lu lors du défilement</string>
+    <string name="pref_title_OpenInBrowserDirectly">Afficher les articles dans un navigateur externe</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Accepter les certificats non sûrs ?</string>
+    <string name="mtm_decision_always">Toujours</string>
+    <string name="mtm_decision_abort">Annuler</string>
+    <string name="mtm_notification">Vérification du certificat</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Aucun podcast sélectionné</string>
+    <string name="no_chapters_available">Aucun chapitre disponible</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Affichage</string>
+    <string name="pref_title_app_theme">Thème de l\'app</string>
+    <string name="pref_title_feed_list_layout">Disposition de la liste des flux</string>
+    <string name="pref_display_title_lines_count">Nombre de lignes pour le titre</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Sombre</item>
+        <item>Clair</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simple</item>
+        <item>Etendue</item>
+        <item>Etendue (texte complet)</item>
+        <item>Etendue avec Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notifications</string>
+    <string name="pref_title_notification_new_articles_available">Afficher une notification lorsque de nouveaux articles sont disponibles</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Erreur</string>
+    <string name="login_dialog_text_something_went_wrong">Quelque chose s\'est mal passé :(</string>
+    <string name="login_dialog_text_not_compatible">La version de cette application n\'est pas compatible avec votre application News de ownCloud. Veuillez mettre à jour l\'application News et le framework d\'applications.</string>
+    <string name="login_dialog_title_security_warning">Avertissement de sécurité</string>
+    <string name="login_dialog_text_security_warning">Vous n\'utilisez pas HTTPS. Une personne malveillante pourrait intercepter votre trafic et obtenir des données sensibles (ex. votre mot de passe). Il est fortement recommandé d\'utiliser HTTPS !</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Données &amp; synchronisation</string>
+    <string name="pref_title_clearCache">Vider le cache</string>
+    <string name="pref_title_CacheImagesOffline">Mise en cache hors-ligne des images</string>
+    <string name="pref_title_Max_Cache_Size">Taille maximale du cache</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 Mo</item>
+        <item>500 Mo</item>
+        <item>750 Mo</item>
+        <item>1 Go</item>
+        <item>2 Go</item>
+        <item>5 Go</item>
+        <item>10 Go</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutes</item>
+        <item>15 Minutes</item>
+        <item>30 Minutes</item>
+        <item>45 Minutes</item>
+        <item>1 Heure</item>
+        <item>2 Heures</item>
+        <item>3 Heures</item>
+        <item>6 Heures</item>
+        <item>12 Heures</item>
+        <item>24 Heures</item>
+    </string-array>
+    <string name="content_desc_play">lire</string>
+    <string name="content_desc_pause">pause</string>
+    <string name="content_desc_rewind">rembobiner</string>
+    <string name="content_desc_forward">avancer</string>
+    <string name="content_desc_expand">étendre</string>
+    <string name="content_desc_collapse">replier</string>
+    <string name="content_desc_mark_as_read">marquer comme lu</string>
+    <string name="content_desc_mark_as_unread">marquer comme non-lu</string>
+    <string name="content_desc_tap_to_refresh">Tapoter pour rafraîchir</string>
+    <string name="content_desc_add_to_favorites">ajouter aux favoris</string>
+    <string name="content_desc_remove_from_favorites">retirer des favoris</string>
+    <string name="content_desc_show_password">montrer le mot de passe</string>
+    <string name="content_desc_delete">suppression</string>
+    <string name="content_desc_download">télécharger</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-gl/strings.xml b/News-Android-App/src/main/res/values-gl/strings.xml
index 9ce102df..06778f17 100644
--- a/News-Android-App/src/main/res/values-gl/strings.xml
+++ b/News-Android-App/src/main/res/values-gl/strings.xml
@@ -1,155 +1,175 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sincronización automática</string>
-  <string name="app_name">Lector de novas do ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Selector de intervalo de sincronización</string>
-  <string name="title_activity_news_detail">Detalle da actividade das novas</string>
-  <string name="empty_view_content">Non hai elementos aquí</string>
-  <string name="toast_GettingMoreItems">Iniciada a descarga de máis elementos... Agarde.</string>
-  <string name="no_wifi_available">Non está conectado á WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Quere descargar as imaxes sen unha conexión WiFi?</string>
-  <string name="widget_header">Novas do ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d elemento novo dispoñíbel</item>
-    <item quantity="other">%d elementos novos dispoñíbeis</item>
-  </plurals>
-  <string name="message_bar_reload">Volver cargar</string>
-  <string name="allUnreadFeeds">Todos os elementos sen ler</string>
-  <string name="starredFeeds">Elementos destacados</string>
-  <string name="title_activity_new_feed">Engadir unha nova fonte</string>
-  <string name="menu_update">Actualizar</string>
-  <string name="menu_About_Changelog">Sobre / Rexistro de cambios</string>
-  <string name="menu_markAllAsRead">Marcar todo como lido</string>
-  <string name="menu_StartImageCaching">Descargar imaxes</string>
-  <string name="menu_downloadMoreItems">Descargar máis elementos</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Destacado</string>
-  <string name="action_read">Ler</string>
-  <string name="action_playPodacst">Reproducir o Podcast</string>
-  <string name="action_openInBrowser">Abrir no navegador</string>
-  <string name="action_Share">Compartir</string>
-  <string name="action_login">Axustes do servidor</string>
-  <string name="action_save">Gardar</string>
-  <string name="action_settings">Axustes</string>
-  <string name="action_sync_settings">Axustes da sincronización</string>
-  <string name="action_add_new_feed">Engadir unha nova fonte</string>
-  <string name="action_textToSpeech">Ler a saída</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Ten %d elemento novo sen ler</item>
-    <item quantity="other">Ten %d elementos novos sen ler</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">Dispón de %d elemento novo sen ler</item>
-    <item quantity="other">Dispón de %d elementos novos sen ler</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="action_add_feed">Engadir fonte</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Copiado no portapapeis.</string>
-  <string name="error_download_failed">Produciuse un fallo na descarga</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Retirar</string>
-  <string name="feed_rename_button">Renomear</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nome de usuario</string>
-  <string name="pref_title_password">Contrasinal</string>
-  <string name="pref_title_owncloudRootPath">Enderezo raíz do ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Rexistrarse</string>
-  <string name="login_progress_signing_in">Rexistrándose en...</string>
-  <string name="error_field_required">Este campo é obrigatorio</string>
-  <string name="error_invalid_url">Este URL é incorrecto</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importar a conta</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Descargado %d elemento antigo</item>
-    <item quantity="other">Descargados %d elementos antigos</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Non hai máis elementos dispoñíbeis</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Axustes</string>
-  <string name="cache_is_cleared">A cahé está limpa!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Xeral</string>
-  <string name="pref_title_general_sort_order">Reordenar</string>
-  <string-array name="pref_general_sort_order">
-    <item>Novo -&gt; Antigo</item>
-    <item>Antigo -&gt; Novo</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Limpando a caché</string>
-  <string name="dialog_clearing_cache_please_wait">Limpando a caché. Agarde.</string>
-  <string name="reset_cache_unsaved_changes">Hai cambios sen sincronizar. Quere restabelecer a caché aínda así?</string>
-  <string name="warning">Aviso</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizar o inicio</string>
-  <string name="pref_title_ShowOnlyUnread">Amosar só os artigos non lidos</string>
-  <string name="pref_title_DisableHostnameVerification">Desactivar a verificación do nome da máquina/servidor</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navegar cos botóns de volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido mentres se despraza</string>
-  <string name="pref_title_OpenInBrowserDirectly">Use un navegador externo para ver os artgos</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Aceptar un certificado descoñecido?</string>
-  <string name="mtm_decision_always">Sempre</string>
-  <string name="mtm_decision_abort">Interromper</string>
-  <string name="mtm_notification">Verificación do certificado</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Non hai ningún podcast seleccionadp</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Presentar</string>
-  <string name="pref_title_app_theme">Tema da aplicación</string>
-  <string name="pref_title_feed_list_layout">Deseño da lista de novas</string>
-  <string name="pref_display_title_lines_count">Contador de liñas para o titulo</string>
-  <string-array name="pref_display_apptheme">
-    <item>Escuro</item>
-    <item>Claro</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificacións</string>
-  <string name="pref_title_notification_new_articles_available">Amosar unha notificación cando estea dispoñíbel un novo artigo</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Erro</string>
-  <string name="login_dialog_text_something_went_wrong">Algo foi mal :(</string>
-  <string name="login_dialog_text_not_compatible">Esta versión da aplicación non é compatíbel coa súa aplicación de novas para ownCloud. Actualice a aplicación de novas e o marco de traballo da aplicación.</string>
-  <string name="login_dialog_title_security_warning">Aviso de seguridade</string>
-  <string name="login_dialog_text_security_warning">Non está a empregar https. Un atacante podería interceptar o seu tráfico e obter acceso a algúns datos sensíbeis (p.ex. o contrasinal). Polo que recomendámoslle que empregue https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Datos e sincronización</string>
-  <string name="pref_title_clearCache">Limpar a caché</string>
-  <string name="pref_title_CacheImagesOffline">Gardar a imaxe na caché sen conexión</string>
-  <string name="pref_title_Max_Cache_Size">Tamaño máximo da caché</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nunca</item>
-    <item>Só sobre WiFi</item>
-    <item>Sobre WiFi &amp; Móbil</item>
-    <item>Preguntar cando non estea conectado por WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minutos</item>
-    <item>15 minutos</item>
-    <item>30 minutos</item>
-    <item>45 minutos</item>
-    <item>1 hora</item>
-    <item>2 horas</item>
-    <item>3 horas</item>
-    <item>6 horas</item>
-    <item>12 horas</item>
-    <item>24 horas</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">eliminar</string>
-</resources>
+
+    <string name="auto_sync_string">Sincronización automática</string>
+    <string name="title_activity_sync_interval_selector">Selector de intervalo de sincronización</string>
+    <string name="title_activity_news_detail">Detalle da actividade das novas</string>
+    <string name="empty_view_content">Non hai elementos aquí</string>
+    <string name="toast_GettingMoreItems">Iniciada a descarga de máis elementos... Agarde.</string>
+    <string name="no_wifi_available">Non está conectado á WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Quere descargar as imaxes sen unha conexión WiFi?</string>
+    <string name="widget_header">Novas do ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d elemento novo dispoñíbel</item>
+        <item quantity="other">%d elementos novos dispoñíbeis</item>
+    </plurals>
+    <string name="message_bar_reload">Volver cargar</string>
+    <string name="allUnreadFeeds">Todos os elementos sen ler</string>
+    <string name="starredFeeds">Elementos destacados</string>
+    <string name="title_activity_new_feed">Engadir unha nova fonte</string>
+
+    <string name="menu_update">Actualizar</string>
+    <string name="menu_About_Changelog">Sobre / Rexistro de cambios</string>
+    <string name="menu_markAllAsRead">Marcar todo como lido</string>
+    <string name="menu_StartImageCaching">Descargar imaxes</string>
+    <string name="menu_downloadMoreItems">Descargar máis elementos</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Destacado</string>
+    <string name="action_read">Ler</string>
+    <string name="action_playPodacst">Reproducir o Podcast</string>
+    <string name="action_openInBrowser">Abrir no navegador</string>
+    <string name="action_Share">Compartir</string>
+    <string name="action_login">Axustes do servidor</string>
+    <string name="action_save">Gardar</string>
+    <string name="action_settings">Axustes</string>
+    <string name="action_sync_settings">Axustes da sincronización</string>
+    <string name="action_add_new_feed">Engadir unha nova fonte</string>
+    <string name="action_textToSpeech">Ler a saída</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Ten %d elemento novo sen ler</item>
+        <item quantity="other">Ten %d elementos novos sen ler</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">Dispón de %d elemento novo sen ler</item>
+        <item quantity="other">Dispón de %d elementos novos sen ler</item>
+    </plurals>
+
+
+    <string name="action_add_feed">Engadir fonte</string>
+
+
+    <string name="toast_copied_to_clipboard">Copiado no portapapeis.</string>
+    <string name="error_download_failed">Produciuse un fallo na descarga</string>
+    <string name="feed_remove_button">Retirar</string>
+    <string name="feed_rename_button">Renomear</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nome de usuario</string>
+    <string name="pref_title_password">Contrasinal</string>
+    <string name="pref_title_owncloudRootPath">Enderezo raíz do ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Rexistrarse</string>
+    <string name="login_progress_signing_in">Rexistrándose en...</string>
+    <string name="error_field_required">Este campo é obrigatorio</string>
+    <string name="error_invalid_url">Este URL é incorrecto</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importar a conta</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Descargado %d elemento antigo</item>
+        <item quantity="other">Descargados %d elementos antigos</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Non hai máis elementos dispoñíbeis</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Axustes</string>
+    <string name="cache_is_cleared">A cahé está limpa!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Xeral</string>
+    <string name="pref_title_general_sort_order">Reordenar</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Novo -&gt; Antigo</item>
+        <item>Antigo -&gt; Novo</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Limpando a caché</string>
+    <string name="dialog_clearing_cache_please_wait">Limpando a caché. Agarde.</string>
+    <string name="reset_cache_unsaved_changes">Hai cambios sen sincronizar. Quere restabelecer a caché aínda así?</string>
+    <string name="warning">Aviso</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizar o inicio</string>
+    <string name="pref_title_ShowOnlyUnread">Amosar só os artigos non lidos</string>
+    <string name="pref_title_DisableHostnameVerification">Desactivar a verificación do nome da máquina/servidor</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navegar cos botóns de volume</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido mentres se despraza</string>
+    <string name="pref_title_OpenInBrowserDirectly">Use un navegador externo para ver os artgos</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Aceptar un certificado descoñecido?</string>
+    <string name="mtm_decision_always">Sempre</string>
+    <string name="mtm_decision_abort">Interromper</string>
+    <string name="mtm_notification">Verificación do certificado</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Non hai ningún podcast seleccionadp</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Presentar</string>
+    <string name="pref_title_app_theme">Tema da aplicación</string>
+    <string name="pref_title_feed_list_layout">Deseño da lista de novas</string>
+    <string name="pref_display_title_lines_count">Contador de liñas para o titulo</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Escuro</item>
+        <item>Claro</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificacións</string>
+    <string name="pref_title_notification_new_articles_available">Amosar unha notificación cando estea dispoñíbel un novo artigo</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Erro</string>
+    <string name="login_dialog_text_something_went_wrong">Algo foi mal :(</string>
+    <string name="login_dialog_text_not_compatible">Esta versión da aplicación non é compatíbel coa súa aplicación de novas para ownCloud. Actualice a aplicación de novas e o marco de traballo da aplicación.</string>
+    <string name="login_dialog_title_security_warning">Aviso de seguridade</string>
+    <string name="login_dialog_text_security_warning">Non está a empregar https. Un atacante podería interceptar o seu tráfico e obter acceso a algúns datos sensíbeis (p.ex. o contrasinal). Polo que recomendámoslle que empregue https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Datos e sincronización</string>
+    <string name="pref_title_clearCache">Limpar a caché</string>
+    <string name="pref_title_CacheImagesOffline">Gardar a imaxe na caché sen conexión</string>
+    <string name="pref_title_Max_Cache_Size">Tamaño máximo da caché</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nunca</item>
+        <item>Só sobre WiFi</item>
+        <item>Sobre WiFi &amp; Móbil</item>
+        <item>Preguntar cando non estea conectado por WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minutos</item>
+        <item>15 minutos</item>
+        <item>30 minutos</item>
+        <item>45 minutos</item>
+        <item>1 hora</item>
+        <item>2 horas</item>
+        <item>3 horas</item>
+        <item>6 horas</item>
+        <item>12 horas</item>
+        <item>24 horas</item>
+    </string-array>
+    <string name="content_desc_delete">eliminar</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-hu-rHU/strings.xml b/News-Android-App/src/main/res/values-hu-rHU/strings.xml
index 18af27ef..47f2d06f 100644
--- a/News-Android-App/src/main/res/values-hu-rHU/strings.xml
+++ b/News-Android-App/src/main/res/values-hu-rHU/strings.xml
@@ -1,123 +1,138 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automata szinkronizáció</string>
-  <string name="app_name">ownCloud Hírolvasó</string>
-  <string name="title_activity_sync_interval_selector">A szinkronizáció gyakoriságának kiválasztása</string>
-  <string name="title_activity_news_detail">HírekRészletTevékenység</string>
-  <string name="empty_view_content">Itt nincs semmi</string>
-  <string name="toast_GettingMoreItems">Több elem letöltése elindítva... Kérjük, várj.</string>
-  <string name="no_wifi_available">Nincs csatlakoztatott WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Le szeretnéd tölteni a képeket WiFi kapcsolat nélkül?</string>
-  <string name="widget_header">ownCloud Hírek</string>
-  <string name="message_bar_reload">Újratöltés</string>
-  <string name="allUnreadFeeds">Az összes olvasatlan</string>
-  <string name="starredFeeds">Csillagozottak</string>
-  <string name="title_activity_new_feed">Új hírcsatorna hozzáadása</string>
-  <string name="menu_update">Frissítés</string>
-  <string name="menu_About_Changelog">Névjegy / Változtatások</string>
-  <string name="menu_markAllAsRead">Jelöljük meg az összeset olvasottként</string>
-  <string name="menu_StartImageCaching">Képek letőltése</string>
-  <string name="menu_downloadMoreItems">Több elem letőltése</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Csillagozott</string>
-  <string name="action_read">Olvas</string>
-  <string name="action_playPodacst">Podcast lejatszás</string>
-  <string name="action_openInBrowser">Megnyitás böngészőben</string>
-  <string name="action_Share">Megosztás</string>
-  <string name="action_login">Szerver Beállítások</string>
-  <string name="action_save">Mentés</string>
-  <string name="action_settings">Beállítások</string>
-  <string name="action_sync_settings">Szinkronizációs beállítások</string>
-  <string name="action_add_new_feed">Új hírcsatorna hozzáadása</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Hírcsatorna hozzáadása</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Bemásolva a vágólapra</string>
-  <string name="error_download_failed">A letöltés sikertelen</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Eltávolítás</string>
-  <string name="feed_rename_button">Átnevezés</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Felhasználónév</string>
-  <string name="pref_title_password">Jelszó</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Belépés</string>
-  <string name="login_progress_signing_in">Belépés...</string>
-  <string name="error_field_required">Ez a mező szükséges</string>
-  <string name="error_invalid_url">Ez az url hibás</string>
-  <!--Import Accounts-->
-  <string name="import_account">Konto importálás</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Nincs elérhető további elem</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Beállítások</string>
-  <string name="cache_is_cleared">Gyorsítótár kiürítve!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Általános</string>
-  <string name="pref_title_general_sort_order">Rendezés Iránya</string>
-  <string-array name="pref_general_sort_order">
-    <item>Új -&gt; Régi</item>
-    <item>Régi -&gt; Új</item>
-  </string-array>
-  <string name="dialog_clearing_cache">A gyorsítótár törlése folyamatban</string>
-  <string name="dialog_clearing_cache_please_wait">Gyorsítótár ürítése... Kérjük, várj.</string>
-  <string name="reset_cache_unsaved_changes">Vannak nem színkronizált változások. Bizots hogy alaphelyzetbe szeretnéd állítani a cache-t így is?</string>
-  <string name="warning">Figyelmeztetés</string>
-  <string name="pref_title_AutoSyncOnStart">Szinkronizáció induláskor</string>
-  <string name="pref_title_ShowOnlyUnread">Csak olvasatlan cikkek megjelenítése</string>
-  <string name="pref_title_DisableHostnameVerification">A \"Hostname Verification\" kikapcsolása</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigálj a hangerőszabályozó gombokkal</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Görgetés közben olvasottként legyen megjelőlve</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Elfogadod az ismeretlen tanusítványokat?</string>
-  <string name="mtm_decision_always">Mindig</string>
-  <string name="mtm_decision_abort">Megszakítás</string>
-  <string name="mtm_notification">Tanusítvány Ellenörzés</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nincs Podcast kiválasztva</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Kijelző</string>
-  <string name="pref_title_app_theme">App téma </string>
-  <string name="pref_title_feed_list_layout">A csatorna elrendezés</string>
-  <string-array name="pref_display_apptheme">
-    <item>Sőtét</item>
-    <item>Világos</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Értesítések</string>
-  <string name="pref_title_notification_new_articles_available">Értesítés megjelenítés amikor van elérhető új cikk </string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Hiba</string>
-  <string name="login_dialog_text_something_went_wrong">Valami balul sült el :(</string>
-  <string name="login_dialog_text_not_compatible">Ez az App verzió hem kompatibilis a the ownCloud Hírolvasó App-pal. Frissitsd a hír app-pt és az app-keretrendszert.</string>
-  <string name="login_dialog_title_security_warning">Biztonsági figyelmeztetés</string>
-  <string name="login_dialog_text_security_warning">Jelenleg nem használsz https-t. Egy támadó beépülhet és lehalgathatja a forgalmat és ez által hozzáférhetet kényes adatokhoz(pl jelszó). Nagyon ajánlott, hogy használj https-t!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Adatok &amp; szinkronizáció</string>
-  <string name="pref_title_clearCache">Átmeneti tár(cache) tisztitása</string>
-  <string name="pref_title_CacheImagesOffline">Képek offline tárolása ideglenesen</string>
-  <string name="pref_title_Max_Cache_Size">Maximum Cache Méret</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 perc</item>
-    <item>15 perc</item>
-    <item>30 perc</item>
-    <item>45 perc</item>
-    <item>1 óra</item>
-    <item>2 óra</item>
-    <item>3 óra</item>
-    <item>6 óra</item>
-    <item>12 óra</item>
-    <item>24 óra</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">törlés</string>
-</resources>
+
+    <string name="auto_sync_string">Automata szinkronizáció</string>
+    <string name="title_activity_sync_interval_selector">A szinkronizáció gyakoriságának kiválasztása</string>
+    <string name="title_activity_news_detail">HírekRészletTevékenység</string>
+    <string name="empty_view_content">Itt nincs semmi</string>
+    <string name="toast_GettingMoreItems">Több elem letöltése elindítva... Kérjük, várj.</string>
+    <string name="no_wifi_available">Nincs csatlakoztatott WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Le szeretnéd tölteni a képeket WiFi kapcsolat nélkül?</string>
+    <string name="widget_header">ownCloud Hírek</string>
+    <string name="message_bar_reload">Újratöltés</string>
+    <string name="allUnreadFeeds">Az összes olvasatlan</string>
+    <string name="starredFeeds">Csillagozottak</string>
+    <string name="title_activity_new_feed">Új hírcsatorna hozzáadása</string>
+
+    <string name="menu_update">Frissítés</string>
+    <string name="menu_About_Changelog">Névjegy / Változtatások</string>
+    <string name="menu_markAllAsRead">Jelöljük meg az összeset olvasottként</string>
+    <string name="menu_StartImageCaching">Képek letőltése</string>
+    <string name="menu_downloadMoreItems">Több elem letőltése</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Csillagozott</string>
+    <string name="action_read">Olvas</string>
+    <string name="action_playPodacst">Podcast lejatszás</string>
+    <string name="action_openInBrowser">Megnyitás böngészőben</string>
+    <string name="action_Share">Megosztás</string>
+    <string name="action_login">Szerver Beállítások</string>
+    <string name="action_save">Mentés</string>
+    <string name="action_settings">Beállítások</string>
+    <string name="action_sync_settings">Szinkronizációs beállítások</string>
+    <string name="action_add_new_feed">Új hírcsatorna hozzáadása</string>
+    <string name="action_add_feed">Hírcsatorna hozzáadása</string>
+
+
+    <string name="toast_copied_to_clipboard">Bemásolva a vágólapra</string>
+    <string name="error_download_failed">A letöltés sikertelen</string>
+    <string name="feed_remove_button">Eltávolítás</string>
+    <string name="feed_rename_button">Átnevezés</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Felhasználónév</string>
+    <string name="pref_title_password">Jelszó</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Belépés</string>
+    <string name="login_progress_signing_in">Belépés...</string>
+    <string name="error_field_required">Ez a mező szükséges</string>
+    <string name="error_invalid_url">Ez az url hibás</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Konto importálás</string>
+
+
+    <string name="toast_no_more_downloads_available">Nincs elérhető további elem</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Beállítások</string>
+    <string name="cache_is_cleared">Gyorsítótár kiürítve!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Általános</string>
+    <string name="pref_title_general_sort_order">Rendezés Iránya</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Új -&gt; Régi</item>
+        <item>Régi -&gt; Új</item>
+    </string-array>
+    <string name="dialog_clearing_cache">A gyorsítótár törlése folyamatban</string>
+    <string name="dialog_clearing_cache_please_wait">Gyorsítótár ürítése... Kérjük, várj.</string>
+    <string name="reset_cache_unsaved_changes">Vannak nem színkronizált változások. Bizots hogy alaphelyzetbe szeretnéd állítani a cache-t így is?</string>
+    <string name="warning">Figyelmeztetés</string>
+    <string name="pref_title_AutoSyncOnStart">Szinkronizáció induláskor</string>
+    <string name="pref_title_ShowOnlyUnread">Csak olvasatlan cikkek megjelenítése</string>
+    <string name="pref_title_DisableHostnameVerification">A \"Hostname Verification\" kikapcsolása</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigálj a hangerőszabályozó gombokkal</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Görgetés közben olvasottként legyen megjelőlve</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Elfogadod az ismeretlen tanusítványokat?</string>
+    <string name="mtm_decision_always">Mindig</string>
+    <string name="mtm_decision_abort">Megszakítás</string>
+    <string name="mtm_notification">Tanusítvány Ellenörzés</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nincs Podcast kiválasztva</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Kijelző</string>
+    <string name="pref_title_app_theme">App téma </string>
+    <string name="pref_title_feed_list_layout">A csatorna elrendezés</string>
+    <string-array name="pref_display_apptheme">
+        <item>Sőtét</item>
+        <item>Világos</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Értesítések</string>
+    <string name="pref_title_notification_new_articles_available">Értesítés megjelenítés amikor van elérhető új cikk </string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Hiba</string>
+    <string name="login_dialog_text_something_went_wrong">Valami balul sült el :(</string>
+    <string name="login_dialog_text_not_compatible">Ez az App verzió hem kompatibilis a the ownCloud Hírolvasó App-pal. Frissitsd a hír app-pt és az app-keretrendszert.</string>
+    <string name="login_dialog_title_security_warning">Biztonsági figyelmeztetés</string>
+    <string name="login_dialog_text_security_warning">Jelenleg nem használsz https-t. Egy támadó beépülhet és lehalgathatja a forgalmat és ez által hozzáférhetet kényes adatokhoz(pl jelszó). Nagyon ajánlott, hogy használj https-t!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Adatok &amp; szinkronizáció</string>
+    <string name="pref_title_clearCache">Átmeneti tár(cache) tisztitása</string>
+    <string name="pref_title_CacheImagesOffline">Képek offline tárolása ideglenesen</string>
+    <string name="pref_title_Max_Cache_Size">Maximum Cache Méret</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 perc</item>
+        <item>15 perc</item>
+        <item>30 perc</item>
+        <item>45 perc</item>
+        <item>1 óra</item>
+        <item>2 óra</item>
+        <item>3 óra</item>
+        <item>6 óra</item>
+        <item>12 óra</item>
+        <item>24 óra</item>
+    </string-array>
+    <string name="content_desc_delete">törlés</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-id/strings.xml b/News-Android-App/src/main/res/values-id/strings.xml
index 6ebd19a7..3719d2ee 100644
--- a/News-Android-App/src/main/res/values-id/strings.xml
+++ b/News-Android-App/src/main/res/values-id/strings.xml
@@ -1,190 +1,220 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sync otomatis</string>
-  <string name="app_name">Pembaca Berita ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Pemilih Jeda Sync</string>
-  <string name="title_activity_news_detail">AktivitasRinciBerita</string>
-  <string name="empty_view_content">Tak ada item disini</string>
-  <string name="toast_GettingMoreItems">Mulai mengunduh lebih banyak item... Mohon tunggu.</string>
-  <string name="no_wifi_available">Tidak ada WiFi yang terhubung</string>
-  <string name="do_you_want_to_download_without_wifi">Apakah anda ingin mengunduh gambar tanpa koneksi WiFi</string>
-  <string name="current_version">Anda menggunakan Versi %s</string>
-  <string name="widget_header">Berita ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="other">%d item baru tersedia</item>
-  </plurals>
-  <string name="message_bar_reload">Muat ulang</string>
-  <string name="allUnreadFeeds">Semua item yang belum dibaca</string>
-  <string name="starredFeeds">Item yang dibintangi</string>
-  <string name="title_activity_new_feed">Tambah feed baru</string>
-  <string name="menu_update">Segarkan</string>
-  <string name="menu_About_Changelog">Tentang / Catatan perubahan</string>
-  <string name="menu_markAllAsRead">Tandai semua telah dibaca</string>
-  <string name="menu_StartImageCaching">Unduh gambar</string>
-  <string name="menu_downloadMoreItems">Unduh beberapa item</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Dibintangi</string>
-  <string name="action_read">Baca</string>
-  <string name="action_playPodacst">Putar Siniar</string>
-  <string name="action_openInBrowser">Buka di Peramban</string>
-  <string name="action_Share">Bagikan</string>
-  <string name="action_login">Pengaturan Server</string>
-  <string name="action_save">Simpan</string>
-  <string name="action_settings">Setelan</string>
-  <string name="action_sync_settings">Setelan Sync</string>
-  <string name="action_add_new_feed">Tambah feed baru</string>
-  <string name="action_textToSpeech">Bacalah</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="other">Anda memiliki %d item baru yang belum dibaca</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="other">Terdapat %d item baru yang belum dibaca </item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">URL Feed</string>
-  <string name="action_add_feed">Tambah feed</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Unduh Gambar</string>
-  <string name="action_img_sharelink">Bagikan Tautan Gambar</string>
-  <string name="action_img_open">Buka Gambar di Peramban</string>
-  <string name="action_img_copylink">Salin Tautan Gambar</string>
-  <string name="action_link_share">Bagikan Tautan</string>
-  <string name="action_link_open">Buka Tautan di Peramban</string>
-  <string name="action_link_copy">Salin Tautan</string>
-  <string name="toast_img_download_wait">Mengunduh... mohon tunggu</string>
-  <string name="toast_img_saved">Gambar disimpan.</string>
-  <string name="toast_img_notwriteable">Gagal menulis Gambar.</string>
-  <string name="toast_copied_to_clipboard">Disalin ke papan klip</string>
-  <string name="error_download_failed">Gagal Mengunduh</string>
-  <string name="intent_title_share">Bagikan via</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Hapus Feed</string>
-  <string name="action_feed_rename">Ubah Nama Feed</string>
-  <string name="feed_remove_button">Hapus</string>
-  <string name="feed_rename_button">Ubah nama</string>
-  <string name="confirm_feed_remove">Apakah Anda yakin ingin menghapus Feed ini? Tindakan ini tidak dapat dibatalkan!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nama pengguna</string>
-  <string name="pref_title_password">Sandi</string>
-  <string name="pref_title_owncloudRootPath">Alamat root ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Masuk</string>
-  <string name="login_progress_signing_in">Sedang masuk...</string>
-  <string name="error_field_required">Bidang wajib diisi</string>
-  <string name="error_invalid_url">URL salah</string>
-  <!--Import Accounts-->
-  <string name="import_account">Impor Akun</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="other">Mengunduh %d item lama</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Tidak ada item lain yang tersedia</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="other">Mengambil %d item sejauh ini...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Setelan</string>
-  <string name="cache_is_cleared">Cache dibersihkan!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Umum</string>
-  <string name="pref_title_general_sort_order">Urutan</string>
-  <string-array name="pref_general_sort_order">
-    <item>Baru -&gt; Lawas</item>
-    <item>Lawas -&gt; Baru</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Membersihkan cache</string>
-  <string name="dialog_clearing_cache_please_wait">Membersihkan cache... Mohon tunggu.</string>
-  <string name="reset_cache_unsaved_changes">Ada perubahan yang belum disinkronkan. Apakah anda tetap ingin mengatur ulang cache?</string>
-  <string name="warning">Peringatan</string>
-  <string name="pref_title_AutoSyncOnStart">Sinkronisasi pada saat mulai</string>
-  <string name="pref_title_ShowOnlyUnread">Tampilkan hanya artikel yang belum dibaca</string>
-  <string name="pref_title_DisableHostnameVerification">Nonaktifkan Verifikasi Hostname</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigasi dengan tombol volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Tandai telah dibaca saat bergulir</string>
-  <string name="pref_title_OpenInBrowserDirectly">Gunakan peramban eksternal untuk melihat artikel</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Terima Sertifikat yang Tak Dikenal?</string>
-  <string name="mtm_decision_always">Selalu</string>
-  <string name="mtm_decision_abort">Batal</string>
-  <string name="mtm_notification">Verifikasi Sertifikat</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Tidak ada siniar yang dipilih</string>
-  <string name="no_chapters_available">Tidak ada bab tersedia</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Tampilkan</string>
-  <string name="pref_title_app_theme">Tema aplikasi</string>
-  <string name="pref_title_feed_list_layout">Tata letak daftar umpan</string>
-  <string name="pref_display_title_lines_count">Jumlah Baris untuk judul</string>
-  <string-array name="pref_display_apptheme">
-    <item>Gelap</item>
-    <item>Terang</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Sederhana</item>
-    <item>Diperluas</item>
-    <item>Diperluas (teks penuh)</item>
-    <item>Diperluas dengan Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Pemberitahuan</string>
-  <string name="pref_title_notification_new_articles_available">Tampilkan pemberitahuan ketika artikel baru tersedia</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Kesalahan</string>
-  <string name="login_dialog_text_something_went_wrong">Ada yang tidak beres :(</string>
-  <string name="login_dialog_text_not_compatible">Versi aplikasi ini tidak kompatibel dengan aplikasi berita ownCloud. Silakan perbarui aplikasi berita ini dan aplikasi bingkai kerjanya.</string>
-  <string name="login_dialog_title_security_warning">Peringatan Keamanan</string>
-  <string name="login_dialog_text_security_warning">Anda tidak menggunakan https. Peratas bisa saja mencegat lalu lintas jaringan dan mendapatkan akses ke beberapa data sensitif (misalnya kata sandi Anda). Jadi sangat disarankan menggunakan https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; sync</string>
-  <string name="pref_title_clearCache">Bersihkan cache</string>
-  <string name="pref_title_CacheImagesOffline">Cache gambar luring</string>
-  <string name="pref_title_Max_Cache_Size">Ukuran Cache Maks</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Jangan pernah</item>
-    <item>Hanya melalui WiFi</item>
-    <item>Melalui WiFi &amp; Mobile</item>
-    <item>Tanya ketika tidak tersambung ke WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Menit</item>
-    <item>15 Menit</item>
-    <item>30 Menit</item>
-    <item>45 Menit</item>
-    <item>1 Jam</item>
-    <item>2 Jam</item>
-    <item>3 Jam</item>
-    <item>6 Jam</item>
-    <item>12 Jam</item>
-    <item>24 Jam</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">putar</string>
-  <string name="content_desc_pause">jeda</string>
-  <string name="content_desc_rewind">mundur</string>
-  <string name="content_desc_forward">maju</string>
-  <string name="content_desc_expand">perluas</string>
-  <string name="content_desc_collapse">runtuh</string>
-  <string name="content_desc_mark_as_read">tandai sudah dibaca</string>
-  <string name="content_desc_mark_as_unread">tandai belum dibaca</string>
-  <string name="content_desc_tap_to_refresh">tekan untuk menyegarkan</string>
-  <string name="content_desc_add_to_favorites">tambah ke favorit</string>
-  <string name="content_desc_remove_from_favorites">hapus dari favorit</string>
-  <string name="content_desc_show_password">tampilkan sandi</string>
-  <string name="content_desc_delete">hapus</string>
-  <string name="content_desc_download">unduh</string>
+
+    <string name="auto_sync_string">Sync otomatis</string>
+    <string name="title_activity_sync_interval_selector">Pemilih Jeda Sync</string>
+    <string name="title_activity_news_detail">AktivitasRinciBerita</string>
+    <string name="empty_view_content">Tak ada item disini</string>
+    <string name="toast_GettingMoreItems">Mulai mengunduh lebih banyak item... Mohon tunggu.</string>
+    <string name="no_wifi_available">Tidak ada WiFi yang terhubung</string>
+    <string name="do_you_want_to_download_without_wifi">Apakah anda ingin mengunduh gambar tanpa koneksi WiFi</string>
+    <string name="current_version">Anda menggunakan Versi %s</string>
+    <string name="widget_header">Berita ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="other">%d item baru tersedia</item>
+    </plurals>
+    <string name="message_bar_reload">Muat ulang</string>
+    <string name="allUnreadFeeds">Semua item yang belum dibaca</string>
+    <string name="starredFeeds">Item yang dibintangi</string>
+    <string name="title_activity_new_feed">Tambah feed baru</string>
+
+    <string name="menu_update">Segarkan</string>
+    <string name="menu_About_Changelog">Tentang / Catatan perubahan</string>
+    <string name="menu_markAllAsRead">Tandai semua telah dibaca</string>
+    <string name="menu_StartImageCaching">Unduh gambar</string>
+    <string name="menu_downloadMoreItems">Unduh beberapa item</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Dibintangi</string>
+    <string name="action_read">Baca</string>
+    <string name="action_playPodacst">Putar Siniar</string>
+    <string name="action_openInBrowser">Buka di Peramban</string>
+    <string name="action_Share">Bagikan</string>
+    <string name="action_login">Pengaturan Server</string>
+    <string name="action_save">Simpan</string>
+    <string name="action_settings">Setelan</string>
+    <string name="action_sync_settings">Setelan Sync</string>
+    <string name="action_add_new_feed">Tambah feed baru</string>
+    <string name="action_textToSpeech">Bacalah</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="other">Anda memiliki %d item baru yang belum dibaca</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="other">Terdapat %d item baru yang belum dibaca </item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">URL Feed</string>
+    <string name="action_add_feed">Tambah feed</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Unduh Gambar</string>
+    <string name="action_img_sharelink">Bagikan Tautan Gambar</string>
+    <string name="action_img_open">Buka Gambar di Peramban</string>
+    <string name="action_img_copylink">Salin Tautan Gambar</string>
+    <string name="action_link_share">Bagikan Tautan</string>
+    <string name="action_link_open">Buka Tautan di Peramban</string>
+    <string name="action_link_copy">Salin Tautan</string>
+    <string name="toast_img_download_wait">Mengunduh... mohon tunggu</string>
+    <string name="toast_img_saved">Gambar disimpan.</string>
+    <string name="toast_img_notwriteable">Gagal menulis Gambar.</string>
+    <string name="toast_copied_to_clipboard">Disalin ke papan klip</string>
+    <string name="error_download_failed">Gagal Mengunduh</string>
+    <string name="intent_title_share">Bagikan via</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Hapus Feed</string>
+    <string name="action_feed_rename">Ubah Nama Feed</string>
+    <string name="feed_remove_button">Hapus</string>
+    <string name="feed_rename_button">Ubah nama</string>
+    <string name="confirm_feed_remove">Apakah Anda yakin ingin menghapus Feed ini? Tindakan ini tidak dapat dibatalkan!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nama pengguna</string>
+    <string name="pref_title_password">Sandi</string>
+    <string name="pref_title_owncloudRootPath">Alamat root ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Masuk</string>
+    <string name="login_progress_signing_in">Sedang masuk...</string>
+    <string name="error_field_required">Bidang wajib diisi</string>
+    <string name="error_invalid_url">URL salah</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Impor Akun</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="other">Mengunduh %d item lama</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Tidak ada item lain yang tersedia</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="other">Mengambil %d item sejauh ini...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Setelan</string>
+    <string name="cache_is_cleared">Cache dibersihkan!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Umum</string>
+    <string name="pref_title_general_sort_order">Urutan</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Baru -&gt; Lawas</item>
+        <item>Lawas -&gt; Baru</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Membersihkan cache</string>
+    <string name="dialog_clearing_cache_please_wait">Membersihkan cache... Mohon tunggu.</string>
+    <string name="reset_cache_unsaved_changes">Ada perubahan yang belum disinkronkan. Apakah anda tetap ingin mengatur ulang cache?</string>
+    <string name="warning">Peringatan</string>
+    <string name="pref_title_AutoSyncOnStart">Sinkronisasi pada saat mulai</string>
+    <string name="pref_title_ShowOnlyUnread">Tampilkan hanya artikel yang belum dibaca</string>
+    <string name="pref_title_DisableHostnameVerification">Nonaktifkan Verifikasi Hostname</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigasi dengan tombol volume</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Tandai telah dibaca saat bergulir</string>
+    <string name="pref_title_OpenInBrowserDirectly">Gunakan peramban eksternal untuk melihat artikel</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Terima Sertifikat yang Tak Dikenal?</string>
+    <string name="mtm_decision_always">Selalu</string>
+    <string name="mtm_decision_abort">Batal</string>
+    <string name="mtm_notification">Verifikasi Sertifikat</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Tidak ada siniar yang dipilih</string>
+    <string name="no_chapters_available">Tidak ada bab tersedia</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Tampilkan</string>
+    <string name="pref_title_app_theme">Tema aplikasi</string>
+    <string name="pref_title_feed_list_layout">Tata letak daftar umpan</string>
+    <string name="pref_display_title_lines_count">Jumlah Baris untuk judul</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Gelap</item>
+        <item>Terang</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Sederhana</item>
+        <item>Diperluas</item>
+        <item>Diperluas (teks penuh)</item>
+        <item>Diperluas dengan Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Pemberitahuan</string>
+    <string name="pref_title_notification_new_articles_available">Tampilkan pemberitahuan ketika artikel baru tersedia</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Kesalahan</string>
+    <string name="login_dialog_text_something_went_wrong">Ada yang tidak beres :(</string>
+    <string name="login_dialog_text_not_compatible">Versi aplikasi ini tidak kompatibel dengan aplikasi berita ownCloud. Silakan perbarui aplikasi berita ini dan aplikasi bingkai kerjanya.</string>
+    <string name="login_dialog_title_security_warning">Peringatan Keamanan</string>
+    <string name="login_dialog_text_security_warning">Anda tidak menggunakan https. Peratas bisa saja mencegat lalu lintas jaringan dan mendapatkan akses ke beberapa data sensitif (misalnya kata sandi Anda). Jadi sangat disarankan menggunakan https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; sync</string>
+    <string name="pref_title_clearCache">Bersihkan cache</string>
+    <string name="pref_title_CacheImagesOffline">Cache gambar luring</string>
+    <string name="pref_title_Max_Cache_Size">Ukuran Cache Maks</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Jangan pernah</item>
+        <item>Hanya melalui WiFi</item>
+        <item>Melalui WiFi &amp; Mobile</item>
+        <item>Tanya ketika tidak tersambung ke WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Menit</item>
+        <item>15 Menit</item>
+        <item>30 Menit</item>
+        <item>45 Menit</item>
+        <item>1 Jam</item>
+        <item>2 Jam</item>
+        <item>3 Jam</item>
+        <item>6 Jam</item>
+        <item>12 Jam</item>
+        <item>24 Jam</item>
+    </string-array>
+    <string name="content_desc_play">putar</string>
+    <string name="content_desc_pause">jeda</string>
+    <string name="content_desc_rewind">mundur</string>
+    <string name="content_desc_forward">maju</string>
+    <string name="content_desc_expand">perluas</string>
+    <string name="content_desc_collapse">runtuh</string>
+    <string name="content_desc_mark_as_read">tandai sudah dibaca</string>
+    <string name="content_desc_mark_as_unread">tandai belum dibaca</string>
+    <string name="content_desc_tap_to_refresh">tekan untuk menyegarkan</string>
+    <string name="content_desc_add_to_favorites">tambah ke favorit</string>
+    <string name="content_desc_remove_from_favorites">hapus dari favorit</string>
+    <string name="content_desc_show_password">tampilkan sandi</string>
+    <string name="content_desc_delete">hapus</string>
+    <string name="content_desc_download">unduh</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-it/strings.xml b/News-Android-App/src/main/res/values-it/strings.xml
index dec30e97..762f906f 100644
--- a/News-Android-App/src/main/res/values-it/strings.xml
+++ b/News-Android-App/src/main/res/values-it/strings.xml
@@ -1,195 +1,225 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sincronizzazione automatica</string>
-  <string name="app_name">Lettore di notizie di ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Selettore intervallo di sincronizzazione</string>
-  <string name="title_activity_news_detail">AttivitàDettagliNotizie</string>
-  <string name="empty_view_content">Nessun elemento</string>
-  <string name="toast_GettingMoreItems">Iniziato lo scaricamento di altri elementi... Attendi.</string>
-  <string name="no_wifi_available">WiFi non connesso</string>
-  <string name="do_you_want_to_download_without_wifi">Vuoi scaricare le immagini senza una connessione WiFi</string>
-  <string name="current_version">Stai usando la versione %s</string>
-  <string name="widget_header">Notizie di ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nuovi elemento disponibile</item>
-    <item quantity="other">%d nuovi elementi disponibili</item>
-  </plurals>
-  <string name="message_bar_reload">Ricarica</string>
-  <string name="allUnreadFeeds">Tutti gli elementi non letti</string>
-  <string name="starredFeeds">Elementi preferiti</string>
-  <string name="title_activity_new_feed">Aggiungi una nuova fonte</string>
-  <string name="menu_update">Aggiorna</string>
-  <string name="menu_About_Changelog">Informazioni / Novità</string>
-  <string name="menu_markAllAsRead">Marca tutti come letti</string>
-  <string name="menu_StartImageCaching">Scarica le immagini</string>
-  <string name="menu_downloadMoreItems">Scarica altri elementi</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Preferiti</string>
-  <string name="action_read">Lettura</string>
-  <string name="action_playPodacst">Riproduci podcast</string>
-  <string name="action_openInBrowser">Apri nel browser</string>
-  <string name="action_Share">Condividi</string>
-  <string name="action_login">Impostazioni del server</string>
-  <string name="action_save">Salva</string>
-  <string name="action_settings">Impostazioni</string>
-  <string name="action_sync_settings">Sincronizza impostazioni</string>
-  <string name="action_add_new_feed">Aggiungi una nuova fonte</string>
-  <string name="action_textToSpeech">Lettura vocale</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Hai %d nuovo elemento non letto</item>
-    <item quantity="other">Hai %d nuovi elementi non letti</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d nuovo elemento non letto disponibile</item>
-    <item quantity="other">%d nuovi elementi non letti disponibili</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">URL fonte</string>
-  <string name="action_add_feed">Aggiungi fonte</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Scarica immagine</string>
-  <string name="action_img_sharelink">Condividi collegamento immagine</string>
-  <string name="action_img_open">Apri immagine nel browser</string>
-  <string name="action_img_copylink">Copia collegamento immagine</string>
-  <string name="action_link_share">Condividi collegamento</string>
-  <string name="action_link_open">Apri collegamento nel browser</string>
-  <string name="action_link_copy">Copia collegamento</string>
-  <string name="toast_img_download_wait">Scaricamento in corso... attendi</string>
-  <string name="toast_img_saved">Immagine salvata.</string>
-  <string name="toast_img_notwriteable">Scrittura dell\'immagine non riuscita.</string>
-  <string name="toast_copied_to_clipboard">Copiato negli appunti</string>
-  <string name="error_download_failed">Scaricamento non riuscito</string>
-  <string name="intent_title_share">Condividi tramite</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Rimuovi fonte</string>
-  <string name="action_feed_rename">Rinomina fonte</string>
-  <string name="feed_remove_button">Rimuovi</string>
-  <string name="feed_rename_button">Rinomina</string>
-  <string name="confirm_feed_remove">Vuoi davvero rimuovere questa fonte? Ciò non può essere annullato!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nome utente</string>
-  <string name="pref_title_password">Password</string>
-  <string name="pref_title_owncloudRootPath">Indirizzo radice di ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Accedi</string>
-  <string name="login_progress_signing_in">Accesso in corso...</string>
-  <string name="error_field_required">Questo campo è obbligatorio</string>
-  <string name="error_invalid_url">Questo URL non è corretto</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importa account</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Scaricato %d vecchio elemento</item>
-    <item quantity="other">Scaricati %d vecchi elementi</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Non ci sono altri elementi disponibili</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Recupera %d elemento...</item>
-    <item quantity="other">Recupera %d elementi...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Impostazioni</string>
-  <string name="cache_is_cleared">La cache è stata svuotata!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Generale</string>
-  <string name="pref_title_general_sort_order">Ordinamento</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nuovo -&gt; Vecchio</item>
-    <item>Vecchio -&gt; Nuovo</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Svuotamento cache</string>
-  <string name="dialog_clearing_cache_please_wait">Svuotamento cache... Attendi.</string>
-  <string name="reset_cache_unsaved_changes">Ci sono modifiche non sincronizzate. Vuoi ripristinare comunque la cache?</string>
-  <string name="warning">Avviso</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizza all\'avvio</string>
-  <string name="pref_title_ShowOnlyUnread">Mostra solo gli articoli non letti</string>
-  <string name="pref_title_DisableHostnameVerification">Disabilita la verifica del nome host</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Naviga con i pulsanti del volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Segna come letto durante lo scorrimento</string>
-  <string name="pref_title_OpenInBrowserDirectly">Usa un browser esterno per visualizzare gli articoli</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Accettare un certificato sconosciuto?</string>
-  <string name="mtm_decision_always">Sempre</string>
-  <string name="mtm_decision_abort">Interrompi</string>
-  <string name="mtm_notification">Verifica certificato</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nessun podcast selezionato</string>
-  <string name="no_chapters_available">Nessun capitolo disponibile</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Schermo</string>
-  <string name="pref_title_app_theme">Tema applicazione</string>
-  <string name="pref_title_feed_list_layout">Struttura elenco fonti</string>
-  <string name="pref_display_title_lines_count">Numero di righe per il titolo</string>
-  <string-array name="pref_display_apptheme">
-    <item>Scuro</item>
-    <item>Chiaro</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Semplice</item>
-    <item>Estesa</item>
-    <item>Estesa (testo completo)</item>
-    <item>Estesa con Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notifiche</string>
-  <string name="pref_title_notification_new_articles_available">Mostra una notifica quando nuovi articoli sono disponibili</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Errore</string>
-  <string name="login_dialog_text_something_went_wrong">Qualcosa non ha funzionato :(</string>
-  <string name="login_dialog_text_not_compatible">Questa versione dell\'applicazione non è compatibile con la tua versione di ownCloud News. Aggiorna l\'applicazione e l\'appframework.</string>
-  <string name="login_dialog_title_security_warning">Avviso di sicurezza</string>
-  <string name="login_dialog_text_security_warning">Non stai usando https. Un malintenzionato potrebbe intercettare il tuo traffico e ottenere accesso a dati sensibili (ad esempio la tua password). Per questo motivo è vivamente consigliato l\'utilizzo di https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Dati e sincronizzazione</string>
-  <string name="pref_title_clearCache">Svuota la cache</string>
-  <string name="pref_title_CacheImagesOffline">Memorizza le immagini nella cache </string>
-  <string name="pref_title_Max_Cache_Size">Dimensione massima della cache</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Mai</item>
-    <item>Solo su WiFi</item>
-    <item>Su WiFi e mobile</item>
-    <item>Chiedi se non connesso al WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minuti</item>
-    <item>15 minuti</item>
-    <item>30 minuti</item>
-    <item>45 minuti</item>
-    <item>1 ora</item>
-    <item>2 ore</item>
-    <item>3 ore</item>
-    <item>6 ore</item>
-    <item>12 ore</item>
-    <item>24 ore</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">riproduci</string>
-  <string name="content_desc_pause">pausa</string>
-  <string name="content_desc_rewind">riavvolgi</string>
-  <string name="content_desc_forward">avanza</string>
-  <string name="content_desc_expand">espandi</string>
-  <string name="content_desc_collapse">contrai</string>
-  <string name="content_desc_mark_as_read">marca come letto</string>
-  <string name="content_desc_mark_as_unread">marca come non letto</string>
-  <string name="content_desc_tap_to_refresh">tocca per aggiornare</string>
-  <string name="content_desc_add_to_favorites">aggiungi ai preferiti</string>
-  <string name="content_desc_remove_from_favorites">rimuovi dai preferiti</string>
-  <string name="content_desc_show_password">mostra la password</string>
-  <string name="content_desc_delete">elimina</string>
-  <string name="content_desc_download">scarica</string>
+
+    <string name="auto_sync_string">Sincronizzazione automatica</string>
+    <string name="title_activity_sync_interval_selector">Selettore intervallo di sincronizzazione</string>
+    <string name="title_activity_news_detail">AttivitàDettagliNotizie</string>
+    <string name="empty_view_content">Nessun elemento</string>
+    <string name="toast_GettingMoreItems">Iniziato lo scaricamento di altri elementi... Attendi.</string>
+    <string name="no_wifi_available">WiFi non connesso</string>
+    <string name="do_you_want_to_download_without_wifi">Vuoi scaricare le immagini senza una connessione WiFi</string>
+    <string name="current_version">Stai usando la versione %s</string>
+    <string name="widget_header">Notizie di ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nuovi elemento disponibile</item>
+        <item quantity="other">%d nuovi elementi disponibili</item>
+    </plurals>
+    <string name="message_bar_reload">Ricarica</string>
+    <string name="allUnreadFeeds">Tutti gli elementi non letti</string>
+    <string name="starredFeeds">Elementi preferiti</string>
+    <string name="title_activity_new_feed">Aggiungi una nuova fonte</string>
+
+    <string name="menu_update">Aggiorna</string>
+    <string name="menu_About_Changelog">Informazioni / Novità</string>
+    <string name="menu_markAllAsRead">Marca tutti come letti</string>
+    <string name="menu_StartImageCaching">Scarica le immagini</string>
+    <string name="menu_downloadMoreItems">Scarica altri elementi</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Preferiti</string>
+    <string name="action_read">Lettura</string>
+    <string name="action_playPodacst">Riproduci podcast</string>
+    <string name="action_openInBrowser">Apri nel browser</string>
+    <string name="action_Share">Condividi</string>
+    <string name="action_login">Impostazioni del server</string>
+    <string name="action_save">Salva</string>
+    <string name="action_settings">Impostazioni</string>
+    <string name="action_sync_settings">Sincronizza impostazioni</string>
+    <string name="action_add_new_feed">Aggiungi una nuova fonte</string>
+    <string name="action_textToSpeech">Lettura vocale</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Hai %d nuovo elemento non letto</item>
+        <item quantity="other">Hai %d nuovi elementi non letti</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d nuovo elemento non letto disponibile</item>
+        <item quantity="other">%d nuovi elementi non letti disponibili</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">URL fonte</string>
+    <string name="action_add_feed">Aggiungi fonte</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Scarica immagine</string>
+    <string name="action_img_sharelink">Condividi collegamento immagine</string>
+    <string name="action_img_open">Apri immagine nel browser</string>
+    <string name="action_img_copylink">Copia collegamento immagine</string>
+    <string name="action_link_share">Condividi collegamento</string>
+    <string name="action_link_open">Apri collegamento nel browser</string>
+    <string name="action_link_copy">Copia collegamento</string>
+    <string name="toast_img_download_wait">Scaricamento in corso... attendi</string>
+    <string name="toast_img_saved">Immagine salvata.</string>
+    <string name="toast_img_notwriteable">Scrittura dell\'immagine non riuscita.</string>
+    <string name="toast_copied_to_clipboard">Copiato negli appunti</string>
+    <string name="error_download_failed">Scaricamento non riuscito</string>
+    <string name="intent_title_share">Condividi tramite</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Rimuovi fonte</string>
+    <string name="action_feed_rename">Rinomina fonte</string>
+    <string name="feed_remove_button">Rimuovi</string>
+    <string name="feed_rename_button">Rinomina</string>
+    <string name="confirm_feed_remove">Vuoi davvero rimuovere questa fonte? Ciò non può essere annullato!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nome utente</string>
+    <string name="pref_title_password">Password</string>
+    <string name="pref_title_owncloudRootPath">Indirizzo radice di ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Accedi</string>
+    <string name="login_progress_signing_in">Accesso in corso...</string>
+    <string name="error_field_required">Questo campo è obbligatorio</string>
+    <string name="error_invalid_url">Questo URL non è corretto</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importa account</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Scaricato %d vecchio elemento</item>
+        <item quantity="other">Scaricati %d vecchi elementi</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Non ci sono altri elementi disponibili</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Recupera %d elemento...</item>
+        <item quantity="other">Recupera %d elementi...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Impostazioni</string>
+    <string name="cache_is_cleared">La cache è stata svuotata!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Generale</string>
+    <string name="pref_title_general_sort_order">Ordinamento</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nuovo -&gt; Vecchio</item>
+        <item>Vecchio -&gt; Nuovo</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Svuotamento cache</string>
+    <string name="dialog_clearing_cache_please_wait">Svuotamento cache... Attendi.</string>
+    <string name="reset_cache_unsaved_changes">Ci sono modifiche non sincronizzate. Vuoi ripristinare comunque la cache?</string>
+    <string name="warning">Avviso</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizza all\'avvio</string>
+    <string name="pref_title_ShowOnlyUnread">Mostra solo gli articoli non letti</string>
+    <string name="pref_title_DisableHostnameVerification">Disabilita la verifica del nome host</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Naviga con i pulsanti del volume</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Segna come letto durante lo scorrimento</string>
+    <string name="pref_title_OpenInBrowserDirectly">Usa un browser esterno per visualizzare gli articoli</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Accettare un certificato sconosciuto?</string>
+    <string name="mtm_decision_always">Sempre</string>
+    <string name="mtm_decision_abort">Interrompi</string>
+    <string name="mtm_notification">Verifica certificato</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nessun podcast selezionato</string>
+    <string name="no_chapters_available">Nessun capitolo disponibile</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Schermo</string>
+    <string name="pref_title_app_theme">Tema applicazione</string>
+    <string name="pref_title_feed_list_layout">Struttura elenco fonti</string>
+    <string name="pref_display_title_lines_count">Numero di righe per il titolo</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Scuro</item>
+        <item>Chiaro</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Semplice</item>
+        <item>Estesa</item>
+        <item>Estesa (testo completo)</item>
+        <item>Estesa con Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notifiche</string>
+    <string name="pref_title_notification_new_articles_available">Mostra una notifica quando nuovi articoli sono disponibili</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Errore</string>
+    <string name="login_dialog_text_something_went_wrong">Qualcosa non ha funzionato :(</string>
+    <string name="login_dialog_text_not_compatible">Questa versione dell\'applicazione non è compatibile con la tua versione di ownCloud News. Aggiorna l\'applicazione e l\'appframework.</string>
+    <string name="login_dialog_title_security_warning">Avviso di sicurezza</string>
+    <string name="login_dialog_text_security_warning">Non stai usando https. Un malintenzionato potrebbe intercettare il tuo traffico e ottenere accesso a dati sensibili (ad esempio la tua password). Per questo motivo è vivamente consigliato l\'utilizzo di https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Dati e sincronizzazione</string>
+    <string name="pref_title_clearCache">Svuota la cache</string>
+    <string name="pref_title_CacheImagesOffline">Memorizza le immagini nella cache </string>
+    <string name="pref_title_Max_Cache_Size">Dimensione massima della cache</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Mai</item>
+        <item>Solo su WiFi</item>
+        <item>Su WiFi e mobile</item>
+        <item>Chiedi se non connesso al WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minuti</item>
+        <item>15 minuti</item>
+        <item>30 minuti</item>
+        <item>45 minuti</item>
+        <item>1 ora</item>
+        <item>2 ore</item>
+        <item>3 ore</item>
+        <item>6 ore</item>
+        <item>12 ore</item>
+        <item>24 ore</item>
+    </string-array>
+    <string name="content_desc_play">riproduci</string>
+    <string name="content_desc_pause">pausa</string>
+    <string name="content_desc_rewind">riavvolgi</string>
+    <string name="content_desc_forward">avanza</string>
+    <string name="content_desc_expand">espandi</string>
+    <string name="content_desc_collapse">contrai</string>
+    <string name="content_desc_mark_as_read">marca come letto</string>
+    <string name="content_desc_mark_as_unread">marca come non letto</string>
+    <string name="content_desc_tap_to_refresh">tocca per aggiornare</string>
+    <string name="content_desc_add_to_favorites">aggiungi ai preferiti</string>
+    <string name="content_desc_remove_from_favorites">rimuovi dai preferiti</string>
+    <string name="content_desc_show_password">mostra la password</string>
+    <string name="content_desc_delete">elimina</string>
+    <string name="content_desc_download">scarica</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-ja-rJP/strings.xml b/News-Android-App/src/main/res/values-ja-rJP/strings.xml
index 80a4b17d..71d7573c 100644
--- a/News-Android-App/src/main/res/values-ja-rJP/strings.xml
+++ b/News-Android-App/src/main/res/values-ja-rJP/strings.xml
@@ -1,190 +1,220 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">自動同期</string>
-  <string name="app_name">ownCloudニュースリーダー</string>
-  <string name="title_activity_sync_interval_selector">同期間隔を指定</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">ここにアイテムなし</string>
-  <string name="toast_GettingMoreItems">複数のアイテムをダウンロード中です... しばらくお待ちください。</string>
-  <string name="no_wifi_available">WiFi接続がありません</string>
-  <string name="do_you_want_to_download_without_wifi">WiFi接続がない場合、画像をダウンロードしますか？</string>
-  <string name="current_version">使用中のバージョンは %s です</string>
-  <string name="widget_header">ownCloudニュース</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="other">%d 個の新しいアイテムが利用可能です</item>
-  </plurals>
-  <string name="message_bar_reload">再読み込み</string>
-  <string name="allUnreadFeeds">すべての未読アイテム</string>
-  <string name="starredFeeds">共有アイテム</string>
-  <string name="title_activity_new_feed">新しいフィードを追加</string>
-  <string name="menu_update">同期</string>
-  <string name="menu_About_Changelog">ownCloudについて / 変更点</string>
-  <string name="menu_markAllAsRead">すべて既読にする</string>
-  <string name="menu_StartImageCaching">画像をダウンロード</string>
-  <string name="menu_downloadMoreItems">さらにアイテムをダウンロード</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">共有</string>
-  <string name="action_read">読込</string>
-  <string name="action_playPodacst">Podcast を再生</string>
-  <string name="action_openInBrowser">ブラウザーで開く</string>
-  <string name="action_Share">共有</string>
-  <string name="action_login">サーバー設定</string>
-  <string name="action_save">保存</string>
-  <string name="action_settings">設定</string>
-  <string name="action_sync_settings">設定の同期</string>
-  <string name="action_add_new_feed">新しいフィードを追加</string>
-  <string name="action_textToSpeech">音声読み上げ</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="other">%d 個の新しい未読アイテムがあります</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="other">%d 個の新しい未読アイテムが利用できます</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">フィードURL</string>
-  <string name="action_add_feed">フィードを追加</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">画像をダウンロード</string>
-  <string name="action_img_sharelink">画像リンクを共有</string>
-  <string name="action_img_open">画像をブラウザで開く</string>
-  <string name="action_img_copylink">画像リンクをコピー</string>
-  <string name="action_link_share">共有リンク</string>
-  <string name="action_link_open">リンクをブラウザで開く</string>
-  <string name="action_link_copy">リンクをコピー</string>
-  <string name="toast_img_download_wait">ダウンロード中... しばらくお待ちください</string>
-  <string name="toast_img_saved">画像を保存しました。</string>
-  <string name="toast_img_notwriteable">画像の書き込みに失敗しました。</string>
-  <string name="toast_copied_to_clipboard">クリップボードにコピー</string>
-  <string name="error_download_failed">ダウンロードに失敗</string>
-  <string name="intent_title_share">次のものでシェア</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">フィードの削除</string>
-  <string name="action_feed_rename">フィードの名前を変更</string>
-  <string name="feed_remove_button">削除</string>
-  <string name="feed_rename_button">名前の変更</string>
-  <string name="confirm_feed_remove">本当にこのフィードを削除してよろしいですか？この操作は元に戻せません！</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">ユーザー名</string>
-  <string name="pref_title_password">パスワード</string>
-  <string name="pref_title_owncloudRootPath">ownCloud ルートアドレス</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">ログイン</string>
-  <string name="login_progress_signing_in">ログイン中...</string>
-  <string name="error_field_required">このフィールドは必須です</string>
-  <string name="error_invalid_url">このURLは不正確です</string>
-  <!--Import Accounts-->
-  <string name="import_account">アカウントをインポート</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="other">ダウンロードされた %d 個の古いアイテム</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">これ以上利用できるアイテムがありません</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="other">これまでに %d 個のアイテムを読み込みました...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">設定</string>
-  <string name="cache_is_cleared">キャッシュがクリアされます！</string>
-  <!--General settings-->
-  <string name="pref_header_general">一般</string>
-  <string name="pref_title_general_sort_order">ソート順</string>
-  <string-array name="pref_general_sort_order">
-    <item>新 -&gt; 旧</item>
-    <item>旧 -&gt; 新</item>
-  </string-array>
-  <string name="dialog_clearing_cache">キャッシュをクリアしています。</string>
-  <string name="dialog_clearing_cache_please_wait">キャッシュをクリアしています…しばらくお待ちください。</string>
-  <string name="reset_cache_unsaved_changes">未同期の変更があります。とにかくキャッシュをリセットしますか？</string>
-  <string name="warning">警告</string>
-  <string name="pref_title_AutoSyncOnStart">起動時に同期</string>
-  <string name="pref_title_ShowOnlyUnread">未読の記事のみ表示</string>
-  <string name="pref_title_DisableHostnameVerification">ホスト名の検証を無効化</string>
-  <string name="pref_title_NavigateWithVolumeButtons">ボリュームボタンで移動する</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">スクロール時に既読としてマークする</string>
-  <string name="pref_title_OpenInBrowserDirectly">この記事を外部ブラウザーで開く</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">未知の証明書を受け入れますか？</string>
-  <string name="mtm_decision_always">常に</string>
-  <string name="mtm_decision_abort">中止</string>
-  <string name="mtm_notification">証明書の検証</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Podcast が選択されていません</string>
-  <string name="no_chapters_available">チャプターがありません</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">表示</string>
-  <string name="pref_title_app_theme">アプリテーマ</string>
-  <string name="pref_title_feed_list_layout">フィードリストのレイアウト</string>
-  <string name="pref_display_title_lines_count">タイトルの行数</string>
-  <string-array name="pref_display_apptheme">
-    <item>ダーク</item>
-    <item>ライト</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>基本</item>
-    <item>拡張</item>
-    <item>拡張 (全文)</item>
-    <item>拡張ウェブ表示</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">通知</string>
-  <string name="pref_title_notification_new_articles_available">新しい記事が追加された時のみ通知</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">エラー</string>
-  <string name="login_dialog_text_something_went_wrong">何かがおかしいです （´・ω・｀）</string>
-  <string name="login_dialog_text_not_compatible">このアプリのバージョンはownCloudニュースアプリと互換性がありません。ニュースアプリとappframeworkをアップデートしてください。</string>
-  <string name="login_dialog_title_security_warning">セキュリティ警告</string>
-  <string name="login_dialog_text_security_warning">httpsを使用していません。攻撃者があなたのトラフィックに干渉し、一部の機密データ(例えば、パスワード)にアクセスする恐れがあります。そのため、httpsを利用することを強くお勧めします！</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">データと同期</string>
-  <string name="pref_title_clearCache">キャッシュをクリア</string>
-  <string name="pref_title_CacheImagesOffline">オフラインのキャッシュ画像</string>
-  <string name="pref_title_Max_Cache_Size">最大キャッシュサイズ</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>なし</item>
-    <item>WiFiのみ</item>
-    <item>WiFi &amp; モバイル</item>
-    <item>WiFi接続がない場合は尋ねる</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 分</item>
-    <item>15 分</item>
-    <item>30 分</item>
-    <item>45 分</item>
-    <item>1 時間</item>
-    <item>2 時間</item>
-    <item>3 時間</item>
-    <item>6 時間</item>
-    <item>12 時間</item>
-    <item>24 時間</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">再生</string>
-  <string name="content_desc_pause">一時停止</string>
-  <string name="content_desc_rewind">巻戻し</string>
-  <string name="content_desc_forward">早送り</string>
-  <string name="content_desc_expand">展開</string>
-  <string name="content_desc_collapse">折りたたみ</string>
-  <string name="content_desc_mark_as_read">既読としてマーク</string>
-  <string name="content_desc_mark_as_unread">未読としてマーク</string>
-  <string name="content_desc_tap_to_refresh">タップして更新</string>
-  <string name="content_desc_add_to_favorites">お気に入りに追加</string>
-  <string name="content_desc_remove_from_favorites">お気に入りから削除</string>
-  <string name="content_desc_show_password">パスワードを表示</string>
-  <string name="content_desc_delete">削除</string>
-  <string name="content_desc_download">ダウンロード</string>
+
+    <string name="auto_sync_string">自動同期</string>
+    <string name="title_activity_sync_interval_selector">同期間隔を指定</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">ここにアイテムなし</string>
+    <string name="toast_GettingMoreItems">複数のアイテムをダウンロード中です... しばらくお待ちください。</string>
+    <string name="no_wifi_available">WiFi接続がありません</string>
+    <string name="do_you_want_to_download_without_wifi">WiFi接続がない場合、画像をダウンロードしますか？</string>
+    <string name="current_version">使用中のバージョンは %s です</string>
+    <string name="widget_header">ownCloudニュース</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="other">%d 個の新しいアイテムが利用可能です</item>
+    </plurals>
+    <string name="message_bar_reload">再読み込み</string>
+    <string name="allUnreadFeeds">すべての未読アイテム</string>
+    <string name="starredFeeds">共有アイテム</string>
+    <string name="title_activity_new_feed">新しいフィードを追加</string>
+
+    <string name="menu_update">同期</string>
+    <string name="menu_About_Changelog">ownCloudについて / 変更点</string>
+    <string name="menu_markAllAsRead">すべて既読にする</string>
+    <string name="menu_StartImageCaching">画像をダウンロード</string>
+    <string name="menu_downloadMoreItems">さらにアイテムをダウンロード</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">共有</string>
+    <string name="action_read">読込</string>
+    <string name="action_playPodacst">Podcast を再生</string>
+    <string name="action_openInBrowser">ブラウザーで開く</string>
+    <string name="action_Share">共有</string>
+    <string name="action_login">サーバー設定</string>
+    <string name="action_save">保存</string>
+    <string name="action_settings">設定</string>
+    <string name="action_sync_settings">設定の同期</string>
+    <string name="action_add_new_feed">新しいフィードを追加</string>
+    <string name="action_textToSpeech">音声読み上げ</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="other">%d 個の新しい未読アイテムがあります</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="other">%d 個の新しい未読アイテムが利用できます</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">フィードURL</string>
+    <string name="action_add_feed">フィードを追加</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">画像をダウンロード</string>
+    <string name="action_img_sharelink">画像リンクを共有</string>
+    <string name="action_img_open">画像をブラウザで開く</string>
+    <string name="action_img_copylink">画像リンクをコピー</string>
+    <string name="action_link_share">共有リンク</string>
+    <string name="action_link_open">リンクをブラウザで開く</string>
+    <string name="action_link_copy">リンクをコピー</string>
+    <string name="toast_img_download_wait">ダウンロード中... しばらくお待ちください</string>
+    <string name="toast_img_saved">画像を保存しました。</string>
+    <string name="toast_img_notwriteable">画像の書き込みに失敗しました。</string>
+    <string name="toast_copied_to_clipboard">クリップボードにコピー</string>
+    <string name="error_download_failed">ダウンロードに失敗</string>
+    <string name="intent_title_share">次のものでシェア</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">フィードの削除</string>
+    <string name="action_feed_rename">フィードの名前を変更</string>
+    <string name="feed_remove_button">削除</string>
+    <string name="feed_rename_button">名前の変更</string>
+    <string name="confirm_feed_remove">本当にこのフィードを削除してよろしいですか？この操作は元に戻せません！</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">ユーザー名</string>
+    <string name="pref_title_password">パスワード</string>
+    <string name="pref_title_owncloudRootPath">ownCloud ルートアドレス</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">ログイン</string>
+    <string name="login_progress_signing_in">ログイン中...</string>
+    <string name="error_field_required">このフィールドは必須です</string>
+    <string name="error_invalid_url">このURLは不正確です</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">アカウントをインポート</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="other">ダウンロードされた %d 個の古いアイテム</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">これ以上利用できるアイテムがありません</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="other">これまでに %d 個のアイテムを読み込みました...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">設定</string>
+    <string name="cache_is_cleared">キャッシュがクリアされます！</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">一般</string>
+    <string name="pref_title_general_sort_order">ソート順</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>新 -&gt; 旧</item>
+        <item>旧 -&gt; 新</item>
+    </string-array>
+    <string name="dialog_clearing_cache">キャッシュをクリアしています。</string>
+    <string name="dialog_clearing_cache_please_wait">キャッシュをクリアしています…しばらくお待ちください。</string>
+    <string name="reset_cache_unsaved_changes">未同期の変更があります。とにかくキャッシュをリセットしますか？</string>
+    <string name="warning">警告</string>
+    <string name="pref_title_AutoSyncOnStart">起動時に同期</string>
+    <string name="pref_title_ShowOnlyUnread">未読の記事のみ表示</string>
+    <string name="pref_title_DisableHostnameVerification">ホスト名の検証を無効化</string>
+    <string name="pref_title_NavigateWithVolumeButtons">ボリュームボタンで移動する</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">スクロール時に既読としてマークする</string>
+    <string name="pref_title_OpenInBrowserDirectly">この記事を外部ブラウザーで開く</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">未知の証明書を受け入れますか？</string>
+    <string name="mtm_decision_always">常に</string>
+    <string name="mtm_decision_abort">中止</string>
+    <string name="mtm_notification">証明書の検証</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Podcast が選択されていません</string>
+    <string name="no_chapters_available">チャプターがありません</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">表示</string>
+    <string name="pref_title_app_theme">アプリテーマ</string>
+    <string name="pref_title_feed_list_layout">フィードリストのレイアウト</string>
+    <string name="pref_display_title_lines_count">タイトルの行数</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>ダーク</item>
+        <item>ライト</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>基本</item>
+        <item>拡張</item>
+        <item>拡張 (全文)</item>
+        <item>拡張ウェブ表示</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">通知</string>
+    <string name="pref_title_notification_new_articles_available">新しい記事が追加された時のみ通知</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">エラー</string>
+    <string name="login_dialog_text_something_went_wrong">何かがおかしいです （´・ω・｀）</string>
+    <string name="login_dialog_text_not_compatible">このアプリのバージョンはownCloudニュースアプリと互換性がありません。ニュースアプリとappframeworkをアップデートしてください。</string>
+    <string name="login_dialog_title_security_warning">セキュリティ警告</string>
+    <string name="login_dialog_text_security_warning">httpsを使用していません。攻撃者があなたのトラフィックに干渉し、一部の機密データ(例えば、パスワード)にアクセスする恐れがあります。そのため、httpsを利用することを強くお勧めします！</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">データと同期</string>
+    <string name="pref_title_clearCache">キャッシュをクリア</string>
+    <string name="pref_title_CacheImagesOffline">オフラインのキャッシュ画像</string>
+    <string name="pref_title_Max_Cache_Size">最大キャッシュサイズ</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>なし</item>
+        <item>WiFiのみ</item>
+        <item>WiFi &amp; モバイル</item>
+        <item>WiFi接続がない場合は尋ねる</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 分</item>
+        <item>15 分</item>
+        <item>30 分</item>
+        <item>45 分</item>
+        <item>1 時間</item>
+        <item>2 時間</item>
+        <item>3 時間</item>
+        <item>6 時間</item>
+        <item>12 時間</item>
+        <item>24 時間</item>
+    </string-array>
+    <string name="content_desc_play">再生</string>
+    <string name="content_desc_pause">一時停止</string>
+    <string name="content_desc_rewind">巻戻し</string>
+    <string name="content_desc_forward">早送り</string>
+    <string name="content_desc_expand">展開</string>
+    <string name="content_desc_collapse">折りたたみ</string>
+    <string name="content_desc_mark_as_read">既読としてマーク</string>
+    <string name="content_desc_mark_as_unread">未読としてマーク</string>
+    <string name="content_desc_tap_to_refresh">タップして更新</string>
+    <string name="content_desc_add_to_favorites">お気に入りに追加</string>
+    <string name="content_desc_remove_from_favorites">お気に入りから削除</string>
+    <string name="content_desc_show_password">パスワードを表示</string>
+    <string name="content_desc_delete">削除</string>
+    <string name="content_desc_download">ダウンロード</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-ko/strings.xml b/News-Android-App/src/main/res/values-ko/strings.xml
index 2336e5ed..cd99ea85 100644
--- a/News-Android-App/src/main/res/values-ko/strings.xml
+++ b/News-Android-App/src/main/res/values-ko/strings.xml
@@ -1,171 +1,194 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">자동 동기화</string>
-  <string name="app_name">ownCloud 뉴스 리더</string>
-  <string name="title_activity_sync_interval_selector">동기화 주기 선택기</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">항목 없음</string>
-  <string name="toast_GettingMoreItems">더 많은 항목을 다운로드하고 있습니다... 잠시 기다려 주십시오.</string>
-  <string name="no_wifi_available">Wi-Fi에 연결되지 않았음</string>
-  <string name="do_you_want_to_download_without_wifi">Wi-Fi에 연결되지 않은 상태에서 사진을 다운로드하시겠습니까?</string>
-  <string name="current_version">현재 %s 버전을 사용 중입니다.</string>
-  <string name="widget_header">ownCloud 뉴스</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="other">새 항목 %d개 있음</item>
-  </plurals>
-  <string name="message_bar_reload">새로 고침</string>
-  <string name="allUnreadFeeds">모든 읽지 않은 항목</string>
-  <string name="starredFeeds">별표한 항목</string>
-  <string name="title_activity_new_feed">새 피드 추가</string>
-  <string name="menu_update">새로 고침</string>
-  <string name="menu_About_Changelog">정보 / 변경 사항</string>
-  <string name="menu_markAllAsRead">모두 읽은 것으로 표시</string>
-  <string name="menu_StartImageCaching">사진 다운로드</string>
-  <string name="menu_downloadMoreItems">더 많은 항목 다운로드</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">별표</string>
-  <string name="action_read">읽기</string>
-  <string name="action_playPodacst">팟캐스트 재생</string>
-  <string name="action_openInBrowser">브라우저에서 열기</string>
-  <string name="action_Share">공유</string>
-  <string name="action_login">서버 설정</string>
-  <string name="action_save">저장</string>
-  <string name="action_settings">설정</string>
-  <string name="action_sync_settings">동기화 설정</string>
-  <string name="action_add_new_feed">새 피드 추가</string>
-  <string name="action_textToSpeech">음성으로 읽기</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="other">읽지 않은 항목이 %d개 있습니다</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="other">새 항목이 %d개 있습니다</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">피드 링크</string>
-  <string name="action_add_feed">피드 추가</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_sharelink">사진 공유 링크</string>
-  <string name="action_img_open">브라우저에서 사진 열기</string>
-  <string name="action_img_copylink">사진 링크 복사</string>
-  <string name="action_link_share">링크 공유</string>
-  <string name="action_link_open">브라우저에서 링크 열기</string>
-  <string name="action_link_copy">링크 복사</string>
-  <string name="toast_img_download_wait">다운로드 중입니다... 잠시 기다려 주십시오.</string>
-  <string name="toast_img_saved">사진이 저장되었습니다.</string>
-  <string name="toast_img_notwriteable">이미지를 쓰지 못했습니다.</string>
-  <string name="toast_copied_to_clipboard">클립보드로 복사됨</string>
-  <string name="error_download_failed">다운로드 실패</string>
-  <string name="intent_title_share">다음으로 공유</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">삭제</string>
-  <string name="feed_rename_button">이름 바꾸기</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">사용자 이름</string>
-  <string name="pref_title_password">암호</string>
-  <string name="pref_title_owncloudRootPath">ownCloud 루트 주소</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">로그인</string>
-  <string name="login_progress_signing_in">로그인 중...</string>
-  <string name="error_field_required">이 항목은 필수 사항입니다</string>
-  <string name="error_invalid_url">URL이 잘못되었습니다</string>
-  <!--Import Accounts-->
-  <string name="import_account">계정 가져오기</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="other">오래된 항목 %d개 다운로드됨</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">더 이상 항목 없음</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">설정</string>
-  <string name="cache_is_cleared">캐시를 비웠습니다!</string>
-  <!--General settings-->
-  <string name="pref_header_general">일반</string>
-  <string name="pref_title_general_sort_order">정렬 순서</string>
-  <string-array name="pref_general_sort_order">
-    <item>새 항목 -&gt; 오래된 항목</item>
-    <item>오래된 항목 -&gt; 새 항목</item>
-  </string-array>
-  <string name="dialog_clearing_cache">캐시 비우는 중</string>
-  <string name="dialog_clearing_cache_please_wait">캐시를 비우고 있습니다... 잠시 기다려 주십시오.</string>
-  <string name="reset_cache_unsaved_changes">동기화되지 않은 변경 사항이 있습니다. 캐시를 비우시겠습니까?</string>
-  <string name="warning">경고</string>
-  <string name="pref_title_AutoSyncOnStart">시작할 때 동기화</string>
-  <string name="pref_title_ShowOnlyUnread">읽지 않은 항목만 보기</string>
-  <string name="pref_title_DisableHostnameVerification">호스트 이름 확인 사용 안함</string>
-  <string name="pref_title_NavigateWithVolumeButtons">음량 단추로 탐색</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">스크롤 중 읽은 것으로 표시</string>
-  <string name="pref_title_OpenInBrowserDirectly">외부 브라우저로 글 읽기</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">알 수 없는 인증서를 허용하시겠습니까?</string>
-  <string name="mtm_decision_always">항상</string>
-  <string name="mtm_decision_abort">중단</string>
-  <string name="mtm_notification">인증서 확인</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">팟캐스트가 선택되지 않았음</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">표시</string>
-  <string name="pref_title_app_theme">앱 테마</string>
-  <string name="pref_title_feed_list_layout">피드 목록 레이아웃</string>
-  <string name="pref_display_title_lines_count">제목 줄 수</string>
-  <string-array name="pref_display_apptheme">
-    <item>어둡게</item>
-    <item>밝게</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>간단히</item>
-    <item>자세히</item>
-    <item>자세히, 웹뷰 포함</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">알림</string>
-  <string name="pref_title_notification_new_articles_available">새 글이 있을 때 알림 표시</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">오류</string>
-  <string name="login_dialog_text_something_went_wrong">무언가 잘못되었습니다 :(</string>
-  <string name="login_dialog_text_not_compatible">이 앱 버전은 ownCloud 뉴스 앱과 호환되지 않습니다. 뉴스 앱과 프레임워크를 업데이트하십시오.</string>
-  <string name="login_dialog_title_security_warning">보안 경고</string>
-  <string name="login_dialog_text_security_warning">HTTPS를 사용하고 있지 않습니다. 공격자가 트래픽을 감청하여 암호와 같은 민감한 데이터에 접근할 수 있습니다. HTTPS 사용을 적극 권장합니다!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">데이터 및 동기화</string>
-  <string name="pref_title_clearCache">캐시 비우기</string>
-  <string name="pref_title_CacheImagesOffline">오프라인 사용을 위하여 사진 저장</string>
-  <string name="pref_title_Max_Cache_Size">최대 캐시 크기</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>하지 않음</item>
-    <item>Wi-Fi에서만</item>
-    <item>Wi-Fi 및 모바일 데이터</item>
-    <item>Wi-Fi에 연결되지 않았을 때 묻기</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250MB</item>
-    <item>500MB</item>
-    <item>750MB</item>
-    <item>1GB</item>
-    <item>2GB</item>
-    <item>5GB</item>
-    <item>10GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5분</item>
-    <item>15분</item>
-    <item>30분</item>
-    <item>45분</item>
-    <item>1시간</item>
-    <item>2시간</item>
-    <item>3시간</item>
-    <item>6시간</item>
-    <item>12시간</item>
-    <item>24시간</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">재생</string>
-  <string name="content_desc_pause">일시정지</string>
-  <string name="content_desc_rewind">되감기</string>
-  <string name="content_desc_delete">삭제</string>
-</resources>
+
+    <string name="auto_sync_string">자동 동기화</string>
+    <string name="title_activity_sync_interval_selector">동기화 주기 선택기</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">항목 없음</string>
+    <string name="toast_GettingMoreItems">더 많은 항목을 다운로드하고 있습니다... 잠시 기다려 주십시오.</string>
+    <string name="no_wifi_available">Wi-Fi에 연결되지 않았음</string>
+    <string name="do_you_want_to_download_without_wifi">Wi-Fi에 연결되지 않은 상태에서 사진을 다운로드하시겠습니까?</string>
+    <string name="current_version">현재 %s 버전을 사용 중입니다.</string>
+    <string name="widget_header">ownCloud 뉴스</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="other">새 항목 %d개 있음</item>
+    </plurals>
+    <string name="message_bar_reload">새로 고침</string>
+    <string name="allUnreadFeeds">모든 읽지 않은 항목</string>
+    <string name="starredFeeds">별표한 항목</string>
+    <string name="title_activity_new_feed">새 피드 추가</string>
+
+    <string name="menu_update">새로 고침</string>
+    <string name="menu_About_Changelog">정보 / 변경 사항</string>
+    <string name="menu_markAllAsRead">모두 읽은 것으로 표시</string>
+    <string name="menu_StartImageCaching">사진 다운로드</string>
+    <string name="menu_downloadMoreItems">더 많은 항목 다운로드</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">별표</string>
+    <string name="action_read">읽기</string>
+    <string name="action_playPodacst">팟캐스트 재생</string>
+    <string name="action_openInBrowser">브라우저에서 열기</string>
+    <string name="action_Share">공유</string>
+    <string name="action_login">서버 설정</string>
+    <string name="action_save">저장</string>
+    <string name="action_settings">설정</string>
+    <string name="action_sync_settings">동기화 설정</string>
+    <string name="action_add_new_feed">새 피드 추가</string>
+    <string name="action_textToSpeech">음성으로 읽기</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="other">읽지 않은 항목이 %d개 있습니다</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="other">새 항목이 %d개 있습니다</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">피드 링크</string>
+    <string name="action_add_feed">피드 추가</string>
+
+
+    <string name="action_img_sharelink">사진 공유 링크</string>
+    <string name="action_img_open">브라우저에서 사진 열기</string>
+    <string name="action_img_copylink">사진 링크 복사</string>
+    <string name="action_link_share">링크 공유</string>
+    <string name="action_link_open">브라우저에서 링크 열기</string>
+    <string name="action_link_copy">링크 복사</string>
+    <string name="toast_img_download_wait">다운로드 중입니다... 잠시 기다려 주십시오.</string>
+    <string name="toast_img_saved">사진이 저장되었습니다.</string>
+    <string name="toast_img_notwriteable">이미지를 쓰지 못했습니다.</string>
+    <string name="toast_copied_to_clipboard">클립보드로 복사됨</string>
+    <string name="error_download_failed">다운로드 실패</string>
+    <string name="intent_title_share">다음으로 공유</string>
+
+
+    <string name="feed_remove_button">삭제</string>
+    <string name="feed_rename_button">이름 바꾸기</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">사용자 이름</string>
+    <string name="pref_title_password">암호</string>
+    <string name="pref_title_owncloudRootPath">ownCloud 루트 주소</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">로그인</string>
+    <string name="login_progress_signing_in">로그인 중...</string>
+    <string name="error_field_required">이 항목은 필수 사항입니다</string>
+    <string name="error_invalid_url">URL이 잘못되었습니다</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">계정 가져오기</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="other">오래된 항목 %d개 다운로드됨</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">더 이상 항목 없음</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">설정</string>
+    <string name="cache_is_cleared">캐시를 비웠습니다!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">일반</string>
+    <string name="pref_title_general_sort_order">정렬 순서</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>새 항목 -&gt; 오래된 항목</item>
+        <item>오래된 항목 -&gt; 새 항목</item>
+    </string-array>
+    <string name="dialog_clearing_cache">캐시 비우는 중</string>
+    <string name="dialog_clearing_cache_please_wait">캐시를 비우고 있습니다... 잠시 기다려 주십시오.</string>
+    <string name="reset_cache_unsaved_changes">동기화되지 않은 변경 사항이 있습니다. 캐시를 비우시겠습니까?</string>
+    <string name="warning">경고</string>
+    <string name="pref_title_AutoSyncOnStart">시작할 때 동기화</string>
+    <string name="pref_title_ShowOnlyUnread">읽지 않은 항목만 보기</string>
+    <string name="pref_title_DisableHostnameVerification">호스트 이름 확인 사용 안함</string>
+    <string name="pref_title_NavigateWithVolumeButtons">음량 단추로 탐색</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">스크롤 중 읽은 것으로 표시</string>
+    <string name="pref_title_OpenInBrowserDirectly">외부 브라우저로 글 읽기</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">알 수 없는 인증서를 허용하시겠습니까?</string>
+    <string name="mtm_decision_always">항상</string>
+    <string name="mtm_decision_abort">중단</string>
+    <string name="mtm_notification">인증서 확인</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">팟캐스트가 선택되지 않았음</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">표시</string>
+    <string name="pref_title_app_theme">앱 테마</string>
+    <string name="pref_title_feed_list_layout">피드 목록 레이아웃</string>
+    <string name="pref_display_title_lines_count">제목 줄 수</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>어둡게</item>
+        <item>밝게</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>간단히</item>
+        <item>자세히</item>
+        <item>자세히, 웹뷰 포함</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">알림</string>
+    <string name="pref_title_notification_new_articles_available">새 글이 있을 때 알림 표시</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">오류</string>
+    <string name="login_dialog_text_something_went_wrong">무언가 잘못되었습니다 :(</string>
+    <string name="login_dialog_text_not_compatible">이 앱 버전은 ownCloud 뉴스 앱과 호환되지 않습니다. 뉴스 앱과 프레임워크를 업데이트하십시오.</string>
+    <string name="login_dialog_title_security_warning">보안 경고</string>
+    <string name="login_dialog_text_security_warning">HTTPS를 사용하고 있지 않습니다. 공격자가 트래픽을 감청하여 암호와 같은 민감한 데이터에 접근할 수 있습니다. HTTPS 사용을 적극 권장합니다!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">데이터 및 동기화</string>
+    <string name="pref_title_clearCache">캐시 비우기</string>
+    <string name="pref_title_CacheImagesOffline">오프라인 사용을 위하여 사진 저장</string>
+    <string name="pref_title_Max_Cache_Size">최대 캐시 크기</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>하지 않음</item>
+        <item>Wi-Fi에서만</item>
+        <item>Wi-Fi 및 모바일 데이터</item>
+        <item>Wi-Fi에 연결되지 않았을 때 묻기</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250MB</item>
+        <item>500MB</item>
+        <item>750MB</item>
+        <item>1GB</item>
+        <item>2GB</item>
+        <item>5GB</item>
+        <item>10GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5분</item>
+        <item>15분</item>
+        <item>30분</item>
+        <item>45분</item>
+        <item>1시간</item>
+        <item>2시간</item>
+        <item>3시간</item>
+        <item>6시간</item>
+        <item>12시간</item>
+        <item>24시간</item>
+    </string-array>
+    <string name="content_desc_play">재생</string>
+    <string name="content_desc_pause">일시정지</string>
+    <string name="content_desc_rewind">되감기</string>
+    <string name="content_desc_delete">삭제</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-lt-rLT/strings.xml b/News-Android-App/src/main/res/values-lt-rLT/strings.xml
index 006b927d..b9e5204f 100644
--- a/News-Android-App/src/main/res/values-lt-rLT/strings.xml
+++ b/News-Android-App/src/main/res/values-lt-rLT/strings.xml
@@ -1,133 +1,147 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Auto sinchronizavimas</string>
-  <string name="app_name">ownCloud naujienų skaitymo programa</string>
-  <string name="title_activity_sync_interval_selector">Sinchronizavimo intervalas</string>
-  <string name="title_activity_news_detail">NaujienosInformacijaVeikla</string>
-  <string name="empty_view_content">Nėra elementų</string>
-  <string name="toast_GettingMoreItems">Atsiunčiama daugiau elementų.. Prašome palaukti.</string>
-  <string name="no_wifi_available">Nėra WiFi ryšio</string>
-  <string name="do_you_want_to_download_without_wifi">Ar norite atsisiųsti paveikslėlius be WiFi ryšio?</string>
-  <string name="widget_header">ownCloud Naujienos</string>
-  <string name="message_bar_reload">Įkelti iš naujo</string>
-  <string name="allUnreadFeeds">Visi neskaityti elementai</string>
-  <string name="starredFeeds">Pažymėti elementai</string>
-  <string name="title_activity_new_feed">Pridėti naują srautą</string>
-  <string name="menu_update">Atnaujinti</string>
-  <string name="menu_About_Changelog">Apie / Pakitimai</string>
-  <string name="menu_markAllAsRead">Žymėti visus skaitytais</string>
-  <string name="menu_StartImageCaching">Atsisiųsti paveikslėlius</string>
-  <string name="menu_downloadMoreItems">Atsiųsti daugiau elementų</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Pažymėti</string>
-  <string name="action_read">Skaityti</string>
-  <string name="action_playPodacst">Groti Podcast</string>
-  <string name="action_openInBrowser">Atverti naršyklėje</string>
-  <string name="action_Share">Dalintis</string>
-  <string name="action_login">Serverio nustatymai</string>
-  <string name="action_save">Išsaugoti</string>
-  <string name="action_settings">Nustatymai</string>
-  <string name="action_sync_settings">Sinchronizavimo nustatymai</string>
-  <string name="action_add_new_feed">Pridėti naują srautą</string>
-  <string name="action_textToSpeech">Perskaityk</string>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d neperskaitytas įrašas</item>
-    <item quantity="few">%d neperskaityti įrašai</item>
-    <item quantity="other">%d neperskaityti įrašai</item>
-  </plurals>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Parsiųsti paveikslėlį</string>
-  <string name="toast_copied_to_clipboard">Nukopijuota į talpyklę</string>
-  <string name="error_download_failed">Atsiuntimas nepavyko</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Pašalinti</string>
-  <string name="feed_rename_button">Pervadinti</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Prisijungimo vardas</string>
-  <string name="pref_title_password">Slaptažodis</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Prisijungti</string>
-  <string name="login_progress_signing_in">Prisijungiama...</string>
-  <string name="error_field_required">Šis laukas privalomas</string>
-  <string name="error_invalid_url">URL yra netinkamas</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importuoti paskyrą</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Daugiau elementų nėra</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Nustatymai</string>
-  <!--General settings-->
-  <string name="pref_header_general">Bendras</string>
-  <string name="pref_title_general_sort_order">Rikiavimo tvarka</string>
-  <string-array name="pref_general_sort_order">
-    <item>Naujas -&gt; Senas</item>
-    <item>Senas -&gt; Naujas</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Valoma talpykla</string>
-  <string name="reset_cache_unsaved_changes">Yra nesinchronizuotų pakitimų. Ar vis tiek norite atstatyti talpyklą?</string>
-  <string name="warning">Įspėjimas</string>
-  <string name="pref_title_AutoSyncOnStart">Sinchronizuoti pasileidžiant</string>
-  <string name="pref_title_ShowOnlyUnread">Rodyti tik neskaitytus straipsnius</string>
-  <string name="pref_title_DisableHostnameVerification">Išjungti mazgo vardo patikrinimą</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Naršyti su garso mygtukais</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Žymėti perskaitytu slenkant</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Priimti nežinomą sertifikatą?</string>
-  <string name="mtm_decision_always">Visada</string>
-  <string name="mtm_decision_abort">Atšaukti</string>
-  <string name="mtm_notification">Sertifikato patikrinimas</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nepasirinktos joks podcast</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Ekranas</string>
-  <string name="pref_title_app_theme">Programos tema</string>
-  <string name="pref_title_feed_list_layout">Sklaikos kanalų sąrašo išdėstymas</string>
-  <string-array name="pref_display_apptheme">
-    <item>Tamsi</item>
-    <item>Šviesi</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Pranešimai</string>
-  <string name="pref_title_notification_new_articles_available">Rodyti pranešimus kai galimi nauji straipsniai</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Klaida</string>
-  <string name="login_dialog_text_something_went_wrong">Kažkas sugriuvo :(</string>
-  <string name="login_dialog_text_not_compatible">Ši programos versija nesuderinama su Jūsų ownCloud naujienų programa. Prašome atnaujinti naujienų programą ir programų sistemą (appframework).</string>
-  <string name="login_dialog_title_security_warning">Saugumo pranešimas</string>
-  <string name="login_dialog_text_security_warning">Jūs nenaudojate https. Atakuojantysis galėtų nuskaityti Jūsų srautą ir gauti prieigą prie jautrios informacijos (pvz. Jūsų slaptažodis). Taigi labai rekomenduotina naudoti https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Duomenys ir sinchonizavimas</string>
-  <string name="pref_title_clearCache">Išvalyti talpyklą</string>
-  <string name="pref_title_CacheImagesOffline">Saugoti paveikslėlius darbui neprisijungu</string>
-  <string name="pref_title_Max_Cache_Size">Didžiausias talpyklos dydis</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>niekada</item>
-    <item>Tik per WiFi</item>
-    <item>Per WiFi &amp; Mobilų tinklą</item>
-    <item>Klausti kai neprisijungta prie WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 min.</item>
-    <item>15 min.</item>
-    <item>30 min.</item>
-    <item>45 min.</item>
-    <item>1 val.</item>
-    <item>2 val.</item>
-    <item>3 val.</item>
-    <item>6 val.</item>
-    <item>12 val.</item>
-    <item>24 val.</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">ištrinti</string>
-</resources>
+
+    <string name="auto_sync_string">Auto sinchronizavimas</string>
+    <string name="title_activity_sync_interval_selector">Sinchronizavimo intervalas</string>
+    <string name="title_activity_news_detail">NaujienosInformacijaVeikla</string>
+    <string name="empty_view_content">Nėra elementų</string>
+    <string name="toast_GettingMoreItems">Atsiunčiama daugiau elementų.. Prašome palaukti.</string>
+    <string name="no_wifi_available">Nėra WiFi ryšio</string>
+    <string name="do_you_want_to_download_without_wifi">Ar norite atsisiųsti paveikslėlius be WiFi ryšio?</string>
+    <string name="widget_header">ownCloud Naujienos</string>
+    <string name="message_bar_reload">Įkelti iš naujo</string>
+    <string name="allUnreadFeeds">Visi neskaityti elementai</string>
+    <string name="starredFeeds">Pažymėti elementai</string>
+    <string name="title_activity_new_feed">Pridėti naują srautą</string>
+
+    <string name="menu_update">Atnaujinti</string>
+    <string name="menu_About_Changelog">Apie / Pakitimai</string>
+    <string name="menu_markAllAsRead">Žymėti visus skaitytais</string>
+    <string name="menu_StartImageCaching">Atsisiųsti paveikslėlius</string>
+    <string name="menu_downloadMoreItems">Atsiųsti daugiau elementų</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Pažymėti</string>
+    <string name="action_read">Skaityti</string>
+    <string name="action_playPodacst">Groti Podcast</string>
+    <string name="action_openInBrowser">Atverti naršyklėje</string>
+    <string name="action_Share">Dalintis</string>
+    <string name="action_login">Serverio nustatymai</string>
+    <string name="action_save">Išsaugoti</string>
+    <string name="action_settings">Nustatymai</string>
+    <string name="action_sync_settings">Sinchronizavimo nustatymai</string>
+    <string name="action_add_new_feed">Pridėti naują srautą</string>
+    <string name="action_textToSpeech">Perskaityk</string>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d neperskaitytas įrašas</item>
+        <item quantity="few">%d neperskaityti įrašai</item>
+        <item quantity="other">%d neperskaityti įrašai</item>
+    </plurals>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Parsiųsti paveikslėlį</string>
+    <string name="toast_copied_to_clipboard">Nukopijuota į talpyklę</string>
+    <string name="error_download_failed">Atsiuntimas nepavyko</string>
+    <string name="feed_remove_button">Pašalinti</string>
+    <string name="feed_rename_button">Pervadinti</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Prisijungimo vardas</string>
+    <string name="pref_title_password">Slaptažodis</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Prisijungti</string>
+    <string name="login_progress_signing_in">Prisijungiama...</string>
+    <string name="error_field_required">Šis laukas privalomas</string>
+    <string name="error_invalid_url">URL yra netinkamas</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importuoti paskyrą</string>
+
+
+    <string name="toast_no_more_downloads_available">Daugiau elementų nėra</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Nustatymai</string>
+    <!-- General settings -->
+    <string name="pref_header_general">Bendras</string>
+    <string name="pref_title_general_sort_order">Rikiavimo tvarka</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Naujas -&gt; Senas</item>
+        <item>Senas -&gt; Naujas</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Valoma talpykla</string>
+    <string name="reset_cache_unsaved_changes">Yra nesinchronizuotų pakitimų. Ar vis tiek norite atstatyti talpyklą?</string>
+    <string name="warning">Įspėjimas</string>
+    <string name="pref_title_AutoSyncOnStart">Sinchronizuoti pasileidžiant</string>
+    <string name="pref_title_ShowOnlyUnread">Rodyti tik neskaitytus straipsnius</string>
+    <string name="pref_title_DisableHostnameVerification">Išjungti mazgo vardo patikrinimą</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Naršyti su garso mygtukais</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Žymėti perskaitytu slenkant</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Priimti nežinomą sertifikatą?</string>
+    <string name="mtm_decision_always">Visada</string>
+    <string name="mtm_decision_abort">Atšaukti</string>
+    <string name="mtm_notification">Sertifikato patikrinimas</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nepasirinktos joks podcast</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Ekranas</string>
+    <string name="pref_title_app_theme">Programos tema</string>
+    <string name="pref_title_feed_list_layout">Sklaikos kanalų sąrašo išdėstymas</string>
+    <string-array name="pref_display_apptheme">
+        <item>Tamsi</item>
+        <item>Šviesi</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Pranešimai</string>
+    <string name="pref_title_notification_new_articles_available">Rodyti pranešimus kai galimi nauji straipsniai</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Klaida</string>
+    <string name="login_dialog_text_something_went_wrong">Kažkas sugriuvo :(</string>
+    <string name="login_dialog_text_not_compatible">Ši programos versija nesuderinama su Jūsų ownCloud naujienų programa. Prašome atnaujinti naujienų programą ir programų sistemą (appframework).</string>
+    <string name="login_dialog_title_security_warning">Saugumo pranešimas</string>
+    <string name="login_dialog_text_security_warning">Jūs nenaudojate https. Atakuojantysis galėtų nuskaityti Jūsų srautą ir gauti prieigą prie jautrios informacijos (pvz. Jūsų slaptažodis). Taigi labai rekomenduotina naudoti https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Duomenys ir sinchonizavimas</string>
+    <string name="pref_title_clearCache">Išvalyti talpyklą</string>
+    <string name="pref_title_CacheImagesOffline">Saugoti paveikslėlius darbui neprisijungu</string>
+    <string name="pref_title_Max_Cache_Size">Didžiausias talpyklos dydis</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>niekada</item>
+        <item>Tik per WiFi</item>
+        <item>Per WiFi &amp; Mobilų tinklą</item>
+        <item>Klausti kai neprisijungta prie WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 min.</item>
+        <item>15 min.</item>
+        <item>30 min.</item>
+        <item>45 min.</item>
+        <item>1 val.</item>
+        <item>2 val.</item>
+        <item>3 val.</item>
+        <item>6 val.</item>
+        <item>12 val.</item>
+        <item>24 val.</item>
+    </string-array>
+    <string name="content_desc_delete">ištrinti</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-nb-rNO/strings.xml b/News-Android-App/src/main/res/values-nb-rNO/strings.xml
index 4efdfc73..ecaf2c78 100644
--- a/News-Android-App/src/main/res/values-nb-rNO/strings.xml
+++ b/News-Android-App/src/main/res/values-nb-rNO/strings.xml
@@ -1,195 +1,225 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Autosynk</string>
-  <string name="app_name">ownClouds Nyhetsleser</string>
-  <string name="title_activity_sync_interval_selector">Velger for synkroniseringsintervall</string>
-  <string name="title_activity_news_detail">NyhetsDetaljAktivitet</string>
-  <string name="empty_view_content">Ingenting her</string>
-  <string name="toast_GettingMoreItems">Startet nedlasting av flere elementer... Vennligst vent.</string>
-  <string name="no_wifi_available">Ingen WiFi-tilkobling</string>
-  <string name="do_you_want_to_download_without_wifi">Vil du laste ned bildene uten WiFi tilkobling?</string>
-  <string name="current_version">Du bruker versjon %s</string>
-  <string name="widget_header">ownCloud Nyheter</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nytt element tilgjengelig</item>
-    <item quantity="other">%d nye elementer tilgjengelig</item>
-  </plurals>
-  <string name="message_bar_reload">Last på nytt</string>
-  <string name="allUnreadFeeds">Alle uleste elementer</string>
-  <string name="starredFeeds">Stjernemerkede elementer</string>
-  <string name="title_activity_new_feed">Legg til ny kilde</string>
-  <string name="menu_update">Oppdater</string>
-  <string name="menu_About_Changelog">Om / Endringslogg</string>
-  <string name="menu_markAllAsRead">Marker alle som lest</string>
-  <string name="menu_StartImageCaching">Last ned bilder</string>
-  <string name="menu_downloadMoreItems">Last ned flere elementer</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Merket</string>
-  <string name="action_read">Les</string>
-  <string name="action_playPodacst">Spill podcast</string>
-  <string name="action_openInBrowser">Åpne i nettleser</string>
-  <string name="action_Share">Del</string>
-  <string name="action_login">Serverinnstillinger</string>
-  <string name="action_save">Lagre</string>
-  <string name="action_settings">Innstillinger</string>
-  <string name="action_sync_settings">Innstillinger for synkronisering</string>
-  <string name="action_add_new_feed">Legg til ny kilde</string>
-  <string name="action_textToSpeech">Les opp</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Du har %d nytt ulest element</item>
-    <item quantity="other">Du har %d nye uleste elementer</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d nytt ulest element tilgjengelig</item>
-    <item quantity="other">%d nye uleste elementer tilgjengelig</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Nyhets-URL</string>
-  <string name="action_add_feed">Legg til nyhetskilde</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Last ned bilde</string>
-  <string name="action_img_sharelink">Del bildelenke</string>
-  <string name="action_img_open">Åpne bilde i nettleser</string>
-  <string name="action_img_copylink">Kopier bildelenke</string>
-  <string name="action_link_share">Del lenke</string>
-  <string name="action_link_open">Åpne lenke i nettleser</string>
-  <string name="action_link_copy">Kopier lenke</string>
-  <string name="toast_img_download_wait">Laster ned... Vennligst vent</string>
-  <string name="toast_img_saved">Bilde lagret.</string>
-  <string name="toast_img_notwriteable">Klarte ikke å skrive bilde.</string>
-  <string name="toast_copied_to_clipboard">Kopiert til utklippstavlen</string>
-  <string name="error_download_failed">Nedlasting feilet</string>
-  <string name="intent_title_share">Del via</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Fjern nyhetskilde</string>
-  <string name="action_feed_rename">Omdøp nyhetskilde</string>
-  <string name="feed_remove_button">Fjern</string>
-  <string name="feed_rename_button">Gi nytt navn</string>
-  <string name="confirm_feed_remove">Vil du virkelig fjerne denne nyhetskilden? Dette kan ikke angres!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Brukernavn</string>
-  <string name="pref_title_password">Passord</string>
-  <string name="pref_title_owncloudRootPath">ownCloud rot-adresse</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Logg inn</string>
-  <string name="login_progress_signing_in">Logger inn...</string>
-  <string name="error_field_required">Dette feltet er påkrevd</string>
-  <string name="error_invalid_url">Denne adressen er feil</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importer konto</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Lastet ned %d gammelt element</item>
-    <item quantity="other">Lastet ned %d gamle elementer</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Ingen flere elemeter tilgjengelig</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Hentet %d element så langt...</item>
-    <item quantity="other">Hentet %d elementer så langt...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Innstillinger</string>
-  <string name="cache_is_cleared">Mellomlager er nullstilt!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Generelt</string>
-  <string name="pref_title_general_sort_order">Sorteringsrekkefølge</string>
-  <string-array name="pref_general_sort_order">
-    <item>Ny -&gt; Gammel</item>
-    <item>Gammel -&gt; Ny</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Sletter hurtiglager</string>
-  <string name="dialog_clearing_cache_please_wait">Nullstiller hurtiglager... Vennligst vent.</string>
-  <string name="reset_cache_unsaved_changes">Det er usynkroniserte forandringer. Vil du resette hurtilageret likevel?</string>
-  <string name="warning">Advarsel</string>
-  <string name="pref_title_AutoSyncOnStart">Synkroniser under oppstart</string>
-  <string name="pref_title_ShowOnlyUnread">Vis kun uleste artikler</string>
-  <string name="pref_title_DisableHostnameVerification">Deaktiver vertsnavnverifikasjon</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Naviger med volumknappene</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Merk som lest når du scroller</string>
-  <string name="pref_title_OpenInBrowserDirectly">Bruk ekstern nettleser til å vise artikler</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Aksepter ukjent sertifikat?</string>
-  <string name="mtm_decision_always">Alltid</string>
-  <string name="mtm_decision_abort">Avbryt</string>
-  <string name="mtm_notification">Sertifikatverifikasjon</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Ingen podcast valgt</string>
-  <string name="no_chapters_available">Ingen kapitler tilgjengelig</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Vis</string>
-  <string name="pref_title_app_theme">App-tema</string>
-  <string name="pref_title_feed_list_layout">Oppsett for kildelisten</string>
-  <string name="pref_display_title_lines_count">Antall linjer for tittel</string>
-  <string-array name="pref_display_apptheme">
-    <item>Mørk</item>
-    <item>Lys</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Enkel</item>
-    <item>Utvidet</item>
-    <item>Utvidet (fulltekst)</item>
-    <item>Utvidet med Nettvisning</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Varsler</string>
-  <string name="pref_title_notification_new_articles_available">Vis varsel når nye artikler er tilgjengelig</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Feil</string>
-  <string name="login_dialog_text_something_went_wrong">Noe gikk galt :-(</string>
-  <string name="login_dialog_text_not_compatible">Applikasjonsversjonen din er ikka kompatibel med din ownCloud Nyhetsapp. Vennligst oppdater nyhetsappen og apprammeverket.</string>
-  <string name="login_dialog_title_security_warning">Sikkerhetsadvarsel</string>
-  <string name="login_dialog_text_security_warning">Du bruker ikke https. En angriper kan fange opp trafikken og få tilgang til noen sensitive data (f.eks passordet ditt). Så det er det sterkt anbefalt å bruke https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; synk.</string>
-  <string name="pref_title_clearCache">Slett hurtiglager</string>
-  <string name="pref_title_CacheImagesOffline">Bildehurtiglager er offline</string>
-  <string name="pref_title_Max_Cache_Size">Maks hurtiglagerstørrelse</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Aldri</item>
-    <item>Bare over WiFi</item>
-    <item>Over WiFi &amp; Mobil</item>
-    <item>Spør når ikke koblet til WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minutter</item>
-    <item>15 minutter</item>
-    <item>30 minutter</item>
-    <item>45 minutter</item>
-    <item>1 time</item>
-    <item>2 timer</item>
-    <item>3 timer</item>
-    <item>6 timer</item>
-    <item>12 timer</item>
-    <item>24 timer</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">spil</string>
-  <string name="content_desc_pause">pause</string>
-  <string name="content_desc_rewind">bakover</string>
-  <string name="content_desc_forward">framover</string>
-  <string name="content_desc_expand">utvid</string>
-  <string name="content_desc_collapse">skjul</string>
-  <string name="content_desc_mark_as_read">merk som lest</string>
-  <string name="content_desc_mark_as_unread">merk som ulest</string>
-  <string name="content_desc_tap_to_refresh">trykk for å oppfiske</string>
-  <string name="content_desc_add_to_favorites">legg til i favoritter</string>
-  <string name="content_desc_remove_from_favorites">fjern fra favoritter</string>
-  <string name="content_desc_show_password">vis passord</string>
-  <string name="content_desc_delete">slett</string>
-  <string name="content_desc_download">last ned</string>
+
+    <string name="auto_sync_string">Autosynk</string>
+    <string name="title_activity_sync_interval_selector">Velger for synkroniseringsintervall</string>
+    <string name="title_activity_news_detail">NyhetsDetaljAktivitet</string>
+    <string name="empty_view_content">Ingenting her</string>
+    <string name="toast_GettingMoreItems">Startet nedlasting av flere elementer... Vennligst vent.</string>
+    <string name="no_wifi_available">Ingen WiFi-tilkobling</string>
+    <string name="do_you_want_to_download_without_wifi">Vil du laste ned bildene uten WiFi tilkobling?</string>
+    <string name="current_version">Du bruker versjon %s</string>
+    <string name="widget_header">ownCloud Nyheter</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nytt element tilgjengelig</item>
+        <item quantity="other">%d nye elementer tilgjengelig</item>
+    </plurals>
+    <string name="message_bar_reload">Last på nytt</string>
+    <string name="allUnreadFeeds">Alle uleste elementer</string>
+    <string name="starredFeeds">Stjernemerkede elementer</string>
+    <string name="title_activity_new_feed">Legg til ny kilde</string>
+
+    <string name="menu_update">Oppdater</string>
+    <string name="menu_About_Changelog">Om / Endringslogg</string>
+    <string name="menu_markAllAsRead">Marker alle som lest</string>
+    <string name="menu_StartImageCaching">Last ned bilder</string>
+    <string name="menu_downloadMoreItems">Last ned flere elementer</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Merket</string>
+    <string name="action_read">Les</string>
+    <string name="action_playPodacst">Spill podcast</string>
+    <string name="action_openInBrowser">Åpne i nettleser</string>
+    <string name="action_Share">Del</string>
+    <string name="action_login">Serverinnstillinger</string>
+    <string name="action_save">Lagre</string>
+    <string name="action_settings">Innstillinger</string>
+    <string name="action_sync_settings">Innstillinger for synkronisering</string>
+    <string name="action_add_new_feed">Legg til ny kilde</string>
+    <string name="action_textToSpeech">Les opp</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Du har %d nytt ulest element</item>
+        <item quantity="other">Du har %d nye uleste elementer</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d nytt ulest element tilgjengelig</item>
+        <item quantity="other">%d nye uleste elementer tilgjengelig</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Nyhets-URL</string>
+    <string name="action_add_feed">Legg til nyhetskilde</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Last ned bilde</string>
+    <string name="action_img_sharelink">Del bildelenke</string>
+    <string name="action_img_open">Åpne bilde i nettleser</string>
+    <string name="action_img_copylink">Kopier bildelenke</string>
+    <string name="action_link_share">Del lenke</string>
+    <string name="action_link_open">Åpne lenke i nettleser</string>
+    <string name="action_link_copy">Kopier lenke</string>
+    <string name="toast_img_download_wait">Laster ned... Vennligst vent</string>
+    <string name="toast_img_saved">Bilde lagret.</string>
+    <string name="toast_img_notwriteable">Klarte ikke å skrive bilde.</string>
+    <string name="toast_copied_to_clipboard">Kopiert til utklippstavlen</string>
+    <string name="error_download_failed">Nedlasting feilet</string>
+    <string name="intent_title_share">Del via</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Fjern nyhetskilde</string>
+    <string name="action_feed_rename">Omdøp nyhetskilde</string>
+    <string name="feed_remove_button">Fjern</string>
+    <string name="feed_rename_button">Gi nytt navn</string>
+    <string name="confirm_feed_remove">Vil du virkelig fjerne denne nyhetskilden? Dette kan ikke angres!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Brukernavn</string>
+    <string name="pref_title_password">Passord</string>
+    <string name="pref_title_owncloudRootPath">ownCloud rot-adresse</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Logg inn</string>
+    <string name="login_progress_signing_in">Logger inn...</string>
+    <string name="error_field_required">Dette feltet er påkrevd</string>
+    <string name="error_invalid_url">Denne adressen er feil</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importer konto</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Lastet ned %d gammelt element</item>
+        <item quantity="other">Lastet ned %d gamle elementer</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Ingen flere elemeter tilgjengelig</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Hentet %d element så langt...</item>
+        <item quantity="other">Hentet %d elementer så langt...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Innstillinger</string>
+    <string name="cache_is_cleared">Mellomlager er nullstilt!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Generelt</string>
+    <string name="pref_title_general_sort_order">Sorteringsrekkefølge</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Ny -&gt; Gammel</item>
+        <item>Gammel -&gt; Ny</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Sletter hurtiglager</string>
+    <string name="dialog_clearing_cache_please_wait">Nullstiller hurtiglager... Vennligst vent.</string>
+    <string name="reset_cache_unsaved_changes">Det er usynkroniserte forandringer. Vil du resette hurtilageret likevel?</string>
+    <string name="warning">Advarsel</string>
+    <string name="pref_title_AutoSyncOnStart">Synkroniser under oppstart</string>
+    <string name="pref_title_ShowOnlyUnread">Vis kun uleste artikler</string>
+    <string name="pref_title_DisableHostnameVerification">Deaktiver vertsnavnverifikasjon</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Naviger med volumknappene</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Merk som lest når du scroller</string>
+    <string name="pref_title_OpenInBrowserDirectly">Bruk ekstern nettleser til å vise artikler</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Aksepter ukjent sertifikat?</string>
+    <string name="mtm_decision_always">Alltid</string>
+    <string name="mtm_decision_abort">Avbryt</string>
+    <string name="mtm_notification">Sertifikatverifikasjon</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Ingen podcast valgt</string>
+    <string name="no_chapters_available">Ingen kapitler tilgjengelig</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Vis</string>
+    <string name="pref_title_app_theme">App-tema</string>
+    <string name="pref_title_feed_list_layout">Oppsett for kildelisten</string>
+    <string name="pref_display_title_lines_count">Antall linjer for tittel</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Mørk</item>
+        <item>Lys</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Enkel</item>
+        <item>Utvidet</item>
+        <item>Utvidet (fulltekst)</item>
+        <item>Utvidet med Nettvisning</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Varsler</string>
+    <string name="pref_title_notification_new_articles_available">Vis varsel når nye artikler er tilgjengelig</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Feil</string>
+    <string name="login_dialog_text_something_went_wrong">Noe gikk galt :-(</string>
+    <string name="login_dialog_text_not_compatible">Applikasjonsversjonen din er ikka kompatibel med din ownCloud Nyhetsapp. Vennligst oppdater nyhetsappen og apprammeverket.</string>
+    <string name="login_dialog_title_security_warning">Sikkerhetsadvarsel</string>
+    <string name="login_dialog_text_security_warning">Du bruker ikke https. En angriper kan fange opp trafikken og få tilgang til noen sensitive data (f.eks passordet ditt). Så det er det sterkt anbefalt å bruke https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; synk.</string>
+    <string name="pref_title_clearCache">Slett hurtiglager</string>
+    <string name="pref_title_CacheImagesOffline">Bildehurtiglager er offline</string>
+    <string name="pref_title_Max_Cache_Size">Maks hurtiglagerstørrelse</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Aldri</item>
+        <item>Bare over WiFi</item>
+        <item>Over WiFi &amp; Mobil</item>
+        <item>Spør når ikke koblet til WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minutter</item>
+        <item>15 minutter</item>
+        <item>30 minutter</item>
+        <item>45 minutter</item>
+        <item>1 time</item>
+        <item>2 timer</item>
+        <item>3 timer</item>
+        <item>6 timer</item>
+        <item>12 timer</item>
+        <item>24 timer</item>
+    </string-array>
+    <string name="content_desc_play">spil</string>
+    <string name="content_desc_pause">pause</string>
+    <string name="content_desc_rewind">bakover</string>
+    <string name="content_desc_forward">framover</string>
+    <string name="content_desc_expand">utvid</string>
+    <string name="content_desc_collapse">skjul</string>
+    <string name="content_desc_mark_as_read">merk som lest</string>
+    <string name="content_desc_mark_as_unread">merk som ulest</string>
+    <string name="content_desc_tap_to_refresh">trykk for å oppfiske</string>
+    <string name="content_desc_add_to_favorites">legg til i favoritter</string>
+    <string name="content_desc_remove_from_favorites">fjern fra favoritter</string>
+    <string name="content_desc_show_password">vis passord</string>
+    <string name="content_desc_delete">slett</string>
+    <string name="content_desc_download">last ned</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-nl/strings.xml b/News-Android-App/src/main/res/values-nl/strings.xml
index eee86830..511ecd68 100644
--- a/News-Android-App/src/main/res/values-nl/strings.xml
+++ b/News-Android-App/src/main/res/values-nl/strings.xml
@@ -1,189 +1,219 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Auto sync</string>
-  <string name="app_name">ownCloud Nieuwslezer</string>
-  <string name="title_activity_sync_interval_selector">Sync interval selector</string>
-  <string name="title_activity_news_detail">NieuwsDetailActiviteit</string>
-  <string name="empty_view_content">Geen items hier</string>
-  <string name="toast_GettingMoreItems">Begonnen meer bestanden te downloaden... Even geduld.</string>
-  <string name="no_wifi_available">Geen wifi verbinding</string>
-  <string name="do_you_want_to_download_without_wifi">Wilt u de afbeeldingen downloaden zonder een wifi verbinding</string>
-  <string name="current_version">U gebruikt versie %s</string>
-  <string name="widget_header">ownCloud nieuws</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nieuw bericht beschikbaar</item>
-    <item quantity="other">%d nieuwe berichten beschikbaar</item>
-  </plurals>
-  <string name="message_bar_reload">Herladen</string>
-  <string name="allUnreadFeeds">Alle ongelezen berichten</string>
-  <string name="starredFeeds">Gemarkeerde berichten</string>
-  <string name="title_activity_new_feed">Voeg nieuwe feed toe</string>
-  <string name="menu_update">Vernieuwen</string>
-  <string name="menu_About_Changelog">Over / Wijzigingen</string>
-  <string name="menu_markAllAsRead">Alles als gelezen markeren</string>
-  <string name="menu_StartImageCaching">Downloaden afbeeldingen</string>
-  <string name="menu_downloadMoreItems">Download meer berichten</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Gemarkeerd</string>
-  <string name="action_read">Lees</string>
-  <string name="action_playPodacst">Afspelen Podcast</string>
-  <string name="action_openInBrowser">Openen in browser</string>
-  <string name="action_Share">Delen</string>
-  <string name="action_login">Serverinstellingen</string>
-  <string name="action_save">Bewaren</string>
-  <string name="action_settings">Instellingen</string>
-  <string name="action_sync_settings">Sync Settings</string>
-  <string name="action_add_new_feed">Voeg nieuwe feed toe</string>
-  <string name="action_textToSpeech">Voorlezen</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">U hebt %d nieuw ongelezen bericht</item>
-    <item quantity="other">U hebt %d nieuwe ongelezen berichten</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d nieuw ongelezen bericht beschikbaar</item>
-    <item quantity="other">%d nieuwe ongelezen berichten beschikbaar</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Feed URL</string>
-  <string name="action_add_feed">Voeg feed toe</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Downloaden afbeelding</string>
-  <string name="action_img_sharelink">Delen afbeeldingslink</string>
-  <string name="action_img_open">Open afbeelding in browser</string>
-  <string name="action_img_copylink">Kopiëren afbeeldingslink</string>
-  <string name="action_link_share">Delen link</string>
-  <string name="action_link_open">Openen link in browser</string>
-  <string name="action_link_copy">Kopiëren link </string>
-  <string name="toast_img_download_wait">Downloaden... even geduld...</string>
-  <string name="toast_img_saved">Afbeelding opgeslagen</string>
-  <string name="toast_img_notwriteable">Opslaan afbeelding mislukt</string>
-  <string name="toast_copied_to_clipboard">Gekopieerd naar het klembord</string>
-  <string name="error_download_failed">Downloaden mislukt</string>
-  <string name="intent_title_share">Delen via</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Verwijder feed</string>
-  <string name="action_feed_rename">Hernoem feed</string>
-  <string name="feed_remove_button">Verwijder</string>
-  <string name="feed_rename_button">Naam wijzigen</string>
-  <string name="confirm_feed_remove">Wilt u deze feed echt verwijderen? Dit kan niet ongedaan worden gemaakt!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Gebruikersnaam</string>
-  <string name="pref_title_password">Wachtwoord</string>
-  <string name="pref_title_owncloudRootPath">ownCloud root adres</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Inloggen</string>
-  <string name="login_progress_signing_in">Inloggen...</string>
-  <string name="error_field_required">Dit veld is verplicht</string>
-  <string name="error_invalid_url">De URL is ongeldig</string>
-  <!--Import Accounts-->
-  <string name="import_account">Import account</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Downloaden %d oud bericht</item>
-    <item quantity="other">Downloaden %d oude berichten</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Geen berichten meer beschikbaar</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Tot nu %d onderwerp opgehaald</item>
-    <item quantity="other">Tot nu %d onderwerpen opgehaald</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Instellingen</string>
-  <string name="cache_is_cleared">Cache is leeggemaakt!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Algemeen</string>
-  <string name="pref_title_general_sort_order">Sorteervolgorde</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nieuw -&gt; Oud</item>
-    <item>Oud -&gt; Nieuw</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Schoonmaken cache</string>
-  <string name="dialog_clearing_cache_please_wait">Opschonen cache… Even geduld.</string>
-  <string name="reset_cache_unsaved_changes">Er zijn nog niet gesynchroniseerde wijzigingen. Wilt u de cache toch resetten?</string>
-  <string name="warning">Waarschuwing</string>
-  <string name="pref_title_AutoSyncOnStart">Sync bij opstarten</string>
-  <string name="pref_title_ShowOnlyUnread">Toon alleen ongelezen artikelen</string>
-  <string name="pref_title_DisableHostnameVerification">Deactiveren Hostname verificatie</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigeren met volumeknoppen</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Markeren als gelezen bij scrollen</string>
-  <string name="pref_title_OpenInBrowserDirectly">Gebruik een externe browser om artikelen te bekijken</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Onbekend certificaat accepteren?</string>
-  <string name="mtm_decision_always">Altijd</string>
-  <string name="mtm_decision_abort">Afbreken</string>
-  <string name="mtm_notification">Certificaat verificatie</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Geen podcast geselecteerd</string>
-  <string name="no_chapters_available">Geen hoofdstukken beschikbaar</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Weergeven</string>
-  <string name="pref_title_app_theme">App thema</string>
-  <string name="pref_title_feed_list_layout">Feed lijst overzicht</string>
-  <string name="pref_display_title_lines_count">Regelteller voor titel</string>
-  <string-array name="pref_display_apptheme">
-    <item>Donker</item>
-    <item>Licht</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simpel</item>
-    <item>Uitgebreid</item>
-    <item>Uitgebreid (volledige tekst)</item>
-    <item>Uitgebreid met Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Meldingen</string>
-  <string name="pref_title_notification_new_articles_available">Toon meldingen als er nieuwe artikelen zijn</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Fout</string>
-  <string name="login_dialog_text_something_went_wrong">Er ging iets verkeerd :(</string>
-  <string name="login_dialog_text_not_compatible">Deze app versie is niet compatibel met uw ownCloud News App. Werk de News App en het Appframework bij.</string>
-  <string name="login_dialog_title_security_warning">Beveiligingswaarschuwing</string>
-  <string name="login_dialog_text_security_warning">U gebruikt geen https. Een aanvaller zou het niet versleutelde verkeer kunnen onderscheppen en toegang krijgen tot gevoelige gegevens (bijv. uw wachtwoord). We adviseren om https te gebruiken!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; synch</string>
-  <string name="pref_title_clearCache">Leegmaken cache</string>
-  <string name="pref_title_CacheImagesOffline">Afbeeldingen offline cachen</string>
-  <string name="pref_title_Max_Cache_Size">Max cache grootte</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minuten</item>
-    <item>15 minuten</item>
-    <item>30 minuten</item>
-    <item>45 minuten</item>
-    <item>1 uur</item>
-    <item>2 uur</item>
-    <item>3 uur</item>
-    <item>6 uur</item>
-    <item>12 uur</item>
-    <item>24 uur</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">afspelen</string>
-  <string name="content_desc_pause">pauze</string>
-  <string name="content_desc_rewind">terugspoelen</string>
-  <string name="content_desc_forward">vooruit spoelen</string>
-  <string name="content_desc_expand">uitbreiden</string>
-  <string name="content_desc_collapse">inklappen</string>
-  <string name="content_desc_mark_as_read">markeren als gelezen</string>
-  <string name="content_desc_mark_as_unread">markeren als ongelezen</string>
-  <string name="content_desc_tap_to_refresh">tik om te verversen</string>
-  <string name="content_desc_add_to_favorites">toevoegen aan favorieten</string>
-  <string name="content_desc_remove_from_favorites">verwijderen uit favorieten</string>
-  <string name="content_desc_show_password">tonen wachtwoord</string>
-  <string name="content_desc_delete">verwijderen</string>
-  <string name="content_desc_download">downloaden</string>
+
+    <string name="auto_sync_string">Auto sync</string>
+    <string name="title_activity_sync_interval_selector">Sync interval selector</string>
+    <string name="title_activity_news_detail">NieuwsDetailActiviteit</string>
+    <string name="empty_view_content">Geen items hier</string>
+    <string name="toast_GettingMoreItems">Begonnen meer bestanden te downloaden... Even geduld.</string>
+    <string name="no_wifi_available">Geen wifi verbinding</string>
+    <string name="do_you_want_to_download_without_wifi">Wilt u de afbeeldingen downloaden zonder een wifi verbinding</string>
+    <string name="current_version">U gebruikt versie %s</string>
+    <string name="widget_header">ownCloud nieuws</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nieuw bericht beschikbaar</item>
+        <item quantity="other">%d nieuwe berichten beschikbaar</item>
+    </plurals>
+    <string name="message_bar_reload">Herladen</string>
+    <string name="allUnreadFeeds">Alle ongelezen berichten</string>
+    <string name="starredFeeds">Gemarkeerde berichten</string>
+    <string name="title_activity_new_feed">Voeg nieuwe feed toe</string>
+
+    <string name="menu_update">Vernieuwen</string>
+    <string name="menu_About_Changelog">Over / Wijzigingen</string>
+    <string name="menu_markAllAsRead">Alles als gelezen markeren</string>
+    <string name="menu_StartImageCaching">Downloaden afbeeldingen</string>
+    <string name="menu_downloadMoreItems">Download meer berichten</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Gemarkeerd</string>
+    <string name="action_read">Lees</string>
+    <string name="action_playPodacst">Afspelen Podcast</string>
+    <string name="action_openInBrowser">Openen in browser</string>
+    <string name="action_Share">Delen</string>
+    <string name="action_login">Serverinstellingen</string>
+    <string name="action_save">Bewaren</string>
+    <string name="action_settings">Instellingen</string>
+    <string name="action_sync_settings">Sync Settings</string>
+    <string name="action_add_new_feed">Voeg nieuwe feed toe</string>
+    <string name="action_textToSpeech">Voorlezen</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">U hebt %d nieuw ongelezen bericht</item>
+        <item quantity="other">U hebt %d nieuwe ongelezen berichten</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d nieuw ongelezen bericht beschikbaar</item>
+        <item quantity="other">%d nieuwe ongelezen berichten beschikbaar</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Feed URL</string>
+    <string name="action_add_feed">Voeg feed toe</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Downloaden afbeelding</string>
+    <string name="action_img_sharelink">Delen afbeeldingslink</string>
+    <string name="action_img_open">Open afbeelding in browser</string>
+    <string name="action_img_copylink">Kopiëren afbeeldingslink</string>
+    <string name="action_link_share">Delen link</string>
+    <string name="action_link_open">Openen link in browser</string>
+    <string name="action_link_copy">Kopiëren link </string>
+    <string name="toast_img_download_wait">Downloaden... even geduld...</string>
+    <string name="toast_img_saved">Afbeelding opgeslagen</string>
+    <string name="toast_img_notwriteable">Opslaan afbeelding mislukt</string>
+    <string name="toast_copied_to_clipboard">Gekopieerd naar het klembord</string>
+    <string name="error_download_failed">Downloaden mislukt</string>
+    <string name="intent_title_share">Delen via</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Verwijder feed</string>
+    <string name="action_feed_rename">Hernoem feed</string>
+    <string name="feed_remove_button">Verwijder</string>
+    <string name="feed_rename_button">Naam wijzigen</string>
+    <string name="confirm_feed_remove">Wilt u deze feed echt verwijderen? Dit kan niet ongedaan worden gemaakt!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Gebruikersnaam</string>
+    <string name="pref_title_password">Wachtwoord</string>
+    <string name="pref_title_owncloudRootPath">ownCloud root adres</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Inloggen</string>
+    <string name="login_progress_signing_in">Inloggen...</string>
+    <string name="error_field_required">Dit veld is verplicht</string>
+    <string name="error_invalid_url">De URL is ongeldig</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Import account</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Downloaden %d oud bericht</item>
+        <item quantity="other">Downloaden %d oude berichten</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Geen berichten meer beschikbaar</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Tot nu %d onderwerp opgehaald</item>
+        <item quantity="other">Tot nu %d onderwerpen opgehaald</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Instellingen</string>
+    <string name="cache_is_cleared">Cache is leeggemaakt!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Algemeen</string>
+    <string name="pref_title_general_sort_order">Sorteervolgorde</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nieuw -&gt; Oud</item>
+        <item>Oud -&gt; Nieuw</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Schoonmaken cache</string>
+    <string name="dialog_clearing_cache_please_wait">Opschonen cache… Even geduld.</string>
+    <string name="reset_cache_unsaved_changes">Er zijn nog niet gesynchroniseerde wijzigingen. Wilt u de cache toch resetten?</string>
+    <string name="warning">Waarschuwing</string>
+    <string name="pref_title_AutoSyncOnStart">Sync bij opstarten</string>
+    <string name="pref_title_ShowOnlyUnread">Toon alleen ongelezen artikelen</string>
+    <string name="pref_title_DisableHostnameVerification">Deactiveren Hostname verificatie</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigeren met volumeknoppen</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Markeren als gelezen bij scrollen</string>
+    <string name="pref_title_OpenInBrowserDirectly">Gebruik een externe browser om artikelen te bekijken</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Onbekend certificaat accepteren?</string>
+    <string name="mtm_decision_always">Altijd</string>
+    <string name="mtm_decision_abort">Afbreken</string>
+    <string name="mtm_notification">Certificaat verificatie</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Geen podcast geselecteerd</string>
+    <string name="no_chapters_available">Geen hoofdstukken beschikbaar</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Weergeven</string>
+    <string name="pref_title_app_theme">App thema</string>
+    <string name="pref_title_feed_list_layout">Feed lijst overzicht</string>
+    <string name="pref_display_title_lines_count">Regelteller voor titel</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Donker</item>
+        <item>Licht</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simpel</item>
+        <item>Uitgebreid</item>
+        <item>Uitgebreid (volledige tekst)</item>
+        <item>Uitgebreid met Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Meldingen</string>
+    <string name="pref_title_notification_new_articles_available">Toon meldingen als er nieuwe artikelen zijn</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Fout</string>
+    <string name="login_dialog_text_something_went_wrong">Er ging iets verkeerd :(</string>
+    <string name="login_dialog_text_not_compatible">Deze app versie is niet compatibel met uw ownCloud News App. Werk de News App en het Appframework bij.</string>
+    <string name="login_dialog_title_security_warning">Beveiligingswaarschuwing</string>
+    <string name="login_dialog_text_security_warning">U gebruikt geen https. Een aanvaller zou het niet versleutelde verkeer kunnen onderscheppen en toegang krijgen tot gevoelige gegevens (bijv. uw wachtwoord). We adviseren om https te gebruiken!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; synch</string>
+    <string name="pref_title_clearCache">Leegmaken cache</string>
+    <string name="pref_title_CacheImagesOffline">Afbeeldingen offline cachen</string>
+    <string name="pref_title_Max_Cache_Size">Max cache grootte</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minuten</item>
+        <item>15 minuten</item>
+        <item>30 minuten</item>
+        <item>45 minuten</item>
+        <item>1 uur</item>
+        <item>2 uur</item>
+        <item>3 uur</item>
+        <item>6 uur</item>
+        <item>12 uur</item>
+        <item>24 uur</item>
+    </string-array>
+    <string name="content_desc_play">afspelen</string>
+    <string name="content_desc_pause">pauze</string>
+    <string name="content_desc_rewind">terugspoelen</string>
+    <string name="content_desc_forward">vooruit spoelen</string>
+    <string name="content_desc_expand">uitbreiden</string>
+    <string name="content_desc_collapse">inklappen</string>
+    <string name="content_desc_mark_as_read">markeren als gelezen</string>
+    <string name="content_desc_mark_as_unread">markeren als ongelezen</string>
+    <string name="content_desc_tap_to_refresh">tik om te verversen</string>
+    <string name="content_desc_add_to_favorites">toevoegen aan favorieten</string>
+    <string name="content_desc_remove_from_favorites">verwijderen uit favorieten</string>
+    <string name="content_desc_show_password">tonen wachtwoord</string>
+    <string name="content_desc_delete">verwijderen</string>
+    <string name="content_desc_download">downloaden</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-oc/strings.xml b/News-Android-App/src/main/res/values-oc/strings.xml
index 0d3efe9e..2cdde4fc 100644
--- a/News-Android-App/src/main/res/values-oc/strings.xml
+++ b/News-Android-App/src/main/res/values-oc/strings.xml
@@ -1,171 +1,192 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sincronizacion auto.</string>
-  <string name="app_name">ownCloud News Reader</string>
-  <string name="title_activity_sync_interval_selector">Selector d\'interval de sincronizacion</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">Pas cap d\'article</string>
-  <string name="toast_GettingMoreItems">Telecargament d\'articles addicionals en cors... Pacientatz.</string>
-  <string name="no_wifi_available">Pas cap de connexion Wi-Fi</string>
-  <string name="do_you_want_to_download_without_wifi">Telecargar los imatges sens connexion Wi-Fi ?</string>
-  <string name="current_version">Utilizatz la Version %s</string>
-  <string name="widget_header">Actualitats ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d article novèl disponible</item>
-    <item quantity="other">%d articles novèls disponibles</item>
-  </plurals>
-  <string name="message_bar_reload">Recargar</string>
-  <string name="allUnreadFeeds">Totes los articles pas legits</string>
-  <string name="starredFeeds">Articles favorits</string>
-  <string name="title_activity_new_feed">Apondre un flux</string>
-  <string name="menu_update">Refrescar</string>
-  <string name="menu_About_Changelog">A prepaus / Jornal de las modificacions</string>
-  <string name="menu_markAllAsRead">Marcar totes coma legits</string>
-  <string name="menu_StartImageCaching">Telecargar los imatges</string>
-  <string name="menu_downloadMoreItems">+ d\'articles</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Favorit</string>
-  <string name="action_read">Legit</string>
-  <string name="action_playPodacst">Legir lo Podcast</string>
-  <string name="action_openInBrowser">Afichar dins lo navigador</string>
-  <string name="action_Share">Partejar</string>
-  <string name="action_login">Paramètres del servidor</string>
-  <string name="action_save">Salvar</string>
-  <string name="action_settings">Paramètres</string>
-  <string name="action_sync_settings">Paramètres de sincronizacion</string>
-  <string name="action_add_new_feed">Apondre un flux novèl</string>
-  <string name="action_textToSpeech">Legir a votz nauta</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">I a %d novèl article pas legit</item>
-    <item quantity="other">I a %d novèls articles pas legits</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d novèl article pas legit</item>
-    <item quantity="other">%d novèls articles pas legits</item>
-  </plurals>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Telecargar l\'Imatge</string>
-  <string name="action_img_sharelink">Partejar lo Ligam cap a l\'Imatge</string>
-  <string name="action_img_open">Dobrir l\'Imatge dins lo Navigador</string>
-  <string name="action_img_copylink">Copiar lo Ligam cap a l\'Imatge</string>
-  <string name="action_link_share">Partejar per un Ligam</string>
-  <string name="action_link_open">Dobrir lo Ligam dins lo Navigador</string>
-  <string name="action_link_copy">Copiar lo Ligam</string>
-  <string name="toast_img_saved">Imatge enregistrat.</string>
-  <string name="toast_img_notwriteable">Error d\'escritura de l\'Imatge.</string>
-  <string name="toast_copied_to_clipboard">Copiat dins lo quichapapièrs</string>
-  <string name="error_download_failed">Lo telecargament a fracassat</string>
-  <string name="intent_title_share">Partejar via</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Suprimir</string>
-  <string name="feed_rename_button">Renomenar</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nom d\'utilizaire</string>
-  <string name="pref_title_password">Senhal</string>
-  <string name="pref_title_owncloudRootPath">adreça raiç d\'ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">S\'identificar</string>
-  <string name="login_progress_signing_in">Connexion en cors…</string>
-  <string name="error_field_required">Aqueste camp es requesit</string>
-  <string name="error_invalid_url">Aquesta URL es incorrècta</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importar un compte</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">%d ancian article telecargat</item>
-    <item quantity="other">%d ancians articles telecargats</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Cap d\'article suplementari pas disponible</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Paramètres</string>
-  <string name="cache_is_cleared">Escondedor netejat !</string>
-  <!--General settings-->
-  <string name="pref_header_general">Generals</string>
-  <string name="pref_title_general_sort_order">Òrdre de triada</string>
-  <string-array name="pref_general_sort_order">
-    <item>Recent -&gt; Ancian</item>
-    <item>Ancian -&gt; Recent</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Voidar l\'escondedor</string>
-  <string name="dialog_clearing_cache_please_wait">Purga de l\'escondedor... Pacientatz.</string>
-  <string name="reset_cache_unsaved_changes">Certanas modificacions son pas sincronizadas. Volètz reïnicializar l\'escondedor malgrat tot ?</string>
-  <string name="warning">Atencion</string>
-  <string name="pref_title_AutoSyncOnStart">Sincro. a l\'aviada</string>
-  <string name="pref_title_ShowOnlyUnread">Amagar los articles legits</string>
-  <string name="pref_title_DisableHostnameVerification">Desactivar la verificacion del nom de maquina</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigar amb los botons de volum</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar coma legit tot en desfilant</string>
-  <string name="pref_title_OpenInBrowserDirectly">Afichar los articles dins un navigator extèrne</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Acceptar los certificats pas segurs ?</string>
-  <string name="mtm_decision_always">Totjorn</string>
-  <string name="mtm_decision_abort">Anullar</string>
-  <string name="mtm_notification">Verificacion del certificat</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Cap de podcast pas seleccionat</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Afichatge</string>
-  <string name="pref_title_app_theme">Tèma de l\'app</string>
-  <string name="pref_title_feed_list_layout">Disposicion de la lista dels fluxes</string>
-  <string name="pref_display_title_lines_count">Nombre de linhas pel títol</string>
-  <string-array name="pref_display_apptheme">
-    <item>Escur</item>
-    <item>Clar</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simpla</item>
-    <item>Espandida</item>
-    <item>Espandida (tèxte complet)</item>
-    <item>Espandida amb Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificacions</string>
-  <string name="pref_title_notification_new_articles_available">Afichar una notificacion quand d\'articles novèls son disponibles</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Error</string>
-  <string name="login_dialog_text_something_went_wrong">Un problèma s\'es produsit :-(</string>
-  <string name="login_dialog_text_not_compatible">La version d\'aquesta aplicacion es pas compatibla amb vòstra aplicacion News de ownCloud. Metètz a jorn l\'aplicacion News e lo framework d\'aplicacions.</string>
-  <string name="login_dialog_title_security_warning">Avertiment de seguretat</string>
-  <string name="login_dialog_text_security_warning">Utilizatz pas HTTPS. Una persona malvolenta poiriá interceptar vòstre trafic e obténer de donadas sensiblas (ex. vòstre senhal). Es bravament recomandat d\'utilizar HTTPS !</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Donadas &amp; sincronizacion</string>
-  <string name="pref_title_clearCache">Voidar l\'escondedor</string>
-  <string name="pref_title_CacheImagesOffline">Mesa en escondedor fòra linha dels imatges</string>
-  <string name="pref_title_Max_Cache_Size">Talha maximala de l\'escondedor</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Pas jamais</item>
-    <item>En WiFi solament</item>
-    <item>En WiFi &amp; Mobil</item>
-    <item>Demandar quand pas connectat</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 Mo</item>
-    <item>500 Mo</item>
-    <item>750 Mo</item>
-    <item>1 Go</item>
-    <item>2 Go</item>
-    <item>5 Go</item>
-    <item>10 Go</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutas</item>
-    <item>15 Minutas</item>
-    <item>30 Minutas</item>
-    <item>45 Minutas</item>
-    <item>1 Ora</item>
-    <item>2 Oras</item>
-    <item>3 Oras</item>
-    <item>6 Oras</item>
-    <item>12 Oras</item>
-    <item>24 Oras</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">suprimir</string>
-</resources>
+
+    <string name="auto_sync_string">Sincronizacion auto.</string>
+    <string name="title_activity_sync_interval_selector">Selector d\'interval de sincronizacion</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">Pas cap d\'article</string>
+    <string name="toast_GettingMoreItems">Telecargament d\'articles addicionals en cors... Pacientatz.</string>
+    <string name="no_wifi_available">Pas cap de connexion Wi-Fi</string>
+    <string name="do_you_want_to_download_without_wifi">Telecargar los imatges sens connexion Wi-Fi ?</string>
+    <string name="current_version">Utilizatz la Version %s</string>
+    <string name="widget_header">Actualitats ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d article novèl disponible</item>
+        <item quantity="other">%d articles novèls disponibles</item>
+    </plurals>
+    <string name="message_bar_reload">Recargar</string>
+    <string name="allUnreadFeeds">Totes los articles pas legits</string>
+    <string name="starredFeeds">Articles favorits</string>
+    <string name="title_activity_new_feed">Apondre un flux</string>
+
+    <string name="menu_update">Refrescar</string>
+    <string name="menu_About_Changelog">A prepaus / Jornal de las modificacions</string>
+    <string name="menu_markAllAsRead">Marcar totes coma legits</string>
+    <string name="menu_StartImageCaching">Telecargar los imatges</string>
+    <string name="menu_downloadMoreItems">+ d\'articles</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Favorit</string>
+    <string name="action_read">Legit</string>
+    <string name="action_playPodacst">Legir lo Podcast</string>
+    <string name="action_openInBrowser">Afichar dins lo navigador</string>
+    <string name="action_Share">Partejar</string>
+    <string name="action_login">Paramètres del servidor</string>
+    <string name="action_save">Salvar</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="action_sync_settings">Paramètres de sincronizacion</string>
+    <string name="action_add_new_feed">Apondre un flux novèl</string>
+    <string name="action_textToSpeech">Legir a votz nauta</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">I a %d novèl article pas legit</item>
+        <item quantity="other">I a %d novèls articles pas legits</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d novèl article pas legit</item>
+        <item quantity="other">%d novèls articles pas legits</item>
+    </plurals>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Telecargar l\'Imatge</string>
+    <string name="action_img_sharelink">Partejar lo Ligam cap a l\'Imatge</string>
+    <string name="action_img_open">Dobrir l\'Imatge dins lo Navigador</string>
+    <string name="action_img_copylink">Copiar lo Ligam cap a l\'Imatge</string>
+    <string name="action_link_share">Partejar per un Ligam</string>
+    <string name="action_link_open">Dobrir lo Ligam dins lo Navigador</string>
+    <string name="action_link_copy">Copiar lo Ligam</string>
+    <string name="toast_img_saved">Imatge enregistrat.</string>
+    <string name="toast_img_notwriteable">Error d\'escritura de l\'Imatge.</string>
+    <string name="toast_copied_to_clipboard">Copiat dins lo quichapapièrs</string>
+    <string name="error_download_failed">Lo telecargament a fracassat</string>
+    <string name="intent_title_share">Partejar via</string>
+
+
+    <string name="feed_remove_button">Suprimir</string>
+    <string name="feed_rename_button">Renomenar</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nom d\'utilizaire</string>
+    <string name="pref_title_password">Senhal</string>
+    <string name="pref_title_owncloudRootPath">adreça raiç d\'ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">S\'identificar</string>
+    <string name="login_progress_signing_in">Connexion en cors…</string>
+    <string name="error_field_required">Aqueste camp es requesit</string>
+    <string name="error_invalid_url">Aquesta URL es incorrècta</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importar un compte</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">%d ancian article telecargat</item>
+        <item quantity="other">%d ancians articles telecargats</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Cap d\'article suplementari pas disponible</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="cache_is_cleared">Escondedor netejat !</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Generals</string>
+    <string name="pref_title_general_sort_order">Òrdre de triada</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Recent -&gt; Ancian</item>
+        <item>Ancian -&gt; Recent</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Voidar l\'escondedor</string>
+    <string name="dialog_clearing_cache_please_wait">Purga de l\'escondedor... Pacientatz.</string>
+    <string name="reset_cache_unsaved_changes">Certanas modificacions son pas sincronizadas. Volètz reïnicializar l\'escondedor malgrat tot ?</string>
+    <string name="warning">Atencion</string>
+    <string name="pref_title_AutoSyncOnStart">Sincro. a l\'aviada</string>
+    <string name="pref_title_ShowOnlyUnread">Amagar los articles legits</string>
+    <string name="pref_title_DisableHostnameVerification">Desactivar la verificacion del nom de maquina</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigar amb los botons de volum</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marcar coma legit tot en desfilant</string>
+    <string name="pref_title_OpenInBrowserDirectly">Afichar los articles dins un navigator extèrne</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Acceptar los certificats pas segurs ?</string>
+    <string name="mtm_decision_always">Totjorn</string>
+    <string name="mtm_decision_abort">Anullar</string>
+    <string name="mtm_notification">Verificacion del certificat</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Cap de podcast pas seleccionat</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Afichatge</string>
+    <string name="pref_title_app_theme">Tèma de l\'app</string>
+    <string name="pref_title_feed_list_layout">Disposicion de la lista dels fluxes</string>
+    <string name="pref_display_title_lines_count">Nombre de linhas pel títol</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Escur</item>
+        <item>Clar</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simpla</item>
+        <item>Espandida</item>
+        <item>Espandida (tèxte complet)</item>
+        <item>Espandida amb Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificacions</string>
+    <string name="pref_title_notification_new_articles_available">Afichar una notificacion quand d\'articles novèls son disponibles</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Error</string>
+    <string name="login_dialog_text_something_went_wrong">Un problèma s\'es produsit :-(</string>
+    <string name="login_dialog_text_not_compatible">La version d\'aquesta aplicacion es pas compatibla amb vòstra aplicacion News de ownCloud. Metètz a jorn l\'aplicacion News e lo framework d\'aplicacions.</string>
+    <string name="login_dialog_title_security_warning">Avertiment de seguretat</string>
+    <string name="login_dialog_text_security_warning">Utilizatz pas HTTPS. Una persona malvolenta poiriá interceptar vòstre trafic e obténer de donadas sensiblas (ex. vòstre senhal). Es bravament recomandat d\'utilizar HTTPS !</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Donadas &amp; sincronizacion</string>
+    <string name="pref_title_clearCache">Voidar l\'escondedor</string>
+    <string name="pref_title_CacheImagesOffline">Mesa en escondedor fòra linha dels imatges</string>
+    <string name="pref_title_Max_Cache_Size">Talha maximala de l\'escondedor</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Pas jamais</item>
+        <item>En WiFi solament</item>
+        <item>En WiFi &amp; Mobil</item>
+        <item>Demandar quand pas connectat</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 Mo</item>
+        <item>500 Mo</item>
+        <item>750 Mo</item>
+        <item>1 Go</item>
+        <item>2 Go</item>
+        <item>5 Go</item>
+        <item>10 Go</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutas</item>
+        <item>15 Minutas</item>
+        <item>30 Minutas</item>
+        <item>45 Minutas</item>
+        <item>1 Ora</item>
+        <item>2 Oras</item>
+        <item>3 Oras</item>
+        <item>6 Oras</item>
+        <item>12 Oras</item>
+        <item>24 Oras</item>
+    </string-array>
+    <string name="content_desc_delete">suprimir</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-pl/strings.xml b/News-Android-App/src/main/res/values-pl/strings.xml
index cc633fc2..dfcaa5a5 100644
--- a/News-Android-App/src/main/res/values-pl/strings.xml
+++ b/News-Android-App/src/main/res/values-pl/strings.xml
@@ -1,134 +1,148 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automatyczna synchronizacja</string>
-  <string name="app_name">ownCloud News Reader</string>
-  <string name="title_activity_sync_interval_selector">Wybór interwału synchronizacji</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">Nic tu nie ma</string>
-  <string name="no_wifi_available">Brak połączenia WIFI</string>
-  <string name="do_you_want_to_download_without_wifi">Czy chcesz pobrać obrazy bez połączenia WiFi</string>
-  <string name="widget_header">ownCloud News</string>
-  <string name="message_bar_reload">Przeładuj</string>
-  <string name="allUnreadFeeds">Wszystkie nieprzeczytane</string>
-  <string name="starredFeeds">Oznaczone Gwiazdką</string>
-  <string name="title_activity_new_feed">Dodaj nowy kanał</string>
-  <string name="menu_update">Odśwież</string>
-  <string name="menu_About_Changelog">O programie / Zmiany</string>
-  <string name="menu_markAllAsRead">Oznacz wszysto jako przeczytane</string>
-  <string name="menu_StartImageCaching">Pobierz obrazki</string>
-  <string name="menu_downloadMoreItems">Pobierz więcej elementów</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Oznaczone</string>
-  <string name="action_read">Odczyt</string>
-  <string name="action_playPodacst">Odtwórz Podcast</string>
-  <string name="action_openInBrowser">Otwórz w przeglądarce</string>
-  <string name="action_Share">Udostępnij</string>
-  <string name="action_login">Ustawienia serwera</string>
-  <string name="action_save">Zapisz</string>
-  <string name="action_settings">Ustawienia</string>
-  <string name="action_sync_settings">Ustawienia synchronizacji</string>
-  <string name="action_add_new_feed">Dodaj nowy kanał</string>
-  <string name="action_textToSpeech">Przeczytane</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Dodaj kanał</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Skopiuj do schowka</string>
-  <string name="error_download_failed">Pobieranie nieudane</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Usuń</string>
-  <string name="feed_rename_button">Zmień nazwę</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nazwa użytkownika</string>
-  <string name="pref_title_password">Hasło</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Zaloguj</string>
-  <string name="login_progress_signing_in">Loguję...</string>
-  <string name="error_field_required">Ten element jest wymagany</string>
-  <string name="error_invalid_url">Ten adres jest niepoprawny</string>
-  <!--Import Accounts-->
-  <string name="import_account">Konto importu</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Brak dostępnych dodatkowych elementów</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Ustawienia</string>
-  <!--General settings-->
-  <string name="pref_header_general">Ogólne</string>
-  <string name="pref_title_general_sort_order">Sortuj w kolejności</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nowe -&gt; Stare</item>
-    <item>Stare -&gt; Nowe</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Czyszczenie pamięci podręcznej</string>
-  <string name="reset_cache_unsaved_changes">Są niezsynchronizowane zmiany. Czy chcesz zresetować pamięć podręczną?</string>
-  <string name="warning">Ostrzeżenie</string>
-  <string name="pref_title_AutoSyncOnStart">Synchronizuj na starcie</string>
-  <string name="pref_title_ShowOnlyUnread">Pokaż tylko nieprzeczytane artykuły</string>
-  <string name="pref_title_DisableHostnameVerification">Wyłącz weryfikację nazwy hosta</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Nawiguj za pomocą przycisków głośności</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Oznacz jako przeczytane podczas przewijania</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Akceptować nieznane certyfikaty?</string>
-  <string name="mtm_decision_always">Zawsze</string>
-  <string name="mtm_decision_abort">Anuluj</string>
-  <string name="mtm_notification">Certyfikat weryfikacji</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Brak wybranego podcastu</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Wygląd</string>
-  <string name="pref_title_app_theme">Motyw aplikacji</string>
-  <string name="pref_title_feed_list_layout">Układ listy kanałów</string>
-  <string name="pref_display_title_lines_count">Licznik linii tytułu</string>
-  <string-array name="pref_display_apptheme">
-    <item>Ciemny</item>
-    <item>Jasny</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Powiadomienia</string>
-  <string name="pref_title_notification_new_articles_available">Pokaż powiadomienie, gdy pojawią się nowe artykuły</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Błąd</string>
-  <string name="login_dialog_text_something_went_wrong">Coś poszło nie tak :(</string>
-  <string name="login_dialog_text_not_compatible">Ta wersja aplikacji nie jest zgodny z twoją aplikacją wiadomości na ownCloud. Zaktualizuj aplikacje news i appframework.</string>
-  <string name="login_dialog_title_security_warning">Ostrzeżenie o zabezpieczeniach</string>
-  <string name="login_dialog_text_security_warning">Nie używaszpołączenia https. Osoba atakująca może przechwytywać ruch i uzyskać dostęp do niektórych poufnych danych (np. hasła). Zdecydowanie polecamy używać https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; synchronizacja</string>
-  <string name="pref_title_clearCache">Czyść pamięć podręczną</string>
-  <string name="pref_title_CacheImagesOffline">Zapisuj obrazy offline</string>
-  <string name="pref_title_Max_Cache_Size">Maksymalny rozmiar pamięci podręcznej</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nigdy</item>
-    <item>Tylko przez WiFi</item>
-    <item>Przez WiFi &amp; Mobilne</item>
-    <item>Zapytaj gdy nie podłączony do WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minut</item>
-    <item>15 minut</item>
-    <item>30 minut</item>
-    <item>45 minut</item>
-    <item>1 godzina</item>
-    <item>2 godziny</item>
-    <item>3 godziny</item>
-    <item>6 godzin</item>
-    <item>12 godzin</item>
-    <item>24 godziny</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">skasuj</string>
-</resources>
+
+    <string name="auto_sync_string">Automatyczna synchronizacja</string>
+    <string name="title_activity_sync_interval_selector">Wybór interwału synchronizacji</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">Nic tu nie ma</string>
+    <string name="no_wifi_available">Brak połączenia WIFI</string>
+    <string name="do_you_want_to_download_without_wifi">Czy chcesz pobrać obrazy bez połączenia WiFi</string>
+    <string name="widget_header">ownCloud News</string>
+    <string name="message_bar_reload">Przeładuj</string>
+    <string name="allUnreadFeeds">Wszystkie nieprzeczytane</string>
+    <string name="starredFeeds">Oznaczone Gwiazdką</string>
+    <string name="title_activity_new_feed">Dodaj nowy kanał</string>
+
+    <string name="menu_update">Odśwież</string>
+    <string name="menu_About_Changelog">O programie / Zmiany</string>
+    <string name="menu_markAllAsRead">Oznacz wszysto jako przeczytane</string>
+    <string name="menu_StartImageCaching">Pobierz obrazki</string>
+    <string name="menu_downloadMoreItems">Pobierz więcej elementów</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Oznaczone</string>
+    <string name="action_read">Odczyt</string>
+    <string name="action_playPodacst">Odtwórz Podcast</string>
+    <string name="action_openInBrowser">Otwórz w przeglądarce</string>
+    <string name="action_Share">Udostępnij</string>
+    <string name="action_login">Ustawienia serwera</string>
+    <string name="action_save">Zapisz</string>
+    <string name="action_settings">Ustawienia</string>
+    <string name="action_sync_settings">Ustawienia synchronizacji</string>
+    <string name="action_add_new_feed">Dodaj nowy kanał</string>
+    <string name="action_textToSpeech">Przeczytane</string>
+    <string name="action_add_feed">Dodaj kanał</string>
+
+
+    <string name="toast_copied_to_clipboard">Skopiuj do schowka</string>
+    <string name="error_download_failed">Pobieranie nieudane</string>
+    <string name="feed_remove_button">Usuń</string>
+    <string name="feed_rename_button">Zmień nazwę</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nazwa użytkownika</string>
+    <string name="pref_title_password">Hasło</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Zaloguj</string>
+    <string name="login_progress_signing_in">Loguję...</string>
+    <string name="error_field_required">Ten element jest wymagany</string>
+    <string name="error_invalid_url">Ten adres jest niepoprawny</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Konto importu</string>
+
+
+    <string name="toast_no_more_downloads_available">Brak dostępnych dodatkowych elementów</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Ustawienia</string>
+    <!-- General settings -->
+    <string name="pref_header_general">Ogólne</string>
+    <string name="pref_title_general_sort_order">Sortuj w kolejności</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nowe -&gt; Stare</item>
+        <item>Stare -&gt; Nowe</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Czyszczenie pamięci podręcznej</string>
+    <string name="reset_cache_unsaved_changes">Są niezsynchronizowane zmiany. Czy chcesz zresetować pamięć podręczną?</string>
+    <string name="warning">Ostrzeżenie</string>
+    <string name="pref_title_AutoSyncOnStart">Synchronizuj na starcie</string>
+    <string name="pref_title_ShowOnlyUnread">Pokaż tylko nieprzeczytane artykuły</string>
+    <string name="pref_title_DisableHostnameVerification">Wyłącz weryfikację nazwy hosta</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Nawiguj za pomocą przycisków głośności</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Oznacz jako przeczytane podczas przewijania</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Akceptować nieznane certyfikaty?</string>
+    <string name="mtm_decision_always">Zawsze</string>
+    <string name="mtm_decision_abort">Anuluj</string>
+    <string name="mtm_notification">Certyfikat weryfikacji</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Brak wybranego podcastu</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Wygląd</string>
+    <string name="pref_title_app_theme">Motyw aplikacji</string>
+    <string name="pref_title_feed_list_layout">Układ listy kanałów</string>
+    <string name="pref_display_title_lines_count">Licznik linii tytułu</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Ciemny</item>
+        <item>Jasny</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Powiadomienia</string>
+    <string name="pref_title_notification_new_articles_available">Pokaż powiadomienie, gdy pojawią się nowe artykuły</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Błąd</string>
+    <string name="login_dialog_text_something_went_wrong">Coś poszło nie tak :(</string>
+    <string name="login_dialog_text_not_compatible">Ta wersja aplikacji nie jest zgodny z twoją aplikacją wiadomości na ownCloud. Zaktualizuj aplikacje news i appframework.</string>
+    <string name="login_dialog_title_security_warning">Ostrzeżenie o zabezpieczeniach</string>
+    <string name="login_dialog_text_security_warning">Nie używaszpołączenia https. Osoba atakująca może przechwytywać ruch i uzyskać dostęp do niektórych poufnych danych (np. hasła). Zdecydowanie polecamy używać https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; synchronizacja</string>
+    <string name="pref_title_clearCache">Czyść pamięć podręczną</string>
+    <string name="pref_title_CacheImagesOffline">Zapisuj obrazy offline</string>
+    <string name="pref_title_Max_Cache_Size">Maksymalny rozmiar pamięci podręcznej</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nigdy</item>
+        <item>Tylko przez WiFi</item>
+        <item>Przez WiFi &amp; Mobilne</item>
+        <item>Zapytaj gdy nie podłączony do WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minut</item>
+        <item>15 minut</item>
+        <item>30 minut</item>
+        <item>45 minut</item>
+        <item>1 godzina</item>
+        <item>2 godziny</item>
+        <item>3 godziny</item>
+        <item>6 godzin</item>
+        <item>12 godzin</item>
+        <item>24 godziny</item>
+    </string-array>
+    <string name="content_desc_delete">skasuj</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-pt-rBR/strings.xml b/News-Android-App/src/main/res/values-pt-rBR/strings.xml
index 9b658536..05c99ed4 100644
--- a/News-Android-App/src/main/res/values-pt-rBR/strings.xml
+++ b/News-Android-App/src/main/res/values-pt-rBR/strings.xml
@@ -1,195 +1,231 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Auto sincronização</string>
-  <string name="app_name">Leitor de Notícias do ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Seletor de Intervalo de Sincronização</string>
-  <string name="title_activity_news_detail">Detalhes da notícia</string>
-  <string name="empty_view_content">Este local está vazio</string>
-  <string name="toast_GettingMoreItems">Começou a baixar mais itens ... Por favor, aguarde.</string>
-  <string name="no_wifi_available">Nenhum WiFi conectado</string>
-  <string name="do_you_want_to_download_without_wifi">Você quer baixar imagens sem uma conexão WiFi?</string>
-  <string name="current_version">Você está usando a versão %s</string>
-  <string name="widget_header">Notícias ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d novo item disponível</item>
-    <item quantity="other">%d novos itens disponíveis</item>
-  </plurals>
-  <string name="message_bar_reload">Recarregar</string>
-  <string name="allUnreadFeeds">Todos itens não lidos</string>
-  <string name="starredFeeds">Itens vistos</string>
-  <string name="title_activity_new_feed">Adicionar novo feed</string>
-  <string name="menu_update">Atualizar</string>
-  <string name="menu_About_Changelog">Sobre / Log de mudanças</string>
-  <string name="menu_markAllAsRead">Marcar todos como lidos</string>
-  <string name="menu_StartImageCaching">Baixar imagens</string>
-  <string name="menu_downloadMoreItems">Fazer download de mais itens</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Vistos</string>
-  <string name="action_read">Ler</string>
-  <string name="action_playPodacst">Ouvir o Podcast</string>
-  <string name="action_openInBrowser">Abrir no Navegador</string>
-  <string name="action_Share">Compartilhar</string>
-  <string name="action_login">Configurações do servidor</string>
-  <string name="action_save">Salvar</string>
-  <string name="action_settings">Configurações</string>
-  <string name="action_sync_settings">Configurações de Sincronização</string>
-  <string name="action_add_new_feed">Adicionar novo feed</string>
-  <string name="action_textToSpeech">Leia</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Você tem %d novo item não lido</item>
-    <item quantity="other">Você tem %d novos itens não lidos</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d novo item não lido disponível</item>
-    <item quantity="other">%d novos itens não lidos disponíveis</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Alimentar URL</string>
-  <string name="action_add_feed">Adicionar alimentador</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Baixar Imagem</string>
-  <string name="action_img_sharelink">Link de Compartilhamento de Imagem</string>
-  <string name="action_img_open">Abrir a Imagem no Navegador</string>
-  <string name="action_img_copylink">Copiar o Link da Imagem</string>
-  <string name="action_link_share">Link de Compartilhamento</string>
-  <string name="action_link_open">Abrir o Link no Navegador</string>
-  <string name="action_link_copy">Copiar o Link</string>
-  <string name="toast_img_download_wait">Baixando... por favor aguarde</string>
-  <string name="toast_img_saved">Imagem salva.</string>
-  <string name="toast_img_notwriteable">Falhou ao salvar Imagem</string>
-  <string name="toast_copied_to_clipboard">Copiado para área de transferência</string>
-  <string name="error_download_failed">A transferência falhou</string>
-  <string name="intent_title_share">Compartilhar via</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Remover alimentação</string>
-  <string name="action_feed_rename">Renomear Alimentação</string>
-  <string name="feed_remove_button">Remover</string>
-  <string name="feed_rename_button">Renomear</string>
-  <string name="confirm_feed_remove">Você realmente deseja remover esta alimentação? Isso não pode ser desfeito!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nome de Usuário</string>
-  <string name="pref_title_password">Senha</string>
-  <string name="pref_title_owncloudRootPath">Endereço raiz do ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Entrar</string>
-  <string name="login_progress_signing_in">Fazendo login...</string>
-  <string name="error_field_required">Este campo é obrigatório</string>
-  <string name="error_invalid_url">A URL está incorreta</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importar Conta</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Transferido %d item antigo</item>
-    <item quantity="other">Transferidos %d itens antigos</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Nenhum item disponível</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">%d item já foi buscado...</item>
-    <item quantity="other">Já foram buscados %d itens até agora...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Configurações</string>
-  <string name="cache_is_cleared">O cache está limpo!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Geral</string>
-  <string name="pref_title_general_sort_order">Ordem de Classificação</string>
-  <string-array name="pref_general_sort_order">
-    <item>Novo -&gt; Antigo</item>
-    <item>Antigo -&gt; Novo</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Limpando o cache</string>
-  <string name="dialog_clearing_cache_please_wait">Limpando o cache ... Por favor, aguarde.</string>
-  <string name="reset_cache_unsaved_changes">Há alterações não sincronizadas. Gostaria de redefinir o cache de qualquer maneira?</string>
-  <string name="warning">Aviso</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizar na inicialização</string>
-  <string name="pref_title_ShowOnlyUnread">Mostrar apenas artigos não lidos</string>
-  <string name="pref_title_DisableHostnameVerification">Desabilitar Verificação de Hostname</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navegar usando os botões de volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido enquanto navegar</string>
-  <string name="pref_title_OpenInBrowserDirectly">Usar um navegador externo para visualizar os artigos</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Aceita Certificado Desconhecido?</string>
-  <string name="mtm_decision_always">Sempre</string>
-  <string name="mtm_decision_abort">Abortar</string>
-  <string name="mtm_notification">Verificação de Certificado</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nenhum podcast selecionado</string>
-  <string name="no_chapters_available">Nenhum capítulo disponível</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Exibir</string>
-  <string name="pref_title_app_theme">Aplicativo tema</string>
-  <string name="pref_title_feed_list_layout">Layout da lista de feeds</string>
-  <string name="pref_display_title_lines_count">Contagem de linha para o título</string>
-  <string-array name="pref_display_apptheme">
-    <item>Escuro</item>
-    <item>Claro</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simples</item>
-    <item>Extendido</item>
-    <item>Extendido (texto completo)</item>
-    <item>Extendid0 com visualização Web</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificações</string>
-  <string name="pref_title_notification_new_articles_available">Mostrar notificações quando novos artigos estiverem disponíveis</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Erro</string>
-  <string name="login_dialog_text_something_went_wrong">Algo deu errado :(</string>
-  <string name="login_dialog_text_not_compatible">Esta versão do aplicativo não é compatível com o seu aplicativo ownCloud News. Por favor atualize o aplicativo e o seu framework.</string>
-  <string name="login_dialog_title_security_warning">Aviso de Segurança</string>
-  <string name="login_dialog_text_security_warning">Você não está usando https. Sua conexão poderá ser interceptada e alguém poderá ter acesso a dados secretos (ex.: sua senha). Então, é fortemente recomendado usar https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Dados &amp; sincronização</string>
-  <string name="pref_title_clearCache">Limpar cache</string>
-  <string name="pref_title_CacheImagesOffline">Armazenar imagens offline</string>
-  <string name="pref_title_Max_Cache_Size">Tamanho Máximo do Cache</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nunca</item>
-    <item>Somente WiFi</item>
-    <item>Sobre WiFi &amp; Móvel</item>
-    <item>Perguntar quando não estiver conectado ao Wi-Fi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutos</item>
-    <item>15 Minutos</item>
-    <item>30 Minutos</item>
-    <item>45 Minutos</item>
-    <item>1 Hora</item>
-    <item>2 Horas</item>
-    <item>3 Horas</item>
-    <item>6 Horas</item>
-    <item>12 Horas</item>
-    <item>24 Horas</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">executar</string>
-  <string name="content_desc_pause">pausa</string>
-  <string name="content_desc_rewind">recarregar</string>
-  <string name="content_desc_forward">adiantar</string>
-  <string name="content_desc_expand">expandir</string>
-  <string name="content_desc_collapse">recolher</string>
-  <string name="content_desc_mark_as_read">marcar como lido</string>
-  <string name="content_desc_mark_as_unread">marcar como não lido</string>
-  <string name="content_desc_tap_to_refresh">toque para atualizar</string>
-  <string name="content_desc_add_to_favorites">adicionar aos favoritos</string>
-  <string name="content_desc_remove_from_favorites">remover dos favoritos</string>
-  <string name="content_desc_show_password">mostrar senha</string>
-  <string name="content_desc_delete">excluir</string>
-  <string name="content_desc_download">baixar</string>
+
+    <string name="auto_sync_string">Auto sincronização</string>
+    <string name="title_activity_sync_interval_selector">Seletor de Intervalo de Sincronização</string>
+    <string name="title_activity_news_detail">Detalhes da notícia</string>
+    <string name="empty_view_content">Este local está vazio</string>
+    <string name="toast_GettingMoreItems">Começou a baixar mais itens ... Por favor, aguarde.</string>
+    <string name="no_wifi_available">Nenhum WiFi conectado</string>
+    <string name="do_you_want_to_download_without_wifi">Você quer baixar imagens sem uma conexão WiFi?</string>
+    <string name="current_version">Você está usando a versão %s</string>
+    <string name="widget_header">Notícias ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d novo item disponível</item>
+        <item quantity="other">%d novos itens disponíveis</item>
+    </plurals>
+    <string name="message_bar_reload">Recarregar</string>
+    <string name="allUnreadFeeds">Todos itens não lidos</string>
+    <string name="starredFeeds">Itens vistos</string>
+    <string name="title_activity_new_feed">Adicionar novo feed</string>
+
+    <string name="menu_update">Atualizar</string>
+    <string name="menu_About_Changelog">Sobre / Log de mudanças</string>
+    <string name="menu_markAllAsRead">Marcar todos como lidos</string>
+    <string name="menu_StartImageCaching">Baixar imagens</string>
+    <string name="menu_downloadMoreItems">Fazer download de mais itens</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Vistos</string>
+    <string name="action_read">Ler</string>
+    <string name="action_playPodacst">Ouvir o Podcast</string>
+    <string name="action_openInBrowser">Abrir no Navegador</string>
+    <string name="action_Share">Compartilhar</string>
+    <string name="action_login">Configurações do servidor</string>
+    <string name="action_save">Salvar</string>
+    <string name="action_settings">Configurações</string>
+    <string name="action_sync_settings">Configurações de Sincronização</string>
+    <string name="action_add_new_feed">Adicionar novo feed</string>
+    <string name="action_textToSpeech">Leia</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Você tem %d novo item não lido</item>
+        <item quantity="other">Você tem %d novos itens não lidos</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d novo item não lido disponível</item>
+        <item quantity="other">%d novos itens não lidos disponíveis</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Alimentar URL</string>
+    <string name="action_add_feed">Adicionar alimentador</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Baixar Imagem</string>
+    <string name="action_img_sharelink">Link de Compartilhamento de Imagem</string>
+    <string name="action_img_open">Abrir a Imagem no Navegador</string>
+    <string name="action_img_copylink">Copiar o Link da Imagem</string>
+    <string name="action_link_share">Link de Compartilhamento</string>
+    <string name="action_link_open">Abrir o Link no Navegador</string>
+    <string name="action_link_copy">Copiar o Link</string>
+    <string name="toast_img_download_wait">Baixando... por favor aguarde</string>
+    <string name="toast_img_saved">Imagem salva.</string>
+    <string name="toast_img_notwriteable">Falhou ao salvar Imagem</string>
+    <string name="toast_copied_to_clipboard">Copiado para área de transferência</string>
+    <string name="error_download_failed">A transferência falhou</string>
+    <string name="intent_title_share">Compartilhar via</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Remover alimentação</string>
+    <string name="action_feed_rename">Renomear Alimentação</string>
+    <string name="feed_remove_button">Remover</string>
+    <string name="feed_rename_button">Renomear</string>
+    <string name="confirm_feed_remove">Você realmente deseja remover esta alimentação? Isso não pode ser desfeito!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nome de Usuário</string>
+    <string name="pref_title_password">Senha</string>
+    <string name="pref_title_owncloudRootPath">Endereço raiz do ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Entrar</string>
+    <string name="login_progress_signing_in">Fazendo login...</string>
+    <string name="error_field_required">Este campo é obrigatório</string>
+    <string name="error_invalid_url">A URL está incorreta</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importar Conta</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Transferido %d item antigo</item>
+        <item quantity="other">Transferidos %d itens antigos</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Nenhum item disponível</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">%d item já foi buscado...</item>
+        <item quantity="other">Já foram buscados %d itens até agora...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Configurações</string>
+    <string name="cache_is_cleared">O cache está limpo!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Geral</string>
+    <string name="pref_title_general_sort_order">Ordem de Classificação</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Novo -&gt; Antigo</item>
+        <item>Antigo -&gt; Novo</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Limpando o cache</string>
+    <string name="dialog_clearing_cache_please_wait">Limpando o cache ... Por favor, aguarde.</string>
+    <string name="reset_cache_unsaved_changes">Há alterações não sincronizadas. Gostaria de redefinir o cache de qualquer maneira?</string>
+    <string name="warning">Aviso</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizar na inicialização</string>
+    <string name="pref_title_ShowOnlyUnread">Mostrar apenas artigos não lidos</string>
+    <string name="pref_title_DisableHostnameVerification">Desabilitar Verificação de Hostname</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navegar usando os botões de volume</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido enquanto navegar</string>
+    <string name="pref_title_OpenInBrowserDirectly">Usar um navegador externo para visualizar os artigos</string>
+
+    <string name="dialog_feature_not_available">Este recurso não está disponível nesta versão open-source deste aplicativo. Se você quiser usar este recurso, baixe o aplicativo do repositório do GitHub ou da Google PlayStore.</string>
+
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Aceita Certificado Desconhecido?</string>
+    <string name="mtm_decision_always">Sempre</string>
+    <string name="mtm_decision_abort">Abortar</string>
+    <string name="mtm_notification">Verificação de Certificado</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nenhum podcast selecionado</string>
+    <string name="no_chapters_available">Nenhum capítulo disponível</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Exibir</string>
+    <string name="pref_title_app_theme">Aplicativo tema</string>
+    <string name="pref_title_feed_list_layout">Layout da lista de feeds</string>
+    <string name="pref_display_title_lines_count">Contagem de linha para o título</string>
+
+    <string name="pref_display_news_detail_actionbar_icons_title">Ícones de ação (Visualização detalhada)</string>
+    <string-array name="pref_display_apptheme">
+        <item>Escuro</item>
+        <item>Claro</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simples</item>
+        <item>Extendido</item>
+        <item>Extendido (texto completo)</item>
+        <item>Extendid0 com visualização Web</item>
+        <item>Estendido com o Cardview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificações</string>
+    <string name="pref_title_notification_new_articles_available">Mostrar notificações quando novos artigos estiverem disponíveis</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Erro</string>
+    <string name="login_dialog_text_something_went_wrong">Algo deu errado :(</string>
+    <string name="login_dialog_text_zero_version_code">O aplicativo Web News retornou a versão \"0\". Por favor, veja o seguinte relatório de erro: https://github.com/nextcloud/news/issues/5#issuecomment-242883795</string>
+    <string name="login_dialog_text_not_compatible">Esta versão do aplicativo não é compatível com o seu aplicativo ownCloud News. Por favor atualize o aplicativo e o seu framework.</string>
+    <string name="login_dialog_title_security_warning">Aviso de Segurança</string>
+    <string name="login_dialog_text_security_warning">Você não está usando https. Sua conexão poderá ser interceptada e alguém poderá ter acesso a dados secretos (ex.: sua senha). Então, é fortemente recomendado usar https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Dados &amp; sincronização</string>
+    <string name="pref_title_clearCache">Limpar cache</string>
+    <string name="pref_title_CacheImagesOffline">Armazenar imagens offline</string>
+    <string name="pref_title_Max_Cache_Size">Tamanho Máximo do Cache</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nunca</item>
+        <item>Somente WiFi</item>
+        <item>Sobre WiFi &amp; Móvel</item>
+        <item>Perguntar quando não estiver conectado ao Wi-Fi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutos</item>
+        <item>15 Minutos</item>
+        <item>30 Minutos</item>
+        <item>45 Minutos</item>
+        <item>1 Hora</item>
+        <item>2 Horas</item>
+        <item>3 Horas</item>
+        <item>6 Horas</item>
+        <item>12 Horas</item>
+        <item>24 Horas</item>
+    </string-array>
+    <string name="content_desc_play">executar</string>
+    <string name="content_desc_pause">pausa</string>
+    <string name="content_desc_rewind">recarregar</string>
+    <string name="content_desc_forward">adiantar</string>
+    <string name="content_desc_expand">expandir</string>
+    <string name="content_desc_collapse">recolher</string>
+    <string name="content_desc_mark_as_read">marcar como lido</string>
+    <string name="content_desc_mark_as_unread">marcar como não lido</string>
+    <string name="content_desc_tap_to_refresh">toque para atualizar</string>
+    <string name="content_desc_add_to_favorites">adicionar aos favoritos</string>
+    <string name="content_desc_remove_from_favorites">remover dos favoritos</string>
+    <string name="content_desc_show_password">mostrar senha</string>
+    <string name="content_desc_delete">excluir</string>
+    <string name="content_desc_download">baixar</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-pt-rPT/strings.xml b/News-Android-App/src/main/res/values-pt-rPT/strings.xml
index e5964b79..1b08c28d 100644
--- a/News-Android-App/src/main/res/values-pt-rPT/strings.xml
+++ b/News-Android-App/src/main/res/values-pt-rPT/strings.xml
@@ -1,195 +1,225 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sincronização Automática</string>
-  <string name="app_name">Leitor de notícias do OwnCloud</string>
-  <string name="title_activity_sync_interval_selector">Selector de intervalo de sincronização</string>
-  <string name="title_activity_news_detail">NotíciasDetalheAtividade</string>
-  <string name="empty_view_content">Sem itens aqui</string>
-  <string name="toast_GettingMoreItems">Foi iniciada a transferência de mais itens... Por favor, aguarde.</string>
-  <string name="no_wifi_available">Sem ligação wi-fi</string>
-  <string name="do_you_want_to_download_without_wifi">Deseja transferir as imagens sem uma ligação wi-fi?</string>
-  <string name="current_version">Está a usar a Versão %s</string>
-  <string name="widget_header">Notícias da ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">Disponível %d novo item</item>
-    <item quantity="other">Disponíveis %d novos itens</item>
-  </plurals>
-  <string name="message_bar_reload">Recarregar</string>
-  <string name="allUnreadFeeds">Todos os itens não lidos</string>
-  <string name="starredFeeds">Itens destacados</string>
-  <string name="title_activity_new_feed">Adicionar nova feed</string>
-  <string name="menu_update">Atualizar</string>
-  <string name="menu_About_Changelog">Sobre / Registo de Alteraçãoes</string>
-  <string name="menu_markAllAsRead">Marcar tudo como lido</string>
-  <string name="menu_StartImageCaching">Transferir as imagens</string>
-  <string name="menu_downloadMoreItems">Transferir mais itens</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Marcado</string>
-  <string name="action_read">Lido</string>
-  <string name="action_playPodacst">Reproduzir Podcast</string>
-  <string name="action_openInBrowser">Abrir no Navegador</string>
-  <string name="action_Share">Compartilhar</string>
-  <string name="action_login">Definições do Servidor</string>
-  <string name="action_save">Guardar</string>
-  <string name="action_settings">Definições</string>
-  <string name="action_sync_settings">Definições da Sincronização </string>
-  <string name="action_add_new_feed">Adicionar novo feed</string>
-  <string name="action_textToSpeech">Leitura automática</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Tem %d novo item por ler</item>
-    <item quantity="other">Tem %d novos itens por ler</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">Tem disponível %d novo item por ler</item>
-    <item quantity="other">Tem disponível %d novos itens por ler</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Feed</string>
-  <string name="action_add_feed">Adicionar feed de notícias.</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Transferir Imagem</string>
-  <string name="action_img_sharelink">Partilhar hiperligação de imagem</string>
-  <string name="action_img_open">Abrir imagem no browser</string>
-  <string name="action_img_copylink">Copiar hiperligação</string>
-  <string name="action_link_share">Partilhar hiperligação</string>
-  <string name="action_link_open">Abrir ligação num explorador</string>
-  <string name="action_link_copy">Copiar hiperligação</string>
-  <string name="toast_img_download_wait">A descarregar... por favor, aguarde</string>
-  <string name="toast_img_saved">Imagem guardada.</string>
-  <string name="toast_img_notwriteable">Falhou ao guardar a imagem</string>
-  <string name="toast_copied_to_clipboard">Copiado para a área de transferência</string>
-  <string name="error_download_failed">Transferência falhada</string>
-  <string name="intent_title_share">Partilhar por</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Remover <em>Feed</em></string>
-  <string name="action_feed_rename">Renomear <em>Feed</em></string>
-  <string name="feed_remove_button">Remover</string>
-  <string name="feed_rename_button">Renomear</string>
-  <string name="confirm_feed_remove">Tem a certeza que pretende remover este <em>Feed</em>? A operação não pode ser revertida!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nome de utilizador</string>
-  <string name="pref_title_password">Palavra-passe:</string>
-  <string name="pref_title_owncloudRootPath">Endereço raiz do ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Iniciar Sessão</string>
-  <string name="login_progress_signing_in">A iniciar a sessão ...</string>
-  <string name="error_field_required">Este campo é obrigatório</string>
-  <string name="error_invalid_url">O url está incorreto</string>
-  <!--Import Accounts-->
-  <string name="import_account">Conta Importar</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Transferidos %d item antigo</item>
-    <item quantity="other">Transferidos %d itens antigos</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Não há mais itens disponíveis</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Descarregados %d itens até agora...</item>
-    <item quantity="other">Descarregados %d items até agora...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Definições</string>
-  <string name="cache_is_cleared">A cache está limpa!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Geral</string>
-  <string name="pref_title_general_sort_order">Ordem da ordenação</string>
-  <string-array name="pref_general_sort_order">
-    <item>Novo -&gt; Antigo</item>
-    <item>Antigo -&gt; Novo</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Limpar cache</string>
-  <string name="dialog_clearing_cache_please_wait">A limpar a cache… Por favor, aguarde.</string>
-  <string name="reset_cache_unsaved_changes">Há mudanças não sincronizadas. Gostaria de repor a cache na mesma?</string>
-  <string name="warning">Aviso</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizar no arranque</string>
-  <string name="pref_title_ShowOnlyUnread">Só mostrar os artigos não lidos</string>
-  <string name="pref_title_DisableHostnameVerification">Desativar a Verificação do Nome do Hopsedeiro</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navegue com os botões do volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido enquanto rolar com o rato</string>
-  <string name="pref_title_OpenInBrowserDirectly">Usar navegador externo para ver artigos</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Aceitar os certificados desconhecidos?</string>
-  <string name="mtm_decision_always">Sempre</string>
-  <string name="mtm_decision_abort">Abortar</string>
-  <string name="mtm_notification">Verificação do certificado</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nenhum podcast selecionado</string>
-  <string name="no_chapters_available">Sem capítulos disponíveis</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Mostrar</string>
-  <string name="pref_title_app_theme">Tema da App</string>
-  <string name="pref_title_feed_list_layout">Disposição da lista de feeds</string>
-  <string name="pref_display_title_lines_count">Contagem de linhas para o título</string>
-  <string-array name="pref_display_apptheme">
-    <item>Escuro</item>
-    <item>Claro</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Simples</item>
-    <item>Estendido</item>
-    <item>Estendido (texto completo)</item>
-    <item>Estendido com vista WebWebview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificações</string>
-  <string name="pref_title_notification_new_articles_available">Mostrar notificações quando existirem novos artigos</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Erro</string>
-  <string name="login_dialog_text_something_went_wrong">Ocorreu algo de errado :(</string>
-  <string name="login_dialog_text_not_compatible">Esta versão da App não é compatível com sua App de Notícias ownCloud. Por favor, atualize a app de notícias e a \'appframework\'.</string>
-  <string name="login_dialog_title_security_warning">Aviso de Segurança</string>
-  <string name="login_dialog_text_security_warning">Não está a usar https. Um atacante poderá intercetar o seu tráfego e ganhar acesso a alguns dados sensíveis (por ex.: a sua senha). Recomenda-se vivamente usar https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Dados &amp; sincronização</string>
-  <string name="pref_title_clearCache">Limpar a cache</string>
-  <string name="pref_title_CacheImagesOffline">Imagens offline da cache</string>
-  <string name="pref_title_Max_Cache_Size">Tamanho Máximo da Cache</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nunca</item>
-    <item>Apenas através de WiFi</item>
-    <item>Através de WiFi e Dados Móveis</item>
-    <item>Perguntar quando não ligado a WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutos</item>
-    <item>15 Minutos</item>
-    <item>30 Minutos</item>
-    <item>45 Minutos</item>
-    <item>1 Hora</item>
-    <item>2 Horas</item>
-    <item>3 Horas</item>
-    <item>6 Horas</item>
-    <item>12 Horas</item>
-    <item>24 Horas</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">reproduzir</string>
-  <string name="content_desc_pause">pausa</string>
-  <string name="content_desc_rewind">rebobinar</string>
-  <string name="content_desc_forward">avançar</string>
-  <string name="content_desc_expand">expandir</string>
-  <string name="content_desc_collapse">colapsar</string>
-  <string name="content_desc_mark_as_read">marcar como lido</string>
-  <string name="content_desc_mark_as_unread">marcar por lêr</string>
-  <string name="content_desc_tap_to_refresh">Toque para refrescar</string>
-  <string name="content_desc_add_to_favorites">Adicionar aos favoritos</string>
-  <string name="content_desc_remove_from_favorites">Remover dos favoritos</string>
-  <string name="content_desc_show_password">Mostrar senha</string>
-  <string name="content_desc_delete">eliminar</string>
-  <string name="content_desc_download">descarregar</string>
+
+    <string name="auto_sync_string">Sincronização Automática</string>
+    <string name="title_activity_sync_interval_selector">Selector de intervalo de sincronização</string>
+    <string name="title_activity_news_detail">NotíciasDetalheAtividade</string>
+    <string name="empty_view_content">Sem itens aqui</string>
+    <string name="toast_GettingMoreItems">Foi iniciada a transferência de mais itens... Por favor, aguarde.</string>
+    <string name="no_wifi_available">Sem ligação wi-fi</string>
+    <string name="do_you_want_to_download_without_wifi">Deseja transferir as imagens sem uma ligação wi-fi?</string>
+    <string name="current_version">Está a usar a Versão %s</string>
+    <string name="widget_header">Notícias da ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">Disponível %d novo item</item>
+        <item quantity="other">Disponíveis %d novos itens</item>
+    </plurals>
+    <string name="message_bar_reload">Recarregar</string>
+    <string name="allUnreadFeeds">Todos os itens não lidos</string>
+    <string name="starredFeeds">Itens destacados</string>
+    <string name="title_activity_new_feed">Adicionar nova feed</string>
+
+    <string name="menu_update">Atualizar</string>
+    <string name="menu_About_Changelog">Sobre / Registo de Alteraçãoes</string>
+    <string name="menu_markAllAsRead">Marcar tudo como lido</string>
+    <string name="menu_StartImageCaching">Transferir as imagens</string>
+    <string name="menu_downloadMoreItems">Transferir mais itens</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Marcado</string>
+    <string name="action_read">Lido</string>
+    <string name="action_playPodacst">Reproduzir Podcast</string>
+    <string name="action_openInBrowser">Abrir no Navegador</string>
+    <string name="action_Share">Compartilhar</string>
+    <string name="action_login">Definições do Servidor</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_settings">Definições</string>
+    <string name="action_sync_settings">Definições da Sincronização </string>
+    <string name="action_add_new_feed">Adicionar novo feed</string>
+    <string name="action_textToSpeech">Leitura automática</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Tem %d novo item por ler</item>
+        <item quantity="other">Tem %d novos itens por ler</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">Tem disponível %d novo item por ler</item>
+        <item quantity="other">Tem disponível %d novos itens por ler</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Feed</string>
+    <string name="action_add_feed">Adicionar feed de notícias.</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Transferir Imagem</string>
+    <string name="action_img_sharelink">Partilhar hiperligação de imagem</string>
+    <string name="action_img_open">Abrir imagem no browser</string>
+    <string name="action_img_copylink">Copiar hiperligação</string>
+    <string name="action_link_share">Partilhar hiperligação</string>
+    <string name="action_link_open">Abrir ligação num explorador</string>
+    <string name="action_link_copy">Copiar hiperligação</string>
+    <string name="toast_img_download_wait">A descarregar... por favor, aguarde</string>
+    <string name="toast_img_saved">Imagem guardada.</string>
+    <string name="toast_img_notwriteable">Falhou ao guardar a imagem</string>
+    <string name="toast_copied_to_clipboard">Copiado para a área de transferência</string>
+    <string name="error_download_failed">Transferência falhada</string>
+    <string name="intent_title_share">Partilhar por</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Remover <em>Feed</em></string>
+    <string name="action_feed_rename">Renomear <em>Feed</em></string>
+    <string name="feed_remove_button">Remover</string>
+    <string name="feed_rename_button">Renomear</string>
+    <string name="confirm_feed_remove">Tem a certeza que pretende remover este <em>Feed</em>? A operação não pode ser revertida!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nome de utilizador</string>
+    <string name="pref_title_password">Palavra-passe:</string>
+    <string name="pref_title_owncloudRootPath">Endereço raiz do ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Iniciar Sessão</string>
+    <string name="login_progress_signing_in">A iniciar a sessão ...</string>
+    <string name="error_field_required">Este campo é obrigatório</string>
+    <string name="error_invalid_url">O url está incorreto</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Conta Importar</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Transferidos %d item antigo</item>
+        <item quantity="other">Transferidos %d itens antigos</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Não há mais itens disponíveis</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Descarregados %d itens até agora...</item>
+        <item quantity="other">Descarregados %d items até agora...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Definições</string>
+    <string name="cache_is_cleared">A cache está limpa!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Geral</string>
+    <string name="pref_title_general_sort_order">Ordem da ordenação</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Novo -&gt; Antigo</item>
+        <item>Antigo -&gt; Novo</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Limpar cache</string>
+    <string name="dialog_clearing_cache_please_wait">A limpar a cache… Por favor, aguarde.</string>
+    <string name="reset_cache_unsaved_changes">Há mudanças não sincronizadas. Gostaria de repor a cache na mesma?</string>
+    <string name="warning">Aviso</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizar no arranque</string>
+    <string name="pref_title_ShowOnlyUnread">Só mostrar os artigos não lidos</string>
+    <string name="pref_title_DisableHostnameVerification">Desativar a Verificação do Nome do Hopsedeiro</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navegue com os botões do volume</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido enquanto rolar com o rato</string>
+    <string name="pref_title_OpenInBrowserDirectly">Usar navegador externo para ver artigos</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Aceitar os certificados desconhecidos?</string>
+    <string name="mtm_decision_always">Sempre</string>
+    <string name="mtm_decision_abort">Abortar</string>
+    <string name="mtm_notification">Verificação do certificado</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nenhum podcast selecionado</string>
+    <string name="no_chapters_available">Sem capítulos disponíveis</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Mostrar</string>
+    <string name="pref_title_app_theme">Tema da App</string>
+    <string name="pref_title_feed_list_layout">Disposição da lista de feeds</string>
+    <string name="pref_display_title_lines_count">Contagem de linhas para o título</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Escuro</item>
+        <item>Claro</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Simples</item>
+        <item>Estendido</item>
+        <item>Estendido (texto completo)</item>
+        <item>Estendido com vista WebWebview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificações</string>
+    <string name="pref_title_notification_new_articles_available">Mostrar notificações quando existirem novos artigos</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Erro</string>
+    <string name="login_dialog_text_something_went_wrong">Ocorreu algo de errado :(</string>
+    <string name="login_dialog_text_not_compatible">Esta versão da App não é compatível com sua App de Notícias ownCloud. Por favor, atualize a app de notícias e a \'appframework\'.</string>
+    <string name="login_dialog_title_security_warning">Aviso de Segurança</string>
+    <string name="login_dialog_text_security_warning">Não está a usar https. Um atacante poderá intercetar o seu tráfego e ganhar acesso a alguns dados sensíveis (por ex.: a sua senha). Recomenda-se vivamente usar https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Dados &amp; sincronização</string>
+    <string name="pref_title_clearCache">Limpar a cache</string>
+    <string name="pref_title_CacheImagesOffline">Imagens offline da cache</string>
+    <string name="pref_title_Max_Cache_Size">Tamanho Máximo da Cache</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nunca</item>
+        <item>Apenas através de WiFi</item>
+        <item>Através de WiFi e Dados Móveis</item>
+        <item>Perguntar quando não ligado a WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutos</item>
+        <item>15 Minutos</item>
+        <item>30 Minutos</item>
+        <item>45 Minutos</item>
+        <item>1 Hora</item>
+        <item>2 Horas</item>
+        <item>3 Horas</item>
+        <item>6 Horas</item>
+        <item>12 Horas</item>
+        <item>24 Horas</item>
+    </string-array>
+    <string name="content_desc_play">reproduzir</string>
+    <string name="content_desc_pause">pausa</string>
+    <string name="content_desc_rewind">rebobinar</string>
+    <string name="content_desc_forward">avançar</string>
+    <string name="content_desc_expand">expandir</string>
+    <string name="content_desc_collapse">colapsar</string>
+    <string name="content_desc_mark_as_read">marcar como lido</string>
+    <string name="content_desc_mark_as_unread">marcar por lêr</string>
+    <string name="content_desc_tap_to_refresh">Toque para refrescar</string>
+    <string name="content_desc_add_to_favorites">Adicionar aos favoritos</string>
+    <string name="content_desc_remove_from_favorites">Remover dos favoritos</string>
+    <string name="content_desc_show_password">Mostrar senha</string>
+    <string name="content_desc_delete">eliminar</string>
+    <string name="content_desc_download">descarregar</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-ro/strings.xml b/News-Android-App/src/main/res/values-ro/strings.xml
index 051c7fb4..1bd335b3 100644
--- a/News-Android-App/src/main/res/values-ro/strings.xml
+++ b/News-Android-App/src/main/res/values-ro/strings.xml
@@ -1,127 +1,139 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Sincronizare automată</string>
-  <string name="app_name">Cititor de Știri ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Interval de sincronizare</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">Nici un articol aici</string>
-  <string name="no_wifi_available">Nu exista conexiune WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Doriti descarcarea imaginilor fara conexiune WiFi</string>
-  <string name="widget_header">Știri ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nou item valabil</item>
-    <item quantity="few">%d noi iteme valabile</item>
-    <item quantity="other">%d noi iteme valabile</item>
-  </plurals>
-  <string name="message_bar_reload">Reîncarcă</string>
-  <string name="allUnreadFeeds">Toate articolele necitite</string>
-  <string name="starredFeeds">Articole selectate</string>
-  <string name="title_activity_new_feed">Adaugă flux nou</string>
-  <string name="menu_update">Împrospătare</string>
-  <string name="menu_About_Changelog">Despre / Modificări</string>
-  <string name="menu_markAllAsRead">Marcaţi tot ca fiind citit</string>
-  <string name="menu_StartImageCaching">Descarca imagini </string>
-  <string name="menu_downloadMoreItems">Descarcă mai multe articole </string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Marcat</string>
-  <string name="action_read">Citeşte</string>
-  <string name="action_playPodacst">Inițiază Podcast</string>
-  <string name="action_openInBrowser">Deschide in Browser</string>
-  <string name="action_Share">Partajează</string>
-  <string name="action_login">Setările serverului</string>
-  <string name="action_save">Salvează</string>
-  <string name="action_settings">Setări</string>
-  <string name="action_sync_settings">Setări Sincronizare</string>
-  <string name="action_add_new_feed">Adaugă flux nou</string>
-  <string name="action_textToSpeech">Citit</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Adăugare flux</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Copiat în clipboard</string>
-  <string name="error_download_failed">Descărcarea a eșuat</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Șterge</string>
-  <string name="feed_rename_button">Redenumește</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nume utilizator</string>
-  <string name="pref_title_password">Parolă</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Înregistraţi-vă</string>
-  <string name="login_progress_signing_in">Înregistrare</string>
-  <string name="error_field_required">Acest câmp este obligatoriu </string>
-  <string name="error_invalid_url">Acest url este incorect</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importează cont</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Nici un articol disponibil.</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Setări</string>
-  <!--General settings-->
-  <string name="pref_header_general">General</string>
-  <string name="pref_title_general_sort_order">Alegeţi ordinea</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nou -&gt; Vechi</item>
-    <item>Vechi -&gt; Nou</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Ștergere cache</string>
-  <string name="reset_cache_unsaved_changes">Există modificări nesincronizate. Dorești totuși să ștergi cache-ul?</string>
-  <string name="warning">Atenție</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizare la pornire</string>
-  <string name="pref_title_ShowOnlyUnread">Arata doar articolele necitite </string>
-  <string name="pref_title_DisableHostnameVerification">Dezactivează Verificarea Hostname</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigheaza cu tastele de volum </string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marchează ca citit in timpul derulării</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Accepta Certificat Necunoscut?</string>
-  <string name="mtm_decision_always">Întotdeauna</string>
-  <string name="mtm_decision_abort">Anuleaza</string>
-  <string name="mtm_notification">Verificare certificat</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nu a fost selectat podcastul</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Display</string>
-  <string name="pref_title_app_theme">Temă aplicație</string>
-  <string name="pref_title_feed_list_layout">Aspectul listei de flux</string>
-  <string-array name="pref_display_apptheme">
-    <item>Închis</item>
-    <item>Deschis</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notificari</string>
-  <string name="pref_title_notification_new_articles_available">Arată notificarea cînd apar articole noi</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Eroare</string>
-  <string name="login_dialog_text_something_went_wrong">Undeva s-a comis o eroare :(</string>
-  <string name="login_dialog_text_not_compatible">Aceasă versiune a aplicației nu e compatibilă cu aplicația ownCloud News. Te rugăm să actualizezi aplicația de știri și appframework.</string>
-  <string name="login_dialog_title_security_warning">Avertisment de securitate</string>
-  <string name="login_dialog_text_security_warning">Nu ați folosit https. Un hacker ar putea intercepta conținutul și obține acces la informație privată (ex.: parola). Se recomandă folosirea https-ului!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Sincronizare &amp; date</string>
-  <string name="pref_title_clearCache">Șterge cache</string>
-  <string name="pref_title_CacheImagesOffline">Imagini Cache offline</string>
-  <string name="pref_title_Max_Cache_Size">Mărime maximă Cache</string>
-  <string-array name="pref_data_sync_image_cache"/>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minute</item>
-    <item>15 Minute</item>
-    <item>30 Minute</item>
-    <item>45 Minute</item>
-    <item>1 Oră</item>
-    <item>2 Ore</item>
-    <item>3 Ore</item>
-    <item>6 Ore</item>
-    <item>12 Ore</item>
-    <item>24 Ore</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">ștergere</string>
-</resources>
+
+    <string name="auto_sync_string">Sincronizare automată</string>
+    <string name="title_activity_sync_interval_selector">Interval de sincronizare</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">Nici un articol aici</string>
+    <string name="no_wifi_available">Nu exista conexiune WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Doriti descarcarea imaginilor fara conexiune WiFi</string>
+    <string name="widget_header">Știri ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nou item valabil</item>
+        <item quantity="few">%d noi iteme valabile</item>
+        <item quantity="other">%d noi iteme valabile</item>
+    </plurals>
+    <string name="message_bar_reload">Reîncarcă</string>
+    <string name="allUnreadFeeds">Toate articolele necitite</string>
+    <string name="starredFeeds">Articole selectate</string>
+    <string name="title_activity_new_feed">Adaugă flux nou</string>
+
+    <string name="menu_update">Împrospătare</string>
+    <string name="menu_About_Changelog">Despre / Modificări</string>
+    <string name="menu_markAllAsRead">Marcaţi tot ca fiind citit</string>
+    <string name="menu_StartImageCaching">Descarca imagini </string>
+    <string name="menu_downloadMoreItems">Descarcă mai multe articole </string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Marcat</string>
+    <string name="action_read">Citeşte</string>
+    <string name="action_playPodacst">Inițiază Podcast</string>
+    <string name="action_openInBrowser">Deschide in Browser</string>
+    <string name="action_Share">Partajează</string>
+    <string name="action_login">Setările serverului</string>
+    <string name="action_save">Salvează</string>
+    <string name="action_settings">Setări</string>
+    <string name="action_sync_settings">Setări Sincronizare</string>
+    <string name="action_add_new_feed">Adaugă flux nou</string>
+    <string name="action_textToSpeech">Citit</string>
+    <string name="action_add_feed">Adăugare flux</string>
+
+
+    <string name="toast_copied_to_clipboard">Copiat în clipboard</string>
+    <string name="error_download_failed">Descărcarea a eșuat</string>
+    <string name="feed_remove_button">Șterge</string>
+    <string name="feed_rename_button">Redenumește</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Nume utilizator</string>
+    <string name="pref_title_password">Parolă</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Înregistraţi-vă</string>
+    <string name="login_progress_signing_in">Înregistrare</string>
+    <string name="error_field_required">Acest câmp este obligatoriu </string>
+    <string name="error_invalid_url">Acest url este incorect</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importează cont</string>
+
+
+    <string name="toast_no_more_downloads_available">Nici un articol disponibil.</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Setări</string>
+    <!-- General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_general_sort_order">Alegeţi ordinea</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nou -&gt; Vechi</item>
+        <item>Vechi -&gt; Nou</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Ștergere cache</string>
+    <string name="reset_cache_unsaved_changes">Există modificări nesincronizate. Dorești totuși să ștergi cache-ul?</string>
+    <string name="warning">Atenție</string>
+    <string name="pref_title_AutoSyncOnStart">Sincronizare la pornire</string>
+    <string name="pref_title_ShowOnlyUnread">Arata doar articolele necitite </string>
+    <string name="pref_title_DisableHostnameVerification">Dezactivează Verificarea Hostname</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigheaza cu tastele de volum </string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Marchează ca citit in timpul derulării</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Accepta Certificat Necunoscut?</string>
+    <string name="mtm_decision_always">Întotdeauna</string>
+    <string name="mtm_decision_abort">Anuleaza</string>
+    <string name="mtm_notification">Verificare certificat</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nu a fost selectat podcastul</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Display</string>
+    <string name="pref_title_app_theme">Temă aplicație</string>
+    <string name="pref_title_feed_list_layout">Aspectul listei de flux</string>
+    <string-array name="pref_display_apptheme">
+        <item>Închis</item>
+        <item>Deschis</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notificari</string>
+    <string name="pref_title_notification_new_articles_available">Arată notificarea cînd apar articole noi</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Eroare</string>
+    <string name="login_dialog_text_something_went_wrong">Undeva s-a comis o eroare :(</string>
+    <string name="login_dialog_text_not_compatible">Aceasă versiune a aplicației nu e compatibilă cu aplicația ownCloud News. Te rugăm să actualizezi aplicația de știri și appframework.</string>
+    <string name="login_dialog_title_security_warning">Avertisment de securitate</string>
+    <string name="login_dialog_text_security_warning">Nu ați folosit https. Un hacker ar putea intercepta conținutul și obține acces la informație privată (ex.: parola). Se recomandă folosirea https-ului!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Sincronizare &amp; date</string>
+    <string name="pref_title_clearCache">Șterge cache</string>
+    <string name="pref_title_CacheImagesOffline">Imagini Cache offline</string>
+    <string name="pref_title_Max_Cache_Size">Mărime maximă Cache</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minute</item>
+        <item>15 Minute</item>
+        <item>30 Minute</item>
+        <item>45 Minute</item>
+        <item>1 Oră</item>
+        <item>2 Ore</item>
+        <item>3 Ore</item>
+        <item>6 Ore</item>
+        <item>12 Ore</item>
+        <item>24 Ore</item>
+    </string-array>
+    <string name="content_desc_delete">ștergere</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-ru/strings.xml b/News-Android-App/src/main/res/values-ru/strings.xml
index 4e8a7b5c..cb9dbf64 100644
--- a/News-Android-App/src/main/res/values-ru/strings.xml
+++ b/News-Android-App/src/main/res/values-ru/strings.xml
@@ -1,205 +1,235 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Авто синхронизация</string>
-  <string name="app_name">Чтение новостей ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Переключатель интервала синхронизации</string>
-  <string name="title_activity_news_detail">Последние новости</string>
-  <string name="empty_view_content">Здесь нет элементов</string>
-  <string name="toast_GettingMoreItems">Началось скачивание элементов... Пожалуйста подождите.</string>
-  <string name="no_wifi_available">Нет соединения с Wi-Fi</string>
-  <string name="do_you_want_to_download_without_wifi">Вы хотите загружать изображения без Wi-Fi соединения</string>
-  <string name="current_version">Вы используете версию %s</string>
-  <string name="widget_header">Новости ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">доступен %d новый элемент</item>
-    <item quantity="few">доступно %d новых элемента</item>
-    <item quantity="many">доступно %d новых элементов</item>
-    <item quantity="other">доступно %d новых элементов</item>
-  </plurals>
-  <string name="message_bar_reload">Обновить</string>
-  <string name="allUnreadFeeds">Все непрочитанные</string>
-  <string name="starredFeeds">Избранные элементы</string>
-  <string name="title_activity_new_feed">Добавить новую ленту</string>
-  <string name="menu_update">Обновить</string>
-  <string name="menu_About_Changelog">О программе / Изменения</string>
-  <string name="menu_markAllAsRead">Пометить всё как прочитанное</string>
-  <string name="menu_StartImageCaching">Скачать изображения</string>
-  <string name="menu_downloadMoreItems">Скачать ещё</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Избранное</string>
-  <string name="action_read">Читать</string>
-  <string name="action_playPodacst">Воспроизвести Подкаст</string>
-  <string name="action_openInBrowser">Открыть в браузере</string>
-  <string name="action_Share">Поделиться</string>
-  <string name="action_login">Параметры сервера</string>
-  <string name="action_save">Сохранить</string>
-  <string name="action_settings">Настройки</string>
-  <string name="action_sync_settings">Настройки синхронизации</string>
-  <string name="action_add_new_feed">Добавить новую ленту</string>
-  <string name="action_textToSpeech">Зачитать вслух</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">У Вас есть %d новый элемент</item>
-    <item quantity="few">У Вас есть %d новых элемента</item>
-    <item quantity="many">У Вас есть %d новых элементов</item>
-    <item quantity="other">У Вас есть %d новых элементов</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">доступен %d непрочинатнный элемент</item>
-    <item quantity="few">доступно %d непрочинатнных элемента</item>
-    <item quantity="many">доступно %d непрочинатнных элементов</item>
-    <item quantity="other">доступно %d непрочинатнных элементов</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Ссылка ленты</string>
-  <string name="action_add_feed">Добавить ленту</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Скачать изображение</string>
-  <string name="action_img_sharelink">Поделиться ссылкой картинки</string>
-  <string name="action_img_open">Открыть картинку в браузере</string>
-  <string name="action_img_copylink">Скопировать ссылку картинки</string>
-  <string name="action_link_share">Поделиться ссылкой</string>
-  <string name="action_link_open">Открыть ссылку в браузере</string>
-  <string name="action_link_copy">Копировать ссылку</string>
-  <string name="toast_img_download_wait">Загрузка ... Пожалуйста, подождите</string>
-  <string name="toast_img_saved">Изображение сохранено</string>
-  <string name="toast_img_notwriteable">Не удалось записать изображение.</string>
-  <string name="toast_copied_to_clipboard">Скопировано в буфер обмена</string>
-  <string name="error_download_failed">Скачивание не удалось</string>
-  <string name="intent_title_share">Поделиться в</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Удалить Новостную ленту</string>
-  <string name="action_feed_rename">Переименовать Новостную ленту</string>
-  <string name="feed_remove_button">Удалить</string>
-  <string name="feed_rename_button">Переименовать</string>
-  <string name="confirm_feed_remove">Вы действительно хотите удалить эту Новостную ленту? Это не действие необратимо!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Имя пользователя</string>
-  <string name="pref_title_password">Пароль</string>
-  <string name="pref_title_owncloudRootPath">root адрес ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Войти</string>
-  <string name="login_progress_signing_in">Авторизация...</string>
-  <string name="error_field_required">Это поле обязательно для заполнения</string>
-  <string name="error_invalid_url">Неверный url адрес</string>
-  <!--Import Accounts-->
-  <string name="import_account">Импортировать учётную запись</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Скачан %d старый элемент</item>
-    <item quantity="few">Скачано %d старых элемента</item>
-    <item quantity="many">Скачано %d старых элементов</item>
-    <item quantity="other">Скачано %d старых элементов</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Доступных объектов больше нет</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Пока привлечено %d  наименований</item>
-    <item quantity="few">Пока привлечено %d  наименований</item>
-    <item quantity="many">Пока привлечено %d  наименований</item>
-    <item quantity="other">Пока привлечено %d  наименований</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Настройки</string>
-  <string name="cache_is_cleared">Кеш очищен!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Основные</string>
-  <string name="pref_title_general_sort_order">Порядок сортировки</string>
-  <string-array name="pref_general_sort_order">
-    <item>Новые -&gt; Старые</item>
-    <item>Старые -&gt; Новые</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Очистить кеш.</string>
-  <string name="dialog_clearing_cache_please_wait">Очистка кеша... Пожалуйста подождите.</string>
-  <string name="reset_cache_unsaved_changes">Есть несинхронизированные изменения. Вы действительно хотите очистить кеш?</string>
-  <string name="warning">Предупреждение</string>
-  <string name="pref_title_AutoSyncOnStart">Синхронизация при запуске</string>
-  <string name="pref_title_ShowOnlyUnread">Показать только непрочитанные статьи</string>
-  <string name="pref_title_DisableHostnameVerification">Отключить проверку доменного имени </string>
-  <string name="pref_title_NavigateWithVolumeButtons">Навигация с помощью клавиш регулировки громкости</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Отмечать как прочитанное при прокрутке</string>
-  <string name="pref_title_OpenInBrowserDirectly">Используйте внешний браузер для просмотра записей</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Принять неизвестный сертификат?</string>
-  <string name="mtm_decision_always">Всегда</string>
-  <string name="mtm_decision_abort">Отмена</string>
-  <string name="mtm_notification">Проверка сертификата</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Нет выбранных подкастов</string>
-  <string name="no_chapters_available">Нет доступных глав</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Экран</string>
-  <string name="pref_title_app_theme">Тема приложения</string>
-  <string name="pref_title_feed_list_layout">Макет списка лент</string>
-  <string name="pref_display_title_lines_count">Количество строк для заголовка</string>
-  <string-array name="pref_display_apptheme">
-    <item>Темная</item>
-    <item>Светлая</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Простой</item>
-    <item>Расширенный</item>
-    <item>Расширенный (полный текст)</item>
-    <item>Расширенный с Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Уведомления</string>
-  <string name="pref_title_notification_new_articles_available">Отображать уведомление когда появляются новые статьи</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Ошибка</string>
-  <string name="login_dialog_text_something_went_wrong">Что-то пошло не так :(</string>
-  <string name="login_dialog_text_not_compatible">Эта версия приложения не совместима с вашим приложением ownCloud News. Обновите новостное приложение и appframework.</string>
-  <string name="login_dialog_title_security_warning">Предупреждение безопасности</string>
-  <string name="login_dialog_text_security_warning">Вы не используете HTTPS. Злоумышленники могут перехватить трафик и получить доступ к некоторым конфиденциальным данным (например, пароль). Мы настоятельно рекомендуем использовать HTTPS!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Данные и синхронизация</string>
-  <string name="pref_title_clearCache">Очистить кэш</string>
-  <string name="pref_title_CacheImagesOffline">Кэшировать изображения вне сети</string>
-  <string name="pref_title_Max_Cache_Size">Максимальный размер кэша</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Никогда</item>
-    <item>Только через WiFi </item>
-    <item>Через WiFi &amp; и мобильный интернет</item>
-    <item>Спросить, если не подключён к WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 МБ</item>
-    <item>500 МБ</item>
-    <item>750 МБ</item>
-    <item>1 ГБ</item>
-    <item>2 ГБ</item>
-    <item>5 ГБ</item>
-    <item>10 ГБ</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Минут</item>
-    <item>15 Минут</item>
-    <item>30 Минут</item>
-    <item>45 Минут</item>
-    <item>1 Час</item>
-    <item>2 Часа</item>
-    <item>3 Часа</item>
-    <item>6 Часов</item>
-    <item>12 Часов</item>
-    <item>24 Часа</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">воспроизвести</string>
-  <string name="content_desc_pause">пауза</string>
-  <string name="content_desc_rewind">перемотка назад </string>
-  <string name="content_desc_forward">перемотка в перед</string>
-  <string name="content_desc_expand">развернуть</string>
-  <string name="content_desc_collapse">свернуть</string>
-  <string name="content_desc_mark_as_read">пометить, как прочитанное</string>
-  <string name="content_desc_mark_as_unread">пометить, как непрочитанное</string>
-  <string name="content_desc_tap_to_refresh">коснитесь для обновления</string>
-  <string name="content_desc_add_to_favorites">добавить в избранное</string>
-  <string name="content_desc_remove_from_favorites">удалить из избранного</string>
-  <string name="content_desc_show_password">показать пароль</string>
-  <string name="content_desc_delete">удалить</string>
-  <string name="content_desc_download">загрузить</string>
+
+    <string name="auto_sync_string">Авто синхронизация</string>
+    <string name="title_activity_sync_interval_selector">Переключатель интервала синхронизации</string>
+    <string name="title_activity_news_detail">Последние новости</string>
+    <string name="empty_view_content">Здесь нет элементов</string>
+    <string name="toast_GettingMoreItems">Началось скачивание элементов... Пожалуйста подождите.</string>
+    <string name="no_wifi_available">Нет соединения с Wi-Fi</string>
+    <string name="do_you_want_to_download_without_wifi">Вы хотите загружать изображения без Wi-Fi соединения</string>
+    <string name="current_version">Вы используете версию %s</string>
+    <string name="widget_header">Новости ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">доступен %d новый элемент</item>
+        <item quantity="few">доступно %d новых элемента</item>
+        <item quantity="many">доступно %d новых элементов</item>
+        <item quantity="other">доступно %d новых элементов</item>
+    </plurals>
+    <string name="message_bar_reload">Обновить</string>
+    <string name="allUnreadFeeds">Все непрочитанные</string>
+    <string name="starredFeeds">Избранные элементы</string>
+    <string name="title_activity_new_feed">Добавить новую ленту</string>
+
+    <string name="menu_update">Обновить</string>
+    <string name="menu_About_Changelog">О программе / Изменения</string>
+    <string name="menu_markAllAsRead">Пометить всё как прочитанное</string>
+    <string name="menu_StartImageCaching">Скачать изображения</string>
+    <string name="menu_downloadMoreItems">Скачать ещё</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Избранное</string>
+    <string name="action_read">Читать</string>
+    <string name="action_playPodacst">Воспроизвести Подкаст</string>
+    <string name="action_openInBrowser">Открыть в браузере</string>
+    <string name="action_Share">Поделиться</string>
+    <string name="action_login">Параметры сервера</string>
+    <string name="action_save">Сохранить</string>
+    <string name="action_settings">Настройки</string>
+    <string name="action_sync_settings">Настройки синхронизации</string>
+    <string name="action_add_new_feed">Добавить новую ленту</string>
+    <string name="action_textToSpeech">Зачитать вслух</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">У Вас есть %d новый элемент</item>
+        <item quantity="few">У Вас есть %d новых элемента</item>
+        <item quantity="many">У Вас есть %d новых элементов</item>
+        <item quantity="other">У Вас есть %d новых элементов</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">доступен %d непрочинатнный элемент</item>
+        <item quantity="few">доступно %d непрочинатнных элемента</item>
+        <item quantity="many">доступно %d непрочинатнных элементов</item>
+        <item quantity="other">доступно %d непрочинатнных элементов</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Ссылка ленты</string>
+    <string name="action_add_feed">Добавить ленту</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Скачать изображение</string>
+    <string name="action_img_sharelink">Поделиться ссылкой картинки</string>
+    <string name="action_img_open">Открыть картинку в браузере</string>
+    <string name="action_img_copylink">Скопировать ссылку картинки</string>
+    <string name="action_link_share">Поделиться ссылкой</string>
+    <string name="action_link_open">Открыть ссылку в браузере</string>
+    <string name="action_link_copy">Копировать ссылку</string>
+    <string name="toast_img_download_wait">Загрузка ... Пожалуйста, подождите</string>
+    <string name="toast_img_saved">Изображение сохранено</string>
+    <string name="toast_img_notwriteable">Не удалось записать изображение.</string>
+    <string name="toast_copied_to_clipboard">Скопировано в буфер обмена</string>
+    <string name="error_download_failed">Скачивание не удалось</string>
+    <string name="intent_title_share">Поделиться в</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Удалить Новостную ленту</string>
+    <string name="action_feed_rename">Переименовать Новостную ленту</string>
+    <string name="feed_remove_button">Удалить</string>
+    <string name="feed_rename_button">Переименовать</string>
+    <string name="confirm_feed_remove">Вы действительно хотите удалить эту Новостную ленту? Это не действие необратимо!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Имя пользователя</string>
+    <string name="pref_title_password">Пароль</string>
+    <string name="pref_title_owncloudRootPath">root адрес ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Войти</string>
+    <string name="login_progress_signing_in">Авторизация...</string>
+    <string name="error_field_required">Это поле обязательно для заполнения</string>
+    <string name="error_invalid_url">Неверный url адрес</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Импортировать учётную запись</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Скачан %d старый элемент</item>
+        <item quantity="few">Скачано %d старых элемента</item>
+        <item quantity="many">Скачано %d старых элементов</item>
+        <item quantity="other">Скачано %d старых элементов</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Доступных объектов больше нет</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Пока привлечено %d  наименований</item>
+        <item quantity="few">Пока привлечено %d  наименований</item>
+        <item quantity="many">Пока привлечено %d  наименований</item>
+        <item quantity="other">Пока привлечено %d  наименований</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Настройки</string>
+    <string name="cache_is_cleared">Кеш очищен!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Основные</string>
+    <string name="pref_title_general_sort_order">Порядок сортировки</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Новые -&gt; Старые</item>
+        <item>Старые -&gt; Новые</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Очистить кеш.</string>
+    <string name="dialog_clearing_cache_please_wait">Очистка кеша... Пожалуйста подождите.</string>
+    <string name="reset_cache_unsaved_changes">Есть несинхронизированные изменения. Вы действительно хотите очистить кеш?</string>
+    <string name="warning">Предупреждение</string>
+    <string name="pref_title_AutoSyncOnStart">Синхронизация при запуске</string>
+    <string name="pref_title_ShowOnlyUnread">Показать только непрочитанные статьи</string>
+    <string name="pref_title_DisableHostnameVerification">Отключить проверку доменного имени </string>
+    <string name="pref_title_NavigateWithVolumeButtons">Навигация с помощью клавиш регулировки громкости</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Отмечать как прочитанное при прокрутке</string>
+    <string name="pref_title_OpenInBrowserDirectly">Используйте внешний браузер для просмотра записей</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Принять неизвестный сертификат?</string>
+    <string name="mtm_decision_always">Всегда</string>
+    <string name="mtm_decision_abort">Отмена</string>
+    <string name="mtm_notification">Проверка сертификата</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Нет выбранных подкастов</string>
+    <string name="no_chapters_available">Нет доступных глав</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Экран</string>
+    <string name="pref_title_app_theme">Тема приложения</string>
+    <string name="pref_title_feed_list_layout">Макет списка лент</string>
+    <string name="pref_display_title_lines_count">Количество строк для заголовка</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Темная</item>
+        <item>Светлая</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Простой</item>
+        <item>Расширенный</item>
+        <item>Расширенный (полный текст)</item>
+        <item>Расширенный с Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Уведомления</string>
+    <string name="pref_title_notification_new_articles_available">Отображать уведомление когда появляются новые статьи</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Ошибка</string>
+    <string name="login_dialog_text_something_went_wrong">Что-то пошло не так :(</string>
+    <string name="login_dialog_text_not_compatible">Эта версия приложения не совместима с вашим приложением ownCloud News. Обновите новостное приложение и appframework.</string>
+    <string name="login_dialog_title_security_warning">Предупреждение безопасности</string>
+    <string name="login_dialog_text_security_warning">Вы не используете HTTPS. Злоумышленники могут перехватить трафик и получить доступ к некоторым конфиденциальным данным (например, пароль). Мы настоятельно рекомендуем использовать HTTPS!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Данные и синхронизация</string>
+    <string name="pref_title_clearCache">Очистить кэш</string>
+    <string name="pref_title_CacheImagesOffline">Кэшировать изображения вне сети</string>
+    <string name="pref_title_Max_Cache_Size">Максимальный размер кэша</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Никогда</item>
+        <item>Только через WiFi </item>
+        <item>Через WiFi &amp; и мобильный интернет</item>
+        <item>Спросить, если не подключён к WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 МБ</item>
+        <item>500 МБ</item>
+        <item>750 МБ</item>
+        <item>1 ГБ</item>
+        <item>2 ГБ</item>
+        <item>5 ГБ</item>
+        <item>10 ГБ</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Минут</item>
+        <item>15 Минут</item>
+        <item>30 Минут</item>
+        <item>45 Минут</item>
+        <item>1 Час</item>
+        <item>2 Часа</item>
+        <item>3 Часа</item>
+        <item>6 Часов</item>
+        <item>12 Часов</item>
+        <item>24 Часа</item>
+    </string-array>
+    <string name="content_desc_play">воспроизвести</string>
+    <string name="content_desc_pause">пауза</string>
+    <string name="content_desc_rewind">перемотка назад </string>
+    <string name="content_desc_forward">перемотка в перед</string>
+    <string name="content_desc_expand">развернуть</string>
+    <string name="content_desc_collapse">свернуть</string>
+    <string name="content_desc_mark_as_read">пометить, как прочитанное</string>
+    <string name="content_desc_mark_as_unread">пометить, как непрочитанное</string>
+    <string name="content_desc_tap_to_refresh">коснитесь для обновления</string>
+    <string name="content_desc_add_to_favorites">добавить в избранное</string>
+    <string name="content_desc_remove_from_favorites">удалить из избранного</string>
+    <string name="content_desc_show_password">показать пароль</string>
+    <string name="content_desc_delete">удалить</string>
+    <string name="content_desc_download">загрузить</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-sk-rSK/strings.xml b/News-Android-App/src/main/res/values-sk-rSK/strings.xml
index 27793bd8..751904e5 100644
--- a/News-Android-App/src/main/res/values-sk-rSK/strings.xml
+++ b/News-Android-App/src/main/res/values-sk-rSK/strings.xml
@@ -1,133 +1,146 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Autosynchronizácia</string>
-  <string name="app_name">ownCloud čítačka noviniek</string>
-  <string name="title_activity_sync_interval_selector">Voľba intervalu synchronizácie</string>
-  <string name="title_activity_news_detail">Podrobná aktivita noviniek</string>
-  <string name="empty_view_content">Žiadne položky</string>
-  <string name="no_wifi_available">Nie je pripojenie k WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Chcete stiahnuť obrázky bez WiFi pripojenia</string>
-  <string name="widget_header">ownCloud Novinky</string>
-  <string name="message_bar_reload">Znovu načítať</string>
-  <string name="allUnreadFeeds">Všetky neprečítané položky</string>
-  <string name="starredFeeds">Položky s hviezdičkou</string>
-  <string name="title_activity_new_feed">Pridať nový kanál</string>
-  <string name="menu_update">Obnoviť</string>
-  <string name="menu_About_Changelog">O aplikácii / Zoznam zmien</string>
-  <string name="menu_markAllAsRead">Všetko označiť ako prečítané</string>
-  <string name="menu_StartImageCaching">Stiahnuť obrázky</string>
-  <string name="menu_downloadMoreItems">Stiahnuť viac položiek</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">S hviezdičkou</string>
-  <string name="action_read">Čítať</string>
-  <string name="action_playPodacst">Prehrať podcast</string>
-  <string name="action_openInBrowser">Otvoriť v prehliadači</string>
-  <string name="action_Share">Zdieľať</string>
-  <string name="action_login">Nastavenia servera</string>
-  <string name="action_save">Uložiť</string>
-  <string name="action_settings">Nastavenia</string>
-  <string name="action_sync_settings">Nastavenia synchronizácie</string>
-  <string name="action_add_new_feed">Pridať nový kanál</string>
-  <string name="action_textToSpeech">Prečítať</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Pridať kanál</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Skopírované do schránky</string>
-  <string name="error_download_failed">Stiahnutie zlyhalo</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Odobrať</string>
-  <string name="feed_rename_button">Premenovať</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Meno používateľa</string>
-  <string name="pref_title_password">Heslo</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Prihlásenie</string>
-  <string name="login_progress_signing_in">Prihlasujem vás...</string>
-  <string name="error_field_required">Toto pole je povinné</string>
-  <string name="error_invalid_url">URL je nesprávna</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importný účet</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Žiadne ďalšie položky k dispozícii</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Nastavenia</string>
-  <!--General settings-->
-  <string name="pref_header_general">Všeobecné</string>
-  <string name="pref_title_general_sort_order">Zoradenie</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nové -&gt; Staré</item>
-    <item>Staré -&gt; Nové</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Čistenie medzipamäte</string>
-  <string name="reset_cache_unsaved_changes">Nezosynchronizované zmeny sú k dispozícii. Aj napriek tomu chcete vyprázdniť medzipamäť?</string>
-  <string name="warning">Varovanie</string>
-  <string name="pref_title_AutoSyncOnStart">Synchronizovať pri spustení</string>
-  <string name="pref_title_ShowOnlyUnread">Zobraziť len neprečítané články</string>
-  <string name="pref_title_DisableHostnameVerification">Vypnúť overovanie názvu hostiteľa</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigácia pomocou tlačidiel hlasitosti</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Označiť ako prečítané pri rolovaní stránky</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Prijať neznámy certifikát?</string>
-  <string name="mtm_decision_always">Vždy</string>
-  <string name="mtm_decision_abort">Prerušiť</string>
-  <string name="mtm_notification">Overenie certifikátu</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Nebol vybraný žiaden podcast</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Zobrazenie</string>
-  <string name="pref_title_app_theme">Téma vzhľadu aplikácie</string>
-  <string name="pref_title_feed_list_layout">Rozvrhnutie zoznamu kanálov</string>
-  <string-array name="pref_display_apptheme">
-    <item>Tmavé</item>
-    <item>Svetlé</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Oznámenia</string>
-  <string name="pref_title_notification_new_articles_available">Zobraziť oznámenie, keď sú k dispozícii nové články</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Chyba</string>
-  <string name="login_dialog_text_something_went_wrong">Tak toto je nepríjemné :(</string>
-  <string name="login_dialog_text_not_compatible">Táto verzia aplikácie nie je kompatibilná s vašou aplikáciou ownCloud News. Urobte aktualizáciu aplikácií News a appFramework.</string>
-  <string name="login_dialog_title_security_warning">Bezpečnostné varovanie</string>
-  <string name="login_dialog_text_security_warning">Nepoužívate HTTPS. Útočník môže zachytiť vašu komunikáciu a získať prístup k niektorým citlivým dátam (napr. vaše heslo). Doporučujeme HTTPS používať!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Dáta &amp; synchronizácia</string>
-  <string name="pref_title_clearCache">Vyčistiť medzipamäť</string>
-  <string name="pref_title_CacheImagesOffline">Ukladať obrázky do offline mezipameti</string>
-  <string name="pref_title_Max_Cache_Size">Maximálna medzipamäť</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nikdy</item>
-    <item>Iba cez WiFi</item>
-    <item>Iba cez WiFi &amp; Mobil</item>
-    <item>Spýtať sa keď nieste pripojený k WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minút</item>
-    <item>15 minút</item>
-    <item>30 minút</item>
-    <item>45 minút</item>
-    <item>1 hodina</item>
-    <item>2 hodiny</item>
-    <item>3 hodiny</item>
-    <item>6 hodín</item>
-    <item>12 hodín</item>
-    <item>24 hodín</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">vymazať</string>
-</resources>
+
+    <string name="auto_sync_string">Autosynchronizácia</string>
+    <string name="title_activity_sync_interval_selector">Voľba intervalu synchronizácie</string>
+    <string name="title_activity_news_detail">Podrobná aktivita noviniek</string>
+    <string name="empty_view_content">Žiadne položky</string>
+    <string name="no_wifi_available">Nie je pripojenie k WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Chcete stiahnuť obrázky bez WiFi pripojenia</string>
+    <string name="widget_header">ownCloud Novinky</string>
+    <string name="message_bar_reload">Znovu načítať</string>
+    <string name="allUnreadFeeds">Všetky neprečítané položky</string>
+    <string name="starredFeeds">Položky s hviezdičkou</string>
+    <string name="title_activity_new_feed">Pridať nový kanál</string>
+
+    <string name="menu_update">Obnoviť</string>
+    <string name="menu_About_Changelog">O aplikácii / Zoznam zmien</string>
+    <string name="menu_markAllAsRead">Všetko označiť ako prečítané</string>
+    <string name="menu_StartImageCaching">Stiahnuť obrázky</string>
+    <string name="menu_downloadMoreItems">Stiahnuť viac položiek</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">S hviezdičkou</string>
+    <string name="action_read">Čítať</string>
+    <string name="action_playPodacst">Prehrať podcast</string>
+    <string name="action_openInBrowser">Otvoriť v prehliadači</string>
+    <string name="action_Share">Zdieľať</string>
+    <string name="action_login">Nastavenia servera</string>
+    <string name="action_save">Uložiť</string>
+    <string name="action_settings">Nastavenia</string>
+    <string name="action_sync_settings">Nastavenia synchronizácie</string>
+    <string name="action_add_new_feed">Pridať nový kanál</string>
+    <string name="action_textToSpeech">Prečítať</string>
+    <string name="action_add_feed">Pridať kanál</string>
+
+
+    <string name="toast_copied_to_clipboard">Skopírované do schránky</string>
+    <string name="error_download_failed">Stiahnutie zlyhalo</string>
+    <string name="feed_remove_button">Odobrať</string>
+    <string name="feed_rename_button">Premenovať</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Meno používateľa</string>
+    <string name="pref_title_password">Heslo</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Prihlásenie</string>
+    <string name="login_progress_signing_in">Prihlasujem vás...</string>
+    <string name="error_field_required">Toto pole je povinné</string>
+    <string name="error_invalid_url">URL je nesprávna</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importný účet</string>
+
+
+    <string name="toast_no_more_downloads_available">Žiadne ďalšie položky k dispozícii</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Nastavenia</string>
+    <!-- General settings -->
+    <string name="pref_header_general">Všeobecné</string>
+    <string name="pref_title_general_sort_order">Zoradenie</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nové -&gt; Staré</item>
+        <item>Staré -&gt; Nové</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Čistenie medzipamäte</string>
+    <string name="reset_cache_unsaved_changes">Nezosynchronizované zmeny sú k dispozícii. Aj napriek tomu chcete vyprázdniť medzipamäť?</string>
+    <string name="warning">Varovanie</string>
+    <string name="pref_title_AutoSyncOnStart">Synchronizovať pri spustení</string>
+    <string name="pref_title_ShowOnlyUnread">Zobraziť len neprečítané články</string>
+    <string name="pref_title_DisableHostnameVerification">Vypnúť overovanie názvu hostiteľa</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigácia pomocou tlačidiel hlasitosti</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Označiť ako prečítané pri rolovaní stránky</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Prijať neznámy certifikát?</string>
+    <string name="mtm_decision_always">Vždy</string>
+    <string name="mtm_decision_abort">Prerušiť</string>
+    <string name="mtm_notification">Overenie certifikátu</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Nebol vybraný žiaden podcast</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Zobrazenie</string>
+    <string name="pref_title_app_theme">Téma vzhľadu aplikácie</string>
+    <string name="pref_title_feed_list_layout">Rozvrhnutie zoznamu kanálov</string>
+    <string-array name="pref_display_apptheme">
+        <item>Tmavé</item>
+        <item>Svetlé</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Oznámenia</string>
+    <string name="pref_title_notification_new_articles_available">Zobraziť oznámenie, keď sú k dispozícii nové články</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Chyba</string>
+    <string name="login_dialog_text_something_went_wrong">Tak toto je nepríjemné :(</string>
+    <string name="login_dialog_text_not_compatible">Táto verzia aplikácie nie je kompatibilná s vašou aplikáciou ownCloud News. Urobte aktualizáciu aplikácií News a appFramework.</string>
+    <string name="login_dialog_title_security_warning">Bezpečnostné varovanie</string>
+    <string name="login_dialog_text_security_warning">Nepoužívate HTTPS. Útočník môže zachytiť vašu komunikáciu a získať prístup k niektorým citlivým dátam (napr. vaše heslo). Doporučujeme HTTPS používať!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Dáta &amp; synchronizácia</string>
+    <string name="pref_title_clearCache">Vyčistiť medzipamäť</string>
+    <string name="pref_title_CacheImagesOffline">Ukladať obrázky do offline mezipameti</string>
+    <string name="pref_title_Max_Cache_Size">Maximálna medzipamäť</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nikdy</item>
+        <item>Iba cez WiFi</item>
+        <item>Iba cez WiFi &amp; Mobil</item>
+        <item>Spýtať sa keď nieste pripojený k WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minút</item>
+        <item>15 minút</item>
+        <item>30 minút</item>
+        <item>45 minút</item>
+        <item>1 hodina</item>
+        <item>2 hodiny</item>
+        <item>3 hodiny</item>
+        <item>6 hodín</item>
+        <item>12 hodín</item>
+        <item>24 hodín</item>
+    </string-array>
+    <string name="content_desc_delete">vymazať</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-sl/strings.xml b/News-Android-App/src/main/res/values-sl/strings.xml
index 2e3b4685..0b4ee010 100644
--- a/News-Android-App/src/main/res/values-sl/strings.xml
+++ b/News-Android-App/src/main/res/values-sl/strings.xml
@@ -1,205 +1,235 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Samodejno usklajevanje</string>
-  <string name="app_name">Bralnik novic ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Izbirnik razmika usklajevanja</string>
-  <string name="title_activity_news_detail">Podrobnosti pregledovanja novic</string>
-  <string name="empty_view_content">Ni vsebine</string>
-  <string name="toast_GettingMoreItems">Začeto je prejemanje večjega števila predmetov ... Počakajte.</string>
-  <string name="no_wifi_available">Ni vzpostavljene povezave WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Ali želite prejeti slike brez vzpostavljene povezave WiFi?</string>
-  <string name="current_version">V uporabi je različica %s</string>
-  <string name="widget_header">Novice ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d nov predmet je na voljo</item>
-    <item quantity="two">%d nova predmeta sta na voljo</item>
-    <item quantity="few">%d novi predmeti so na voljo</item>
-    <item quantity="other">%d novih predmetov je na voljo</item>
-  </plurals>
-  <string name="message_bar_reload">Ponovno naloži</string>
-  <string name="allUnreadFeeds">Vsi neprebrani predmeti</string>
-  <string name="starredFeeds">Označeni predmeti</string>
-  <string name="title_activity_new_feed">Dodaj nov vir</string>
-  <string name="menu_update">Osveži</string>
-  <string name="menu_About_Changelog">O programu / Dnevnik sprememb</string>
-  <string name="menu_markAllAsRead">Označi vse kot prebrano</string>
-  <string name="menu_StartImageCaching">Prejmi slike</string>
-  <string name="menu_downloadMoreItems">Prejmi več predmetov</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Označeno</string>
-  <string name="action_read">Branje</string>
-  <string name="action_playPodacst">Predvajaj podcast</string>
-  <string name="action_openInBrowser">Odpri v brskalniku</string>
-  <string name="action_Share">Souporaba</string>
-  <string name="action_login">Nastavitve strežnika</string>
-  <string name="action_save">Shrani</string>
-  <string name="action_settings">Nastavitve</string>
-  <string name="action_sync_settings">Nastavitve usklajevanja</string>
-  <string name="action_add_new_feed">Dodaj nov vir</string>
-  <string name="action_textToSpeech">Preberi</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">V dohodni mapi je %d neprebrano sporočilo</item>
-    <item quantity="two">V dohodni mapi sta %d neprebrani sporoči</item>
-    <item quantity="few">V dohodni mapi so %d neprebrana sporočila</item>
-    <item quantity="other">V dohodni mapi je %d neprebranih sporočil</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d novo sporočilo je na voljo</item>
-    <item quantity="two">%d novi sporočili sta na voljo</item>
-    <item quantity="few">%d nova sporočila so na voljo</item>
-    <item quantity="other">%d novih sporočil je na voljo</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Naslov URL vira</string>
-  <string name="action_add_feed">Dodaj vir</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Prejmi sliko</string>
-  <string name="action_img_sharelink">Omogoči souporabo povezave do slike</string>
-  <string name="action_img_open">Pokaži sliko v brskalniku</string>
-  <string name="action_img_copylink">Kopiraj povezavo do slike</string>
-  <string name="action_link_share">Omogoči souporabo povezave</string>
-  <string name="action_link_open">Odpri povezavo v brskalniku</string>
-  <string name="action_link_copy">Kopiraj povezavo</string>
-  <string name="toast_img_download_wait">Poteka prejemanje ...</string>
-  <string name="toast_img_saved">Slika je shranjena.</string>
-  <string name="toast_img_notwriteable">Zapisovanje slike je spodletelo.</string>
-  <string name="toast_copied_to_clipboard">Kopirano v odložišče</string>
-  <string name="error_download_failed">Prejemanje je spodletelo</string>
-  <string name="intent_title_share">Omogoči souporabo prek</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Odstrani vir</string>
-  <string name="action_feed_rename">Preimenuj vir</string>
-  <string name="feed_remove_button">Odstrani</string>
-  <string name="feed_rename_button">Preimenuj</string>
-  <string name="confirm_feed_remove">Ali res želite odstraniti ta vir? Dejanjaa ni mogoče povrniti!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Uporabniško ime</string>
-  <string name="pref_title_password">Geslo</string>
-  <string name="pref_title_owncloudRootPath">korenski naslov oblaka ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Prijava</string>
-  <string name="login_progress_signing_in">Prijavljanje ...</string>
-  <string name="error_field_required">Vpis v to polje je obvezno</string>
-  <string name="error_invalid_url">Naslov URL ni veljaven</string>
-  <!--Import Accounts-->
-  <string name="import_account">Uvozi račun</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Prejet je %d stari predmeti</item>
-    <item quantity="two">Prejeta sta %d stara predmeta</item>
-    <item quantity="few">Prejeti so %d stari predmeti</item>
-    <item quantity="other">Prejetih je %d starih predmetov</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Ni nadaljnjih predmetov</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Do sedaj je prejet %d predmet ...</item>
-    <item quantity="two">Do sedaj sta prejeta %d predmeta ...</item>
-    <item quantity="few">Do sedaj so prejeti %d predmeti ...</item>
-    <item quantity="other">Do sedaj je prejetih %d predmetov ...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Nastavitve</string>
-  <string name="cache_is_cleared">Predpomnilnik je počiščen!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Splošno</string>
-  <string name="pref_title_general_sort_order">Način razvrščanja</string>
-  <string-array name="pref_general_sort_order">
-    <item>Novo -&gt; Staro</item>
-    <item>Staro -&gt; Novo</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Čiščenje predpomnilnika</string>
-  <string name="dialog_clearing_cache_please_wait">Poteka čiščenje predpomnilnika ...</string>
-  <string name="reset_cache_unsaved_changes">Obstajajo neusklajene spremembe. Ali želite vseeno počistiti predpomnilnik?</string>
-  <string name="warning">Opozorilo</string>
-  <string name="pref_title_AutoSyncOnStart">Uskladi ob zagonu</string>
-  <string name="pref_title_ShowOnlyUnread">Pokaži le neprebrane prispevke</string>
-  <string name="pref_title_DisableHostnameVerification">Onemogoči overjanje imena gostitelja</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Pomikanje po zaslonu z uporabo gumbov za glasnost</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Označi kot prebrano med pomikanjem med predmeti</string>
-  <string name="pref_title_OpenInBrowserDirectly">Uporabi zunanji brskalnik za ogled prispevkov</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Ali želite prejeti neznano digitalno potrdilo?</string>
-  <string name="mtm_decision_always">Vedno</string>
-  <string name="mtm_decision_abort">Prekini</string>
-  <string name="mtm_notification">Overitev digitalnih potrdil</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Ni izbranega podcasta</string>
-  <string name="no_chapters_available">V prispevku ni poglavij</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Prikaz</string>
-  <string name="pref_title_app_theme">Ime teme</string>
-  <string name="pref_title_feed_list_layout">Postavitev seznama virov</string>
-  <string name="pref_display_title_lines_count">Vrstični števec za naslov</string>
-  <string-array name="pref_display_apptheme">
-    <item>Temna</item>
-    <item>Svetla</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Enostavno</item>
-    <item>Razširjeno</item>
-    <item>Razširjeno (polno besedilo)</item>
-    <item>Razširjeno z Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Obvestila</string>
-  <string name="pref_title_notification_new_articles_available">Pokaži obvestilo, ko je na voljo nov prispevek</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Napaka</string>
-  <string name="login_dialog_text_something_went_wrong">Prišlo je do napake :(</string>
-  <string name="login_dialog_text_not_compatible">Različica programa ni skladna z različico programa za prikaz novic za ownCloud. Za pravilno delovanje je treba program posodobiti.</string>
-  <string name="login_dialog_title_security_warning">Varnostno opozorilo</string>
-  <string name="login_dialog_text_security_warning">Trenutno varna povezava HTTPS ni uporabljena. Spletni goljufi lahko prestrežejo prenos podatkov in si pridobijo dostop do zasebnih dokumentov in podatkov (na primer gesel). Uporaba protokola HTTPS je zato preudarna odločitev.</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Podatki in usklajevanje</string>
-  <string name="pref_title_clearCache">Počisti predpomnilnik</string>
-  <string name="pref_title_CacheImagesOffline">Shrani slike v predpomnilnik za delo brez povezave</string>
-  <string name="pref_title_Max_Cache_Size">Največja velikost predpomnilnika</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Nikoli</item>
-    <item>Le preko WiFi</item>
-    <item>Preko WiFi ali Mobilne povezave</item>
-    <item>Vprašaj, kadar ni povezave preko WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minut</item>
-    <item>15 minut</item>
-    <item>30 minut</item>
-    <item>45 minut</item>
-    <item>1 ura</item>
-    <item>2 uri</item>
-    <item>3 ure</item>
-    <item>6 ur</item>
-    <item>12 ur</item>
-    <item>24 ur</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">predvajaj</string>
-  <string name="content_desc_pause">premor</string>
-  <string name="content_desc_rewind">skoči nazaj</string>
-  <string name="content_desc_forward">skoči naprej</string>
-  <string name="content_desc_expand">razširi</string>
-  <string name="content_desc_collapse">zloži</string>
-  <string name="content_desc_mark_as_read">označi kot prebrano</string>
-  <string name="content_desc_mark_as_unread">označi kot neprebrano</string>
-  <string name="content_desc_tap_to_refresh">s pritiskom osveži</string>
-  <string name="content_desc_add_to_favorites">dodaj med priljubljene</string>
-  <string name="content_desc_remove_from_favorites">odstrani iz priljubljenih</string>
-  <string name="content_desc_show_password">pokaži geslo</string>
-  <string name="content_desc_delete">izbriši</string>
-  <string name="content_desc_download">prejmi</string>
+
+    <string name="auto_sync_string">Samodejno usklajevanje</string>
+    <string name="title_activity_sync_interval_selector">Izbirnik razmika usklajevanja</string>
+    <string name="title_activity_news_detail">Podrobnosti pregledovanja novic</string>
+    <string name="empty_view_content">Ni vsebine</string>
+    <string name="toast_GettingMoreItems">Začeto je prejemanje večjega števila predmetov ... Počakajte.</string>
+    <string name="no_wifi_available">Ni vzpostavljene povezave WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Ali želite prejeti slike brez vzpostavljene povezave WiFi?</string>
+    <string name="current_version">V uporabi je različica %s</string>
+    <string name="widget_header">Novice ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d nov predmet je na voljo</item>
+        <item quantity="two">%d nova predmeta sta na voljo</item>
+        <item quantity="few">%d novi predmeti so na voljo</item>
+        <item quantity="other">%d novih predmetov je na voljo</item>
+    </plurals>
+    <string name="message_bar_reload">Ponovno naloži</string>
+    <string name="allUnreadFeeds">Vsi neprebrani predmeti</string>
+    <string name="starredFeeds">Označeni predmeti</string>
+    <string name="title_activity_new_feed">Dodaj nov vir</string>
+
+    <string name="menu_update">Osveži</string>
+    <string name="menu_About_Changelog">O programu / Dnevnik sprememb</string>
+    <string name="menu_markAllAsRead">Označi vse kot prebrano</string>
+    <string name="menu_StartImageCaching">Prejmi slike</string>
+    <string name="menu_downloadMoreItems">Prejmi več predmetov</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Označeno</string>
+    <string name="action_read">Branje</string>
+    <string name="action_playPodacst">Predvajaj podcast</string>
+    <string name="action_openInBrowser">Odpri v brskalniku</string>
+    <string name="action_Share">Souporaba</string>
+    <string name="action_login">Nastavitve strežnika</string>
+    <string name="action_save">Shrani</string>
+    <string name="action_settings">Nastavitve</string>
+    <string name="action_sync_settings">Nastavitve usklajevanja</string>
+    <string name="action_add_new_feed">Dodaj nov vir</string>
+    <string name="action_textToSpeech">Preberi</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">V dohodni mapi je %d neprebrano sporočilo</item>
+        <item quantity="two">V dohodni mapi sta %d neprebrani sporoči</item>
+        <item quantity="few">V dohodni mapi so %d neprebrana sporočila</item>
+        <item quantity="other">V dohodni mapi je %d neprebranih sporočil</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d novo sporočilo je na voljo</item>
+        <item quantity="two">%d novi sporočili sta na voljo</item>
+        <item quantity="few">%d nova sporočila so na voljo</item>
+        <item quantity="other">%d novih sporočil je na voljo</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Naslov URL vira</string>
+    <string name="action_add_feed">Dodaj vir</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Prejmi sliko</string>
+    <string name="action_img_sharelink">Omogoči souporabo povezave do slike</string>
+    <string name="action_img_open">Pokaži sliko v brskalniku</string>
+    <string name="action_img_copylink">Kopiraj povezavo do slike</string>
+    <string name="action_link_share">Omogoči souporabo povezave</string>
+    <string name="action_link_open">Odpri povezavo v brskalniku</string>
+    <string name="action_link_copy">Kopiraj povezavo</string>
+    <string name="toast_img_download_wait">Poteka prejemanje ...</string>
+    <string name="toast_img_saved">Slika je shranjena.</string>
+    <string name="toast_img_notwriteable">Zapisovanje slike je spodletelo.</string>
+    <string name="toast_copied_to_clipboard">Kopirano v odložišče</string>
+    <string name="error_download_failed">Prejemanje je spodletelo</string>
+    <string name="intent_title_share">Omogoči souporabo prek</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Odstrani vir</string>
+    <string name="action_feed_rename">Preimenuj vir</string>
+    <string name="feed_remove_button">Odstrani</string>
+    <string name="feed_rename_button">Preimenuj</string>
+    <string name="confirm_feed_remove">Ali res želite odstraniti ta vir? Dejanjaa ni mogoče povrniti!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Uporabniško ime</string>
+    <string name="pref_title_password">Geslo</string>
+    <string name="pref_title_owncloudRootPath">korenski naslov oblaka ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Prijava</string>
+    <string name="login_progress_signing_in">Prijavljanje ...</string>
+    <string name="error_field_required">Vpis v to polje je obvezno</string>
+    <string name="error_invalid_url">Naslov URL ni veljaven</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Uvozi račun</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Prejet je %d stari predmeti</item>
+        <item quantity="two">Prejeta sta %d stara predmeta</item>
+        <item quantity="few">Prejeti so %d stari predmeti</item>
+        <item quantity="other">Prejetih je %d starih predmetov</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Ni nadaljnjih predmetov</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Do sedaj je prejet %d predmet ...</item>
+        <item quantity="two">Do sedaj sta prejeta %d predmeta ...</item>
+        <item quantity="few">Do sedaj so prejeti %d predmeti ...</item>
+        <item quantity="other">Do sedaj je prejetih %d predmetov ...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Nastavitve</string>
+    <string name="cache_is_cleared">Predpomnilnik je počiščen!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Splošno</string>
+    <string name="pref_title_general_sort_order">Način razvrščanja</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Novo -&gt; Staro</item>
+        <item>Staro -&gt; Novo</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Čiščenje predpomnilnika</string>
+    <string name="dialog_clearing_cache_please_wait">Poteka čiščenje predpomnilnika ...</string>
+    <string name="reset_cache_unsaved_changes">Obstajajo neusklajene spremembe. Ali želite vseeno počistiti predpomnilnik?</string>
+    <string name="warning">Opozorilo</string>
+    <string name="pref_title_AutoSyncOnStart">Uskladi ob zagonu</string>
+    <string name="pref_title_ShowOnlyUnread">Pokaži le neprebrane prispevke</string>
+    <string name="pref_title_DisableHostnameVerification">Onemogoči overjanje imena gostitelja</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Pomikanje po zaslonu z uporabo gumbov za glasnost</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Označi kot prebrano med pomikanjem med predmeti</string>
+    <string name="pref_title_OpenInBrowserDirectly">Uporabi zunanji brskalnik za ogled prispevkov</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Ali želite prejeti neznano digitalno potrdilo?</string>
+    <string name="mtm_decision_always">Vedno</string>
+    <string name="mtm_decision_abort">Prekini</string>
+    <string name="mtm_notification">Overitev digitalnih potrdil</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Ni izbranega podcasta</string>
+    <string name="no_chapters_available">V prispevku ni poglavij</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Prikaz</string>
+    <string name="pref_title_app_theme">Ime teme</string>
+    <string name="pref_title_feed_list_layout">Postavitev seznama virov</string>
+    <string name="pref_display_title_lines_count">Vrstični števec za naslov</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Temna</item>
+        <item>Svetla</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Enostavno</item>
+        <item>Razširjeno</item>
+        <item>Razširjeno (polno besedilo)</item>
+        <item>Razširjeno z Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Obvestila</string>
+    <string name="pref_title_notification_new_articles_available">Pokaži obvestilo, ko je na voljo nov prispevek</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Napaka</string>
+    <string name="login_dialog_text_something_went_wrong">Prišlo je do napake :(</string>
+    <string name="login_dialog_text_not_compatible">Različica programa ni skladna z različico programa za prikaz novic za ownCloud. Za pravilno delovanje je treba program posodobiti.</string>
+    <string name="login_dialog_title_security_warning">Varnostno opozorilo</string>
+    <string name="login_dialog_text_security_warning">Trenutno varna povezava HTTPS ni uporabljena. Spletni goljufi lahko prestrežejo prenos podatkov in si pridobijo dostop do zasebnih dokumentov in podatkov (na primer gesel). Uporaba protokola HTTPS je zato preudarna odločitev.</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Podatki in usklajevanje</string>
+    <string name="pref_title_clearCache">Počisti predpomnilnik</string>
+    <string name="pref_title_CacheImagesOffline">Shrani slike v predpomnilnik za delo brez povezave</string>
+    <string name="pref_title_Max_Cache_Size">Največja velikost predpomnilnika</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Nikoli</item>
+        <item>Le preko WiFi</item>
+        <item>Preko WiFi ali Mobilne povezave</item>
+        <item>Vprašaj, kadar ni povezave preko WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minut</item>
+        <item>15 minut</item>
+        <item>30 minut</item>
+        <item>45 minut</item>
+        <item>1 ura</item>
+        <item>2 uri</item>
+        <item>3 ure</item>
+        <item>6 ur</item>
+        <item>12 ur</item>
+        <item>24 ur</item>
+    </string-array>
+    <string name="content_desc_play">predvajaj</string>
+    <string name="content_desc_pause">premor</string>
+    <string name="content_desc_rewind">skoči nazaj</string>
+    <string name="content_desc_forward">skoči naprej</string>
+    <string name="content_desc_expand">razširi</string>
+    <string name="content_desc_collapse">zloži</string>
+    <string name="content_desc_mark_as_read">označi kot prebrano</string>
+    <string name="content_desc_mark_as_unread">označi kot neprebrano</string>
+    <string name="content_desc_tap_to_refresh">s pritiskom osveži</string>
+    <string name="content_desc_add_to_favorites">dodaj med priljubljene</string>
+    <string name="content_desc_remove_from_favorites">odstrani iz priljubljenih</string>
+    <string name="content_desc_show_password">pokaži geslo</string>
+    <string name="content_desc_delete">izbriši</string>
+    <string name="content_desc_download">prejmi</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-sq/strings.xml b/News-Android-App/src/main/res/values-sq/strings.xml
index 694e4dd0..4cdf95c4 100644
--- a/News-Android-App/src/main/res/values-sq/strings.xml
+++ b/News-Android-App/src/main/res/values-sq/strings.xml
@@ -1,195 +1,225 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Vetënjëkohëso</string>
-  <string name="app_name">Lexues Lajmesh ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Përzgjedhës Intervali Njëkohësimesh</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">S\’ka gjë këtu</string>
-  <string name="toast_GettingMoreItems">Filloi të shkarkojë më tepër zëra… Ju lutemi, pritni.</string>
-  <string name="no_wifi_available">Pa lidhje WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">Doni të shkarkohen figurat pa një lidhje WiFi</string>
-  <string name="current_version">Po përdorni Versionin %s</string>
-  <string name="widget_header">Lajme ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d zë i ri gati</item>
-    <item quantity="other">%d zëra të rinj gati</item>
-  </plurals>
-  <string name="message_bar_reload">Ringarkoje</string>
-  <string name="allUnreadFeeds">Krejt zërat e palexuar</string>
-  <string name="starredFeeds">Zëra me yje</string>
-  <string name="title_activity_new_feed">Shtoni prurje të re</string>
-  <string name="menu_update">Rifreskoje</string>
-  <string name="menu_About_Changelog">Mbi / Regjistër ndryshimesh</string>
-  <string name="menu_markAllAsRead">Shënoji krejt si të lexuar</string>
-  <string name="menu_StartImageCaching">Shkarko figura</string>
-  <string name="menu_downloadMoreItems">Shkarko më tepër zëra</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Me yll</string>
-  <string name="action_read">Lexoni</string>
-  <string name="action_playPodacst">Luani Podcast</string>
-  <string name="action_openInBrowser">Hape në Shfletues</string>
-  <string name="action_Share">Ndajeni me të tjerët</string>
-  <string name="action_login">Rregullime Shërbyesi</string>
-  <string name="action_save">Ruaje</string>
-  <string name="action_settings">Rregullime</string>
-  <string name="action_sync_settings">Rregullime Njëkohësimi</string>
-  <string name="action_add_new_feed">Shtoni prurje të re</string>
-  <string name="action_textToSpeech">Lexoje</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Keni %d zë të palexuar</item>
-    <item quantity="other">Keni %d zëra të palexuar</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">Ka të gatshëm %d zë të palexuar</item>
-    <item quantity="other">Ka të gatshëm %d zëra të palexuar</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">URL Prurjeje</string>
-  <string name="action_add_feed">Shtoni prurje</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Shkarko Figurën</string>
-  <string name="action_img_sharelink">Ndani Lidhje Figure</string>
-  <string name="action_img_open">Hape Figurën në Shfletues</string>
-  <string name="action_img_copylink">Kopjo Lidhje Figure</string>
-  <string name="action_link_share">Ndani Lidhjen</string>
-  <string name="action_link_open">Hapeni Lidhjen në Shfletues</string>
-  <string name="action_link_copy">Kopjoje Lidhjen</string>
-  <string name="toast_img_download_wait">Po shkarkohet… Ju lutemi, pritni</string>
-  <string name="toast_img_saved">Figura u ruajt.</string>
-  <string name="toast_img_notwriteable">Dështoi shkrimi i Figurës.</string>
-  <string name="toast_copied_to_clipboard">U kopjua në të papastër</string>
-  <string name="error_download_failed">Shkarkimi dështoi</string>
-  <string name="intent_title_share">Ndajeni përmes</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">Hiqe Prurjen</string>
-  <string name="action_feed_rename">Riemërtojeni Prurjen</string>
-  <string name="feed_remove_button">Hiqe</string>
-  <string name="feed_rename_button">Riemërtoje</string>
-  <string name="confirm_feed_remove">Doni vërtet të hiqet kjo Prurje? Kjo s’mund të zhbëhet!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Emër përdoruesi</string>
-  <string name="pref_title_password">Fjalëkalim</string>
-  <string name="pref_title_owncloudRootPath">Adresa rrënjë e ownCloud-it</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Hyni</string>
-  <string name="login_progress_signing_in">Po hyhet…</string>
-  <string name="error_field_required">Kjo fushë është e domosdoshme</string>
-  <string name="error_invalid_url">Kjo URL është e pasaktë</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importoni Llogari</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">U shkarkua %d objekt i vjetër</item>
-    <item quantity="other">U shkarkua %d objekte të vjetër</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">S\’ka objekte të tjerë gati</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Deri tani është sjellë %d objekt…</item>
-    <item quantity="other">Deri tani janë sjellë %d objekte…</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Rregullime</string>
-  <string name="cache_is_cleared">Fshehtina u pastrua!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Të përgjithshme</string>
-  <string name="pref_title_general_sort_order">Radhë Renditjeje</string>
-  <string-array name="pref_general_sort_order">
-    <item>Të rinj -&gt; Të vjetër</item>
-    <item>Të vjetër -&gt; Të rinj</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Pastrim fshehtine</string>
-  <string name="dialog_clearing_cache_please_wait">Fshehtina po pastrohet… Ju lutemi, pritni.</string>
-  <string name="reset_cache_unsaved_changes">Ka ndryshime të panjëkohësuara. Doni ta ktheni fshehtinën në gjendjen fillestare sido qoftë?</string>
-  <string name="warning">Kujdes</string>
-  <string name="pref_title_AutoSyncOnStart">Njëkohësoji gjatë nisjes</string>
-  <string name="pref_title_ShowOnlyUnread">Shfaq vetëm artikuj të palexuar</string>
-  <string name="pref_title_DisableHostnameVerification">Çaktivizo Verifikim e Strehëemrave</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Lëvizni me butona volumi</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Shënoji si të lexuara teksa rrëshqitet</string>
-  <string name="pref_title_OpenInBrowserDirectly">Përdor shfletues të jashtëm për të parë artikujt</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Të pranohet Dëshmi e Panjohur?</string>
-  <string name="mtm_decision_always">Përherë</string>
-  <string name="mtm_decision_abort">Ndërprite</string>
-  <string name="mtm_notification">Verifikim Dëshmish</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">S\’u përzgjodh podcast</string>
-  <string name="no_chapters_available">S’ka kapituj gati</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Ekran</string>
-  <string name="pref_title_app_theme">Temë aplikacioni</string>
-  <string name="pref_title_feed_list_layout">Skemë liste prurjesh</string>
-  <string name="pref_display_title_lines_count">Numërim Rreshtash për titullin</string>
-  <string-array name="pref_display_apptheme">
-    <item>E errët</item>
-    <item>E çelët</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>E thjeshtë</item>
-    <item>E zgjeruar</item>
-    <item>E zgjeruar (me tekst të plotë)</item>
-    <item>E zgjeruar me Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Njoftime</string>
-  <string name="pref_title_notification_new_articles_available">Shfaq njoftime kur ka gati artikuj të rinj</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Gabim</string>
-  <string name="login_dialog_text_something_went_wrong">Diçka shkoi ters :(</string>
-  <string name="login_dialog_text_not_compatible">Ky version i Aplikacionit s\’është i përputhshëm me Aplikacionin tuaj ownCloud Për Lajme. Ju lutemi, përditësojeni aplikacionin e lajmeve dhe appframework-un.</string>
-  <string name="login_dialog_title_security_warning">Sinjalizim Sigurie</string>
-  <string name="login_dialog_text_security_warning">S\’po përdorni https. Një sulmues mund të kapë trafikun tuaj dhe të arrijë të hyjë në disa të dhëna me spec (p.sh. fjalëkalimi juaj). Ndaj këshillohet me forcë të përdorni https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Të dhëna &amp; njëkohësim</string>
-  <string name="pref_title_clearCache">Pastroje fshehtinën</string>
-  <string name="pref_title_CacheImagesOffline">Ruajio figurat në fshehtinë</string>
-  <string name="pref_title_Max_Cache_Size">Madhësi Maksimum Fshehtine</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Kurrë</item>
-    <item>Vetëm përmes WiFi-ji</item>
-    <item>Përmes WiFi-ji &amp; Lidhjeje Celulari</item>
-    <item>Pyet, kur s\’është i lidhur me WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minuta</item>
-    <item>15 Minuta</item>
-    <item>30 Minuta</item>
-    <item>45 Minuta</item>
-    <item>1 Orë</item>
-    <item>2 Orë</item>
-    <item>3 Orë</item>
-    <item>6 Orë</item>
-    <item>12 Orë</item>
-    <item>24 Orë</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">luaje</string>
-  <string name="content_desc_pause">pushoje</string>
-  <string name="content_desc_rewind">mbrapsht</string>
-  <string name="content_desc_forward">përpara</string>
-  <string name="content_desc_expand">zgjeroje</string>
-  <string name="content_desc_collapse">tkurre</string>
-  <string name="content_desc_mark_as_read">shënoje si të lexuar</string>
-  <string name="content_desc_mark_as_unread">shënoje si të palexuar</string>
-  <string name="content_desc_tap_to_refresh">prekeni që të rifreskohet</string>
-  <string name="content_desc_add_to_favorites">shtojeni te të parapëlqyerat</string>
-  <string name="content_desc_remove_from_favorites">hiqe prej të parapëlqyerave</string>
-  <string name="content_desc_show_password">shfaqe fjalëkalimin</string>
-  <string name="content_desc_delete">fshi</string>
-  <string name="content_desc_download">shkarkoje</string>
+
+    <string name="auto_sync_string">Vetënjëkohëso</string>
+    <string name="title_activity_sync_interval_selector">Përzgjedhës Intervali Njëkohësimesh</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">S\’ka gjë këtu</string>
+    <string name="toast_GettingMoreItems">Filloi të shkarkojë më tepër zëra… Ju lutemi, pritni.</string>
+    <string name="no_wifi_available">Pa lidhje WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">Doni të shkarkohen figurat pa një lidhje WiFi</string>
+    <string name="current_version">Po përdorni Versionin %s</string>
+    <string name="widget_header">Lajme ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d zë i ri gati</item>
+        <item quantity="other">%d zëra të rinj gati</item>
+    </plurals>
+    <string name="message_bar_reload">Ringarkoje</string>
+    <string name="allUnreadFeeds">Krejt zërat e palexuar</string>
+    <string name="starredFeeds">Zëra me yje</string>
+    <string name="title_activity_new_feed">Shtoni prurje të re</string>
+
+    <string name="menu_update">Rifreskoje</string>
+    <string name="menu_About_Changelog">Mbi / Regjistër ndryshimesh</string>
+    <string name="menu_markAllAsRead">Shënoji krejt si të lexuar</string>
+    <string name="menu_StartImageCaching">Shkarko figura</string>
+    <string name="menu_downloadMoreItems">Shkarko më tepër zëra</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Me yll</string>
+    <string name="action_read">Lexoni</string>
+    <string name="action_playPodacst">Luani Podcast</string>
+    <string name="action_openInBrowser">Hape në Shfletues</string>
+    <string name="action_Share">Ndajeni me të tjerët</string>
+    <string name="action_login">Rregullime Shërbyesi</string>
+    <string name="action_save">Ruaje</string>
+    <string name="action_settings">Rregullime</string>
+    <string name="action_sync_settings">Rregullime Njëkohësimi</string>
+    <string name="action_add_new_feed">Shtoni prurje të re</string>
+    <string name="action_textToSpeech">Lexoje</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Keni %d zë të palexuar</item>
+        <item quantity="other">Keni %d zëra të palexuar</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">Ka të gatshëm %d zë të palexuar</item>
+        <item quantity="other">Ka të gatshëm %d zëra të palexuar</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">URL Prurjeje</string>
+    <string name="action_add_feed">Shtoni prurje</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Shkarko Figurën</string>
+    <string name="action_img_sharelink">Ndani Lidhje Figure</string>
+    <string name="action_img_open">Hape Figurën në Shfletues</string>
+    <string name="action_img_copylink">Kopjo Lidhje Figure</string>
+    <string name="action_link_share">Ndani Lidhjen</string>
+    <string name="action_link_open">Hapeni Lidhjen në Shfletues</string>
+    <string name="action_link_copy">Kopjoje Lidhjen</string>
+    <string name="toast_img_download_wait">Po shkarkohet… Ju lutemi, pritni</string>
+    <string name="toast_img_saved">Figura u ruajt.</string>
+    <string name="toast_img_notwriteable">Dështoi shkrimi i Figurës.</string>
+    <string name="toast_copied_to_clipboard">U kopjua në të papastër</string>
+    <string name="error_download_failed">Shkarkimi dështoi</string>
+    <string name="intent_title_share">Ndajeni përmes</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">Hiqe Prurjen</string>
+    <string name="action_feed_rename">Riemërtojeni Prurjen</string>
+    <string name="feed_remove_button">Hiqe</string>
+    <string name="feed_rename_button">Riemërtoje</string>
+    <string name="confirm_feed_remove">Doni vërtet të hiqet kjo Prurje? Kjo s’mund të zhbëhet!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Emër përdoruesi</string>
+    <string name="pref_title_password">Fjalëkalim</string>
+    <string name="pref_title_owncloudRootPath">Adresa rrënjë e ownCloud-it</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Hyni</string>
+    <string name="login_progress_signing_in">Po hyhet…</string>
+    <string name="error_field_required">Kjo fushë është e domosdoshme</string>
+    <string name="error_invalid_url">Kjo URL është e pasaktë</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importoni Llogari</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">U shkarkua %d objekt i vjetër</item>
+        <item quantity="other">U shkarkua %d objekte të vjetër</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">S\’ka objekte të tjerë gati</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Deri tani është sjellë %d objekt…</item>
+        <item quantity="other">Deri tani janë sjellë %d objekte…</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Rregullime</string>
+    <string name="cache_is_cleared">Fshehtina u pastrua!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Të përgjithshme</string>
+    <string name="pref_title_general_sort_order">Radhë Renditjeje</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Të rinj -&gt; Të vjetër</item>
+        <item>Të vjetër -&gt; Të rinj</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Pastrim fshehtine</string>
+    <string name="dialog_clearing_cache_please_wait">Fshehtina po pastrohet… Ju lutemi, pritni.</string>
+    <string name="reset_cache_unsaved_changes">Ka ndryshime të panjëkohësuara. Doni ta ktheni fshehtinën në gjendjen fillestare sido qoftë?</string>
+    <string name="warning">Kujdes</string>
+    <string name="pref_title_AutoSyncOnStart">Njëkohësoji gjatë nisjes</string>
+    <string name="pref_title_ShowOnlyUnread">Shfaq vetëm artikuj të palexuar</string>
+    <string name="pref_title_DisableHostnameVerification">Çaktivizo Verifikim e Strehëemrave</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Lëvizni me butona volumi</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Shënoji si të lexuara teksa rrëshqitet</string>
+    <string name="pref_title_OpenInBrowserDirectly">Përdor shfletues të jashtëm për të parë artikujt</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Të pranohet Dëshmi e Panjohur?</string>
+    <string name="mtm_decision_always">Përherë</string>
+    <string name="mtm_decision_abort">Ndërprite</string>
+    <string name="mtm_notification">Verifikim Dëshmish</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">S\’u përzgjodh podcast</string>
+    <string name="no_chapters_available">S’ka kapituj gati</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Ekran</string>
+    <string name="pref_title_app_theme">Temë aplikacioni</string>
+    <string name="pref_title_feed_list_layout">Skemë liste prurjesh</string>
+    <string name="pref_display_title_lines_count">Numërim Rreshtash për titullin</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>E errët</item>
+        <item>E çelët</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>E thjeshtë</item>
+        <item>E zgjeruar</item>
+        <item>E zgjeruar (me tekst të plotë)</item>
+        <item>E zgjeruar me Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Njoftime</string>
+    <string name="pref_title_notification_new_articles_available">Shfaq njoftime kur ka gati artikuj të rinj</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Gabim</string>
+    <string name="login_dialog_text_something_went_wrong">Diçka shkoi ters :(</string>
+    <string name="login_dialog_text_not_compatible">Ky version i Aplikacionit s\’është i përputhshëm me Aplikacionin tuaj ownCloud Për Lajme. Ju lutemi, përditësojeni aplikacionin e lajmeve dhe appframework-un.</string>
+    <string name="login_dialog_title_security_warning">Sinjalizim Sigurie</string>
+    <string name="login_dialog_text_security_warning">S\’po përdorni https. Një sulmues mund të kapë trafikun tuaj dhe të arrijë të hyjë në disa të dhëna me spec (p.sh. fjalëkalimi juaj). Ndaj këshillohet me forcë të përdorni https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Të dhëna &amp; njëkohësim</string>
+    <string name="pref_title_clearCache">Pastroje fshehtinën</string>
+    <string name="pref_title_CacheImagesOffline">Ruajio figurat në fshehtinë</string>
+    <string name="pref_title_Max_Cache_Size">Madhësi Maksimum Fshehtine</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Kurrë</item>
+        <item>Vetëm përmes WiFi-ji</item>
+        <item>Përmes WiFi-ji &amp; Lidhjeje Celulari</item>
+        <item>Pyet, kur s\’është i lidhur me WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minuta</item>
+        <item>15 Minuta</item>
+        <item>30 Minuta</item>
+        <item>45 Minuta</item>
+        <item>1 Orë</item>
+        <item>2 Orë</item>
+        <item>3 Orë</item>
+        <item>6 Orë</item>
+        <item>12 Orë</item>
+        <item>24 Orë</item>
+    </string-array>
+    <string name="content_desc_play">luaje</string>
+    <string name="content_desc_pause">pushoje</string>
+    <string name="content_desc_rewind">mbrapsht</string>
+    <string name="content_desc_forward">përpara</string>
+    <string name="content_desc_expand">zgjeroje</string>
+    <string name="content_desc_collapse">tkurre</string>
+    <string name="content_desc_mark_as_read">shënoje si të lexuar</string>
+    <string name="content_desc_mark_as_unread">shënoje si të palexuar</string>
+    <string name="content_desc_tap_to_refresh">prekeni që të rifreskohet</string>
+    <string name="content_desc_add_to_favorites">shtojeni te të parapëlqyerat</string>
+    <string name="content_desc_remove_from_favorites">hiqe prej të parapëlqyerave</string>
+    <string name="content_desc_show_password">shfaqe fjalëkalimin</string>
+    <string name="content_desc_delete">fshi</string>
+    <string name="content_desc_download">shkarkoje</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-sr/strings.xml b/News-Android-App/src/main/res/values-sr/strings.xml
index 4394d3c5..94721c0b 100644
--- a/News-Android-App/src/main/res/values-sr/strings.xml
+++ b/News-Android-App/src/main/res/values-sr/strings.xml
@@ -1,142 +1,157 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Ауто-освежавање</string>
-  <string name="app_name">оунКлауд читач вести</string>
-  <string name="title_activity_sync_interval_selector">Период освежавања</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">Овде нема ничега</string>
-  <string name="no_wifi_available">Нема бежичне везе</string>
-  <string name="do_you_want_to_download_without_wifi">Желите ли да преузмете слике без бежичне везе?</string>
-  <string name="widget_header">оунКлауд новости</string>
-  <string name="message_bar_reload">Поново учитај</string>
-  <string name="allUnreadFeeds">Све непрочитане ставке</string>
-  <string name="starredFeeds">Озвездане ставке</string>
-  <string name="title_activity_new_feed">Додај довод</string>
-  <string name="menu_update">Освежи</string>
-  <string name="menu_About_Changelog">О програму / Дневник измена</string>
-  <string name="menu_markAllAsRead">Означи све као прочитано</string>
-  <string name="menu_StartImageCaching">Преузми слике</string>
-  <string name="menu_downloadMoreItems">Преузми још ставки</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Озвездано</string>
-  <string name="action_read">Читај</string>
-  <string name="action_playPodacst">Пусти подемисију</string>
-  <string name="action_openInBrowser">Отвори у прегледачу</string>
-  <string name="action_Share">Дели</string>
-  <string name="action_login">Поставке сервера</string>
-  <string name="action_save">Сачувај</string>
-  <string name="action_settings">Поставке</string>
-  <string name="action_sync_settings">Поставке освежавања</string>
-  <string name="action_add_new_feed">Додај довод</string>
-  <string name="action_textToSpeech">Ишчитај</string>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Копирано у клипборд</string>
-  <string name="error_download_failed">Преузимање није успело</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Уклони</string>
-  <string name="feed_rename_button">Преименуј</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Корисничко име</string>
-  <string name="pref_title_password">Лозинка</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Пријави се</string>
-  <string name="login_progress_signing_in">Пријављујем се...</string>
-  <string name="error_field_required">Ово поље је неопходно</string>
-  <string name="error_invalid_url">УРЛ је неисправан</string>
-  <!--Import Accounts-->
-  <string name="import_account">Увези налог</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Нема више доступних ставки</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Поставке</string>
-  <string name="cache_is_cleared">Кеш је очишћен!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Опште</string>
-  <string name="pref_title_general_sort_order">Сортирање</string>
-  <string-array name="pref_general_sort_order">
-    <item>нови -&gt; стари</item>
-    <item>стари -&gt; нови</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Чистим кеш</string>
-  <string name="dialog_clearing_cache_please_wait">Чистим кеш… Сачекајте.</string>
-  <string name="reset_cache_unsaved_changes">Постоје несинхронизоване измене. Да ипак обришем кеш?</string>
-  <string name="warning">Упозорење</string>
-  <string name="pref_title_AutoSyncOnStart">Освежи при покретању</string>
-  <string name="pref_title_ShowOnlyUnread">Прикажи само непрочитане чланке</string>
-  <string name="pref_title_DisableHostnameVerification">Искључи проверу имена домаћина</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Навигација помоћу дугмади за јачину звука</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Означи као прочитано током клизања</string>
-  <string name="pref_title_OpenInBrowserDirectly">Користи спољашњи прегледач за приказ чланака</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Прихватити непознати сертификат?</string>
-  <string name="mtm_decision_always">Увек</string>
-  <string name="mtm_decision_abort">Прекини</string>
-  <string name="mtm_notification">Провера сертификата</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Није изабрана подемисија</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Приказ</string>
-  <string name="pref_title_app_theme">Тема</string>
-  <string name="pref_title_feed_list_layout">Распоред листе довода</string>
-  <string name="pref_display_title_lines_count">Број линија у наслову</string>
-  <string-array name="pref_display_apptheme">
-    <item>тамна</item>
-    <item>светла</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>једноставна</item>
-    <item>проширена</item>
-    <item>прочирена (цео текст)</item>
-    <item>проширена помоћу Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Обавештења</string>
-  <string name="pref_title_notification_new_articles_available">Прикажи обавештења о новим чланцима</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Грешка</string>
-  <string name="login_dialog_text_something_went_wrong">Нешто је пошло наопако :(</string>
-  <string name="login_dialog_text_not_compatible">Верзија ове апликације није усклађена са новинском апликацијом оунКлауда. Ажурирајте апликацију и њен радни оквир.</string>
-  <string name="login_dialog_title_security_warning">Сигурносно упозорење</string>
-  <string name="login_dialog_text_security_warning">Не користите безбедни пренос. Нападач може пресрести ваш саобраћај и доћи у посед осетљивих података (нпр. ваше лозинке). Заиста препоручујемо да користите https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Подаци и синхронизација</string>
-  <string name="pref_title_clearCache">Очисти кеш</string>
-  <string name="pref_title_CacheImagesOffline">Кеширај слике за рад ван везе</string>
-  <string name="pref_title_Max_Cache_Size">Највише</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>никад</item>
-    <item>само преко бежичне везе</item>
-    <item>преко бежичне и мобилне</item>
-    <item>питај кад нема бежичне везе</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 минута</item>
-    <item>15 минута</item>
-    <item>30 минута</item>
-    <item>45 минута</item>
-    <item>1 сат</item>
-    <item>2 сата</item>
-    <item>3 сата</item>
-    <item>6 сати</item>
-    <item>12 сати</item>
-    <item>24 сата</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">обриши</string>
-</resources>
+
+    <string name="auto_sync_string">Ауто-освежавање</string>
+    <string name="title_activity_sync_interval_selector">Период освежавања</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">Овде нема ничега</string>
+    <string name="no_wifi_available">Нема бежичне везе</string>
+    <string name="do_you_want_to_download_without_wifi">Желите ли да преузмете слике без бежичне везе?</string>
+    <string name="widget_header">оунКлауд новости</string>
+    <string name="message_bar_reload">Поново учитај</string>
+    <string name="allUnreadFeeds">Све непрочитане ставке</string>
+    <string name="starredFeeds">Озвездане ставке</string>
+    <string name="title_activity_new_feed">Додај довод</string>
+
+    <string name="menu_update">Освежи</string>
+    <string name="menu_About_Changelog">О програму / Дневник измена</string>
+    <string name="menu_markAllAsRead">Означи све као прочитано</string>
+    <string name="menu_StartImageCaching">Преузми слике</string>
+    <string name="menu_downloadMoreItems">Преузми још ставки</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Озвездано</string>
+    <string name="action_read">Читај</string>
+    <string name="action_playPodacst">Пусти подемисију</string>
+    <string name="action_openInBrowser">Отвори у прегледачу</string>
+    <string name="action_Share">Дели</string>
+    <string name="action_login">Поставке сервера</string>
+    <string name="action_save">Сачувај</string>
+    <string name="action_settings">Поставке</string>
+    <string name="action_sync_settings">Поставке освежавања</string>
+    <string name="action_add_new_feed">Додај довод</string>
+    <string name="action_textToSpeech">Ишчитај</string>
+    <string name="toast_copied_to_clipboard">Копирано у клипборд</string>
+    <string name="error_download_failed">Преузимање није успело</string>
+    <string name="feed_remove_button">Уклони</string>
+    <string name="feed_rename_button">Преименуј</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Корисничко име</string>
+    <string name="pref_title_password">Лозинка</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Пријави се</string>
+    <string name="login_progress_signing_in">Пријављујем се...</string>
+    <string name="error_field_required">Ово поље је неопходно</string>
+    <string name="error_invalid_url">УРЛ је неисправан</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Увези налог</string>
+
+
+    <string name="toast_no_more_downloads_available">Нема више доступних ставки</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Поставке</string>
+    <string name="cache_is_cleared">Кеш је очишћен!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Опште</string>
+    <string name="pref_title_general_sort_order">Сортирање</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>нови -&gt; стари</item>
+        <item>стари -&gt; нови</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Чистим кеш</string>
+    <string name="dialog_clearing_cache_please_wait">Чистим кеш… Сачекајте.</string>
+    <string name="reset_cache_unsaved_changes">Постоје несинхронизоване измене. Да ипак обришем кеш?</string>
+    <string name="warning">Упозорење</string>
+    <string name="pref_title_AutoSyncOnStart">Освежи при покретању</string>
+    <string name="pref_title_ShowOnlyUnread">Прикажи само непрочитане чланке</string>
+    <string name="pref_title_DisableHostnameVerification">Искључи проверу имена домаћина</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Навигација помоћу дугмади за јачину звука</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Означи као прочитано током клизања</string>
+    <string name="pref_title_OpenInBrowserDirectly">Користи спољашњи прегледач за приказ чланака</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Прихватити непознати сертификат?</string>
+    <string name="mtm_decision_always">Увек</string>
+    <string name="mtm_decision_abort">Прекини</string>
+    <string name="mtm_notification">Провера сертификата</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Није изабрана подемисија</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Приказ</string>
+    <string name="pref_title_app_theme">Тема</string>
+    <string name="pref_title_feed_list_layout">Распоред листе довода</string>
+    <string name="pref_display_title_lines_count">Број линија у наслову</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>тамна</item>
+        <item>светла</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>једноставна</item>
+        <item>проширена</item>
+        <item>прочирена (цео текст)</item>
+        <item>проширена помоћу Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Обавештења</string>
+    <string name="pref_title_notification_new_articles_available">Прикажи обавештења о новим чланцима</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Грешка</string>
+    <string name="login_dialog_text_something_went_wrong">Нешто је пошло наопако :(</string>
+    <string name="login_dialog_text_not_compatible">Верзија ове апликације није усклађена са новинском апликацијом оунКлауда. Ажурирајте апликацију и њен радни оквир.</string>
+    <string name="login_dialog_title_security_warning">Сигурносно упозорење</string>
+    <string name="login_dialog_text_security_warning">Не користите безбедни пренос. Нападач може пресрести ваш саобраћај и доћи у посед осетљивих података (нпр. ваше лозинке). Заиста препоручујемо да користите https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Подаци и синхронизација</string>
+    <string name="pref_title_clearCache">Очисти кеш</string>
+    <string name="pref_title_CacheImagesOffline">Кеширај слике за рад ван везе</string>
+    <string name="pref_title_Max_Cache_Size">Највише</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>никад</item>
+        <item>само преко бежичне везе</item>
+        <item>преко бежичне и мобилне</item>
+        <item>питај кад нема бежичне везе</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 минута</item>
+        <item>15 минута</item>
+        <item>30 минута</item>
+        <item>45 минута</item>
+        <item>1 сат</item>
+        <item>2 сата</item>
+        <item>3 сата</item>
+        <item>6 сати</item>
+        <item>12 сати</item>
+        <item>24 сата</item>
+    </string-array>
+    <string name="content_desc_delete">обриши</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-sv/strings.xml b/News-Android-App/src/main/res/values-sv/strings.xml
index c5bdab5d..9428d104 100644
--- a/News-Android-App/src/main/res/values-sv/strings.xml
+++ b/News-Android-App/src/main/res/values-sv/strings.xml
@@ -1,191 +1,218 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Automatisk synkning</string>
-  <string name="app_name">ownCloud Nyhetsläsare</string>
-  <string name="title_activity_sync_interval_selector">Synkronisera intervallväljaren</string>
-  <string name="title_activity_news_detail">NyheterDetaljerAktivitet</string>
-  <string name="empty_view_content">Inga objekt här</string>
-  <string name="toast_GettingMoreItems">Börjat ladda ner fler artiklar... Var god vänta.</string>
-  <string name="no_wifi_available">Ingen WIFI ansluten</string>
-  <string name="do_you_want_to_download_without_wifi">Vill du ladda ner bilderna utan en WIFI-anslutning</string>
-  <string name="current_version">Du använder Version %s</string>
-  <string name="widget_header">ownCloud nyheter</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d ny artikel tillgänglig</item>
-    <item quantity="other">%d nya artiklar tillgängliga</item>
-  </plurals>
-  <string name="message_bar_reload">Ladda om</string>
-  <string name="allUnreadFeeds">Alla olästa objekt</string>
-  <string name="starredFeeds">Stjärnmärkta objekt</string>
-  <string name="title_activity_new_feed">Lägg till flöde</string>
-  <string name="menu_update">Uppdatera</string>
-  <string name="menu_About_Changelog">Om / Ändringslogg</string>
-  <string name="menu_markAllAsRead">Markera alla som lästa</string>
-  <string name="menu_StartImageCaching">Ladda ner bilder</string>
-  <string name="menu_downloadMoreItems">Ladda ner fler objekt</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Stjärnmärkt</string>
-  <string name="action_read">Läsa</string>
-  <string name="action_playPodacst">Spela Podcast</string>
-  <string name="action_openInBrowser">Öppna i webbläsaren</string>
-  <string name="action_Share">Dela</string>
-  <string name="action_login">Serverinställningar</string>
-  <string name="action_save">Spara</string>
-  <string name="action_settings">Inställningar</string>
-  <string name="action_sync_settings">Synk inställningar</string>
-  <string name="action_add_new_feed">Lägg till flöde</string>
-  <string name="action_textToSpeech">Läs upp</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Du har %d oläst sak</item>
-    <item quantity="other">Du har %d olästa saker</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">%d ny oläst artikel tillgänglig</item>
-    <item quantity="other">%d nya olästa artiklar tillgängliga</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">FlödesURL</string>
-  <string name="action_add_feed">Lägg till flöde</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Ladda ner bild</string>
-  <string name="action_img_sharelink">Dela bildlänk</string>
-  <string name="action_img_open">Öppna bilden i webbläsaren</string>
-  <string name="action_img_copylink">Kopiera bildlänk</string>
-  <string name="action_link_share">Dela länk</string>
-  <string name="action_link_open">Öppna länk i webbläsaren</string>
-  <string name="action_link_copy">Kopiera länk</string>
-  <string name="toast_img_download_wait">Laddar ner... var god vänta</string>
-  <string name="toast_img_saved">Bild sparad.</string>
-  <string name="toast_img_notwriteable">Misslyckades att skriva bilden.</string>
-  <string name="toast_copied_to_clipboard">Kopierat till urklipp</string>
-  <string name="error_download_failed">Misslyckad nedladdning</string>
-  <string name="intent_title_share">Dela via</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Radera</string>
-  <string name="feed_rename_button">Byt namn</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Användarnamn</string>
-  <string name="pref_title_password">Lösenord</string>
-  <string name="pref_title_owncloudRootPath">ownCloud rotadress</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Logga in</string>
-  <string name="login_progress_signing_in">Logga in...</string>
-  <string name="error_field_required">Detta fält obligatoriskt</string>
-  <string name="error_invalid_url">Felaktig URL</string>
-  <!--Import Accounts-->
-  <string name="import_account">Importera Konto</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">Laddade ner %d gamla artiklar</item>
-    <item quantity="other">Laddade ner %d gamla artiklar</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Inga fler föremål är tillgängliga</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="one">Hämtat %d artikel än så länge...</item>
-    <item quantity="other">Hämtat %d artiklar än så länge...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Inställningar</string>
-  <string name="cache_is_cleared">Cacheminne rensat!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Allmänt</string>
-  <string name="pref_title_general_sort_order">Sorteringsordning</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nyare -&gt; Äldre</item>
-    <item>Äldre -&gt; Nyare</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Rensar cache</string>
-  <string name="dialog_clearing_cache_please_wait">Rensar cache, var god vänta...</string>
-  <string name="reset_cache_unsaved_changes">Det finns ändringar som ännu inte har synkroniserats. Vill du återställa cachen ändå?</string>
-  <string name="warning">Varning</string>
-  <string name="pref_title_AutoSyncOnStart">Synkronisera vid uppstart</string>
-  <string name="pref_title_ShowOnlyUnread">Visa endast olästa artiklar</string>
-  <string name="pref_title_DisableHostnameVerification">Inaktivera verifiering av värdnamn</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navigera med volymknapparna</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Markera som läst vid bläddring</string>
-  <string name="pref_title_OpenInBrowserDirectly">Använd extern webbläsare för att visa artiklar</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Acceptera okänt certifikat?</string>
-  <string name="mtm_decision_always">Alltid</string>
-  <string name="mtm_decision_abort">Avbryt</string>
-  <string name="mtm_notification">Verifikation av certifikat</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Ingen podcast vald</string>
-  <string name="no_chapters_available">Inga kapitel tillgängliga.</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Visa</string>
-  <string name="pref_title_app_theme">App tema</string>
-  <string name="pref_title_feed_list_layout">Utseende nyhetsflöde</string>
-  <string-array name="pref_display_apptheme">
-    <item>Mörk</item>
-    <item>Ljus</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Enkel</item>
-    <item>Utvidgad</item>
-    <item>Utvidgad (fulltext)</item>
-    <item>Utvidgad med WebView</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Notifieringar</string>
-  <string name="pref_title_notification_new_articles_available">Visa notifiering när nya artiklar är tillgängliga</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Fel</string>
-  <string name="login_dialog_text_something_went_wrong">Något gick fel :(</string>
-  <string name="login_dialog_text_not_compatible">Denna version är inte kompatibel med din ownCloud nyhetsapp. Vänligen uppdatera nyhetsappen och dess beroenden.</string>
-  <string name="login_dialog_title_security_warning">Säkerhetsvarning</string>
-  <string name="login_dialog_text_security_warning">Du använder inte https. En angripare kan fånga din trafik och få tillgång till känsliga uppgifter (t.ex. ditt lösenord). Så det är starkt rekommenderat att använda https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Data &amp; synk</string>
-  <string name="pref_title_clearCache">Rensa cache</string>
-  <string name="pref_title_CacheImagesOffline">Cacha bilder offline</string>
-  <string name="pref_title_Max_Cache_Size">Max Cache-storlek</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Aldrig</item>
-    <item>Endast över WiFi</item>
-    <item>Över WiFi &amp; Mobildata</item>
-    <item>Fråga om ej ansluten till WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 minuter</item>
-    <item>15 minuter</item>
-    <item>30 minuter</item>
-    <item>45 minuter</item>
-    <item>1 timme</item>
-    <item>2 timme</item>
-    <item>3 timme</item>
-    <item>6 timme</item>
-    <item>12 timme</item>
-    <item>24 timme</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">spela</string>
-  <string name="content_desc_pause">pausa</string>
-  <string name="content_desc_rewind">spola bakåt</string>
-  <string name="content_desc_forward">spola framåt</string>
-  <string name="content_desc_expand">utöka</string>
-  <string name="content_desc_collapse">dölj</string>
-  <string name="content_desc_mark_as_read">markera som läst</string>
-  <string name="content_desc_mark_as_unread">markera som oläst</string>
-  <string name="content_desc_tap_to_refresh">tryck för att uppdatera</string>
-  <string name="content_desc_add_to_favorites">lägg till i favoriter</string>
-  <string name="content_desc_remove_from_favorites">ta bort från favoriter</string>
-  <string name="content_desc_show_password">visa lösenordet</string>
-  <string name="content_desc_delete">radera</string>
-  <string name="content_desc_download">ladda ner</string>
+
+    <string name="auto_sync_string">Automatisk synkning</string>
+    <string name="title_activity_sync_interval_selector">Synkronisera intervallväljaren</string>
+    <string name="title_activity_news_detail">NyheterDetaljerAktivitet</string>
+    <string name="empty_view_content">Inga objekt här</string>
+    <string name="toast_GettingMoreItems">Börjat ladda ner fler artiklar... Var god vänta.</string>
+    <string name="no_wifi_available">Ingen WIFI ansluten</string>
+    <string name="do_you_want_to_download_without_wifi">Vill du ladda ner bilderna utan en WIFI-anslutning</string>
+    <string name="current_version">Du använder Version %s</string>
+    <string name="widget_header">ownCloud nyheter</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d ny artikel tillgänglig</item>
+        <item quantity="other">%d nya artiklar tillgängliga</item>
+    </plurals>
+    <string name="message_bar_reload">Ladda om</string>
+    <string name="allUnreadFeeds">Alla olästa objekt</string>
+    <string name="starredFeeds">Stjärnmärkta objekt</string>
+    <string name="title_activity_new_feed">Lägg till flöde</string>
+
+    <string name="menu_update">Uppdatera</string>
+    <string name="menu_About_Changelog">Om / Ändringslogg</string>
+    <string name="menu_markAllAsRead">Markera alla som lästa</string>
+    <string name="menu_StartImageCaching">Ladda ner bilder</string>
+    <string name="menu_downloadMoreItems">Ladda ner fler objekt</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Stjärnmärkt</string>
+    <string name="action_read">Läsa</string>
+    <string name="action_playPodacst">Spela Podcast</string>
+    <string name="action_openInBrowser">Öppna i webbläsaren</string>
+    <string name="action_Share">Dela</string>
+    <string name="action_login">Serverinställningar</string>
+    <string name="action_save">Spara</string>
+    <string name="action_settings">Inställningar</string>
+    <string name="action_sync_settings">Synk inställningar</string>
+    <string name="action_add_new_feed">Lägg till flöde</string>
+    <string name="action_textToSpeech">Läs upp</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Du har %d oläst sak</item>
+        <item quantity="other">Du har %d olästa saker</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">%d ny oläst artikel tillgänglig</item>
+        <item quantity="other">%d nya olästa artiklar tillgängliga</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">FlödesURL</string>
+    <string name="action_add_feed">Lägg till flöde</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Ladda ner bild</string>
+    <string name="action_img_sharelink">Dela bildlänk</string>
+    <string name="action_img_open">Öppna bilden i webbläsaren</string>
+    <string name="action_img_copylink">Kopiera bildlänk</string>
+    <string name="action_link_share">Dela länk</string>
+    <string name="action_link_open">Öppna länk i webbläsaren</string>
+    <string name="action_link_copy">Kopiera länk</string>
+    <string name="toast_img_download_wait">Laddar ner... var god vänta</string>
+    <string name="toast_img_saved">Bild sparad.</string>
+    <string name="toast_img_notwriteable">Misslyckades att skriva bilden.</string>
+    <string name="toast_copied_to_clipboard">Kopierat till urklipp</string>
+    <string name="error_download_failed">Misslyckad nedladdning</string>
+    <string name="intent_title_share">Dela via</string>
+
+
+    <string name="feed_remove_button">Radera</string>
+    <string name="feed_rename_button">Byt namn</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Användarnamn</string>
+    <string name="pref_title_password">Lösenord</string>
+    <string name="pref_title_owncloudRootPath">ownCloud rotadress</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Logga in</string>
+    <string name="login_progress_signing_in">Logga in...</string>
+    <string name="error_field_required">Detta fält obligatoriskt</string>
+    <string name="error_invalid_url">Felaktig URL</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Importera Konto</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">Laddade ner %d gamla artiklar</item>
+        <item quantity="other">Laddade ner %d gamla artiklar</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Inga fler föremål är tillgängliga</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="one">Hämtat %d artikel än så länge...</item>
+        <item quantity="other">Hämtat %d artiklar än så länge...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Inställningar</string>
+    <string name="cache_is_cleared">Cacheminne rensat!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Allmänt</string>
+    <string name="pref_title_general_sort_order">Sorteringsordning</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Nyare -&gt; Äldre</item>
+        <item>Äldre -&gt; Nyare</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Rensar cache</string>
+    <string name="dialog_clearing_cache_please_wait">Rensar cache, var god vänta...</string>
+    <string name="reset_cache_unsaved_changes">Det finns ändringar som ännu inte har synkroniserats. Vill du återställa cachen ändå?</string>
+    <string name="warning">Varning</string>
+    <string name="pref_title_AutoSyncOnStart">Synkronisera vid uppstart</string>
+    <string name="pref_title_ShowOnlyUnread">Visa endast olästa artiklar</string>
+    <string name="pref_title_DisableHostnameVerification">Inaktivera verifiering av värdnamn</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Navigera med volymknapparna</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Markera som läst vid bläddring</string>
+    <string name="pref_title_OpenInBrowserDirectly">Använd extern webbläsare för att visa artiklar</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Acceptera okänt certifikat?</string>
+    <string name="mtm_decision_always">Alltid</string>
+    <string name="mtm_decision_abort">Avbryt</string>
+    <string name="mtm_notification">Verifikation av certifikat</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Ingen podcast vald</string>
+    <string name="no_chapters_available">Inga kapitel tillgängliga.</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Visa</string>
+    <string name="pref_title_app_theme">App tema</string>
+    <string name="pref_title_feed_list_layout">Utseende nyhetsflöde</string>
+    <string-array name="pref_display_apptheme">
+        <item>Mörk</item>
+        <item>Ljus</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Enkel</item>
+        <item>Utvidgad</item>
+        <item>Utvidgad (fulltext)</item>
+        <item>Utvidgad med WebView</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notifieringar</string>
+    <string name="pref_title_notification_new_articles_available">Visa notifiering när nya artiklar är tillgängliga</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Fel</string>
+    <string name="login_dialog_text_something_went_wrong">Något gick fel :(</string>
+    <string name="login_dialog_text_not_compatible">Denna version är inte kompatibel med din ownCloud nyhetsapp. Vänligen uppdatera nyhetsappen och dess beroenden.</string>
+    <string name="login_dialog_title_security_warning">Säkerhetsvarning</string>
+    <string name="login_dialog_text_security_warning">Du använder inte https. En angripare kan fånga din trafik och få tillgång till känsliga uppgifter (t.ex. ditt lösenord). Så det är starkt rekommenderat att använda https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; synk</string>
+    <string name="pref_title_clearCache">Rensa cache</string>
+    <string name="pref_title_CacheImagesOffline">Cacha bilder offline</string>
+    <string name="pref_title_Max_Cache_Size">Max Cache-storlek</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Aldrig</item>
+        <item>Endast över WiFi</item>
+        <item>Över WiFi &amp; Mobildata</item>
+        <item>Fråga om ej ansluten till WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 minuter</item>
+        <item>15 minuter</item>
+        <item>30 minuter</item>
+        <item>45 minuter</item>
+        <item>1 timme</item>
+        <item>2 timme</item>
+        <item>3 timme</item>
+        <item>6 timme</item>
+        <item>12 timme</item>
+        <item>24 timme</item>
+    </string-array>
+    <string name="content_desc_play">spela</string>
+    <string name="content_desc_pause">pausa</string>
+    <string name="content_desc_rewind">spola bakåt</string>
+    <string name="content_desc_forward">spola framåt</string>
+    <string name="content_desc_expand">utöka</string>
+    <string name="content_desc_collapse">dölj</string>
+    <string name="content_desc_mark_as_read">markera som läst</string>
+    <string name="content_desc_mark_as_unread">markera som oläst</string>
+    <string name="content_desc_tap_to_refresh">tryck för att uppdatera</string>
+    <string name="content_desc_add_to_favorites">lägg till i favoriter</string>
+    <string name="content_desc_remove_from_favorites">ta bort från favoriter</string>
+    <string name="content_desc_show_password">visa lösenordet</string>
+    <string name="content_desc_delete">radera</string>
+    <string name="content_desc_download">ladda ner</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-th-rTH/strings.xml b/News-Android-App/src/main/res/values-th-rTH/strings.xml
index 4d7a6974..746b0d27 100644
--- a/News-Android-App/src/main/res/values-th-rTH/strings.xml
+++ b/News-Android-App/src/main/res/values-th-rTH/strings.xml
@@ -1,190 +1,220 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">ประสานข้อมูลอัตโนมัติ</string>
-  <string name="app_name">ประกาศข่าว ownCloud</string>
-  <string name="title_activity_sync_interval_selector">เลือกช่วงเวลาการประสานข้อมูล</string>
-  <string name="title_activity_news_detail">รายละเอียดกิจกรรม</string>
-  <string name="empty_view_content">ไม่มีรายการที่นี่</string>
-  <string name="toast_GettingMoreItems">กำลังเริ่มดาวน์โหลดรายการอื่นๆ ... โปรดรอสักครู่</string>
-  <string name="no_wifi_available">ไม่มีการเชื่อมต่อ Wifi</string>
-  <string name="do_you_want_to_download_without_wifi">คุณต้องการดาวน์โหลดรูปภาพได้โดยไม่ต้องเชื่อมต่อ WiFi</string>
-  <string name="current_version">คุณกำลังใช้รุ่น %s</string>
-  <string name="widget_header">ข่าว ownCloud</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="other">%d รายการใหม่ที่สามารถใช้ได้</item>
-  </plurals>
-  <string name="message_bar_reload">โหลดใหม่อีกครั้ง</string>
-  <string name="allUnreadFeeds">ยังไม่ได้อ่านรายการทั้งหมด</string>
-  <string name="starredFeeds">รายการที่ติดดาว</string>
-  <string name="title_activity_new_feed">เพิ่ม feed ใหม่</string>
-  <string name="menu_update">รีเฟรช</string>
-  <string name="menu_About_Changelog">เกี่ยวกับ/เปลี่ยนแปลง</string>
-  <string name="menu_markAllAsRead">เลือกอ่านทั้งหมด</string>
-  <string name="menu_StartImageCaching">ดาวน์โหลดรูปภาพ</string>
-  <string name="menu_downloadMoreItems">ดาวน์โหลดรายการอื่นๆ</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">ติดดาวแล้ว</string>
-  <string name="action_read">อ่าน</string>
-  <string name="action_playPodacst">เล่นพอดคาสต์</string>
-  <string name="action_openInBrowser">เปิดในเบราว์เซอร์</string>
-  <string name="action_Share">แชร์</string>
-  <string name="action_login">ตั้งค่าเซิร์ฟเวอร์</string>
-  <string name="action_save">บันทึก</string>
-  <string name="action_settings">ตั้งค่า</string>
-  <string name="action_sync_settings">ตั้งค่าการประสานข้อมูล</string>
-  <string name="action_add_new_feed">เพิ่ม feed ใหม่</string>
-  <string name="action_textToSpeech">อ่านออก</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="other">คุณมี %d รายการใหม่ที่ยังไม่ได้อ่าน</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="other">มี %d รายการใหม่ที่ยังไม่ได้อ่าน</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">ฟีด URL</string>
-  <string name="action_add_feed">เพิ่ม feed</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">ดาวน์โหลดรูปภาพ</string>
-  <string name="action_img_sharelink">แชร์ลิงค์รูปภาพ</string>
-  <string name="action_img_open">เปิดรูปในบราวเซอร์</string>
-  <string name="action_img_copylink">คัดลอกลิงค์รูปภาพ</string>
-  <string name="action_link_share">แชร์ลิงค์</string>
-  <string name="action_link_open">เปิดลิงค์ในบราวเซอร์</string>
-  <string name="action_link_copy">คัดลอกลิงค์</string>
-  <string name="toast_img_download_wait">กำลังดาวน์โหลด... โปรดรอสักครู่</string>
-  <string name="toast_img_saved">บันทึกรูปภาพแล้ว</string>
-  <string name="toast_img_notwriteable">บันทึกรูปภาพล้มเหลว</string>
-  <string name="toast_copied_to_clipboard">คัดลอกไปยังคลิปบอร์ด</string>
-  <string name="error_download_failed">ดาวน์โหลดล้มเหลว</string>
-  <string name="intent_title_share">แชร์ผ่าน</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">ลบฟีด</string>
-  <string name="action_feed_rename">เปลี่ยนชื่อฟีด</string>
-  <string name="feed_remove_button">ลบออก</string>
-  <string name="feed_rename_button">เปลี่ยนชื่อ</string>
-  <string name="confirm_feed_remove">คุณต้องการลบฟีดนี้หรือไม่? หากลบแล้วจะกู้คืนไม่ได้!</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">ชื่อผู้ใช้งาน</string>
-  <string name="pref_title_password">รหัสผ่าน</string>
-  <string name="pref_title_owncloudRootPath">ที่อยู่รากของ ownCloud</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">เข้าสู่ระบบ</string>
-  <string name="login_progress_signing_in">กำลังเข้าสู่ระบบ ...</string>
-  <string name="error_field_required">ต้องใส่ข้อมูลลงในช่องนี้</string>
-  <string name="error_invalid_url">URL นี้ไม่ถูกต้อง</string>
-  <!--Import Accounts-->
-  <string name="import_account">นำเข้าบัญชี</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="other">ดาวน์โหลด %d รายการเก่า</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">ไม่มีรายการที่ใช้ได้</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="other">%d ที่ถูกเรียก...</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">ตั้งค่า</string>
-  <string name="cache_is_cleared">แคชจะถูกล้างออก!</string>
-  <!--General settings-->
-  <string name="pref_header_general">ทั่วไป</string>
-  <string name="pref_title_general_sort_order">เรียงลำดับรายการ</string>
-  <string-array name="pref_general_sort_order">
-    <item>ใหม่ -&gt; เก่า</item>
-    <item>เก่า -&gt; ใหม่</item>
-  </string-array>
-  <string name="dialog_clearing_cache">กำลังล้างแคช</string>
-  <string name="dialog_clearing_cache_please_wait">กำลังล้างแคช ... โปรดรอสักครู่</string>
-  <string name="reset_cache_unsaved_changes">มีการเปลี่ยนแปลงที่ไม่ได้ประสานข้อมูล คุณต้องการตั้งค่าแคชหรือไม่?</string>
-  <string name="warning">คำเตือน</string>
-  <string name="pref_title_AutoSyncOnStart">ประสานข้อมูลเมื่อเริ่มต้น</string>
-  <string name="pref_title_ShowOnlyUnread">แสดงบทความที่ยังไม่ได้อ่านเท่านั้น</string>
-  <string name="pref_title_DisableHostnameVerification">ปิดการใช้งานการตรวจสอบ Hostname</string>
-  <string name="pref_title_NavigateWithVolumeButtons">นำทางด้วยปุ่มปรับระดับเสียง</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">ทำเครื่องหมายว่าอ่านในขณะที่เลื่อน</string>
-  <string name="pref_title_OpenInBrowserDirectly">ใช้เบราว์เซอร์ภายนอกเพื่อดูบทความ</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">ยอมรับใบรับรองที่ไม่รู้จัก?</string>
-  <string name="mtm_decision_always">เสมอ</string>
-  <string name="mtm_decision_abort">ยกเลิก</string>
-  <string name="mtm_notification">การตรวจสอบใบรับรอง</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">ไม่ได้เลือกพอดคาสต์</string>
-  <string name="no_chapters_available">ไม่มีเรื่องที่สามารถใช้ได้</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">แสดงผล</string>
-  <string name="pref_title_app_theme">ธีมแอพฯ</string>
-  <string name="pref_title_feed_list_layout">รูปแบบรายการฟีด</string>
-  <string name="pref_display_title_lines_count">จำนวนบรรทัดสำหรับชื่อเรื่อง</string>
-  <string-array name="pref_display_apptheme">
-    <item>มืด</item>
-    <item>สว่าง</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>ปกติ</item>
-    <item>ขยาย</item>
-    <item>ขยาย (ฉบับเต็ม)</item>
-    <item>ขยายด้วย Webview</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">การแจ้งเตือน</string>
-  <string name="pref_title_notification_new_articles_available">แสดงการแจ้งเตือนเมื่อมีบทความใหม่</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">ข้อผิดพลาด</string>
-  <string name="login_dialog_text_something_went_wrong">เกิดข้อผิดพลาดบางอย่าง :(</string>
-  <string name="login_dialog_text_not_compatible">แอพฯรุ่นนี้เข้ากันไม่ได้กับแอพฯข่าว ownCloud ของคุณ โปรดอัพเดตแอพฯข่าวและ appframework</string>
-  <string name="login_dialog_title_security_warning">คำเตือนเกี่ยวกับความปลอดภัย</string>
-  <string name="login_dialog_text_security_warning">คุณไม่ได้ใช้ Https คุณอาจถูกดักแพคเกจเช่นรหัสผ่านของคุณดังนั้นจึงขอแนะนำให้ใช้ Https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">ข้อมูล &amp; ประสานข้อมูล</string>
-  <string name="pref_title_clearCache">ล้างแคช</string>
-  <string name="pref_title_CacheImagesOffline">แคชรูปภาพออฟไลน์</string>
-  <string name="pref_title_Max_Cache_Size">ขนาดแคชสูงสุด</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>ไม่เคย</item>
-    <item>เฉพาะ WiFi เท่านั้น</item>
-    <item>เฉพาะ WiFi &amp; เคลือข่ายมือถือ</item>
-    <item>ถามเมื่อไม่ได้เชื่อมต่อกับ WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 เมกะไบต์</item>
-    <item>500 เมกะไบต์</item>
-    <item>750 เมกะไบต์</item>
-    <item>1 กิกะไบต์</item>
-    <item>2 กิกะไบต์</item>
-    <item>5 กิกะไบต์</item>
-    <item>10 กิกะไบต์</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 นาที</item>
-    <item>15 นาที</item>
-    <item>30 นาที</item>
-    <item>45 นาที</item>
-    <item>1 ชั่วโมง</item>
-    <item>2 ชั่วโมง</item>
-    <item>3 ชั่วโมง</item>
-    <item>6 ชั่วโมง</item>
-    <item>12 ชั่วโมง</item>
-    <item>24 ชั่วโมง</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">เล่น</string>
-  <string name="content_desc_pause">หยุดชั่วคราว</string>
-  <string name="content_desc_rewind">กรอกลับ</string>
-  <string name="content_desc_forward">เลื่อนไปข้างหน้า</string>
-  <string name="content_desc_expand">ขยาย</string>
-  <string name="content_desc_collapse">ย่อ</string>
-  <string name="content_desc_mark_as_read">ทำเครื่องหมายว่าอ่านแล้ว</string>
-  <string name="content_desc_mark_as_unread">ทำเครื่องหมายว่ายังไม่ได้อ่าน</string>
-  <string name="content_desc_tap_to_refresh">แตะเพื่อรีเฟรช</string>
-  <string name="content_desc_add_to_favorites">เพิ่มในรายการโปรด</string>
-  <string name="content_desc_remove_from_favorites">ลบออกจากรายการโปรด</string>
-  <string name="content_desc_show_password">แสดงรหัสผ่าน</string>
-  <string name="content_desc_delete">ลบ</string>
-  <string name="content_desc_download">ดาวน์โหลด</string>
+
+    <string name="auto_sync_string">ประสานข้อมูลอัตโนมัติ</string>
+    <string name="title_activity_sync_interval_selector">เลือกช่วงเวลาการประสานข้อมูล</string>
+    <string name="title_activity_news_detail">รายละเอียดกิจกรรม</string>
+    <string name="empty_view_content">ไม่มีรายการที่นี่</string>
+    <string name="toast_GettingMoreItems">กำลังเริ่มดาวน์โหลดรายการอื่นๆ ... โปรดรอสักครู่</string>
+    <string name="no_wifi_available">ไม่มีการเชื่อมต่อ Wifi</string>
+    <string name="do_you_want_to_download_without_wifi">คุณต้องการดาวน์โหลดรูปภาพได้โดยไม่ต้องเชื่อมต่อ WiFi</string>
+    <string name="current_version">คุณกำลังใช้รุ่น %s</string>
+    <string name="widget_header">ข่าว ownCloud</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="other">%d รายการใหม่ที่สามารถใช้ได้</item>
+    </plurals>
+    <string name="message_bar_reload">โหลดใหม่อีกครั้ง</string>
+    <string name="allUnreadFeeds">ยังไม่ได้อ่านรายการทั้งหมด</string>
+    <string name="starredFeeds">รายการที่ติดดาว</string>
+    <string name="title_activity_new_feed">เพิ่ม feed ใหม่</string>
+
+    <string name="menu_update">รีเฟรช</string>
+    <string name="menu_About_Changelog">เกี่ยวกับ/เปลี่ยนแปลง</string>
+    <string name="menu_markAllAsRead">เลือกอ่านทั้งหมด</string>
+    <string name="menu_StartImageCaching">ดาวน์โหลดรูปภาพ</string>
+    <string name="menu_downloadMoreItems">ดาวน์โหลดรายการอื่นๆ</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">ติดดาวแล้ว</string>
+    <string name="action_read">อ่าน</string>
+    <string name="action_playPodacst">เล่นพอดคาสต์</string>
+    <string name="action_openInBrowser">เปิดในเบราว์เซอร์</string>
+    <string name="action_Share">แชร์</string>
+    <string name="action_login">ตั้งค่าเซิร์ฟเวอร์</string>
+    <string name="action_save">บันทึก</string>
+    <string name="action_settings">ตั้งค่า</string>
+    <string name="action_sync_settings">ตั้งค่าการประสานข้อมูล</string>
+    <string name="action_add_new_feed">เพิ่ม feed ใหม่</string>
+    <string name="action_textToSpeech">อ่านออก</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="other">คุณมี %d รายการใหม่ที่ยังไม่ได้อ่าน</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="other">มี %d รายการใหม่ที่ยังไม่ได้อ่าน</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">ฟีด URL</string>
+    <string name="action_add_feed">เพิ่ม feed</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">ดาวน์โหลดรูปภาพ</string>
+    <string name="action_img_sharelink">แชร์ลิงค์รูปภาพ</string>
+    <string name="action_img_open">เปิดรูปในบราวเซอร์</string>
+    <string name="action_img_copylink">คัดลอกลิงค์รูปภาพ</string>
+    <string name="action_link_share">แชร์ลิงค์</string>
+    <string name="action_link_open">เปิดลิงค์ในบราวเซอร์</string>
+    <string name="action_link_copy">คัดลอกลิงค์</string>
+    <string name="toast_img_download_wait">กำลังดาวน์โหลด... โปรดรอสักครู่</string>
+    <string name="toast_img_saved">บันทึกรูปภาพแล้ว</string>
+    <string name="toast_img_notwriteable">บันทึกรูปภาพล้มเหลว</string>
+    <string name="toast_copied_to_clipboard">คัดลอกไปยังคลิปบอร์ด</string>
+    <string name="error_download_failed">ดาวน์โหลดล้มเหลว</string>
+    <string name="intent_title_share">แชร์ผ่าน</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">ลบฟีด</string>
+    <string name="action_feed_rename">เปลี่ยนชื่อฟีด</string>
+    <string name="feed_remove_button">ลบออก</string>
+    <string name="feed_rename_button">เปลี่ยนชื่อ</string>
+    <string name="confirm_feed_remove">คุณต้องการลบฟีดนี้หรือไม่? หากลบแล้วจะกู้คืนไม่ได้!</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">ชื่อผู้ใช้งาน</string>
+    <string name="pref_title_password">รหัสผ่าน</string>
+    <string name="pref_title_owncloudRootPath">ที่อยู่รากของ ownCloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">เข้าสู่ระบบ</string>
+    <string name="login_progress_signing_in">กำลังเข้าสู่ระบบ ...</string>
+    <string name="error_field_required">ต้องใส่ข้อมูลลงในช่องนี้</string>
+    <string name="error_invalid_url">URL นี้ไม่ถูกต้อง</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">นำเข้าบัญชี</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="other">ดาวน์โหลด %d รายการเก่า</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">ไม่มีรายการที่ใช้ได้</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="other">%d ที่ถูกเรียก...</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">ตั้งค่า</string>
+    <string name="cache_is_cleared">แคชจะถูกล้างออก!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">ทั่วไป</string>
+    <string name="pref_title_general_sort_order">เรียงลำดับรายการ</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>ใหม่ -&gt; เก่า</item>
+        <item>เก่า -&gt; ใหม่</item>
+    </string-array>
+    <string name="dialog_clearing_cache">กำลังล้างแคช</string>
+    <string name="dialog_clearing_cache_please_wait">กำลังล้างแคช ... โปรดรอสักครู่</string>
+    <string name="reset_cache_unsaved_changes">มีการเปลี่ยนแปลงที่ไม่ได้ประสานข้อมูล คุณต้องการตั้งค่าแคชหรือไม่?</string>
+    <string name="warning">คำเตือน</string>
+    <string name="pref_title_AutoSyncOnStart">ประสานข้อมูลเมื่อเริ่มต้น</string>
+    <string name="pref_title_ShowOnlyUnread">แสดงบทความที่ยังไม่ได้อ่านเท่านั้น</string>
+    <string name="pref_title_DisableHostnameVerification">ปิดการใช้งานการตรวจสอบ Hostname</string>
+    <string name="pref_title_NavigateWithVolumeButtons">นำทางด้วยปุ่มปรับระดับเสียง</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">ทำเครื่องหมายว่าอ่านในขณะที่เลื่อน</string>
+    <string name="pref_title_OpenInBrowserDirectly">ใช้เบราว์เซอร์ภายนอกเพื่อดูบทความ</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">ยอมรับใบรับรองที่ไม่รู้จัก?</string>
+    <string name="mtm_decision_always">เสมอ</string>
+    <string name="mtm_decision_abort">ยกเลิก</string>
+    <string name="mtm_notification">การตรวจสอบใบรับรอง</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">ไม่ได้เลือกพอดคาสต์</string>
+    <string name="no_chapters_available">ไม่มีเรื่องที่สามารถใช้ได้</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">แสดงผล</string>
+    <string name="pref_title_app_theme">ธีมแอพฯ</string>
+    <string name="pref_title_feed_list_layout">รูปแบบรายการฟีด</string>
+    <string name="pref_display_title_lines_count">จำนวนบรรทัดสำหรับชื่อเรื่อง</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>มืด</item>
+        <item>สว่าง</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>ปกติ</item>
+        <item>ขยาย</item>
+        <item>ขยาย (ฉบับเต็ม)</item>
+        <item>ขยายด้วย Webview</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">การแจ้งเตือน</string>
+    <string name="pref_title_notification_new_articles_available">แสดงการแจ้งเตือนเมื่อมีบทความใหม่</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">ข้อผิดพลาด</string>
+    <string name="login_dialog_text_something_went_wrong">เกิดข้อผิดพลาดบางอย่าง :(</string>
+    <string name="login_dialog_text_not_compatible">แอพฯรุ่นนี้เข้ากันไม่ได้กับแอพฯข่าว ownCloud ของคุณ โปรดอัพเดตแอพฯข่าวและ appframework</string>
+    <string name="login_dialog_title_security_warning">คำเตือนเกี่ยวกับความปลอดภัย</string>
+    <string name="login_dialog_text_security_warning">คุณไม่ได้ใช้ Https คุณอาจถูกดักแพคเกจเช่นรหัสผ่านของคุณดังนั้นจึงขอแนะนำให้ใช้ Https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">ข้อมูล &amp; ประสานข้อมูล</string>
+    <string name="pref_title_clearCache">ล้างแคช</string>
+    <string name="pref_title_CacheImagesOffline">แคชรูปภาพออฟไลน์</string>
+    <string name="pref_title_Max_Cache_Size">ขนาดแคชสูงสุด</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>ไม่เคย</item>
+        <item>เฉพาะ WiFi เท่านั้น</item>
+        <item>เฉพาะ WiFi &amp; เคลือข่ายมือถือ</item>
+        <item>ถามเมื่อไม่ได้เชื่อมต่อกับ WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 เมกะไบต์</item>
+        <item>500 เมกะไบต์</item>
+        <item>750 เมกะไบต์</item>
+        <item>1 กิกะไบต์</item>
+        <item>2 กิกะไบต์</item>
+        <item>5 กิกะไบต์</item>
+        <item>10 กิกะไบต์</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 นาที</item>
+        <item>15 นาที</item>
+        <item>30 นาที</item>
+        <item>45 นาที</item>
+        <item>1 ชั่วโมง</item>
+        <item>2 ชั่วโมง</item>
+        <item>3 ชั่วโมง</item>
+        <item>6 ชั่วโมง</item>
+        <item>12 ชั่วโมง</item>
+        <item>24 ชั่วโมง</item>
+    </string-array>
+    <string name="content_desc_play">เล่น</string>
+    <string name="content_desc_pause">หยุดชั่วคราว</string>
+    <string name="content_desc_rewind">กรอกลับ</string>
+    <string name="content_desc_forward">เลื่อนไปข้างหน้า</string>
+    <string name="content_desc_expand">ขยาย</string>
+    <string name="content_desc_collapse">ย่อ</string>
+    <string name="content_desc_mark_as_read">ทำเครื่องหมายว่าอ่านแล้ว</string>
+    <string name="content_desc_mark_as_unread">ทำเครื่องหมายว่ายังไม่ได้อ่าน</string>
+    <string name="content_desc_tap_to_refresh">แตะเพื่อรีเฟรช</string>
+    <string name="content_desc_add_to_favorites">เพิ่มในรายการโปรด</string>
+    <string name="content_desc_remove_from_favorites">ลบออกจากรายการโปรด</string>
+    <string name="content_desc_show_password">แสดงรหัสผ่าน</string>
+    <string name="content_desc_delete">ลบ</string>
+    <string name="content_desc_download">ดาวน์โหลด</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-tr/strings.xml b/News-Android-App/src/main/res/values-tr/strings.xml
index 7199883c..cf6fcfad 100644
--- a/News-Android-App/src/main/res/values-tr/strings.xml
+++ b/News-Android-App/src/main/res/values-tr/strings.xml
@@ -1,184 +1,205 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Otomatik eşitle</string>
-  <string name="app_name">ownCloud Haber Okuyucu</string>
-  <string name="title_activity_sync_interval_selector">Eşitleme Aralık Seçici</string>
-  <string name="title_activity_news_detail">NewsDetailActivity</string>
-  <string name="empty_view_content">Burada öge yok</string>
-  <string name="toast_GettingMoreItems">Daha fazla öge indirilmeye başlandı... Lütfen bekleyin.</string>
-  <string name="no_wifi_available">Kablosuz bağlı değil</string>
-  <string name="do_you_want_to_download_without_wifi">Resimleri bir kablosuz bağlantı olmadan indirmek ister misiniz</string>
-  <string name="current_version">%s sürümünü kullanıyorsunuz</string>
-  <string name="widget_header">ownCloud Haberler</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">%d yeni öge mevcut</item>
-    <item quantity="other">%d yeni öge mevcut</item>
-  </plurals>
-  <string name="message_bar_reload">Yeniden yükle</string>
-  <string name="allUnreadFeeds">Tüm okunmamış ögeler</string>
-  <string name="starredFeeds">Yıldızlı ögeler</string>
-  <string name="title_activity_new_feed">Yeni besleme ekle</string>
-  <string name="menu_update">Yenile</string>
-  <string name="menu_About_Changelog">Hakkında / Değişim Günlüğü</string>
-  <string name="menu_markAllAsRead">Tümünü okundu işaretle</string>
-  <string name="menu_StartImageCaching">Resimleri indir</string>
-  <string name="menu_downloadMoreItems">Daha fazla öge indir</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Yıldızlı</string>
-  <string name="action_read">Oku</string>
-  <string name="action_playPodacst">Podcast\'i Oynat</string>
-  <string name="action_openInBrowser">Tarayıcıda Aç</string>
-  <string name="action_Share">Paylaş</string>
-  <string name="action_login">Sunucu Ayarları</string>
-  <string name="action_save">Kaydet</string>
-  <string name="action_settings">Ayarlar</string>
-  <string name="action_sync_settings">Eşitleme Ayarları</string>
-  <string name="action_add_new_feed">Yeni besleme ekle</string>
-  <string name="action_textToSpeech">Sesli oku</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="one">Yeni %d okunmamış ögeniz var</item>
-    <item quantity="other">Yeni %d okunmamış ögeniz var</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="one">Yeni %d okunmamış öge mevcut</item>
-    <item quantity="other">Yeni %d okunmamış öge mevcut</item>
-  </plurals>
-  <!--Add new feed-->
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">Resmi İndir</string>
-  <string name="action_img_sharelink">Resim Bağlantısını Paylaş</string>
-  <string name="action_img_open">Resmi Tarayıcıda Aç</string>
-  <string name="action_img_copylink">Resim Bağlantısını Kopyala</string>
-  <string name="action_link_share">Bağlantıyı Paylaş</string>
-  <string name="action_link_open">Bağlantıyı Tarayıcıda Aç</string>
-  <string name="action_link_copy">Bağlantıyı Kopyala</string>
-  <string name="toast_img_download_wait">İndiriliyor... Lütfen bekleyin</string>
-  <string name="toast_img_saved">Resim kaydedildi.</string>
-  <string name="toast_img_notwriteable">Resim diske yazılamadı.</string>
-  <string name="toast_copied_to_clipboard">Panoya kopyalandı</string>
-  <string name="error_download_failed">İndirme başarısız</string>
-  <string name="intent_title_share">Şununla paylaş</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Kaldır</string>
-  <string name="feed_rename_button">Yeniden adlandır</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Kullanıcı Adı</string>
-  <string name="pref_title_password">Parola</string>
-  <string name="pref_title_owncloudRootPath">ownCloud ana dizin adresi</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Oturum aç</string>
-  <string name="login_progress_signing_in">Oturum açılıyor...</string>
-  <string name="error_field_required">Bu alan gerekli</string>
-  <string name="error_invalid_url">Bu adres geçersiz</string>
-  <!--Import Accounts-->
-  <string name="import_account">Hesabı İçe Aktar</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="one">%d eski öge indirildi</item>
-    <item quantity="other">%d eski öge indirildi</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">Daha fazla öge yok</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Ayarlar</string>
-  <string name="cache_is_cleared">Önbellek temizlendi!</string>
-  <!--General settings-->
-  <string name="pref_header_general">Genel</string>
-  <string name="pref_title_general_sort_order">Sıralama Şekli</string>
-  <string-array name="pref_general_sort_order">
-    <item>Yeni -&gt; Eski</item>
-    <item>Eski -&gt; Yeni</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Önbellek temizleniyor</string>
-  <string name="dialog_clearing_cache_please_wait">Önbellek temizleniyor... Lütfen bekleyin.</string>
-  <string name="reset_cache_unsaved_changes">Eşitlenmemiş değişiklikler var. Önbelleği yine de sıfırlamak ister misiniz?</string>
-  <string name="warning">Uyarı</string>
-  <string name="pref_title_AutoSyncOnStart">Başlangıçta eşitle</string>
-  <string name="pref_title_ShowOnlyUnread">Sadece okunmamışları göster</string>
-  <string name="pref_title_DisableHostnameVerification">Ana Makine Doğrulamayı Devre Dışı Bırak</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Ses düğmeleri ile gezin</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Kaydırırken okundu işaretle</string>
-  <string name="pref_title_OpenInBrowserDirectly">Makaleleri görüntülemek için harici tarayıcı kullan</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Bilinmeyen Sertifika Kabul Edilsin mi?</string>
-  <string name="mtm_decision_always">Her Zaman</string>
-  <string name="mtm_decision_abort">İptal Et</string>
-  <string name="mtm_notification">Sertifika Doğrulama</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Hiç podcast seçilmedi</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Görüntüle</string>
-  <string name="pref_title_app_theme">Uyg. teması</string>
-  <string name="pref_title_feed_list_layout">Besleme listesi yerleşimi</string>
-  <string name="pref_display_title_lines_count">Başlık için satır sayısı</string>
-  <string-array name="pref_display_apptheme">
-    <item>Koyu</item>
-    <item>Açık</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Basit</item>
-    <item>Genişletilmiş</item>
-    <item>&gt;Genişletilmiş (tam metin)</item>
-    <item>Web görünümü ile genişletilmiş</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Bildirimler</string>
-  <string name="pref_title_notification_new_articles_available">Yeni makaleler kullanılabilir olduğunda bildirim göster</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Hata</string>
-  <string name="login_dialog_text_something_went_wrong">Bir şeyler yanlış gitti :(</string>
-  <string name="login_dialog_text_not_compatible">Bu uygulama sürümü sizin ownCloud Haber uygulamanız ile uyumlu değil. Lütfen haber uygulama ve uygulama çerçevesini güncelleyin.</string>
-  <string name="login_dialog_title_security_warning">Güvenlik Uyarısı</string>
-  <string name="login_dialog_text_security_warning">HTTPS kullanmıyorsunuz. Bir saldırgan trafiğinizi kesip hassas verilere erişim kazanabilir (örn. parolanız). Bu yüzden HTTPS kullanmanız şiddetle tavsiye olunur!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Veri ve eşitleme</string>
-  <string name="pref_title_clearCache">Önbelleği temizle</string>
-  <string name="pref_title_CacheImagesOffline">Resimleri çevrimdışı önbelleğe al</string>
-  <string name="pref_title_Max_Cache_Size">Azami Önbellek Boyutu</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Asla</item>
-    <item>Sadece WiFi ile</item>
-    <item>WiFi ve Mobil</item>
-    <item>WiFi ile bağlı değilken sor</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Dakika</item>
-    <item>15 Dakika</item>
-    <item>30 Dakika</item>
-    <item>45 Dakika</item>
-    <item>1 Saat</item>
-    <item>2 Saat</item>
-    <item>3 Saat</item>
-    <item>6 Saat</item>
-    <item>12 Saat</item>
-    <item>24 Saat</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">oynat</string>
-  <string name="content_desc_pause">duraklat</string>
-  <string name="content_desc_rewind">geri</string>
-  <string name="content_desc_forward">ileri</string>
-  <string name="content_desc_expand">genişlet</string>
-  <string name="content_desc_collapse">daralt</string>
-  <string name="content_desc_mark_as_read">okundu olarak işaretle</string>
-  <string name="content_desc_mark_as_unread">okunmadı olarak işaretle</string>
-  <string name="content_desc_add_to_favorites">sık kullanılanlara ekle</string>
-  <string name="content_desc_remove_from_favorites">sık kullanılanlardan çıkart</string>
-  <string name="content_desc_show_password">şifre göster</string>
-  <string name="content_desc_delete">sil</string>
-  <string name="content_desc_download">indir</string>
+
+    <string name="auto_sync_string">Otomatik eşitle</string>
+    <string name="title_activity_sync_interval_selector">Eşitleme Aralık Seçici</string>
+    <string name="title_activity_news_detail">NewsDetailActivity</string>
+    <string name="empty_view_content">Burada öge yok</string>
+    <string name="toast_GettingMoreItems">Daha fazla öge indirilmeye başlandı... Lütfen bekleyin.</string>
+    <string name="no_wifi_available">Kablosuz bağlı değil</string>
+    <string name="do_you_want_to_download_without_wifi">Resimleri bir kablosuz bağlantı olmadan indirmek ister misiniz</string>
+    <string name="current_version">%s sürümünü kullanıyorsunuz</string>
+    <string name="widget_header">ownCloud Haberler</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">%d yeni öge mevcut</item>
+        <item quantity="other">%d yeni öge mevcut</item>
+    </plurals>
+    <string name="message_bar_reload">Yeniden yükle</string>
+    <string name="allUnreadFeeds">Tüm okunmamış ögeler</string>
+    <string name="starredFeeds">Yıldızlı ögeler</string>
+    <string name="title_activity_new_feed">Yeni besleme ekle</string>
+
+    <string name="menu_update">Yenile</string>
+    <string name="menu_About_Changelog">Hakkında / Değişim Günlüğü</string>
+    <string name="menu_markAllAsRead">Tümünü okundu işaretle</string>
+    <string name="menu_StartImageCaching">Resimleri indir</string>
+    <string name="menu_downloadMoreItems">Daha fazla öge indir</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Yıldızlı</string>
+    <string name="action_read">Oku</string>
+    <string name="action_playPodacst">Podcast\'i Oynat</string>
+    <string name="action_openInBrowser">Tarayıcıda Aç</string>
+    <string name="action_Share">Paylaş</string>
+    <string name="action_login">Sunucu Ayarları</string>
+    <string name="action_save">Kaydet</string>
+    <string name="action_settings">Ayarlar</string>
+    <string name="action_sync_settings">Eşitleme Ayarları</string>
+    <string name="action_add_new_feed">Yeni besleme ekle</string>
+    <string name="action_textToSpeech">Sesli oku</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="one">Yeni %d okunmamış ögeniz var</item>
+        <item quantity="other">Yeni %d okunmamış ögeniz var</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="one">Yeni %d okunmamış öge mevcut</item>
+        <item quantity="other">Yeni %d okunmamış öge mevcut</item>
+    </plurals>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">Resmi İndir</string>
+    <string name="action_img_sharelink">Resim Bağlantısını Paylaş</string>
+    <string name="action_img_open">Resmi Tarayıcıda Aç</string>
+    <string name="action_img_copylink">Resim Bağlantısını Kopyala</string>
+    <string name="action_link_share">Bağlantıyı Paylaş</string>
+    <string name="action_link_open">Bağlantıyı Tarayıcıda Aç</string>
+    <string name="action_link_copy">Bağlantıyı Kopyala</string>
+    <string name="toast_img_download_wait">İndiriliyor... Lütfen bekleyin</string>
+    <string name="toast_img_saved">Resim kaydedildi.</string>
+    <string name="toast_img_notwriteable">Resim diske yazılamadı.</string>
+    <string name="toast_copied_to_clipboard">Panoya kopyalandı</string>
+    <string name="error_download_failed">İndirme başarısız</string>
+    <string name="intent_title_share">Şununla paylaş</string>
+
+
+    <string name="feed_remove_button">Kaldır</string>
+    <string name="feed_rename_button">Yeniden adlandır</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Kullanıcı Adı</string>
+    <string name="pref_title_password">Parola</string>
+    <string name="pref_title_owncloudRootPath">ownCloud ana dizin adresi</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Oturum aç</string>
+    <string name="login_progress_signing_in">Oturum açılıyor...</string>
+    <string name="error_field_required">Bu alan gerekli</string>
+    <string name="error_invalid_url">Bu adres geçersiz</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Hesabı İçe Aktar</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="one">%d eski öge indirildi</item>
+        <item quantity="other">%d eski öge indirildi</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">Daha fazla öge yok</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Ayarlar</string>
+    <string name="cache_is_cleared">Önbellek temizlendi!</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">Genel</string>
+    <string name="pref_title_general_sort_order">Sıralama Şekli</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Yeni -&gt; Eski</item>
+        <item>Eski -&gt; Yeni</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Önbellek temizleniyor</string>
+    <string name="dialog_clearing_cache_please_wait">Önbellek temizleniyor... Lütfen bekleyin.</string>
+    <string name="reset_cache_unsaved_changes">Eşitlenmemiş değişiklikler var. Önbelleği yine de sıfırlamak ister misiniz?</string>
+    <string name="warning">Uyarı</string>
+    <string name="pref_title_AutoSyncOnStart">Başlangıçta eşitle</string>
+    <string name="pref_title_ShowOnlyUnread">Sadece okunmamışları göster</string>
+    <string name="pref_title_DisableHostnameVerification">Ana Makine Doğrulamayı Devre Dışı Bırak</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Ses düğmeleri ile gezin</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Kaydırırken okundu işaretle</string>
+    <string name="pref_title_OpenInBrowserDirectly">Makaleleri görüntülemek için harici tarayıcı kullan</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Bilinmeyen Sertifika Kabul Edilsin mi?</string>
+    <string name="mtm_decision_always">Her Zaman</string>
+    <string name="mtm_decision_abort">İptal Et</string>
+    <string name="mtm_notification">Sertifika Doğrulama</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Hiç podcast seçilmedi</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Görüntüle</string>
+    <string name="pref_title_app_theme">Uyg. teması</string>
+    <string name="pref_title_feed_list_layout">Besleme listesi yerleşimi</string>
+    <string name="pref_display_title_lines_count">Başlık için satır sayısı</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>Koyu</item>
+        <item>Açık</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>Basit</item>
+        <item>Genişletilmiş</item>
+        <item>&gt;Genişletilmiş (tam metin)</item>
+        <item>Web görünümü ile genişletilmiş</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Bildirimler</string>
+    <string name="pref_title_notification_new_articles_available">Yeni makaleler kullanılabilir olduğunda bildirim göster</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Hata</string>
+    <string name="login_dialog_text_something_went_wrong">Bir şeyler yanlış gitti :(</string>
+    <string name="login_dialog_text_not_compatible">Bu uygulama sürümü sizin ownCloud Haber uygulamanız ile uyumlu değil. Lütfen haber uygulama ve uygulama çerçevesini güncelleyin.</string>
+    <string name="login_dialog_title_security_warning">Güvenlik Uyarısı</string>
+    <string name="login_dialog_text_security_warning">HTTPS kullanmıyorsunuz. Bir saldırgan trafiğinizi kesip hassas verilere erişim kazanabilir (örn. parolanız). Bu yüzden HTTPS kullanmanız şiddetle tavsiye olunur!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Veri ve eşitleme</string>
+    <string name="pref_title_clearCache">Önbelleği temizle</string>
+    <string name="pref_title_CacheImagesOffline">Resimleri çevrimdışı önbelleğe al</string>
+    <string name="pref_title_Max_Cache_Size">Azami Önbellek Boyutu</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Asla</item>
+        <item>Sadece WiFi ile</item>
+        <item>WiFi ve Mobil</item>
+        <item>WiFi ile bağlı değilken sor</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Dakika</item>
+        <item>15 Dakika</item>
+        <item>30 Dakika</item>
+        <item>45 Dakika</item>
+        <item>1 Saat</item>
+        <item>2 Saat</item>
+        <item>3 Saat</item>
+        <item>6 Saat</item>
+        <item>12 Saat</item>
+        <item>24 Saat</item>
+    </string-array>
+    <string name="content_desc_play">oynat</string>
+    <string name="content_desc_pause">duraklat</string>
+    <string name="content_desc_rewind">geri</string>
+    <string name="content_desc_forward">ileri</string>
+    <string name="content_desc_expand">genişlet</string>
+    <string name="content_desc_collapse">daralt</string>
+    <string name="content_desc_mark_as_read">okundu olarak işaretle</string>
+    <string name="content_desc_mark_as_unread">okunmadı olarak işaretle</string>
+    <string name="content_desc_add_to_favorites">sık kullanılanlara ekle</string>
+    <string name="content_desc_remove_from_favorites">sık kullanılanlardan çıkart</string>
+    <string name="content_desc_show_password">şifre göster</string>
+    <string name="content_desc_delete">sil</string>
+    <string name="content_desc_download">indir</string>
 </resources>
diff --git a/News-Android-App/src/main/res/values-uk/strings.xml b/News-Android-App/src/main/res/values-uk/strings.xml
index 2ef6d624..8d7b41cb 100644
--- a/News-Android-App/src/main/res/values-uk/strings.xml
+++ b/News-Android-App/src/main/res/values-uk/strings.xml
@@ -1,127 +1,140 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Автоматична синхронізація</string>
-  <string name="app_name">Читати Новини в ownCloud </string>
-  <string name="title_activity_sync_interval_selector">Перемикач Інтервалу Синхронізації</string>
-  <string name="title_activity_news_detail">Останні Новини</string>
-  <string name="empty_view_content">Нічого нема</string>
-  <string name="toast_GettingMoreItems">Почато завантаження більшої кількості елементів... Будь ласка, зачекайте.</string>
-  <string name="no_wifi_available">Відсутнє WiFi з\'єднання</string>
-  <string name="do_you_want_to_download_without_wifi">Бажаєте завантажувати зображення коли немає WiFi з\'єднання?</string>
-  <string name="widget_header">Новини ownCloud </string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="one">Доступний %d новий елемент</item>
-    <item quantity="few">Доступно %d нових елементів</item>
-    <item quantity="other">Доступно %d нових елементів</item>
-  </plurals>
-  <string name="message_bar_reload">Перезавантажити</string>
-  <string name="allUnreadFeeds">Всі непрочитані</string>
-  <string name="starredFeeds">Помічені</string>
-  <string name="title_activity_new_feed">Додати нову стрічку</string>
-  <string name="menu_update">Оновити</string>
-  <string name="menu_About_Changelog">Зміни</string>
-  <string name="menu_markAllAsRead">Позначити все як прочитане</string>
-  <string name="menu_StartImageCaching">Завантажити зображення</string>
-  <string name="menu_downloadMoreItems">Завантажити більше елементів</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Помічені зірочкою</string>
-  <string name="action_read">Читати</string>
-  <string name="action_playPodacst">Відтворити Подкаст</string>
-  <string name="action_openInBrowser">Відкрити у переглядачі</string>
-  <string name="action_Share">Поділитися</string>
-  <string name="action_login">Налаштування Серверу</string>
-  <string name="action_save">Зберегти</string>
-  <string name="action_settings">Налаштування</string>
-  <string name="action_sync_settings">Налаштування синхронізації</string>
-  <string name="action_add_new_feed">Додати нову стрічку</string>
-  <string name="action_textToSpeech">Читати</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Додати стрічку</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="toast_copied_to_clipboard">Скопійовано в буфер обміну</string>
-  <string name="error_download_failed">Завантаження не вдалося</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Видалити</string>
-  <string name="feed_rename_button">Перейменувати</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Ім\'я користувача</string>
-  <string name="pref_title_password">Пароль</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Ввійти...</string>
-  <string name="login_progress_signing_in">Вхід...</string>
-  <string name="error_field_required">Обов\'язкове поле</string>
-  <string name="error_invalid_url">Невірний url</string>
-  <!--Import Accounts-->
-  <string name="import_account">Імпортувати обліковий запис</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Більше немає об\'єктів</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Налаштування</string>
-  <!--General settings-->
-  <string name="pref_header_general">Загалом</string>
-  <string name="pref_title_general_sort_order">Порядок сортування</string>
-  <string-array name="pref_general_sort_order">
-    <item>Новіші -&gt; Старші</item>
-    <item>Старші -&gt; Нові</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Очистити кеш</string>
-  <string name="reset_cache_unsaved_changes">Є несинхронізовані зміни. Ви дійсно бажаєте очистити кеш?</string>
-  <string name="warning">Попередження</string>
-  <string name="pref_title_AutoSyncOnStart">Синхронізація при включені</string>
-  <string name="pref_title_ShowOnlyUnread">Показати непрочитані статті</string>
-  <string name="pref_title_DisableHostnameVerification">Вимкнути перевірку доменного ім\'я</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Керування кнопками гучності</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Помічати прочитаними при прокрутці</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Підтвердити невідомий сертифікат?</string>
-  <string name="mtm_decision_always">Завжди</string>
-  <string name="mtm_decision_abort">Відміна</string>
-  <string name="mtm_notification">Перевірка сертифікату</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Жодного Подкасту не обрано</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Показати</string>
-  <string name="pref_title_app_theme">Тема додатку</string>
-  <string name="pref_title_feed_list_layout">Поле списку стрічок</string>
-  <string-array name="pref_display_apptheme">
-    <item>Темна</item>
-    <item>Світла</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Сповіщення</string>
-  <string name="pref_title_notification_new_articles_available">Показати сповіщення коли доступна нова стаття</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Помилка</string>
-  <string name="login_dialog_text_something_went_wrong">Щось пішло не так :(</string>
-  <string name="login_dialog_text_not_compatible">Ця версія додатку не сумісна з вашим додатком Читання Новин. Будь ласка, оновіть додаток та framework для додатка.</string>
-  <string name="login_dialog_title_security_warning">Попередження про небезпеку</string>
-  <string name="login_dialog_text_security_warning">Ви не використовуєте HTTPS. Зловмисники можуть перехопити трафік та отримати доступ до деяких персональних даних (наприклад пароль). Ми наполегливо рекомендуємо використовувати HTTPS!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Дані та синхронізація</string>
-  <string name="pref_title_clearCache">Очистити кеш</string>
-  <string name="pref_title_CacheImagesOffline">Зберігати зображення оффлайн</string>
-  <string name="pref_title_Max_Cache_Size">Максимальний розмір кеша</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 МБ</item>
-    <item>500 МБ</item>
-    <item>750 МБ</item>
-    <item>1 ГБ</item>
-    <item>2 ГБ</item>
-    <item>5 ГБ</item>
-    <item>10 ГБ</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Хвилин</item>
-    <item>15 Хвилин</item>
-    <item>30 Хвилин</item>
-    <item>45 Хвилин</item>
-    <item>1 Година</item>
-    <item>2 Години</item>
-    <item>3 Години</item>
-    <item>6 Годин</item>
-    <item>12 Годин</item>
-    <item>24 Години</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">видалити</string>
-</resources>
+
+    <string name="auto_sync_string">Автоматична синхронізація</string>
+    <string name="title_activity_sync_interval_selector">Перемикач Інтервалу Синхронізації</string>
+    <string name="title_activity_news_detail">Останні Новини</string>
+    <string name="empty_view_content">Нічого нема</string>
+    <string name="toast_GettingMoreItems">Почато завантаження більшої кількості елементів... Будь ласка, зачекайте.</string>
+    <string name="no_wifi_available">Відсутнє WiFi з\'єднання</string>
+    <string name="do_you_want_to_download_without_wifi">Бажаєте завантажувати зображення коли немає WiFi з\'єднання?</string>
+    <string name="widget_header">Новини ownCloud </string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="one">Доступний %d новий елемент</item>
+        <item quantity="few">Доступно %d нових елементів</item>
+        <item quantity="other">Доступно %d нових елементів</item>
+    </plurals>
+    <string name="message_bar_reload">Перезавантажити</string>
+    <string name="allUnreadFeeds">Всі непрочитані</string>
+    <string name="starredFeeds">Помічені</string>
+    <string name="title_activity_new_feed">Додати нову стрічку</string>
+
+    <string name="menu_update">Оновити</string>
+    <string name="menu_About_Changelog">Зміни</string>
+    <string name="menu_markAllAsRead">Позначити все як прочитане</string>
+    <string name="menu_StartImageCaching">Завантажити зображення</string>
+    <string name="menu_downloadMoreItems">Завантажити більше елементів</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Помічені зірочкою</string>
+    <string name="action_read">Читати</string>
+    <string name="action_playPodacst">Відтворити Подкаст</string>
+    <string name="action_openInBrowser">Відкрити у переглядачі</string>
+    <string name="action_Share">Поділитися</string>
+    <string name="action_login">Налаштування Серверу</string>
+    <string name="action_save">Зберегти</string>
+    <string name="action_settings">Налаштування</string>
+    <string name="action_sync_settings">Налаштування синхронізації</string>
+    <string name="action_add_new_feed">Додати нову стрічку</string>
+    <string name="action_textToSpeech">Читати</string>
+    <string name="action_add_feed">Додати стрічку</string>
+
+
+    <string name="toast_copied_to_clipboard">Скопійовано в буфер обміну</string>
+    <string name="error_download_failed">Завантаження не вдалося</string>
+    <string name="feed_remove_button">Видалити</string>
+    <string name="feed_rename_button">Перейменувати</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Ім\'я користувача</string>
+    <string name="pref_title_password">Пароль</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Ввійти...</string>
+    <string name="login_progress_signing_in">Вхід...</string>
+    <string name="error_field_required">Обов\'язкове поле</string>
+    <string name="error_invalid_url">Невірний url</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Імпортувати обліковий запис</string>
+
+
+    <string name="toast_no_more_downloads_available">Більше немає об\'єктів</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Налаштування</string>
+    <!-- General settings -->
+    <string name="pref_header_general">Загалом</string>
+    <string name="pref_title_general_sort_order">Порядок сортування</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Новіші -&gt; Старші</item>
+        <item>Старші -&gt; Нові</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Очистити кеш</string>
+    <string name="reset_cache_unsaved_changes">Є несинхронізовані зміни. Ви дійсно бажаєте очистити кеш?</string>
+    <string name="warning">Попередження</string>
+    <string name="pref_title_AutoSyncOnStart">Синхронізація при включені</string>
+    <string name="pref_title_ShowOnlyUnread">Показати непрочитані статті</string>
+    <string name="pref_title_DisableHostnameVerification">Вимкнути перевірку доменного ім\'я</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Керування кнопками гучності</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Помічати прочитаними при прокрутці</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Підтвердити невідомий сертифікат?</string>
+    <string name="mtm_decision_always">Завжди</string>
+    <string name="mtm_decision_abort">Відміна</string>
+    <string name="mtm_notification">Перевірка сертифікату</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Жодного Подкасту не обрано</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Показати</string>
+    <string name="pref_title_app_theme">Тема додатку</string>
+    <string name="pref_title_feed_list_layout">Поле списку стрічок</string>
+    <string-array name="pref_display_apptheme">
+        <item>Темна</item>
+        <item>Світла</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Сповіщення</string>
+    <string name="pref_title_notification_new_articles_available">Показати сповіщення коли доступна нова стаття</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Помилка</string>
+    <string name="login_dialog_text_something_went_wrong">Щось пішло не так :(</string>
+    <string name="login_dialog_text_not_compatible">Ця версія додатку не сумісна з вашим додатком Читання Новин. Будь ласка, оновіть додаток та framework для додатка.</string>
+    <string name="login_dialog_title_security_warning">Попередження про небезпеку</string>
+    <string name="login_dialog_text_security_warning">Ви не використовуєте HTTPS. Зловмисники можуть перехопити трафік та отримати доступ до деяких персональних даних (наприклад пароль). Ми наполегливо рекомендуємо використовувати HTTPS!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Дані та синхронізація</string>
+    <string name="pref_title_clearCache">Очистити кеш</string>
+    <string name="pref_title_CacheImagesOffline">Зберігати зображення оффлайн</string>
+    <string name="pref_title_Max_Cache_Size">Максимальний розмір кеша</string>
+
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 МБ</item>
+        <item>500 МБ</item>
+        <item>750 МБ</item>
+        <item>1 ГБ</item>
+        <item>2 ГБ</item>
+        <item>5 ГБ</item>
+        <item>10 ГБ</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Хвилин</item>
+        <item>15 Хвилин</item>
+        <item>30 Хвилин</item>
+        <item>45 Хвилин</item>
+        <item>1 Година</item>
+        <item>2 Години</item>
+        <item>3 Години</item>
+        <item>6 Годин</item>
+        <item>12 Годин</item>
+        <item>24 Години</item>
+    </string-array>
+    <string name="content_desc_delete">видалити</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-vi/strings.xml b/News-Android-App/src/main/res/values-vi/strings.xml
index 3429352f..3d4803ee 100644
--- a/News-Android-App/src/main/res/values-vi/strings.xml
+++ b/News-Android-App/src/main/res/values-vi/strings.xml
@@ -1,127 +1,140 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">Tự đồng b</string>
-  <string name="app_name">Tin tức ownCloud </string>
-  <string name="title_activity_sync_interval_selector">Đồng bộ khoảng thời gian đã chọn</string>
-  <string name="title_activity_news_detail">Chi tiết hoạt </string>
-  <string name="empty_view_content">Không có mục nào ở đây</string>
-  <string name="toast_GettingMoreItems">Bắt đầu tải thêm các tin khác ... Xin vui lòng chờ đợi.</string>
-  <string name="no_wifi_available">Không có </string>
-  <string name="do_you_want_to_download_without_wifi">Bạn có muốn tải về những hình ảnh mà không c kết nối WiFi</string>
-  <string name="widget_header">ownCloud News</string>
-  <string name="message_bar_reload">Tải </string>
-  <string name="allUnreadFeeds">Tất cả các mục chưa đọc</string>
-  <string name="starredFeeds">Những mục được đánh dấu</string>
-  <string name="title_activity_new_feed">Thêm feed mới</string>
-  <string name="menu_update">Làm mới</string>
-  <string name="menu_About_Changelog">About / Changelog</string>
-  <string name="menu_markAllAsRead">Đánh dấu tất cả như đã </string>
-  <string name="menu_StartImageCaching">Tải hình </string>
-  <string name="menu_downloadMoreItems">Tải nhiều h</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Starred</string>
-  <string name="action_read">Đọc</string>
-  <string name="action_playPodacst">Chơi Podcast</string>
-  <string name="action_openInBrowser">Mở trong trình </string>
-  <string name="action_Share">Chia sẻ</string>
-  <string name="action_login">Cài </string>
-  <string name="action_save">Lưu</string>
-  <string name="action_settings">Cài đặt</string>
-  <string name="action_sync_settings">Đồng bộ cài đặt</string>
-  <string name="action_add_new_feed">Thêm feed mới</string>
-  <string name="action_textToSpeech">Đọc</string>
-  <!--Add new feed-->
-  <string name="action_add_feed">Thêm feed</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="error_download_failed">Tải về thất bại</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">Xóa</string>
-  <string name="feed_rename_button">Sửa tên</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Tên đăng nhập</string>
-  <string name="pref_title_password">Mật khẩu</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">Đăng nh</string>
-  <string name="login_progress_signing_in">Đang đăng nhập...</string>
-  <string name="error_field_required">Những mục cần th</string>
-  <string name="error_invalid_url">URL không </string>
-  <!--Import Accounts-->
-  <string name="import_account">Nhập vào tài khoản</string>
-  <!--Toast Messages-->
-  <string name="toast_no_more_downloads_available">Không có thư mục </string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Cài đặt</string>
-  <!--General settings-->
-  <string name="pref_header_general">Tổng hợp</string>
-  <string name="pref_title_general_sort_order">Sắp x</string>
-  <string-array name="pref_general_sort_order">
-    <item>Mới -&gt; Cũ</item>
-    <item>C -&gt; Mới</item>
-  </string-array>
-  <string name="dialog_clearing_cache">Xóa bộ </string>
-  <string name="reset_cache_unsaved_changes">Có sự thay đổi đồng bộ. Bạn muốn thiết lập lại bộ nhớ đệm ?</string>
-  <string name="warning">Cảnh báo</string>
-  <string name="pref_title_AutoSyncOnStart">Đồng bộ khi khởi </string>
-  <string name="pref_title_ShowOnlyUnread">Hiển thị bài chưa </string>
-  <string name="pref_title_DisableHostnameVerification">Tắt H</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Điều chỉnh m lượng</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Đánh dấu đã đọc trong khi di chuyển</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">Chấp nhận Certificate không biết nguồn gốc ?</string>
-  <string name="mtm_decision_always">Luôn l</string>
-  <string name="mtm_decision_abort">Hủy bỏ</string>
-  <string name="mtm_notification">Xác nhận C</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">Khôngc có podcast nào được chọn</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">Hiển th</string>
-  <string name="pref_title_app_theme">Chủ để ứng dụng</string>
-  <string name="pref_title_feed_list_layout">Danh sách bố trí F</string>
-  <string-array name="pref_display_apptheme">
-    <item>Tối</item>
-    <item>Sáng</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">Thông b</string>
-  <string name="pref_title_notification_new_articles_available">Hiển thị thông báo khi bài viết mới có giá trị</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Lỗi</string>
-  <string name="login_dialog_text_something_went_wrong">Có một lỗi gì đó :(</string>
-  <string name="login_dialog_text_not_compatible">Phiên bản ứng dụng này không tương thích với ownCloud News. Vui lòng cập nhật các ứng dụng tin tức và appframework.</string>
-  <string name="login_dialog_title_security_warning">Cảnh bảo bảo mật</string>
-  <string name="login_dialog_text_security_warning">Bạn nên dùng https. Nếu không bạn có thể dễ dàng bị tấn công bởi hacker và truy cập vào một số dữ liệu nhạy cảm (ví dụ như mật khẩu của bạn). Do đó, nó đề nghị sử dụng https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Dữ liệu &amp; đồng bộ</string>
-  <string name="pref_title_clearCache">Xóa bộ nhớ </string>
-  <string name="pref_title_CacheImagesOffline">Bộ đệm hình ảnh ẩn</string>
-  <string name="pref_title_Max_Cache_Size">Kích cỡ tối đa bộ </string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>Không bao giờ</item>
-    <item>Chỉ qua Wifi</item>
-    <item>Qua Wifi và mạng di động</item>
-    <item>Hỏi khi không kết nối WiFi</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutes</item>
-    <item>15 Minutes</item>
-    <item>30 Minutes</item>
-    <item>45 Minutes</item>
-    <item>1 Hour</item>
-    <item>2 Hours</item>
-    <item>3 Hours</item>
-    <item>6 Hours</item>
-    <item>12 Hours</item>
-    <item>24 Hours</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_delete">xóa</string>
-</resources>
+
+    <string name="auto_sync_string">Tự đồng b</string>
+    <string name="title_activity_sync_interval_selector">Đồng bộ khoảng thời gian đã chọn</string>
+    <string name="title_activity_news_detail">Chi tiết hoạt </string>
+    <string name="empty_view_content">Không có mục nào ở đây</string>
+    <string name="toast_GettingMoreItems">Bắt đầu tải thêm các tin khác ... Xin vui lòng chờ đợi.</string>
+    <string name="no_wifi_available">Không có </string>
+    <string name="do_you_want_to_download_without_wifi">Bạn có muốn tải về những hình ảnh mà không c kết nối WiFi</string>
+    <string name="widget_header">ownCloud News</string>
+    <string name="message_bar_reload">Tải </string>
+    <string name="allUnreadFeeds">Tất cả các mục chưa đọc</string>
+    <string name="starredFeeds">Những mục được đánh dấu</string>
+    <string name="title_activity_new_feed">Thêm feed mới</string>
+
+    <string name="menu_update">Làm mới</string>
+    <string name="menu_About_Changelog">About / Changelog</string>
+    <string name="menu_markAllAsRead">Đánh dấu tất cả như đã </string>
+    <string name="menu_StartImageCaching">Tải hình </string>
+    <string name="menu_downloadMoreItems">Tải nhiều h</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">Starred</string>
+    <string name="action_read">Đọc</string>
+    <string name="action_playPodacst">Chơi Podcast</string>
+    <string name="action_openInBrowser">Mở trong trình </string>
+    <string name="action_Share">Chia sẻ</string>
+    <string name="action_login">Cài </string>
+    <string name="action_save">Lưu</string>
+    <string name="action_settings">Cài đặt</string>
+    <string name="action_sync_settings">Đồng bộ cài đặt</string>
+    <string name="action_add_new_feed">Thêm feed mới</string>
+    <string name="action_textToSpeech">Đọc</string>
+    <string name="action_add_feed">Thêm feed</string>
+
+
+    <string name="error_download_failed">Tải về thất bại</string>
+    <string name="feed_remove_button">Xóa</string>
+    <string name="feed_rename_button">Sửa tên</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">Tên đăng nhập</string>
+    <string name="pref_title_password">Mật khẩu</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">Đăng nh</string>
+    <string name="login_progress_signing_in">Đang đăng nhập...</string>
+    <string name="error_field_required">Những mục cần th</string>
+    <string name="error_invalid_url">URL không </string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">Nhập vào tài khoản</string>
+
+
+    <string name="toast_no_more_downloads_available">Không có thư mục </string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Cài đặt</string>
+    <!-- General settings -->
+    <string name="pref_header_general">Tổng hợp</string>
+    <string name="pref_title_general_sort_order">Sắp x</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>Mới -&gt; Cũ</item>
+        <item>C -&gt; Mới</item>
+    </string-array>
+    <string name="dialog_clearing_cache">Xóa bộ </string>
+    <string name="reset_cache_unsaved_changes">Có sự thay đổi đồng bộ. Bạn muốn thiết lập lại bộ nhớ đệm ?</string>
+    <string name="warning">Cảnh báo</string>
+    <string name="pref_title_AutoSyncOnStart">Đồng bộ khi khởi </string>
+    <string name="pref_title_ShowOnlyUnread">Hiển thị bài chưa </string>
+    <string name="pref_title_DisableHostnameVerification">Tắt H</string>
+    <string name="pref_title_NavigateWithVolumeButtons">Điều chỉnh m lượng</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">Đánh dấu đã đọc trong khi di chuyển</string>
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">Chấp nhận Certificate không biết nguồn gốc ?</string>
+    <string name="mtm_decision_always">Luôn l</string>
+    <string name="mtm_decision_abort">Hủy bỏ</string>
+    <string name="mtm_notification">Xác nhận C</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">Khôngc có podcast nào được chọn</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">Hiển th</string>
+    <string name="pref_title_app_theme">Chủ để ứng dụng</string>
+    <string name="pref_title_feed_list_layout">Danh sách bố trí F</string>
+    <string-array name="pref_display_apptheme">
+        <item>Tối</item>
+        <item>Sáng</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Thông b</string>
+    <string name="pref_title_notification_new_articles_available">Hiển thị thông báo khi bài viết mới có giá trị</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Lỗi</string>
+    <string name="login_dialog_text_something_went_wrong">Có một lỗi gì đó :(</string>
+    <string name="login_dialog_text_not_compatible">Phiên bản ứng dụng này không tương thích với ownCloud News. Vui lòng cập nhật các ứng dụng tin tức và appframework.</string>
+    <string name="login_dialog_title_security_warning">Cảnh bảo bảo mật</string>
+    <string name="login_dialog_text_security_warning">Bạn nên dùng https. Nếu không bạn có thể dễ dàng bị tấn công bởi hacker và truy cập vào một số dữ liệu nhạy cảm (ví dụ như mật khẩu của bạn). Do đó, nó đề nghị sử dụng https!</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Dữ liệu &amp; đồng bộ</string>
+    <string name="pref_title_clearCache">Xóa bộ nhớ </string>
+    <string name="pref_title_CacheImagesOffline">Bộ đệm hình ảnh ẩn</string>
+    <string name="pref_title_Max_Cache_Size">Kích cỡ tối đa bộ </string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>Không bao giờ</item>
+        <item>Chỉ qua Wifi</item>
+        <item>Qua Wifi và mạng di động</item>
+        <item>Hỏi khi không kết nối WiFi</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 Minutes</item>
+        <item>15 Minutes</item>
+        <item>30 Minutes</item>
+        <item>45 Minutes</item>
+        <item>1 Hour</item>
+        <item>2 Hours</item>
+        <item>3 Hours</item>
+        <item>6 Hours</item>
+        <item>12 Hours</item>
+        <item>24 Hours</item>
+    </string-array>
+    <string name="content_desc_delete">xóa</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-zh-rCN/strings.xml b/News-Android-App/src/main/res/values-zh-rCN/strings.xml
index e419c9a1..eca700a8 100644
--- a/News-Android-App/src/main/res/values-zh-rCN/strings.xml
+++ b/News-Android-App/src/main/res/values-zh-rCN/strings.xml
@@ -1,175 +1,200 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">自动同步</string>
-  <string name="app_name">ownCloud 新闻阅读器</string>
-  <string name="title_activity_sync_interval_selector">同步间隔选择器</string>
-  <string name="title_activity_news_detail">新闻详细活动</string>
-  <string name="empty_view_content">无内容</string>
-  <string name="toast_GettingMoreItems">开始下载更多内容，请稍候（“稍后”和“稍候”请分清楚，OK？）。</string>
-  <string name="no_wifi_available">没有连接到WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">您是否想在无 WiFi 连接时下载图片</string>
-  <string name="current_version">亲，您正在使用的版本号为：%s</string>
-  <string name="widget_header">ownCloud 新闻</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="other">%d 条新内容</item>
-  </plurals>
-  <string name="message_bar_reload">刷新</string>
-  <string name="allUnreadFeeds">所有未读内容</string>
-  <string name="starredFeeds">标星内容</string>
-  <string name="title_activity_new_feed">增加新 Feed</string>
-  <string name="menu_update">刷新</string>
-  <string name="menu_About_Changelog">关于/变更日志</string>
-  <string name="menu_markAllAsRead">标记所有为已读</string>
-  <string name="menu_StartImageCaching">下载图片</string>
-  <string name="menu_downloadMoreItems">下载更多内容</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">已加星标</string>
-  <string name="action_read">阅读</string>
-  <string name="action_playPodacst">播放 Podcast</string>
-  <string name="action_openInBrowser">在浏览器中打开</string>
-  <string name="action_Share">共享</string>
-  <string name="action_login">服务器配置</string>
-  <string name="action_save">保存</string>
-  <string name="action_settings">设置</string>
-  <string name="action_sync_settings">同步设置</string>
-  <string name="action_add_new_feed">增加新 Feed</string>
-  <string name="action_textToSpeech">朗读</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="other">您还有 %d 条未读内容</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="other">%d 条新内容</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="action_add_feed">添加Feed</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">下载图片</string>
-  <string name="action_img_sharelink">分享图片链接</string>
-  <string name="action_img_open">在浏览器中打开图片</string>
-  <string name="action_img_copylink">分享图片链接</string>
-  <string name="action_link_share">分享图片链接</string>
-  <string name="action_link_open">在浏览器中打开链接</string>
-  <string name="action_link_copy">复制链接</string>
-  <string name="toast_img_download_wait">下载中... 请稍候</string>
-  <string name="toast_img_saved">图片已保存。</string>
-  <string name="toast_img_notwriteable">未能写入图片。</string>
-  <string name="toast_copied_to_clipboard">复制到剪贴板</string>
-  <string name="error_download_failed">下载失败</string>
-  <string name="intent_title_share">分享途径</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="feed_remove_button">移除</string>
-  <string name="feed_rename_button">重命名</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">用户名</string>
-  <string name="pref_title_password">密码</string>
-  <string name="pref_title_owncloudRootPath">ownCloud 根目录地址</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">登录</string>
-  <string name="login_progress_signing_in">登录中...</string>
-  <string name="error_field_required">这个字段是必填的</string>
-  <string name="error_invalid_url">这个网址是错误的</string>
-  <!--Import Accounts-->
-  <string name="import_account">导入帐号</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="other">已下载 %d 条旧内容</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">没有更多的选项了</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="other">目前已获取%d项…</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">设置</string>
-  <string name="cache_is_cleared">缓存已清空！</string>
-  <!--General settings-->
-  <string name="pref_header_general">常规</string>
-  <string name="pref_title_general_sort_order">排序</string>
-  <string-array name="pref_general_sort_order">
-    <item>日期（新-&gt;旧）</item>
-    <item>日期（旧-&gt;新）</item>
-  </string-array>
-  <string name="dialog_clearing_cache">清除缓存</string>
-  <string name="dialog_clearing_cache_please_wait">清理缓存中，请稍候</string>
-  <string name="reset_cache_unsaved_changes">有一部分文件未同步，你确定仍然清空缓存吗？</string>
-  <string name="warning">警告</string>
-  <string name="pref_title_AutoSyncOnStart">启动后就同步</string>
-  <string name="pref_title_ShowOnlyUnread">仅显示未读文章</string>
-  <string name="pref_title_DisableHostnameVerification">禁用主机名校验</string>
-  <string name="pref_title_NavigateWithVolumeButtons">用音量键导航</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">当滚动时标记为已读</string>
-  <string name="pref_title_OpenInBrowserDirectly">使用外部浏览器浏览文章</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">接受未知认证？</string>
-  <string name="mtm_decision_always">总是</string>
-  <string name="mtm_decision_abort">终止</string>
-  <string name="mtm_notification">校验证书</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">无 Podcast 被选中</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">显示</string>
-  <string name="pref_title_app_theme">应用主题</string>
-  <string name="pref_title_feed_list_layout">源清单布局</string>
-  <string name="pref_display_title_lines_count">标题行数计数</string>
-  <string-array name="pref_display_apptheme">
-    <item>深色</item>
-    <item>浅色</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>简单</item>
-    <item>扩展</item>
-    <item>扩展(全部文本)</item>
-    <item>扩展,使用网页浏览器</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">通知</string>
-  <string name="pref_title_notification_new_articles_available">有新消息时显示通知</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">错误</string>
-  <string name="login_dialog_text_something_went_wrong">有地方出错了 :(</string>
-  <string name="login_dialog_text_not_compatible">此 App 版本与您的 ownCloud 新闻 App 不兼容。请更新新闻 app 和 appframework。</string>
-  <string name="login_dialog_title_security_warning">安全警告</string>
-  <string name="login_dialog_text_security_warning">你正在使用的是安全性相对较差的http协议 (其他人可能会截取到你的账号密码等信息)，强烈建议您使用https协议访问本网站</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">数据 &amp; 同步</string>
-  <string name="pref_title_clearCache">清除缓存</string>
-  <string name="pref_title_CacheImagesOffline">离线缓存图片</string>
-  <string name="pref_title_Max_Cache_Size">最大缓存大小</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>从不</item>
-    <item>仅在 WiFi 下</item>
-    <item>仅在 WiFi 和移动网络</item>
-    <item>在未连接到 WiFi 时询问</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 分钟</item>
-    <item>15 分钟</item>
-    <item>30 分钟</item>
-    <item>45 分钟</item>
-    <item>1 小时</item>
-    <item>2 小时</item>
-    <item>3 小时</item>
-    <item>6 小时</item>
-    <item>12 小时</item>
-    <item>24 小时</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_pause">暂停</string>
-  <string name="content_desc_mark_as_read">标记为已读</string>
-  <string name="content_desc_mark_as_unread">标记为未读</string>
-  <string name="content_desc_delete">删除</string>
-</resources>
+
+    <string name="auto_sync_string">自动同步</string>
+    <string name="title_activity_sync_interval_selector">同步间隔选择器</string>
+    <string name="title_activity_news_detail">新闻详细活动</string>
+    <string name="empty_view_content">无内容</string>
+    <string name="toast_GettingMoreItems">开始下载更多内容，请稍候（“稍后”和“稍候”请分清楚，OK？）。</string>
+    <string name="no_wifi_available">没有连接到WiFi</string>
+    <string name="do_you_want_to_download_without_wifi">您是否想在无 WiFi 连接时下载图片</string>
+    <string name="current_version">亲，您正在使用的版本号为：%s</string>
+    <string name="widget_header">ownCloud 新闻</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="other">%d 条新内容</item>
+    </plurals>
+    <string name="message_bar_reload">刷新</string>
+    <string name="allUnreadFeeds">所有未读内容</string>
+    <string name="starredFeeds">标星内容</string>
+    <string name="title_activity_new_feed">增加新 Feed</string>
+
+    <string name="menu_update">刷新</string>
+    <string name="menu_About_Changelog">关于/变更日志</string>
+    <string name="menu_markAllAsRead">标记所有为已读</string>
+    <string name="menu_StartImageCaching">下载图片</string>
+    <string name="menu_downloadMoreItems">下载更多内容</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">已加星标</string>
+    <string name="action_read">阅读</string>
+    <string name="action_playPodacst">播放 Podcast</string>
+    <string name="action_openInBrowser">在浏览器中打开</string>
+    <string name="action_Share">共享</string>
+    <string name="action_login">服务器配置</string>
+    <string name="action_save">保存</string>
+    <string name="action_settings">设置</string>
+    <string name="action_sync_settings">同步设置</string>
+    <string name="action_add_new_feed">增加新 Feed</string>
+    <string name="action_textToSpeech">朗读</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="other">您还有 %d 条未读内容</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="other">%d 条新内容</item>
+    </plurals>
+
+
+    <string name="action_add_feed">添加Feed</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">下载图片</string>
+    <string name="action_img_sharelink">分享图片链接</string>
+    <string name="action_img_open">在浏览器中打开图片</string>
+    <string name="action_img_copylink">分享图片链接</string>
+    <string name="action_link_share">分享图片链接</string>
+    <string name="action_link_open">在浏览器中打开链接</string>
+    <string name="action_link_copy">复制链接</string>
+    <string name="toast_img_download_wait">下载中... 请稍候</string>
+    <string name="toast_img_saved">图片已保存。</string>
+    <string name="toast_img_notwriteable">未能写入图片。</string>
+    <string name="toast_copied_to_clipboard">复制到剪贴板</string>
+    <string name="error_download_failed">下载失败</string>
+    <string name="intent_title_share">分享途径</string>
+
+
+    <string name="feed_remove_button">移除</string>
+    <string name="feed_rename_button">重命名</string>
+    <!-- Strings related to login -->
+    <string name="pref_title_username">用户名</string>
+    <string name="pref_title_password">密码</string>
+    <string name="pref_title_owncloudRootPath">ownCloud 根目录地址</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">登录</string>
+    <string name="login_progress_signing_in">登录中...</string>
+    <string name="error_field_required">这个字段是必填的</string>
+    <string name="error_invalid_url">这个网址是错误的</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">导入帐号</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="other">已下载 %d 条旧内容</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">没有更多的选项了</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="other">目前已获取%d项…</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">设置</string>
+    <string name="cache_is_cleared">缓存已清空！</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">常规</string>
+    <string name="pref_title_general_sort_order">排序</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>日期（新-&gt;旧）</item>
+        <item>日期（旧-&gt;新）</item>
+    </string-array>
+    <string name="dialog_clearing_cache">清除缓存</string>
+    <string name="dialog_clearing_cache_please_wait">清理缓存中，请稍候</string>
+    <string name="reset_cache_unsaved_changes">有一部分文件未同步，你确定仍然清空缓存吗？</string>
+    <string name="warning">警告</string>
+    <string name="pref_title_AutoSyncOnStart">启动后就同步</string>
+    <string name="pref_title_ShowOnlyUnread">仅显示未读文章</string>
+    <string name="pref_title_DisableHostnameVerification">禁用主机名校验</string>
+    <string name="pref_title_NavigateWithVolumeButtons">用音量键导航</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">当滚动时标记为已读</string>
+    <string name="pref_title_OpenInBrowserDirectly">使用外部浏览器浏览文章</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">接受未知认证？</string>
+    <string name="mtm_decision_always">总是</string>
+    <string name="mtm_decision_abort">终止</string>
+    <string name="mtm_notification">校验证书</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">无 Podcast 被选中</string>
+    <!-- Settings for Display -->
+    <string name="pref_header_display">显示</string>
+    <string name="pref_title_app_theme">应用主题</string>
+    <string name="pref_title_feed_list_layout">源清单布局</string>
+    <string name="pref_display_title_lines_count">标题行数计数</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>深色</item>
+        <item>浅色</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>简单</item>
+        <item>扩展</item>
+        <item>扩展(全部文本)</item>
+        <item>扩展,使用网页浏览器</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">通知</string>
+    <string name="pref_title_notification_new_articles_available">有新消息时显示通知</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">错误</string>
+    <string name="login_dialog_text_something_went_wrong">有地方出错了 :(</string>
+    <string name="login_dialog_text_not_compatible">此 App 版本与您的 ownCloud 新闻 App 不兼容。请更新新闻 app 和 appframework。</string>
+    <string name="login_dialog_title_security_warning">安全警告</string>
+    <string name="login_dialog_text_security_warning">你正在使用的是安全性相对较差的http协议 (其他人可能会截取到你的账号密码等信息)，强烈建议您使用https协议访问本网站</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">数据 &amp; 同步</string>
+    <string name="pref_title_clearCache">清除缓存</string>
+    <string name="pref_title_CacheImagesOffline">离线缓存图片</string>
+    <string name="pref_title_Max_Cache_Size">最大缓存大小</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>从不</item>
+        <item>仅在 WiFi 下</item>
+        <item>仅在 WiFi 和移动网络</item>
+        <item>在未连接到 WiFi 时询问</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 分钟</item>
+        <item>15 分钟</item>
+        <item>30 分钟</item>
+        <item>45 分钟</item>
+        <item>1 小时</item>
+        <item>2 小时</item>
+        <item>3 小时</item>
+        <item>6 小时</item>
+        <item>12 小时</item>
+        <item>24 小时</item>
+    </string-array>
+    <string name="content_desc_pause">暂停</string>
+    <string name="content_desc_mark_as_read">标记为已读</string>
+    <string name="content_desc_mark_as_unread">标记为未读</string>
+    <string name="content_desc_delete">删除</string>
+    </resources>
diff --git a/News-Android-App/src/main/res/values-zh-rTW/strings.xml b/News-Android-App/src/main/res/values-zh-rTW/strings.xml
index fe922ee8..29b6e256 100644
--- a/News-Android-App/src/main/res/values-zh-rTW/strings.xml
+++ b/News-Android-App/src/main/res/values-zh-rTW/strings.xml
@@ -1,190 +1,220 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="auto_sync_string">自動同步</string>
-  <string name="app_name">ownCloud 新聞閱讀器</string>
-  <string name="title_activity_sync_interval_selector">同步時間間隔選擇</string>
-  <string name="title_activity_news_detail">新聞內容活動</string>
-  <string name="empty_view_content">無任何項目</string>
-  <string name="toast_GettingMoreItems">正在下載更多的項目，請稍候</string>
-  <string name="no_wifi_available">WiFi 未連線</string>
-  <string name="do_you_want_to_download_without_wifi">是否要在沒有 WiFi 的狀況下下載圖片</string>
-  <string name="current_version">您在使用版本 %s</string>
-  <string name="widget_header">ownCloud 新聞</string>
-  <plurals name="message_bar_new_articles_available">
-    <item quantity="other">%d 個新的項目</item>
-  </plurals>
-  <string name="message_bar_reload">重新載入</string>
-  <string name="allUnreadFeeds">所有未閱讀項目</string>
-  <string name="starredFeeds">星號項目</string>
-  <string name="title_activity_new_feed">加入新訂閱</string>
-  <string name="menu_update">重新整理</string>
-  <string name="menu_About_Changelog">關於 / 更新日誌</string>
-  <string name="menu_markAllAsRead">全部標示為已閱讀</string>
-  <string name="menu_StartImageCaching">下載圖片</string>
-  <string name="menu_downloadMoreItems">下載更多項目</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">星號</string>
-  <string name="action_read">已讀</string>
-  <string name="action_playPodacst">播放 Podcast</string>
-  <string name="action_openInBrowser">開啟瀏覽器</string>
-  <string name="action_Share">分享</string>
-  <string name="action_login">伺服器設定</string>
-  <string name="action_save">儲存</string>
-  <string name="action_settings">設定</string>
-  <string name="action_sync_settings">同步設定</string>
-  <string name="action_add_new_feed">加入新訂閱</string>
-  <string name="action_textToSpeech">讀出</string>
-  <plurals name="notification_new_items_ticker">
-    <item quantity="other">您有 %d 個新的未讀項目</item>
-  </plurals>
-  <plurals name="notification_new_items_text">
-    <item quantity="other">%d 個新的未讀項目</item>
-  </plurals>
-  <!--Add new feed-->
-  <string name="hint_feed_url">Feed URL</string>
-  <string name="action_add_feed">新增訂閱</string>
-  <!--String related to NewsDetail-ContextMenu Items-->
-  <string name="action_img_download">下載圖片</string>
-  <string name="action_img_sharelink">分享圖片連結</string>
-  <string name="action_img_open">在瀏覽器中開啟圖片</string>
-  <string name="action_img_copylink">複製圖片連結</string>
-  <string name="action_link_share">分享連結</string>
-  <string name="action_link_open">在瀏覽器中打開連結</string>
-  <string name="action_link_copy">複製連結</string>
-  <string name="toast_img_download_wait">下載中…請稍候</string>
-  <string name="toast_img_saved">圖片已儲存</string>
-  <string name="toast_img_notwriteable">寫入圖片失敗</string>
-  <string name="toast_copied_to_clipboard">複製至剪貼簿</string>
-  <string name="error_download_failed">下載失敗</string>
-  <string name="intent_title_share">分享到</string>
-  <!--Strings related to NewsReaderListDialogFragment (Rename/Remove Feed)-->
-  <string name="action_feed_remove">移除 Feed</string>
-  <string name="action_feed_rename">重新命名 Feed</string>
-  <string name="feed_remove_button">移除</string>
-  <string name="feed_rename_button">重新命名</string>
-  <string name="confirm_feed_remove">您真的要移除這個 Feed 嗎？此動作無法復原</string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">使用者名稱</string>
-  <string name="pref_title_password">密碼</string>
-  <string name="pref_title_owncloudRootPath">ownCloud 最上層位址</string>
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <string name="action_sign_in_short">登入</string>
-  <string name="login_progress_signing_in">登入中…</string>
-  <string name="error_field_required">此欄位為必填</string>
-  <string name="error_invalid_url">網址不正確</string>
-  <!--Import Accounts-->
-  <string name="import_account">匯入帳戶</string>
-  <!--Toast Messages-->
-  <plurals name="toast_downloaded_x_items">
-    <item quantity="other">已下載 %d 個舊項目</item>
-  </plurals>
-  <string name="toast_no_more_downloads_available">已經載入所有項目</string>
-  <plurals name="fetched_items_so_far">
-    <item quantity="other">目前已抓取 %d 項…</item>
-  </plurals>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">設定</string>
-  <string name="cache_is_cleared">快取已清除</string>
-  <!--General settings-->
-  <string name="pref_header_general">一般</string>
-  <string name="pref_title_general_sort_order">排序依據</string>
-  <string-array name="pref_general_sort_order">
-    <item>新 -&gt; 舊</item>
-    <item>舊 -&gt; 新</item>
-  </string-array>
-  <string name="dialog_clearing_cache">正在清除快取</string>
-  <string name="dialog_clearing_cache_please_wait">正在清除快取…請稍候</string>
-  <string name="reset_cache_unsaved_changes">有未同步的更動，您仍然要重設快取嗎？</string>
-  <string name="warning">警告</string>
-  <string name="pref_title_AutoSyncOnStart">啟動時同步</string>
-  <string name="pref_title_ShowOnlyUnread">只顯示未讀的條目</string>
-  <string name="pref_title_DisableHostnameVerification">停用主機名稱檢驗</string>
-  <string name="pref_title_NavigateWithVolumeButtons">用音量鍵瀏覽</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">當滾動時標為已讀</string>
-  <string name="pref_title_OpenInBrowserDirectly">使用外部瀏覽器來閱讀條目</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">允許未知憑證？</string>
-  <string name="mtm_decision_always">總是</string>
-  <string name="mtm_decision_abort">中斷</string>
-  <string name="mtm_notification">憑證驗證</string>
-  <!--Podcast-->
-  <string name="no_podcast_selected">沒有選擇 podcast</string>
-  <string name="no_chapters_available">沒有章節</string>
-  <!--Settings for Display-->
-  <string name="pref_header_display">顯示</string>
-  <string name="pref_title_app_theme">App 主題</string>
-  <string name="pref_title_feed_list_layout">Feed 清單版型</string>
-  <string name="pref_display_title_lines_count">標題的行數</string>
-  <string-array name="pref_display_apptheme">
-    <item>暗色</item>
-    <item>亮色</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>簡單</item>
-    <item>完整</item>
-    <item>完整（全文）</item>
-    <item>完整（使用內嵌式網頁瀏覽器）</item>
-  </string-array>
-  <string-array name="pref_title_lines_count">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-  </string-array>
-  <!--Settings for Notifications-->
-  <string name="pref_header_notifications">通知</string>
-  <string name="pref_title_notification_new_articles_available">當有新條目時顯示通知</string>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">錯誤</string>
-  <string name="login_dialog_text_something_went_wrong">發生錯誤了 :(</string>
-  <string name="login_dialog_text_not_compatible">此 App 版本不相容您的 ownCloud 新聞應用程式，請更新 ownCloud 新聞應用程式和 appframework</string>
-  <string name="login_dialog_title_security_warning">安全性警告</string>
-  <string name="login_dialog_text_security_warning">您不是使用 HTTPS，攻擊者可能攔截您的通訊，進而取得敏感資料（例如您的密碼），因此強烈建議使用 HTTPS！</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">資料 &amp; 同步</string>
-  <string name="pref_title_clearCache">清除快取</string>
-  <string name="pref_title_CacheImagesOffline">暫存離線圖片</string>
-  <string name="pref_title_Max_Cache_Size">最大快取容量</string>
-  <string-array name="pref_data_sync_image_cache">
-    <item>從不</item>
-    <item>只透過 WiFi</item>
-    <item>透過 WiFi 和行動網路</item>
-    <item>當未連接到 WiFi 時詢問</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 分鐘</item>
-    <item>15 分鐘</item>
-    <item>30 分鐘</item>
-    <item>45 分鐘</item>
-    <item>1 小時</item>
-    <item>2 小時</item>
-    <item>3 小時</item>
-    <item>6 小時</item>
-    <item>12 小時</item>
-    <item>24 小時</item>
-  </string-array>
-  <!--content description for images and icons-->
-  <string name="content_desc_play">播放</string>
-  <string name="content_desc_pause">暫停</string>
-  <string name="content_desc_rewind">倒帶</string>
-  <string name="content_desc_forward">快進</string>
-  <string name="content_desc_expand">展開</string>
-  <string name="content_desc_collapse">收合</string>
-  <string name="content_desc_mark_as_read">標為已讀</string>
-  <string name="content_desc_mark_as_unread">標為未讀</string>
-  <string name="content_desc_tap_to_refresh">輕觸以更新</string>
-  <string name="content_desc_add_to_favorites">加到最愛</string>
-  <string name="content_desc_remove_from_favorites">從最愛移除</string>
-  <string name="content_desc_show_password">顯示密碼</string>
-  <string name="content_desc_delete">刪除</string>
-  <string name="content_desc_download">下載</string>
+
+    <string name="auto_sync_string">自動同步</string>
+    <string name="title_activity_sync_interval_selector">同步時間間隔選擇</string>
+    <string name="title_activity_news_detail">新聞內容活動</string>
+    <string name="empty_view_content">無任何項目</string>
+    <string name="toast_GettingMoreItems">正在下載更多的項目，請稍候</string>
+    <string name="no_wifi_available">WiFi 未連線</string>
+    <string name="do_you_want_to_download_without_wifi">是否要在沒有 WiFi 的狀況下下載圖片</string>
+    <string name="current_version">您在使用版本 %s</string>
+    <string name="widget_header">ownCloud 新聞</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="other">%d 個新的項目</item>
+    </plurals>
+    <string name="message_bar_reload">重新載入</string>
+    <string name="allUnreadFeeds">所有未閱讀項目</string>
+    <string name="starredFeeds">星號項目</string>
+    <string name="title_activity_new_feed">加入新訂閱</string>
+
+    <string name="menu_update">重新整理</string>
+    <string name="menu_About_Changelog">關於 / 更新日誌</string>
+    <string name="menu_markAllAsRead">全部標示為已閱讀</string>
+    <string name="menu_StartImageCaching">下載圖片</string>
+    <string name="menu_downloadMoreItems">下載更多項目</string>
+
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">星號</string>
+    <string name="action_read">已讀</string>
+    <string name="action_playPodacst">播放 Podcast</string>
+    <string name="action_openInBrowser">開啟瀏覽器</string>
+    <string name="action_Share">分享</string>
+    <string name="action_login">伺服器設定</string>
+    <string name="action_save">儲存</string>
+    <string name="action_settings">設定</string>
+    <string name="action_sync_settings">同步設定</string>
+    <string name="action_add_new_feed">加入新訂閱</string>
+    <string name="action_textToSpeech">讀出</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="other">您有 %d 個新的未讀項目</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="other">%d 個新的未讀項目</item>
+    </plurals>
+
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">Feed URL</string>
+    <string name="action_add_feed">新增訂閱</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">下載圖片</string>
+    <string name="action_img_sharelink">分享圖片連結</string>
+    <string name="action_img_open">在瀏覽器中開啟圖片</string>
+    <string name="action_img_copylink">複製圖片連結</string>
+    <string name="action_link_share">分享連結</string>
+    <string name="action_link_open">在瀏覽器中打開連結</string>
+    <string name="action_link_copy">複製連結</string>
+    <string name="toast_img_download_wait">下載中…請稍候</string>
+    <string name="toast_img_saved">圖片已儲存</string>
+    <string name="toast_img_notwriteable">寫入圖片失敗</string>
+    <string name="toast_copied_to_clipboard">複製至剪貼簿</string>
+    <string name="error_download_failed">下載失敗</string>
+    <string name="intent_title_share">分享到</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">移除 Feed</string>
+    <string name="action_feed_rename">重新命名 Feed</string>
+    <string name="feed_remove_button">移除</string>
+    <string name="feed_rename_button">重新命名</string>
+    <string name="confirm_feed_remove">您真的要移除這個 Feed 嗎？此動作無法復原</string>
+
+    <!-- Strings related to login -->
+    <string name="pref_title_username">使用者名稱</string>
+    <string name="pref_title_password">密碼</string>
+    <string name="pref_title_owncloudRootPath">ownCloud 最上層位址</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+
+    <string name="action_sign_in_short">登入</string>
+    <string name="login_progress_signing_in">登入中…</string>
+    <string name="error_field_required">此欄位為必填</string>
+    <string name="error_invalid_url">網址不正確</string>
+
+
+    <!-- Import Accounts -->
+    <string name="import_account">匯入帳戶</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="other">已下載 %d 個舊項目</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">已經載入所有項目</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="other">目前已抓取 %d 項…</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">設定</string>
+    <string name="cache_is_cleared">快取已清除</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">一般</string>
+    <string name="pref_title_general_sort_order">排序依據</string>
+
+    <string-array name="pref_general_sort_order">
+        <item>新 -&gt; 舊</item>
+        <item>舊 -&gt; 新</item>
+    </string-array>
+    <string name="dialog_clearing_cache">正在清除快取</string>
+    <string name="dialog_clearing_cache_please_wait">正在清除快取…請稍候</string>
+    <string name="reset_cache_unsaved_changes">有未同步的更動，您仍然要重設快取嗎？</string>
+    <string name="warning">警告</string>
+    <string name="pref_title_AutoSyncOnStart">啟動時同步</string>
+    <string name="pref_title_ShowOnlyUnread">只顯示未讀的條目</string>
+    <string name="pref_title_DisableHostnameVerification">停用主機名稱檢驗</string>
+    <string name="pref_title_NavigateWithVolumeButtons">用音量鍵瀏覽</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">當滾動時標為已讀</string>
+    <string name="pref_title_OpenInBrowserDirectly">使用外部瀏覽器來閱讀條目</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">允許未知憑證？</string>
+    <string name="mtm_decision_always">總是</string>
+    <string name="mtm_decision_abort">中斷</string>
+    <string name="mtm_notification">憑證驗證</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">沒有選擇 podcast</string>
+    <string name="no_chapters_available">沒有章節</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">顯示</string>
+    <string name="pref_title_app_theme">App 主題</string>
+    <string name="pref_title_feed_list_layout">Feed 清單版型</string>
+    <string name="pref_display_title_lines_count">標題的行數</string>
+
+    <string-array name="pref_display_apptheme">
+        <item>暗色</item>
+        <item>亮色</item>
+    </string-array>
+    <string-array name="pref_display_feed_list_layout">
+        <item>簡單</item>
+        <item>完整</item>
+        <item>完整（全文）</item>
+        <item>完整（使用內嵌式網頁瀏覽器）</item>
+    </string-array>
+    <string-array name="pref_title_lines_count">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">通知</string>
+    <string name="pref_title_notification_new_articles_available">當有新條目時顯示通知</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">錯誤</string>
+    <string name="login_dialog_text_something_went_wrong">發生錯誤了 :(</string>
+    <string name="login_dialog_text_not_compatible">此 App 版本不相容您的 ownCloud 新聞應用程式，請更新 ownCloud 新聞應用程式和 appframework</string>
+    <string name="login_dialog_title_security_warning">安全性警告</string>
+    <string name="login_dialog_text_security_warning">您不是使用 HTTPS，攻擊者可能攔截您的通訊，進而取得敏感資料（例如您的密碼），因此強烈建議使用 HTTPS！</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">資料 &amp; 同步</string>
+    <string name="pref_title_clearCache">清除快取</string>
+    <string name="pref_title_CacheImagesOffline">暫存離線圖片</string>
+    <string name="pref_title_Max_Cache_Size">最大快取容量</string>
+
+    <string-array name="pref_data_sync_image_cache">
+        <item>從不</item>
+        <item>只透過 WiFi</item>
+        <item>透過 WiFi 和行動網路</item>
+        <item>當未連接到 WiFi 時詢問</item>
+    </string-array>
+    <string-array name="pref_data_sync_max_cache_size">
+        <item>250 MB</item>
+        <item>500 MB</item>
+        <item>750 MB</item>
+        <item>1 GB</item>
+        <item>2 GB</item>
+        <item>5 GB</item>
+        <item>10 GB</item>
+    </string-array>
+    <string-array name="array_sync_interval">
+        <item>5 分鐘</item>
+        <item>15 分鐘</item>
+        <item>30 分鐘</item>
+        <item>45 分鐘</item>
+        <item>1 小時</item>
+        <item>2 小時</item>
+        <item>3 小時</item>
+        <item>6 小時</item>
+        <item>12 小時</item>
+        <item>24 小時</item>
+    </string-array>
+    <string name="content_desc_play">播放</string>
+    <string name="content_desc_pause">暫停</string>
+    <string name="content_desc_rewind">倒帶</string>
+    <string name="content_desc_forward">快進</string>
+    <string name="content_desc_expand">展開</string>
+    <string name="content_desc_collapse">收合</string>
+    <string name="content_desc_mark_as_read">標為已讀</string>
+    <string name="content_desc_mark_as_unread">標為未讀</string>
+    <string name="content_desc_tap_to_refresh">輕觸以更新</string>
+    <string name="content_desc_add_to_favorites">加到最愛</string>
+    <string name="content_desc_remove_from_favorites">從最愛移除</string>
+    <string name="content_desc_show_password">顯示密碼</string>
+    <string name="content_desc_delete">刪除</string>
+    <string name="content_desc_download">下載</string>
 </resources>