From: masensio <masensio@solidgear.es>
Date: Thu, 17 Oct 2013 14:54:43 +0000 (+0200)
Subject: OC-1663: Replace references to app_name in code
X-Git-Tag: oc-android-1.5.5~159^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7488345470b405b06a648748b3e4039e9ae964f0?hp=--cc

OC-1663: Replace references to app_name in code
---

7488345470b405b06a648748b3e4039e9ae964f0
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9145abad..0acd29f0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,6 +44,7 @@
     </uses-permission>
 
     <application
+        android:name=".MainApp"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/Theme.ownCloud"> 
@@ -123,7 +124,7 @@
 
         <provider
             android:name=".providers.FileContentProvider"
-            android:authorities="org.owncloud"
+            android:authorities="@string/authority"
             android:enabled="true"
             android:exported="false"
             android:label="@string/sync_string_files"
diff --git a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
index 9b2922e3..5a7c57e6 100644
--- a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
+++ b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
@@ -33,7 +33,7 @@ import android.os.IBinder;
 public class AccountAuthenticatorService extends Service {
 
     private AccountAuthenticator mAuthenticator;
-    static final public String ACCOUNT_TYPE = "owncloud";
+    //static final public String ACCOUNT_TYPE = "owncloud";
 
     @Override
     public void onCreate() {
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index acecf93e..70ae6da6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Contrasenya:</string>
   <string name="main_login">Nom d\'usuari:</string>
   <string name="main_button_login">Accés</string>
-  <string name="main_welcome">Benvingut al vostre ownCloud</string>
+  <string name="main_welcome">Benvingut</string>
   <string name="main_files">Fitxers</string>
   <string name="main_music">Música</string>
   <string name="main_contacts">Contactes</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Adreces d\'interès</string>
   <string name="main_settings">Configuració</string>
   <string name="main_tit_accsetup">Configuració de comptes</string>
-  <string name="main_wrn_accsetup">No hi ha comptes d\'ownCloud en el dispositiu. Per usar l\'aplicació, n\'heu de crear un.</string>
+  <string name="main_wrn_accsetup">No hi ha comptes en el dispositiu. Per usar l\'aplicació, n\'heu de crear un.</string>
   <string name="about_android">%1$s aplicació per Android</string>
   <string name="about_version">versió %1$s</string>
   <string name="actionbar_sync">Actualitza compte</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Seleccioneu un compte</string>
   <string name="prefs_summary_select_oc_account">Escolliu quin dels comptes hauria d\'usar l\'aplicació</string>
   <string name="prefs_trackmydevice">Seguiment del dispositiu</string>
-  <string name="prefs_trackmydevice_summary_off">Permet que owCloud faci el seguiment del dispositiu</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud manté el seguiment d\'aquest dispositiu</string>
+  <string name="prefs_trackmydevice_summary_off">Permet que l\'aplicació faci el seguiment del dispositiu</string>
+  <string name="prefs_trackmydevice_summary_on">L\'aplicació manté el seguiment d\'aquest dispositiu</string>
   <string name="prefs_trackmydevice_interval">Actualitza l\'interval</string>
   <string name="prefs_trackmydevice_interval_summary">Actualitza cada %1$s minuts</string>
   <string name="prefs_accounts">Comptes</string>
   <string name="prefs_manage_accounts">Gestió de comptes</string>
-  <string name="prefs_pincode">PIN de l\'aplicació ownCloud</string>
-  <string name="prefs_pincode_summary">Protegiu el client ownCloud</string>
+  <string name="prefs_pincode">PIN de l\'aplicació</string>
+  <string name="prefs_pincode_summary">Protegiu el client</string>
   <string name="prefs_instant_upload">Activa la pujada instantània</string>
   <string name="prefs_instant_upload_summary">Puja instantàniament les fotografies preses amb la càmera</string>
   <string name="prefs_log_title">Habilita el registre</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">Contrasenya</string>
   <string name="setup_hint_address">Adreça web</string>
   <string name="setup_hint_show_password">Mostra la contrasenya</string>
-  <string name="setup_title">Connecta amb ownCloud</string>
+  <string name="setup_title">Connecta amb %1$s</string>
   <string name="setup_btn_connect">Connecta</string>
   <string name="uploader_btn_upload_text">Puja</string>
   <string name="uploader_top_message">Seleccioneu la carpeta de pujada:</string>
   <string name="uploader_wrn_no_account_title">No s\'ha trobat el compte</string>
-  <string name="uploader_wrn_no_account_text">No hi ha comptes ownCloud en el dispositiu. Configureu un compte primer</string>
+  <string name="uploader_wrn_no_account_text">No hi ha comptes %1$s en el dispositiu. Configureu un compte primer</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configura</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Surt</string>
   <string name="uploader_wrn_no_content_title">No hi ha continguts per pujar</string>
   <string name="uploader_wrn_no_content_text">No s\'ha rebut cap contingut. Res per pujar</string>
-  <string name="uploader_error_forbidden_content">ownCloud no pot accedir al contingut compartit</string>
+  <string name="uploader_error_forbidden_content">%1$s no pot accedir al contingut compartit</string>
   <string name="uploader_info_uploading">S\'està pujant</string>
   <string name="uploader_btn_create_dir_text">Crea una carpeta per les pujades</string>
   <string name="file_list_empty">No hi ha fitxers en aquesta carpeta.\nPodeu afegir fitxers a través de l\'opció \"Puja\"  del menú.</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Cancel·la la pujada</string>
   <string name="common_cancel">Cancel·la</string>
   <string name="common_save_exit">Desa &amp; Surt</string>
-  <string name="common_exit">Surt de ownCloud</string>
+  <string name="common_exit">Surt de %1$s</string>
   <string name="common_error">Error</string>
   <string name="common_loading">Carregant...</string>
   <string name="common_error_unknown">Error desconegut</string>
@@ -131,17 +131,17 @@
   <string name="foreign_files_remote_text">Remot: %1$s</string>
   <string name="upload_query_move_foreign_files">No hi ha prou espai per copiar els fitxers seleccionats a la carpeta %1$s. Els hi voleu moure?</string>
   <string name="use_ssl">Usa connexió segura</string>
-  <string name="location_no_provider">ownCloud no pot fer el seguiment de l\'equip. Comproveu la configuració d\'ubicuació</string>
+  <string name="location_no_provider">%1$s no pot fer el seguiment de l\'equip. Comproveu la configuració d\'ubicuació</string>
   <string name="pincode_enter_pin_code">Escriviu el PIN de l\'aplicació</string>
   <string name="pincode_enter_new_pin_code">Escriviu el nou PIN de l\'aplicació</string>
-  <string name="pincode_configure_your_pin">Escriviu el PIN de l\'aplicació ownCloud</string>
+  <string name="pincode_configure_your_pin">Escriviu el PIN de l\'aplicació</string>
   <string name="pincode_configure_your_pin_explanation">es requerirà el PIN cada vegada que s\'iniciï l\'aplicació</string>
-  <string name="pincode_reenter_your_pincode">Torneu a escriure el PIN de l\'aplicació ownCloud</string>
-  <string name="pincode_remove_your_pincode">Elimina el PIN de l\'aplicació ownCloud</string>
+  <string name="pincode_reenter_your_pincode">Torneu a escriure el PIN de l\'aplicació </string>
+  <string name="pincode_remove_your_pincode">Elimina el PIN de l\'aplicació</string>
   <string name="pincode_mismatch">Els PINs de l\'aplicació no coincideixen</string>
-  <string name="pincode_wrong">El PIN de l\'aplicació ownCloud no és correcte</string>
-  <string name="pincode_removed">S\'ha eliminat el PIN de l\'aplicació ownCloud</string>
-  <string name="pincode_stored">S\'ha desat el PIN de l\'aplicació ownCloud</string>
+  <string name="pincode_wrong">El PIN de l\'aplicació no és correcte</string>
+  <string name="pincode_removed">S\'ha eliminat el PIN de l\'aplicació </string>
+  <string name="pincode_stored">S\'ha desat el PIN de l\'aplicació </string>
   <string name="media_notif_ticker">reproductor de música %1$s</string>
   <string name="media_state_playing">%1$s (sonant)</string>
   <string name="media_state_loading">%1$s (carregant)</string>
@@ -181,19 +181,19 @@
   <string name="auth_nossl_plain_ok_message">L\'aplicació no ha pogut establir una connexió segura amb el servidor. Malgrat tot, una connexió no segura està disponible. Podeu continuar o cancel·lar.</string>
   <string name="auth_connection_established">S\'ha establert la connexió</string>
   <string name="auth_testing_connection">S\'està comprovant la connexió...</string>
-  <string name="auth_not_configured_title">La configuració de ownCloud està malformada</string>
-  <string name="auth_not_configured_message">Sembla que la instància ownCloud no està configurada correctament. Per més detalls contacteu amb l\'administrador.</string>
+  <string name="auth_not_configured_title">La configuració del servidor està malformada</string>
+  <string name="auth_not_configured_message">Sembla que la instància del sevidor no està configurada correctament. Per més detalls contacteu amb l\'administrador.</string>
   <string name="auth_unknown_error_title">S\'ha produït un error desconegut</string>
   <string name="auth_unknown_error_message">S\'ha produït un error desconegut. Contacteu els autors i inclogueu els registres del dispositiu.</string>
   <string name="auth_unknown_host_title">No s\'ha trobat el servidor</string>
   <string name="auth_unknown_host_message">No s\'ha trobat el servidor. Comproveu el nom del servidor i la seva disponibilitat i intenteu-ho de nou.</string>
-  <string name="auth_incorrect_path_title">No s\'ha trobat la instància ownCloud</string>
-  <string name="auth_incorrect_path_message">L\'aplicació no ha trobat la instància ownCloud al camí indicat. Comproveu el camí i torneu-ho a intentar.</string>
+  <string name="auth_incorrect_path_title">No s\'ha trobat la instància del servidor</string>
+  <string name="auth_incorrect_path_message">L\'aplicació no ha trobat la instància del servidor al camí indicat. Comproveu el camí i torneu-ho a intentar.</string>
   <string name="auth_timeout_title">El servidor ha trigat massa en respondre</string>
   <string name="auth_incorrect_address_title">La URL esà malformada</string>
   <string name="auth_ssl_general_error_title">La inicialització SSL ha fallat</string>
   <string name="auth_ssl_unverified_server_title">No s\'ha pogut verificar la identitat SSL del servidor</string>
-  <string name="auth_bad_oc_version_title">Versió del servidor ownCloud desconeguda</string>
+  <string name="auth_bad_oc_version_title">Versió del servidor desconeguda</string>
   <string name="auth_wrong_connection_title">No s\'ha pogut establir la connexió</string>
   <string name="auth_secure_connection">S\'ha establert la connexió segura</string>
   <string name="auth_unauthorized">Nom d\'usuari o contrasenya incorrectes</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Envia el registre d\'errors</string>
   <string name="crashlog_dont_send_report">No envïis el registre d\'errors</string>
   <string name="extensions_avail_title">Hi ha extensions disponibles!</string>
-  <string name="extensions_avail_message">Sembla que la instància ownCloud té suport per extensions avançades. Voleu veure les extensions disponibles per Android?</string>
+  <string name="extensions_avail_message">Sembla que la instància del servidor està donant suport per extensions avançades. Voleu veure les extensions disponibles per Android?</string>
   <string name="fd_keep_in_sync">Mantén el fitxer actualitzat</string>
   <string name="common_share">Comparteix</string>
   <string name="common_rename">Reanomena</string>
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 8b19dc61..ca8ede9a 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -29,8 +29,8 @@
   <string name="prefs_select_oc_account">Vybrat účet</string>
   <string name="prefs_summary_select_oc_account">Vyberte, který účet má tato aplikace používat.</string>
   <string name="prefs_trackmydevice">Sledování zařízení</string>
-  <string name="prefs_trackmydevice_summary_off">Povolit ownCloudu sledovat polohu Vašeho zařízení</string>
-  <string name="prefs_trackmydevice_summary_on">Váš ownCloud sleduje toto zařízení</string>
+  <string name="prefs_trackmydevice_summary_off">Povolit tuto aplikaci sledovat polohu Vašeho zařízení</string>
+  <string name="prefs_trackmydevice_summary_on">Váš aplikaci sleduje toto zařízení</string>
   <string name="prefs_trackmydevice_interval">Interval aktualizace</string>
   <string name="prefs_trackmydevice_interval_summary">Aktualizovat každých %1$s minut</string>
   <string name="prefs_accounts">Účty</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e38852eb..d6953355 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Kodeord:</string>
   <string name="main_login">Brugernavn:</string>
   <string name="main_button_login">Log ind</string>
-  <string name="main_welcome">Velkommen til dit ownCloud</string>
+  <string name="main_welcome">Velkommen</string>
   <string name="main_files">Filer</string>
   <string name="main_music">Musik</string>
   <string name="main_contacts">Kontakter</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Bogmærker</string>
   <string name="main_settings">Indstillinger</string>
   <string name="main_tit_accsetup">Opsæt konto</string>
-  <string name="main_wrn_accsetup">Der er ingen ownCloud konti på enheden. For at bruge denne App, skal du oprette en.</string>
+  <string name="main_wrn_accsetup">Der er ingen konti på enheden. For at bruge denne App, skal du oprette en.</string>
   <string name="about_android">%1$s Android App</string>
   <string name="about_version">version %1$s</string>
   <string name="actionbar_sync">Genindlæs konto</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Vælg en konto</string>
   <string name="prefs_summary_select_oc_account">Vælg hvilken af dine brugere denne app skal bruge.</string>
   <string name="prefs_trackmydevice">Enhedssporing</string>
-  <string name="prefs_trackmydevice_summary_off">Tillad ownCloud at spore denne enheds placering</string>
-  <string name="prefs_trackmydevice_summary_on">Din ownCloud sporer denne enhed</string>
+  <string name="prefs_trackmydevice_summary_off">Tillad App at spore denne enheds placering</string>
+  <string name="prefs_trackmydevice_summary_on">Din App sporer denne enhed</string>
   <string name="prefs_trackmydevice_interval">Opdateringsinterval</string>
   <string name="prefs_trackmydevice_interval_summary">Opdater hvert %1$s minut</string>
   <string name="prefs_accounts">Konti</string>
   <string name="prefs_manage_accounts">Administrer konti</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Beskyt din ownCloud klient</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">Beskyt din klient</string>
   <string name="prefs_instant_upload">Slå øjeblikkelig upload til</string>
   <string name="prefs_instant_upload_summary">Upload billeder taget med kamera med det samme</string>
   <string name="prefs_log_title">Aktiver Logning</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">Kodeord</string>
   <string name="setup_hint_address">Web adresse</string>
   <string name="setup_hint_show_password">Hvis kodeord?</string>
-  <string name="setup_title">Tilslut til din ownCloud</string>
+  <string name="setup_title">Tilslut til din %1$s</string>
   <string name="setup_btn_connect">Tilslut</string>
   <string name="uploader_btn_upload_text">Upload</string>
   <string name="uploader_top_message">Vælg upload mappe:</string>
   <string name="uploader_wrn_no_account_title">Ingen konto fundet</string>
-  <string name="uploader_wrn_no_account_text">Der er ingen ownCloud brugere på din enhed. Sæt venligst en bruger op først.</string>
+  <string name="uploader_wrn_no_account_text">Der er ingen %1$s brugere på din enhed. Sæt venligst en bruger op først.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Opsætning</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Afslut</string>
   <string name="uploader_wrn_no_content_title">Intet indhold at uploade</string>
   <string name="uploader_wrn_no_content_text">Intet indhold blev modtaget. Intet at uploade.</string>
-  <string name="uploader_error_forbidden_content">ownCloud er ikke tilladt adgang til delt indhold</string>
+  <string name="uploader_error_forbidden_content">%1$s er ikke tilladt adgang til delt indhold</string>
   <string name="uploader_info_uploading">Uploader</string>
   <string name="uploader_btn_create_dir_text">Opret mappe til uploads</string>
   <string name="file_list_empty">Der er ingen filer i denne mappe.\nNye filer kan tilføjes med menu valgmuligheden \"Upload\".</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Fortryd upload</string>
   <string name="common_cancel">Annuller</string>
   <string name="common_save_exit">Gem &amp; Afslut</string>
-  <string name="common_exit">Forlad ownCloud</string>
+  <string name="common_exit">Forlad %1$s</string>
   <string name="common_error">Fejl</string>
   <string name="common_loading">Indlæser...</string>
   <string name="common_error_unknown">Ukendt fejl</string>
@@ -131,17 +131,17 @@
   <string name="foreign_files_remote_text">Fjernplacering: %1$s</string>
   <string name="upload_query_move_foreign_files">Der er ikke tilstrækkelig plads til at kopiere de valgte filer ind i %1$s mappen. Vil du flytte dem i stedet?</string>
   <string name="use_ssl">Brug sikker forbindelse</string>
-  <string name="location_no_provider">ownCloud kan ikke spore din enhed. Tjek venligst dine indstillinger for brug af GPS</string>
+  <string name="location_no_provider">%1$s kan ikke spore din enhed. Tjek venligst dine indstillinger for brug af GPS</string>
   <string name="pincode_enter_pin_code">Indsæt venligst din App PIN</string>
   <string name="pincode_enter_new_pin_code">Indsæt venligst din nye App PIN</string>
-  <string name="pincode_configure_your_pin">Indtast ownCloud App PIN</string>
+  <string name="pincode_configure_your_pin">Indtast App PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN koden vil blive anmodet om hver gang applikationen bliver startet</string>
-  <string name="pincode_reenter_your_pincode">Indtast venligst ownCloud App PIN igen</string>
-  <string name="pincode_remove_your_pincode">Fjern din ownCloud App PIN</string>
-  <string name="pincode_mismatch">ownCloud App PIN er ikke ens</string>
-  <string name="pincode_wrong">Forkert ownCloud App PIN</string>
-  <string name="pincode_removed">ownCloud App PIN fjernet</string>
-  <string name="pincode_stored">ownCloud App PIN gemt</string>
+  <string name="pincode_reenter_your_pincode">Indtast venligst App PIN igen</string>
+  <string name="pincode_remove_your_pincode">Fjern din App PIN</string>
+  <string name="pincode_mismatch">App PIN er ikke ens</string>
+  <string name="pincode_wrong">Forkert App PIN</string>
+  <string name="pincode_removed">App PIN fjernet</string>
+  <string name="pincode_stored">App PIN gemt</string>
   <string name="media_notif_ticker">%1$s musikafspiller</string>
   <string name="media_state_playing">%1$s (afspiller)</string>
   <string name="media_state_loading">%1$s (indlæser)</string>
@@ -181,19 +181,19 @@
   <string name="auth_nossl_plain_ok_message">Applikationen kunne ikke oprette en sikker forbindelse med serveren. Selvom en sikker forbindelse ikke er tilgængeligt, kan du vælge at fortsætte eller annullere.</string>
   <string name="auth_connection_established">Forbindelse oprettet</string>
   <string name="auth_testing_connection">Afprøver forbindelse ...</string>
-  <string name="auth_not_configured_title">Misdannet ownCloud konfiguration</string>
-  <string name="auth_not_configured_message">Det ser ud til, at din ownCloud instans ikke er konfigureret korrekt. KOntakt din administrator for flere detaljer.</string>
+  <string name="auth_not_configured_title">Misdannet server konfiguration</string>
+  <string name="auth_not_configured_message">Det ser ud til, at din sever instans ikke er konfigureret korrekt. KOntakt din administrator for flere detaljer.</string>
   <string name="auth_unknown_error_title">Ukendt fejl opstod!</string>
   <string name="auth_unknown_error_message">Der forekom en ukendt fejl. Kontakt venligst forfattere og inkluder logfiler fra din enhed.</string>
   <string name="auth_unknown_host_title">Kunne ikke finde host</string>
   <string name="auth_unknown_host_message">Kunne ikke finde den indtastede host. Tjek venligst host\'ens navn og om serveren er tilgængelig og prøv derefter igen.</string>
-  <string name="auth_incorrect_path_title">ownCloud instans blev ikke fundet</string>
-  <string name="auth_incorrect_path_message">Applikation kunne ikke finde ownCloud instans på den givne placering. Tjek venligst din placering og prøv igen.</string>
+  <string name="auth_incorrect_path_title">Server instans blev ikke fundet</string>
+  <string name="auth_incorrect_path_message">Applikation kunne ikke finde server instans på den givne placering. Tjek venligst din placering og prøv igen.</string>
   <string name="auth_timeout_title">Serveren var for længe om at svare</string>
   <string name="auth_incorrect_address_title">Deform URL</string>
   <string name="auth_ssl_general_error_title">SSL initialisering fejlede</string>
   <string name="auth_ssl_unverified_server_title">Ikke verifiseret SSL servers identitet</string>
-  <string name="auth_bad_oc_version_title">Ikke genkendt ownCloud server version</string>
+  <string name="auth_bad_oc_version_title">Ikke genkendt server version</string>
   <string name="auth_wrong_connection_title">Ikke ikke oprette forbindelse</string>
   <string name="auth_secure_connection">Sikker forbindelse oprettet</string>
   <string name="auth_unauthorized">Forkert brugernavn eller kodeord</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Send rapport</string>
   <string name="crashlog_dont_send_report">Send ikke rapport</string>
   <string name="extensions_avail_title">Udvidelser tilgængelige!</string>
-  <string name="extensions_avail_message">Det ser ud til at dit instans af ownCloud har understøttelse af avancerede tilføjelser. Vil du se udvidelser tilgængelig til Android?</string>
+  <string name="extensions_avail_message">Det ser ud til at dit instans af server har understøttelse af avancerede tilføjelser. Vil du se udvidelser tilgængelig til Android?</string>
   <string name="fd_keep_in_sync">Hold fil opdateret</string>
   <string name="common_share">Del</string>
   <string name="common_rename">Omdøb</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c3918beb..7275ec78 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Συνθηματικό:</string>
   <string name="main_login">Όνομα Χρήστη:</string>
   <string name="main_button_login">Σύνδεση</string>
-  <string name="main_welcome">Καλώς ήλθατε στο ownCloud</string>
+  <string name="main_welcome">Καλώς ήλθατε!</string>
   <string name="main_files">Αρχεία</string>
   <string name="main_music">Μουσική</string>
   <string name="main_contacts">Επαφές</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Σελιδοδείκτες</string>
   <string name="main_settings">Ρυθμίσεις</string>
   <string name="main_tit_accsetup">Ρύθμιση Λογαριασμού</string>
-  <string name="main_wrn_accsetup">Δεν υπάρχουν λογαριασμοί ownCloud στη συσκευή σας. Για να χρησιμοποιήσετε την εφαρμογή, πρέπει να δημιουργήσετε ένα.</string>
+  <string name="main_wrn_accsetup">Δεν υπάρχουν λογαριασμοί στη συσκευή σας. Για να χρησιμοποιήσετε την εφαρμογή, πρέπει να δημιουργήσετε ένα.</string>
   <string name="about_android">%1$s Εφαρμογή για Android</string>
   <string name="about_version">έκδοση %1$s</string>
   <string name="actionbar_upload">Μεταφόρτωση</string>
@@ -28,14 +28,14 @@
   <string name="prefs_select_oc_account">Επιλογή λογαριασμού</string>
   <string name="prefs_summary_select_oc_account">Επιλέξτε, ποιόν από τους λογαρισμούς σας θα χρησιμοποιήσει η εφαρμογή.</string>
   <string name="prefs_trackmydevice">Παρακολούθηση συσκευής</string>
-  <string name="prefs_trackmydevice_summary_off">Επιτρέψτε στο ownCloud να ανιχνεύει την τοποθεσία στης συσκευής σας</string>
-  <string name="prefs_trackmydevice_summary_on">Το ownCloud ανιχνεύει την τοποθεσία αυτής της συσκευής</string>
+  <string name="prefs_trackmydevice_summary_off">Επιτρέψτε στο εφαρμογή να ανιχνεύει την τοποθεσία στης συσκευής σας</string>
+  <string name="prefs_trackmydevice_summary_on">Το εφαρμογή ανιχνεύει την τοποθεσία αυτής της συσκευής</string>
   <string name="prefs_trackmydevice_interval">Περίοδος ανανέωσης</string>
   <string name="prefs_trackmydevice_interval_summary">Ενημέρωση κάθε %1$s λεπτά</string>
   <string name="prefs_accounts">Λογαριασμοί</string>
   <string name="prefs_manage_accounts">Διαχείριση λογαριασμών</string>
-  <string name="prefs_pincode">PIN της εφαρμογής ownCloud</string>
-  <string name="prefs_pincode_summary">Προστατέψτε την ownCloud εφαρμογή</string>
+  <string name="prefs_pincode">PIN της εφαρμογής</string>
+  <string name="prefs_pincode_summary">Προστατέψτε την εφαρμογή</string>
   <string name="prefs_instant_upload">Ενεργοποιήστε την άμεση μεταφόρτωση</string>
   <string name="prefs_instant_upload_summary">Άμεση μεταφόρτωση των φωτογραφιών που τραβάει η φωτογρ. μηχανή</string>
   <string name="prefs_log_delete_history_button">Διαγραφή Ιστορικού</string>
@@ -51,17 +51,17 @@
   <string name="setup_hint_password">Συνθηματικό</string>
   <string name="setup_hint_address">Διεύθυνση ιστοσελίδας</string>
   <string name="setup_hint_show_password">Προβολή κωδικού;</string>
-  <string name="setup_title">Σύνδεση στο ownCloud σας</string>
+  <string name="setup_title">Σύνδεση στο %1$s σας</string>
   <string name="setup_btn_connect">Σύνδεση</string>
   <string name="uploader_btn_upload_text">Μεταφόρτωση</string>
   <string name="uploader_top_message">Επιλέξτε κατάλογο ανεβάσματος</string>
   <string name="uploader_wrn_no_account_title">Δεν βρέθηκε λογαριασμός</string>
-  <string name="uploader_wrn_no_account_text">Δεν υπάρχουν λογαριασμοί ownCloud στη συσκευή σας. Παρακαλώ ρυθμίστε πρώτα ένα λογαριασμό.</string>
+  <string name="uploader_wrn_no_account_text">Δεν υπάρχουν λογαριασμοί %1$s στη συσκευή σας. Παρακαλώ ρυθμίστε πρώτα ένα λογαριασμό.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Ρύθμιση</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Κλείσιμο</string>
   <string name="uploader_wrn_no_content_title">Δεν υπάρχει περιεχόμενο για να μεταφορτώσετε</string>
   <string name="uploader_wrn_no_content_text">Δεν ελήφθη περιεχόμενο. Δεν υπάρχει τίποτα να μεταφορτώσετε.</string>
-  <string name="uploader_error_forbidden_content">Το ownCloud δεν επιτρέπεται να έχει πρόσβαση στο κοινόχρηστο περιεχόμενο</string>
+  <string name="uploader_error_forbidden_content">Το %1$s δεν επιτρέπεται να έχει πρόσβαση στο κοινόχρηστο περιεχόμενο</string>
   <string name="uploader_info_uploading">Μεταφόρτωση</string>
   <string name="uploader_btn_create_dir_text">Δημιουργία καταλόγου για μεταφόρτωση</string>
   <string name="file_list_empty">Δεν υπάρχουν αρχεία σε αυτόν τον φάκελο.\nΝέα αρχεία μπορούν να προστεθούν με την επιλογή \"Μεταφόρτωση\" του μενού.</string>
@@ -123,17 +123,17 @@
   <string name="foreign_files_remote_text">Remote: %1$s</string>
   <string name="upload_query_move_foreign_files">Δεν υπαρχει αρκετος χωρος για να αντιγραφθουν τα επιλεγμενα αρχεια στον χωρο αποθηκευσης  %1$s. Θελετε να μετακινηθουν μερικα?</string>
   <string name="use_ssl">Χρήση ασφαλούς σύνδεσης</string>
-  <string name="location_no_provider">Το ownCloud δεν μπορεί να ανιχνεύσει την τοποθεσία της συσκευής. Παρακαλώ ελέγξτε τις ρυθμίσεις σύνδεσης. </string>
+  <string name="location_no_provider">Το %1$s δεν μπορεί να ανιχνεύσει την τοποθεσία της συσκευής. Παρακαλώ ελέγξτε τις ρυθμίσεις σύνδεσης. </string>
   <string name="pincode_enter_pin_code">Παρακαλώ, εισάγετε το PIN σας</string>
   <string name="pincode_enter_new_pin_code">Παρακαλώ, εισάγετε το νέο PIN σας</string>
-  <string name="pincode_configure_your_pin">Εισάγετε το PIN της εφαρμογής ownCloud</string>
+  <string name="pincode_configure_your_pin">Εισάγετε το PIN της εφαρμογής</string>
   <string name="pincode_configure_your_pin_explanation">Το PIN θα ζητείται κάθε φορά στην εκκίνηση </string>
-  <string name="pincode_reenter_your_pincode">Παρακαλώ επαναεισάγετε το PIN της εφαρμογής ownCloud</string>
-  <string name="pincode_remove_your_pincode">Αφαιρέστε τον PIN της εφαρμογής ownCloud</string>
-  <string name="pincode_mismatch">Δεν ταιριάζουν τα PIN της εφαρμογής ownCloud</string>
-  <string name="pincode_wrong">Εσφαλμένο PIN της εφαρμογής ownCloud</string>
-  <string name="pincode_removed">Αφαιρέθηκε το PIN της εφαρμογής ownCloud</string>
-  <string name="pincode_stored">Το PIN της εφαρμογής ownCloud αποθηκεύτηκε</string>
+  <string name="pincode_reenter_your_pincode">Παρακαλώ επαναεισάγετε το PIN της εφαρμογής</string>
+  <string name="pincode_remove_your_pincode">Αφαιρέστε τον PIN της εφαρμογής</string>
+  <string name="pincode_mismatch">Δεν ταιριάζουν τα PIN της εφαρμογής </string>
+  <string name="pincode_wrong">Εσφαλμένο PIN της εφαρμογής</string>
+  <string name="pincode_removed">Αφαιρέθηκε το PIN της εφαρμογής</string>
+  <string name="pincode_stored">Το PIN της εφαρμογής αποθηκεύτηκε</string>
   <string name="media_err_nothing_to_play">Δεν βρέθηκε αρχείο πολυμέσων</string>
   <string name="media_err_no_account">Δεν δόθηκε λογαριασμός</string>
   <string name="media_err_io">Το αρχείο πολυμέσων δεν μπόρεσε να διαβαστεί</string>
@@ -158,19 +158,19 @@
   <string name="auth_nossl_plain_ok_message">Αδυναμία καθιέρωσης ασφαλούς σύνδεσης με τον διακομιστή. Παρόλο που είναι διαθέσιμη μη ασφαλή σύνδεση. Μπορείτε να συνεχίσετε ή να ακυρώσετε.</string>
   <string name="auth_connection_established">Επετεύχθη σύνδεση</string>
   <string name="auth_testing_connection">Έλεγχος σύνδεσης...</string>
-  <string name="auth_not_configured_title">Λανθασμένες ρυθμίσεις ownCloud</string>
-  <string name="auth_not_configured_message">Φαίνεται ότι το ownCloud δεν είναι σωστά ρυθμισμένο. Παρακαλώ επικοινωνήστε με τον διαχειριστή σας, για περισσότερες πληροφορίες. </string>
+  <string name="auth_not_configured_title">Λανθασμένες ρυθμίσεις </string>
+  <string name="auth_not_configured_message">Φαίνεται ότι το server σας δεν είναι σωστά ρυθμισμένο. Παρακαλώ επικοινωνήστε με τον διαχειριστή σας, για περισσότερες πληροφορίες. </string>
   <string name="auth_unknown_error_title">Παρουσιάστηκε άγνωστο σφάλμα</string>
   <string name="auth_unknown_error_message">Παρουσιάστηκε άγνωστο σφάλμα. Παρακαλώ επικοινωνήστε με τους προγραμματιστές και συμπεριλάβετε το ιστορικό από την συσκευή σας.</string>
   <string name="auth_unknown_host_title">Δεν βρέθηκε υπολογιστής</string>
   <string name="auth_unknown_host_message">Δεν βρέθηκε ο ζητούμενος υπολογιστής. Παρακαλώ ελέγξτε το όνομα του υπολογιστή και την διαθεσιμότητα του εξυπηρετητή και προσπαθήστε πάλι. </string>
-  <string name="auth_incorrect_path_title">Δεν βρέθηκε στιγμιότυπο ownCloud</string>
-  <string name="auth_incorrect_path_message">Η  εφαρμογή δεν βρήκε να υπάρχει ownCloud στον δοσμένο μονοπάτι. Παρακαλώ ελέγξτε το μονοπάτι και ξαναπροσπαθήστε.</string>
+  <string name="auth_incorrect_path_title">Δεν βρέθηκε στιγμιότυπο server σας</string>
+  <string name="auth_incorrect_path_message">Η  εφαρμογή δεν βρήκε να υπάρχει server σας στον δοσμένο μονοπάτι. Παρακαλώ ελέγξτε το μονοπάτι και ξαναπροσπαθήστε.</string>
   <string name="auth_timeout_title">Ο εξυπηρετητής αργεί πολύ να απαντήσει</string>
   <string name="auth_incorrect_address_title">Κακώς διατυπωμένο URL</string>
   <string name="auth_ssl_general_error_title">Η αρχικοποίηση του SLL απέτυχε</string>
   <string name="auth_ssl_unverified_server_title">Μη επιβεβαιωμένη ταυτότητα SSL του εξυπηρετητή</string>
-  <string name="auth_bad_oc_version_title">Μη αναγνωρίσιμη έκδοση διακομιστή ownCloud</string>
+  <string name="auth_bad_oc_version_title">Μη αναγνωρίσιμη έκδοση διακομιστή server σας</string>
   <string name="auth_wrong_connection_title">Δεν ήταν δυνατή η σύνδεση</string>
   <string name="auth_secure_connection">Επιτεύχθηκε ασφαλής σύνδεση</string>
   <string name="auth_unauthorized">Λάθος όνομα χρήστη ή κωδικός</string>
@@ -182,7 +182,7 @@
   <string name="crashlog_send_report">Αποστολή αναφοράς</string>
   <string name="crashlog_dont_send_report">Να μην αποσταλεί αναφορά</string>
   <string name="extensions_avail_title">Διαθέσιμες επεκτάσεις!</string>
-  <string name="extensions_avail_message">Φαίνεται ότι το ownCloud σας υποστηρίζει προηγμένες επεκτάσεις. Θα θέλατε να δείτε τις διαθέσιμες επεκτάσεις για το android;</string>
+  <string name="extensions_avail_message">Φαίνεται ότι το server σας υποστηρίζει προηγμένες επεκτάσεις. Θα θέλατε να δείτε τις διαθέσιμες επεκτάσεις για το android;</string>
   <string name="fd_keep_in_sync">Διατήρηση αρχείου ενημερωμένo</string>
   <string name="common_share">Διαμοιρασμός</string>
   <string name="common_rename">Μετονομασία</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 7c49fb54..8c15518f 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Järjehoidjad</string>
   <string name="main_settings">Seaded</string>
   <string name="main_tit_accsetup">Konto seadistamine</string>
-  <string name="main_wrn_accsetup">Sinu seadmes pole ühtegi ownCloudi kontot. Selle rakenduse kasutamiseks pead sa ühe looma.</string>
+  <string name="main_wrn_accsetup">Sinu seadmes pole ühtegi kontot. Selle rakenduse kasutamiseks pead sa ühe looma.</string>
   <string name="about_android">%1$s Android App</string>
   <string name="about_version">versioon %1$s</string>
   <string name="actionbar_sync">Värskenda kontot</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Vali konto</string>
   <string name="prefs_summary_select_oc_account">Vali, milliseid sinu kontosid peaks rakendus kasutama.</string>
   <string name="prefs_trackmydevice">Seadme jälgimine</string>
-  <string name="prefs_trackmydevice_summary_off">Luba ownCloudil jälgida oma seadme asukohta</string>
-  <string name="prefs_trackmydevice_summary_on">Sinu ownCloud jälgib seda seadet</string>
+  <string name="prefs_trackmydevice_summary_off">Luba jälgida oma seadme asukohta</string>
+  <string name="prefs_trackmydevice_summary_on">Sinu jälgib seda seadet</string>
   <string name="prefs_trackmydevice_interval">Uuendamise intervall</string>
   <string name="prefs_trackmydevice_interval_summary">Uuenda iga %1$s minuti tagant</string>
   <string name="prefs_accounts">Kontod</string>
   <string name="prefs_manage_accounts">Halda kontosid</string>
-  <string name="prefs_pincode">ownCloud rakenduse PIN</string>
-  <string name="prefs_pincode_summary">Kaitse oma ownCloudi klienti</string>
+  <string name="prefs_pincode">Rakenduse PIN</string>
+  <string name="prefs_pincode_summary">Kaitse oma klienti</string>
   <string name="prefs_instant_upload">Luba kohene üleslaadimine</string>
   <string name="prefs_instant_upload_summary">Lae kaamera poolt tehtud fotod automaatselt üles</string>
   <string name="prefs_log_title">Luba logimine</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">Parool</string>
   <string name="setup_hint_address">Veebiaadress</string>
   <string name="setup_hint_show_password">Näita parooli?</string>
-  <string name="setup_title">Ühenda oma ownCloudiga</string>
+  <string name="setup_title">Ühenda oma %1$siga</string>
   <string name="setup_btn_connect">Ühenda</string>
   <string name="uploader_btn_upload_text">Lae üles</string>
   <string name="uploader_top_message">Vali kataloog serveris: </string>
   <string name="uploader_wrn_no_account_title">Kontot ei leitud</string>
-  <string name="uploader_wrn_no_account_text">Selles seadmes pole ühtegi ownCloudi kontot. Palun seadista esmalt konto.</string>
+  <string name="uploader_wrn_no_account_text">Selles seadmes pole ühtegi %1$si kontot. Palun seadista esmalt konto.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Seadista</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Lõpeta</string>
   <string name="uploader_wrn_no_content_title">Pole sisu, mida üles laadida</string>
   <string name="uploader_wrn_no_content_text">Sisu ei saadud. Pole midagi üles laadida.</string>
-  <string name="uploader_error_forbidden_content">ownCloudile pole lubatud ligipääs jagatud sisule</string>
+  <string name="uploader_error_forbidden_content">%1$sile pole lubatud ligipääs jagatud sisule</string>
   <string name="uploader_info_uploading">Üleslaadimine</string>
   <string name="uploader_btn_create_dir_text">Loo üleslaadimise jaoks kaust</string>
   <string name="file_list_empty">Selles kaustas pole ühtegi faili.\nUusi faile saab lisada kasutades menüü valikut \"Lae üles\".</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Tühista üleslaadimine</string>
   <string name="common_cancel">Loobu</string>
   <string name="common_save_exit">Salvesta &amp; Välju</string>
-  <string name="common_exit">Lahku ownCloudist</string>
+  <string name="common_exit">Lahku %1$sist</string>
   <string name="common_error">Viga</string>
   <string name="common_loading">Laadin ...</string>
   <string name="common_error_unknown">Tundmatu viga</string>
@@ -131,17 +131,17 @@
   <string name="foreign_files_remote_text">Serveris: %1$s</string>
   <string name="upload_query_move_foreign_files">Pole piisavalt ruumi kopeerimaks valitud faile kataloogi %1$s. Soovid kopeerimise asemel neid ümber tõsta?</string>
   <string name="use_ssl">Kasuta turvalist ühendust</string>
-  <string name="location_no_provider">ownCloud ei saa sinu seadet jälgida. Palun kontrolli oma asukoha seadeid</string>
+  <string name="location_no_provider">%1$s ei saa sinu seadet jälgida. Palun kontrolli oma asukoha seadeid</string>
   <string name="pincode_enter_pin_code">Palun sisesta oma rakenduse PIN</string>
   <string name="pincode_enter_new_pin_code">Palun sisesta oma rakenduse uus PIN</string>
-  <string name="pincode_configure_your_pin">Palun ownCloudi rakenduse PIN</string>
+  <string name="pincode_configure_your_pin">Palun rakenduse PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN-i nõutakse iga kord, kui rakendus käivitatakse</string>
-  <string name="pincode_reenter_your_pincode">Palun sisesta oma ownCloudi rakenduse PIN uuesti</string>
-  <string name="pincode_remove_your_pincode">Eemalda oma ownCloud rakenduse PIN</string>
-  <string name="pincode_mismatch">Mõlemad ownCloudi rakenduse PIN-id pole samad</string>
-  <string name="pincode_wrong">Vigane ownCloudii rakenduse PIN</string>
-  <string name="pincode_removed">ownCloud rakenduse PIN on eemaldatud</string>
-  <string name="pincode_stored">ownCloud rakenduse PIN on salvestatud</string>
+  <string name="pincode_reenter_your_pincode">Palun sisesta oma rakenduse PIN uuesti</string>
+  <string name="pincode_remove_your_pincode">Eemalda oma rakenduse PIN</string>
+  <string name="pincode_mismatch">Mõlemad rakenduse PIN-id pole samad</string>
+  <string name="pincode_wrong">Vigane rakenduse PIN</string>
+  <string name="pincode_removed">Rakenduse PIN on eemaldatud</string>
+  <string name="pincode_stored">Rakenduse PIN on salvestatud</string>
   <string name="media_notif_ticker">%1$s muusika mängija</string>
   <string name="media_state_playing">%1$s (mängib)</string>
   <string name="media_state_loading">%1$s (laeb)</string>
@@ -181,19 +181,19 @@
   <string name="auth_nossl_plain_ok_message">Rakendus ei suutnud serveriga turvalist ühendust luua. Kuid saadaval on mitteturvaline ühendus. Sa võid jätkata või loobuda.</string>
   <string name="auth_connection_established">Saadi ühendus</string>
   <string name="auth_testing_connection">Ühenduse testimine...</string>
-  <string name="auth_not_configured_title">Vigases vormingus ownCloud seadistus</string>
-  <string name="auth_not_configured_message">Näib, et sinu ownCloud pole korralikult seadistatud. Lisainfo saamiseks võta ühendust oma administraatoriga.</string>
+  <string name="auth_not_configured_title">Vigases vormingus server seadistus</string>
+  <string name="auth_not_configured_message">Näib, et sinu server pole korralikult seadistatud. Lisainfo saamiseks võta ühendust oma administraatoriga.</string>
   <string name="auth_unknown_error_title">Tekkis tundmatu tõrge!</string>
   <string name="auth_unknown_error_message">Tekkis tundmatu tõrge. Palun võta autoritega ühendust ja kaasa oma seadme logid.</string>
   <string name="auth_unknown_host_title">Hosti ei leitud</string>
   <string name="auth_unknown_host_message">Sisestatud hosti ei leitud. Palun kontrolli hostiinme ja serveri kättesaadavust ning proovi seejärel uuesti.</string>
-  <string name="auth_incorrect_path_title">ownCloud protsessi ei leitud</string>
+  <string name="auth_incorrect_path_title">server protsessi ei leitud</string>
   <string name="auth_incorrect_path_message">Rakendus antud asukohast ownCloundi. Palun kontrolli asukohta ja proovi uuesti.</string>
   <string name="auth_timeout_title">Serveri vastus võttis liiga kaua aega</string>
   <string name="auth_incorrect_address_title">Vigases vormingus URL</string>
   <string name="auth_ssl_general_error_title">SSL-i käivitamine ebaõnnestus</string>
   <string name="auth_ssl_unverified_server_title">Kinnitamata SSL serveri identiteet</string>
-  <string name="auth_bad_oc_version_title">Tundmatu ownCloud serveri versioon</string>
+  <string name="auth_bad_oc_version_title">Tundmatu server serveri versioon</string>
   <string name="auth_wrong_connection_title">Ühenduse loomine ebaõnnestus</string>
   <string name="auth_secure_connection">Saavutati turvaline ühendus</string>
   <string name="auth_unauthorized">Vale kasutajanimi või parool</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Saada veateade</string>
   <string name="crashlog_dont_send_report">Ära saada veateadet</string>
   <string name="extensions_avail_title">Saadaval on lisaprogrammid!</string>
-  <string name="extensions_avail_message">Näib, et sinu ownCloud toetab laienduste kasutamist. Kas sa sooviksid näha androidile saada olevaid lisaprogramme ?</string>
+  <string name="extensions_avail_message">Näib, et sinu server toetab laienduste kasutamist. Kas sa sooviksid näha androidile saada olevaid lisaprogramme ?</string>
   <string name="fd_keep_in_sync">Hoia faili ajakohasena</string>
   <string name="common_share">Jaga</string>
   <string name="common_rename">Nimeta ümber</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c137ba27..b4c6e2e0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Pasahitza:</string>
   <string name="main_login">Erabiltzaile izena:</string>
   <string name="main_button_login">Saioa hasi</string>
-  <string name="main_welcome">Ongi etorria zure ownCloudera</string>
+  <string name="main_welcome">Ongi etorri</string>
   <string name="main_files">Fitxategiak</string>
   <string name="main_music">Musika</string>
   <string name="main_contacts">Kontaktuak</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Laster-markak</string>
   <string name="main_settings">Ezarpenak</string>
   <string name="main_tit_accsetup">Konfiguratu kontua</string>
-  <string name="main_wrn_accsetup"> Ez dago ownCloud konturik zure gailuan. Programa hau erabiltzeko, kontu bat sortu behar duzu.</string>
+  <string name="main_wrn_accsetup"> Ez dago konturik zure gailuan. Programa hau erabiltzeko, kontu bat sortu behar duzu.</string>
   <string name="about_android">%1$s Android Aplikazioa</string>
   <string name="about_version">%1$s bertsioa</string>
   <string name="actionbar_sync">Freskatu kontua</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Aukeratu kontu bat</string>
   <string name="prefs_summary_select_oc_account">Aukeratu aplikazioak ze kontu erabiliko duen. </string>
   <string name="prefs_trackmydevice">Gailuaren jarraipena</string>
-  <string name="prefs_trackmydevice_summary_off">Gaitu ownCloud zure gailuaren kokapena jarraitzeari</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloudek gailu honen jarraipena egiten du</string>
+  <string name="prefs_trackmydevice_summary_off">Gaitu zure gailuaren kokapena jarraitzeari</string>
+  <string name="prefs_trackmydevice_summary_on">Gailu honen jarraipena egiten du</string>
   <string name="prefs_trackmydevice_interval">Eguneraketa tartea</string>
   <string name="prefs_trackmydevice_interval_summary">Eguneratu %1$s minuturo</string>
   <string name="prefs_accounts">Kontuak</string>
   <string name="prefs_manage_accounts">Kontuak kudeatu</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Babestu zure ownCloud bezeroa</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">Babestu zure bezeroa</string>
   <string name="prefs_instant_upload">Gaitu berehalako igoera</string>
   <string name="prefs_instant_upload_summary">Igo berehala kamerak ateratako argazkiak</string>
   <string name="prefs_log_title">Gaitu erregistroa</string>
@@ -57,12 +57,12 @@
   <string name="setup_hint_password">Pasahitza</string>
   <string name="setup_hint_address">Web helbidea</string>
   <string name="setup_hint_show_password">Bistaratu pasahitza?</string>
-  <string name="setup_title">Konektatu zure ownCloudera</string>
+  <string name="setup_title">Konektatu zure %1$sera</string>
   <string name="setup_btn_connect">Konektatu</string>
   <string name="uploader_btn_upload_text">Igo</string>
   <string name="uploader_top_message">Hautatu igoera direktorioa:</string>
   <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
-  <string name="uploader_wrn_no_account_text">Zure gailuan ez dago ownCloud konturik. Mesedez konfiguratu kontu bat lehenengo.</string>
+  <string name="uploader_wrn_no_account_text">Zure gailuan ez dago %1$s konturik. Mesedez konfiguratu kontu bat lehenengo.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Konfiguratu</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Irten</string>
   <string name="uploader_wrn_no_content_title">Ez dago igotzeko edukirik</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Ezeztatu igoera</string>
   <string name="common_cancel">Ezeztatu</string>
   <string name="common_save_exit">Gorde eta Irten</string>
-  <string name="common_exit">Utzi ownCloud</string>
+  <string name="common_exit">Utzi %1$s</string>
   <string name="common_error">Errorea</string>
   <string name="common_loading">Kargatzen ...</string>
   <string name="common_error_unknown">Errore ezezaguna</string>
@@ -130,17 +130,17 @@
   <string name="foreign_files_remote_text">Urrunekoa: %1$s</string>
   <string name="upload_query_move_foreign_files">Ez dago leku nahikorik hautatutako fitxategiak %1$s karpetan kopiatzeko. Nahi al duzu kopiatu ordez bertara mugitzea?</string>
   <string name="use_ssl">Erabili konexio segurua</string>
-  <string name="location_no_provider">ownCloudek ezin du zure gailua jarraitu. Mesedez begiratu zure kokapen ezarpenak</string>
+  <string name="location_no_provider">%1$sek ezin du zure gailua jarraitu. Mesedez begiratu zure kokapen ezarpenak</string>
   <string name="pincode_enter_pin_code">Mesedez, sartu zure aplikazioaren PINa</string>
   <string name="pincode_enter_new_pin_code">Mesedez, sartu zure aplikazioaren PIN berria</string>
-  <string name="pincode_configure_your_pin">Sartu ownCloud aplikazioaren PINa</string>
+  <string name="pincode_configure_your_pin">Sartu aplikazioaren PINa</string>
   <string name="pincode_configure_your_pin_explanation">PINa aplikazioa abiarazten den bakoitzean eskatuko da</string>
-  <string name="pincode_reenter_your_pincode">Sartu berriz ownCloud aplikazioarenPINa, mesedez</string>
-  <string name="pincode_remove_your_pincode">Ezabatu zure ownCloud aplikazioaren PINa</string>
-  <string name="pincode_mismatch">ownCloud aplikazioko bi PINak ez dira berdinak</string>
-  <string name="pincode_wrong">ownCloud aplikazioaren PINa ezda zuzena</string>
-  <string name="pincode_removed">ownCloud aplikazioaren PINa kendu da</string>
-  <string name="pincode_stored">ownCloud aplikazioaren PINa gorde da</string>
+  <string name="pincode_reenter_your_pincode">Sartu berriz aplikazioarenPINa, mesedez</string>
+  <string name="pincode_remove_your_pincode">Ezabatu zure aplikazioaren PINa</string>
+  <string name="pincode_mismatch">Aplikazioko bi PINak ez dira berdinak</string>
+  <string name="pincode_wrong">Aplikazioaren PINa ezda zuzena</string>
+  <string name="pincode_removed">Aplikazioaren PINa kendu da</string>
+  <string name="pincode_stored">Aplikazioaren PINa gorde da</string>
   <string name="media_notif_ticker">%1$s musika erreproduzigailua</string>
   <string name="media_state_playing">%1$s (jotzen)</string>
   <string name="media_state_loading">%1$s (kargatzen)</string>
@@ -180,19 +180,19 @@
   <string name="auth_nossl_plain_ok_message">Aplikazioak ezin izan du zerbitzariarekin konexio seguru bat ezarri. Hala ere konexio ez segurua egin daiteke. Jarraitu edo ezeztatu dezakezu.</string>
   <string name="auth_connection_established">Konexioa ezarri da</string>
   <string name="auth_testing_connection">Konexioa probatzen...</string>
-  <string name="auth_not_configured_title">gaizki egindako ownCloud konfigurazioa</string>
-  <string name="auth_not_configured_message">Badirudi zure ownCloud instantzia ez dagoela ongi konfiguratuta. Jarri zure harremanetan administradorearkin informazio gehiago izateko.</string>
+  <string name="auth_not_configured_title">gaizki egindako server konfigurazioa</string>
+  <string name="auth_not_configured_message">Badirudi zure server instantzia ez dagoela ongi konfiguratuta. Jarri zure harremanetan administradorearkin informazio gehiago izateko.</string>
   <string name="auth_unknown_error_title">Errore ezezagun bat gertatu da</string>
   <string name="auth_unknown_error_message">Errore ezezagun bat gertatu da. Mezedez jarri harremanetan egileekin eta zure gailuko log-ak erantsi.</string>
   <string name="auth_unknown_host_title">Ezin izan da hostalaria aurkitu</string>
   <string name="auth_unknown_host_message">Ezin da sartutako hostalaria aurkitu. Mezedez egiaztatu hostalari izena eta zerbitzariaren eskuragarritasuna eta saiatu berriz.</string>
-  <string name="auth_incorrect_path_title">ez da ownClouden instalaziorik aurkitu</string>
-  <string name="auth_incorrect_path_message">Programak ezin du ownCloud instantzia aurkitu emandako bidean. Mesedez egiaztatu bidea eta saiatu berriz.</string>
+  <string name="auth_incorrect_path_title">ez da serveren instalaziorik aurkitu</string>
+  <string name="auth_incorrect_path_message">Programak ezin du server instantzia aurkitu emandako bidean. Mesedez egiaztatu bidea eta saiatu berriz.</string>
   <string name="auth_timeout_title">Zerbitzariak denbora asko hartu du erantzuteko</string>
   <string name="auth_incorrect_address_title">Gaizki sortutako URLa</string>
   <string name="auth_ssl_general_error_title">SSL abiaratzeak huts egin du</string>
   <string name="auth_ssl_unverified_server_title">Egiaztatu gabeko SSL zerbitzariaren identitaea</string>
-  <string name="auth_bad_oc_version_title">ownCloud zerbitzari bertsio ezezaguna</string>
+  <string name="auth_bad_oc_version_title">server zerbitzari bertsio ezezaguna</string>
   <string name="auth_wrong_connection_title">Ezin izan da konexioa egin</string>
   <string name="auth_secure_connection">Konexio segurua ezarri da</string>
   <string name="auth_unauthorized">Okerreko erabiltzaile izen edo pasahitza</string>
@@ -207,7 +207,7 @@
   <string name="crashlog_send_report">Bidali txostena</string>
   <string name="crashlog_dont_send_report">Ez bidali txostena</string>
   <string name="extensions_avail_title">Hedapenak eskuragarri!</string>
-  <string name="extensions_avail_message">Badirudi zure ownCloud instantziak aukera aurreratuak eskuragarri dituela. Nahiko zenuke aukera horiek zure androidean ikustea?</string>
+  <string name="extensions_avail_message">Badirudi zure server instantziak aukera aurreratuak eskuragarri dituela. Nahiko zenuke aukera horiek zure androidean ikustea?</string>
   <string name="fd_keep_in_sync">Mantendu fitxategia eguneratuta</string>
   <string name="common_share">Elkarbanatu</string>
   <string name="common_rename">Berrizendatu</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 44ffa628..4e98e4de 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">رمز عبور:</string>
   <string name="main_login">نام کاربری:</string>
   <string name="main_button_login">ورود</string>
-  <string name="main_welcome">به ownCloud خود خوش‌آمدید</string>
+  <string name="main_welcome">خوش آمد</string>
   <string name="main_files">پرونده‌ها</string>
   <string name="main_music">موزیک</string>
   <string name="main_contacts">ارتباط‌ها</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">نشانک‌ها</string>
   <string name="main_settings">تنظیمات</string>
   <string name="main_tit_accsetup">نصب حساب کاربری</string>
-  <string name="main_wrn_accsetup">حساب کاربری ownCloud در دستگاه شما وجود ندارد. برای استفاده از این برنامه می‌بایست یکی ایجاد کنید.</string>
+  <string name="main_wrn_accsetup">حساب کاربری  در دستگاه شما وجود ندارد. برای استفاده از این برنامه می‌بایست یکی ایجاد کنید.</string>
   <string name="about_android">%1$s برنامه اندروید</string>
   <string name="about_version">%1$s نسخه</string>
   <string name="actionbar_sync">بازنمایی حساب کاربری</string>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index c0b72690..da6e3c15 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Salasana:</string>
   <string name="main_login">Käyttäjätunnus:</string>
   <string name="main_button_login">Kirjaudu</string>
-  <string name="main_welcome">Tervetuloa ownCloudiin</string>
+  <string name="main_welcome">Tervetuloa </string>
   <string name="main_files">Tiedostot</string>
   <string name="main_music">Musiikki</string>
   <string name="main_contacts">Yhteystiedot</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Kirjanmerkit</string>
   <string name="main_settings">Asetukset</string>
   <string name="main_tit_accsetup">Aseta tili</string>
-  <string name="main_wrn_accsetup">Laitteessasi ei ole ownCloud-tilejä. Luo tili käyttääksesi tätä sovellusta.</string>
+  <string name="main_wrn_accsetup">Laitteessasi ei ole tilejä. Luo tili käyttääksesi tätä sovellusta.</string>
   <string name="about_android">%1$s-Android-sovellus</string>
   <string name="about_version">versio %1$s</string>
   <string name="actionbar_sync">Päivitä tili</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Valitse tili</string>
   <string name="prefs_summary_select_oc_account">Valitse sovelluksen käyttämät tilit.</string>
   <string name="prefs_trackmydevice">Laitteen jäljitys</string>
-  <string name="prefs_trackmydevice_summary_off">Salli ownCloudin jäljittää laitteesi sijainti</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud jäljittää tätä laitetta</string>
+  <string name="prefs_trackmydevice_summary_off">Salli jäljittää laitteesi sijainti</string>
+  <string name="prefs_trackmydevice_summary_on">Jäljittää tätä laitetta</string>
   <string name="prefs_trackmydevice_interval">Päivitysväli</string>
   <string name="prefs_trackmydevice_interval_summary">Päivitä %1$s minuutin välein</string>
   <string name="prefs_accounts">Tilit</string>
   <string name="prefs_manage_accounts">Tilien hallinta</string>
-  <string name="prefs_pincode">ownCloud-sovelluksen PIN-koodi</string>
-  <string name="prefs_pincode_summary">Suojaa ownCloud-asiakasohjelmasi</string>
+  <string name="prefs_pincode">Sovelluksen PIN-koodi</string>
+  <string name="prefs_pincode_summary">Suojaa Asiakasohjelmasi</string>
   <string name="prefs_instant_upload">Käytä välitöntä lähetystä</string>
   <string name="prefs_instant_upload_summary">Lähetä kameralla otetut kuvat välittömästi</string>
   <string name="prefs_log_delete_history_button">Poista historia</string>
@@ -52,17 +52,17 @@
   <string name="setup_hint_password">Salasana</string>
   <string name="setup_hint_address">Verkko-osoite</string>
   <string name="setup_hint_show_password">Näytä salasana</string>
-  <string name="setup_title">Yhdistä omaan ownCloudiin</string>
+  <string name="setup_title">Yhdistä omaan %1$siin</string>
   <string name="setup_btn_connect">Yhdistä</string>
   <string name="uploader_btn_upload_text">Lähetä</string>
   <string name="uploader_top_message">Valitse lähetyskansio:</string>
   <string name="uploader_wrn_no_account_title">Tiliä ei löytynyt</string>
-  <string name="uploader_wrn_no_account_text">Laitteelle ei ole asetettu ownCloud-tiliä. Luo tili ensin.</string>
+  <string name="uploader_wrn_no_account_text">Laitteelle ei ole asetettu %1$s-tiliä. Luo tili ensin.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Asetukset</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Lopeta</string>
   <string name="uploader_wrn_no_content_title">Ei sisältöä ladattavaksi</string>
   <string name="uploader_wrn_no_content_text">Sisältöä ei saatu. Ei lähetettävää palvelimelle.</string>
-  <string name="uploader_error_forbidden_content">ownCloudilla ei ole oikeuksia jaettuun sisältöön</string>
+  <string name="uploader_error_forbidden_content">%1$silla ei ole oikeuksia jaettuun sisältöön</string>
   <string name="uploader_info_uploading">Lähetetään</string>
   <string name="uploader_btn_create_dir_text">Luo kansio latausta varten</string>
   <string name="file_list_empty">Tässä kansiossa ei ole tiedostoja.\nUusia tiedostoja voi lisätä käyttäen valikon \"Lähetä\"-toimintoa.</string>
@@ -82,7 +82,7 @@
   <string name="common_cancel_upload">Peru lähetys</string>
   <string name="common_cancel">Peru</string>
   <string name="common_save_exit">Tallenna ja poistu</string>
-  <string name="common_exit">Jätä ownCloud</string>
+  <string name="common_exit">Jätä %1$s</string>
   <string name="common_error">Virhe</string>
   <string name="common_loading">Ladataan…</string>
   <string name="common_error_unknown">Tuntematon virhe</string>
@@ -120,17 +120,17 @@
   <string name="foreign_files_local_text">Paikallinen: %1$s</string>
   <string name="foreign_files_remote_text">Etä: %1$s</string>
   <string name="use_ssl">Käytä salattua yhteyttä</string>
-  <string name="location_no_provider">ownCloud ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
+  <string name="location_no_provider">%1$s ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
   <string name="pincode_enter_pin_code">Aseta sovelluksesi PIN</string>
   <string name="pincode_enter_new_pin_code">Anna uuden sovelluksesi PIN-koodi</string>
-  <string name="pincode_configure_your_pin">Anna ownCloud-sovelluksen PIN</string>
+  <string name="pincode_configure_your_pin">Anna sovelluksen PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN kysytään joka kerta, kun sovellus käynnistetään</string>
-  <string name="pincode_reenter_your_pincode">Anna ownCloud-sovelluksen PIN uudestaan</string>
-  <string name="pincode_remove_your_pincode">Poista ownCloud-sovelluksen PIN</string>
-  <string name="pincode_mismatch">ownCloud-sovelluksen PIN-koodit eivät täsmää</string>
-  <string name="pincode_wrong">Väärä ownCloud-sovelluksen PIN</string>
-  <string name="pincode_removed">ownCloud-sovelluksen PIN poistettu</string>
-  <string name="pincode_stored">ownCloud-sovelluksen PIN-koodi tallennettu</string>
+  <string name="pincode_reenter_your_pincode">Anna sovelluksen PIN uudestaan</string>
+  <string name="pincode_remove_your_pincode">Poista sovelluksen PIN</string>
+  <string name="pincode_mismatch">Sovelluksen PIN-koodit eivät täsmää</string>
+  <string name="pincode_wrong">Väärä sovelluksen PIN</string>
+  <string name="pincode_removed">Sovelluksen PIN poistettu</string>
+  <string name="pincode_stored">Sovelluksen PIN-koodi tallennettu</string>
   <string name="media_state_playing">%1$s (toistetaan)</string>
   <string name="media_state_loading">%1$s (ladataan)</string>
   <string name="media_err_nothing_to_play">Mediatiedostoa ei löytynyt</string>
@@ -158,19 +158,19 @@
   <string name="auth_nossl_plain_ok_message">Sovellus ei voinut luoda salattua yhteyttä palvelimeen. Kuitenkin salaamaton yhteys on olemassa. Jatka sitä käyttäen tai lopeta tähän.</string>
   <string name="auth_connection_established">Yhteys muodostettu</string>
   <string name="auth_testing_connection">Testataan yhteyttä...</string>
-  <string name="auth_not_configured_title">Väärin tehdyt ownCloud-asetukset</string>
-  <string name="auth_not_configured_message">Vaikuttaa ettei ownCloud ole oikein määritetty. Ota yhteyttä ylläpitäjään.</string>
+  <string name="auth_not_configured_title">Väärin tehdyt palvelin-asetukset</string>
+  <string name="auth_not_configured_message">Vaikuttaa ettei palvelin ole oikein määritetty. Ota yhteyttä ylläpitäjään.</string>
   <string name="auth_unknown_error_title">Tuntematon virhe</string>
   <string name="auth_unknown_error_message">Tuntematon virhe tapahtui. Ota yhteyttä tekijöihin ja liitä mukaan lokitiedostot laitteestasi.</string>
   <string name="auth_unknown_host_title">Isäntää ei löydy</string>
   <string name="auth_unknown_host_message">Annettua isäntää ei löydy. Tarkista nimi ja onko palvelin käytettävissä, yritä sitten uudestaan.</string>
-  <string name="auth_incorrect_path_title">ownCloud-instanssia ei löydetty</string>
-  <string name="auth_incorrect_path_message">Sovellus ei löydä ownCloud-instanssia annetusta polusta. Tarkista polku ja yritä uudestaan.</string>
+  <string name="auth_incorrect_path_title">Palvelin-instanssia ei löydetty</string>
+  <string name="auth_incorrect_path_message">Sovellus ei löydä palvelin-instanssia annetusta polusta. Tarkista polku ja yritä uudestaan.</string>
   <string name="auth_timeout_title">Palvelimen vastaus viipyy liian kauan</string>
   <string name="auth_incorrect_address_title">Väärin annettu osoite</string>
   <string name="auth_ssl_general_error_title">SSL:n alustus epäonnistui</string>
   <string name="auth_ssl_unverified_server_title">SSL-palvelimen identiteettiä ei voida varmistaa</string>
-  <string name="auth_bad_oc_version_title">Tuntematon ownCloud-palvelimen versio</string>
+  <string name="auth_bad_oc_version_title">Tuntematon palvelimen versio</string>
   <string name="auth_wrong_connection_title">Yhteyden muodostus epäonnistui</string>
   <string name="auth_secure_connection">Salattu yhteys muodostettu</string>
   <string name="auth_unauthorized">Väärä käyttäjätunnus tai salasana</string>
@@ -182,7 +182,7 @@
   <string name="crashlog_send_report">Lähetä ilmoitus</string>
   <string name="crashlog_dont_send_report">Älä lähetä ilmoitusta</string>
   <string name="extensions_avail_title">Laajennuksia saatavilla!</string>
-  <string name="extensions_avail_message">ownCloud-instanssisi näyttäisi tukevan laajennuksia. Haluatko nähdä Androidille saatavilla olevat laajennukset?</string>
+  <string name="extensions_avail_message">Palvelin-instanssisi näyttäisi tukevan laajennuksia. Haluatko nähdä Androidille saatavilla olevat laajennukset?</string>
   <string name="fd_keep_in_sync">Pidä tiedosto ajan tasalla</string>
   <string name="common_share">Jaa</string>
   <string name="common_rename">Nimeä uudelleen</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7dafc810..b65ad316 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Mot de passe : </string>
   <string name="main_login">Utilisateur : </string>
   <string name="main_button_login">Connexion</string>
-  <string name="main_welcome">Bienvenue dans votre ownCloud</string>
+  <string name="main_welcome">Bienvenue</string>
   <string name="main_files">Fichiers</string>
   <string name="main_music">Musique</string>
   <string name="main_contacts">Contacts</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Marque-pages</string>
   <string name="main_settings">Paramètres</string>
   <string name="main_tit_accsetup">Paramètres du compte</string>
-  <string name="main_wrn_accsetup">Aucun compte ownCloud n\'est encore paramétré. Pour utiliser cette application, il vous faut en ajouter un.</string>
+  <string name="main_wrn_accsetup">Aucun compte n\'est encore paramétré. Pour utiliser cette application, il vous faut en ajouter un.</string>
   <string name="about_android">%1$s Android App</string>
   <string name="about_version">version %1$s</string>
   <string name="actionbar_sync">Actualiser le compte</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Sélectionnez un compte</string>
   <string name="prefs_summary_select_oc_account">Choisissez quel compte utiliser</string>
   <string name="prefs_trackmydevice">Traçage de l\'appareil</string>
-  <string name="prefs_trackmydevice_summary_off">Permettre à ownCloud de suivre votre position</string>
-  <string name="prefs_trackmydevice_summary_on">Votre ownCloud trace actuellement cet appareil</string>
+  <string name="prefs_trackmydevice_summary_off">Permettre à l\'application de suivre votre position</string>
+  <string name="prefs_trackmydevice_summary_on">Votre application trace actuellement cet appareil</string>
   <string name="prefs_trackmydevice_interval">Intervalle de mise à jour</string>
   <string name="prefs_trackmydevice_interval_summary">Mettre à jour toutes les %1$s minutes</string>
   <string name="prefs_accounts">Comptes</string>
   <string name="prefs_manage_accounts">Gestion des comptes utilisateur</string>
-  <string name="prefs_pincode">Utilisation d\'un code de sécurité ownCloud</string>
-  <string name="prefs_pincode_summary">Protéger l\'accès aux données maniplulées par le client ownCloud</string>
+  <string name="prefs_pincode">Utilisation d\'un code de sécurité</string>
+  <string name="prefs_pincode_summary">Protéger l\'accès aux données maniplulées par le client</string>
   <string name="prefs_instant_upload">Activer le téléversement instantané</string>
   <string name="prefs_instant_upload_summary">Import instantané des photos prises par la caméra</string>
   <string name="prefs_log_title">Activer les logs</string>
@@ -55,17 +55,17 @@
   <string name="setup_hint_password">Mot de passe</string>
   <string name="setup_hint_address">Adresse web</string>
   <string name="setup_hint_show_password">Afficher le mot de passe ?</string>
-  <string name="setup_title">Me connecter à mon ownCloud</string>
+  <string name="setup_title">Me connecter à mon %1$s</string>
   <string name="setup_btn_connect">Connecter</string>
   <string name="uploader_btn_upload_text">Téléverser</string>
   <string name="uploader_top_message">Choisissez le répertoire de destination:</string>
   <string name="uploader_wrn_no_account_title">Aucun compte n\'a été trouvé</string>
-  <string name="uploader_wrn_no_account_text">Aucun compte ownCloud n\'a été trouvé. Veuillez commencer par en configurer un.</string>
+  <string name="uploader_wrn_no_account_text">Aucun compte %1$s n\'a été trouvé. Veuillez commencer par en configurer un.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Paramètres</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Quitter</string>
   <string name="uploader_wrn_no_content_title">Rien à envoyer</string>
   <string name="uploader_wrn_no_content_text">Aucun contenu reçu. Rien à envoyer</string>
-  <string name="uploader_error_forbidden_content">ownCloud n\'est pas autorisé à accéder au contenu partagé</string>
+  <string name="uploader_error_forbidden_content">%1$s n\'est pas autorisé à accéder au contenu partagé</string>
   <string name="uploader_info_uploading">Téléversement</string>
   <string name="uploader_btn_create_dir_text">Créer un répertoire pour le téléversement</string>
   <string name="file_list_empty">Ce répertoire ne contient aucun fichier.\nDe nouveaux fichiers peuvent être importés en cliquant sur le bouton « Téléverser un fichier » du menu des options</string>
@@ -85,7 +85,7 @@
   <string name="common_cancel_upload">Annuler l\'envoi</string>
   <string name="common_cancel">Annuler</string>
   <string name="common_save_exit">Sauvegarder &amp; Quitter</string>
-  <string name="common_exit">Quitter ownCloud</string>
+  <string name="common_exit">Quitter %1$s</string>
   <string name="common_error">Erreur</string>
   <string name="common_loading">Chargement ...</string>
   <string name="common_error_unknown">Erreur Inconnue </string>
@@ -128,17 +128,17 @@
   <string name="foreign_files_remote_text">Distant: %1$s</string>
   <string name="upload_query_move_foreign_files">Il n\'y a pas assez de place disponible pour copier les fichiers sélectionnés dans le dossier %1$s. Voulez-vous les déplacer à la place ?</string>
   <string name="use_ssl">Utiliser une connexion sécurisée</string>
-  <string name="location_no_provider">ownCloud ne peut pister votre appareil, veuillez vérifier vos paramètres de localisation</string>
+  <string name="location_no_provider">%1$s ne peut pister votre appareil, veuillez vérifier vos paramètres de localisation</string>
   <string name="pincode_enter_pin_code">Veuillez saisir votre code de sécurité</string>
   <string name="pincode_enter_new_pin_code">Veuillez saisir votre nouveau code de sécurité</string>
-  <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité ownCloud</string>
+  <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité </string>
   <string name="pincode_configure_your_pin_explanation">Le code PIN vous sera demandé à chaque lancement de l\'application</string>
-  <string name="pincode_reenter_your_pincode">Veuillez saisir à nouveau votre code de sécurité ownCloud</string>
-  <string name="pincode_remove_your_pincode">Retirer le code de sécurité ownCloud</string>
+  <string name="pincode_reenter_your_pincode">Veuillez saisir à nouveau votre code de sécurité</string>
+  <string name="pincode_remove_your_pincode">Retirer le code de sécurité</string>
   <string name="pincode_mismatch">Les deux codes saisis ne concordent pas</string>
-  <string name="pincode_wrong">code de sécurité ownCloud incorrect</string>
-  <string name="pincode_removed">code de sécurité ownCloud retiré</string>
-  <string name="pincode_stored">code de sécurité ownCloud enregistré</string>
+  <string name="pincode_wrong">Code de sécurité incorrect</string>
+  <string name="pincode_removed">Code de sécurité retiré</string>
+  <string name="pincode_stored">Code de sécurité enregistré</string>
   <string name="media_notif_ticker">%1$s lecteur de musique</string>
   <string name="media_state_playing">%1$s (lecture)</string>
   <string name="media_state_loading">%1$s (chargement)</string>
@@ -178,19 +178,19 @@
   <string name="auth_nossl_plain_ok_message">L\'application ne peut établir de connexion sécurisée avec le serveur. Cependant, une connexion non sécurisée est disponible. Vous pouvez continuer en utilisant celle-ci ou annuler.</string>
   <string name="auth_connection_established">Connexion établie</string>
   <string name="auth_testing_connection">Test de la connexion…</string>
-  <string name="auth_not_configured_title">Configuration ownCloud erronée</string>
-  <string name="auth_not_configured_message">Il semblerait que votre instance ownCloud ne soit pas correctement configurée. Veuillez contacter votre administrateur pour plus de détails.</string>
+  <string name="auth_not_configured_title">Configuration du serveur erronée</string>
+  <string name="auth_not_configured_message">Il semblerait que votre instance du serveur ne soit pas correctement configurée. Veuillez contacter votre administrateur pour plus de détails.</string>
   <string name="auth_unknown_error_title">Une erreur inconnue s\'est produite</string>
   <string name="auth_unknown_error_message">Une erreur inconnue s\'est produite, merci de bien vouloir contacter les auteurs du programme en y incluant les messages d\'erreurs.</string>
   <string name="auth_unknown_host_title">Impossible de trouver l\'hôte</string>
   <string name="auth_unknown_host_message">Impossible de trouver l\'hôte spécifié. Veuillez vérifier le nom du serveur, qu\'il est disponible, et essayer à nouveau.</string>
-  <string name="auth_incorrect_path_title">Aucune instance ownCloud n\'a été trouvée</string>
-  <string name="auth_incorrect_path_message">L\'application n\'a pu trouver une instance ownCloud à cette adresse. Veuillez vérifier l\'adresse et essayez à nouveau</string>
+  <string name="auth_incorrect_path_title">Aucune instance du serveur n\'a été trouvée</string>
+  <string name="auth_incorrect_path_message">L\'application n\'a pu trouver une instance du serveur à cette adresse. Veuillez vérifier l\'adresse et essayez à nouveau</string>
   <string name="auth_timeout_title">Le serveur met trop longtemps à répondre</string>
   <string name="auth_incorrect_address_title">Adresse invalide</string>
   <string name="auth_ssl_general_error_title">Échec de l\'initialisation SSL</string>
   <string name="auth_ssl_unverified_server_title">L\'identité SSL du serveur n\'a pu être vérifiée</string>
-  <string name="auth_bad_oc_version_title">La version ownCloud du serveur n\'est pas reconnue</string>
+  <string name="auth_bad_oc_version_title">La version du serveur n\'est pas reconnue</string>
   <string name="auth_wrong_connection_title">Impossible d\'établir la connexion</string>
   <string name="auth_secure_connection">Connexion sécurisée établie</string>
   <string name="auth_oauth_error">Echec d\'autorisation</string>
@@ -203,7 +203,7 @@
   <string name="crashlog_send_report">Envoyer un rapport</string>
   <string name="crashlog_dont_send_report">Ne rien envoyer</string>
   <string name="extensions_avail_title">Des extensions sont disponibles !</string>
-  <string name="extensions_avail_message">Il semblerait que votre ownCloud supporte les extensions avancées. Voulez-vous afficher les extensions disponibles pour android ?</string>
+  <string name="extensions_avail_message">Il semblerait que votre du serveur supporte les extensions avancées. Voulez-vous afficher les extensions disponibles pour android ?</string>
   <string name="fd_keep_in_sync">Maintenir le fichier à jour</string>
   <string name="common_share">Partager</string>
   <string name="common_rename">Renommer</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cce9651a..6d308724 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Password:</string>
   <string name="main_login"> Nome utente:</string>
   <string name="main_button_login">Accedi</string>
-  <string name="main_welcome">Benvenuto nel tuo ownCloud</string>
+  <string name="main_welcome">Benvenuto</string>
   <string name="main_files">File</string>
   <string name="main_music">Musica</string>
   <string name="main_contacts">Contatti</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Segnalibri</string>
   <string name="main_settings">Impostazioni</string>
   <string name="main_tit_accsetup">Configurazione account</string>
-  <string name="main_wrn_accsetup">Non ci sono account ownCloud su questo dispositivo. Per utilizzare questa applicazione, devi crearne uno.</string>
+  <string name="main_wrn_accsetup">Non ci sono account su questo dispositivo. Per utilizzare questa applicazione, devi crearne uno.</string>
   <string name="about_android">Applicazione Android di %1$s </string>
   <string name="about_version">versione %1$s</string>
   <string name="actionbar_sync">Aggiorna account</string>
@@ -23,20 +23,21 @@
   <string name="actionbar_search">Cerca</string>
   <string name="actionbar_settings">Impostazioni</string>
   <string name="actionbar_see_details">Dettagli</string>
+  
   <string name="prefs_category_general">Generale</string>
   <string name="prefs_add_session">Aggiungi nuova sessione</string>
   <string name="prefs_create_img_thumbnails">Crea anteprime immagini</string>
   <string name="prefs_select_oc_account">Scegli un account</string>
   <string name="prefs_summary_select_oc_account">Scegli quale dei tuoi account sarà utilizzato dall\'applicazione</string>
   <string name="prefs_trackmydevice">Tracciamento del dispositivo</string>
-  <string name="prefs_trackmydevice_summary_off">Abilita ownCloud a tracciare la posizione del tuo dispositivo</string>
-  <string name="prefs_trackmydevice_summary_on">Il tuo ownCloud tiene traccia di questo dispositivo</string>
+  <string name="prefs_trackmydevice_summary_off">Abilita l\'applicazione a tracciare la posizione del tuo dispositivo</string>
+  <string name="prefs_trackmydevice_summary_on">Il tuo l\'applicazione tiene traccia di questo dispositivo</string>
   <string name="prefs_trackmydevice_interval">Intervallo di aggiornamento</string>
   <string name="prefs_trackmydevice_interval_summary">Aggiorna ogni %1$s minuti</string>
   <string name="prefs_accounts">Account</string>
   <string name="prefs_manage_accounts">Gestisci account</string>
-  <string name="prefs_pincode">PIN ownCloud App</string>
-  <string name="prefs_pincode_summary">Proteggi il tuo client ownCloud</string>
+  <string name="prefs_pincode">PIN App</string>
+  <string name="prefs_pincode_summary">Proteggi il tuo client l\'applicazione</string>
   <string name="prefs_instant_upload">Caricamento immediato</string>
   <string name="prefs_instant_upload_summary">Carica immediatamente le foto dalla fotocamera</string>
   <string name="prefs_log_title">Abilita registrazione log</string>
@@ -44,6 +45,7 @@
   <string name="prefs_log_title_history">Cronologia di registrazione log</string>
   <string name="prefs_log_summary_history">Mostra i log registrati</string>
   <string name="prefs_log_delete_history_button">Elimina la cronologia</string>
+  
   <string name="auth_check_server">Verifica server</string>
   <string name="auth_host_url">Indirizzo del server</string>
   <string name="auth_username">Nome utente</string>
@@ -57,17 +59,17 @@
   <string name="setup_hint_password">Password</string>
   <string name="setup_hint_address">Indirizzo web</string>
   <string name="setup_hint_show_password">Mostrare la password?</string>
-  <string name="setup_title">Connettiti al tuo ownCloud</string>
+  <string name="setup_title">Connettiti al tuo %1$s</string>
   <string name="setup_btn_connect">Connetti</string>
   <string name="uploader_btn_upload_text">Carica</string>
   <string name="uploader_top_message">Scegli la cartella di caricamento:</string>
   <string name="uploader_wrn_no_account_title">Nessun account trovato</string>
-  <string name="uploader_wrn_no_account_text">Non ci sono account ownCloud sul tuo dispositivo. Configura prima un account.</string>
+  <string name="uploader_wrn_no_account_text">Non ci sono account %1$s sul tuo dispositivo. Configura prima un account.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurazione</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Esci</string>
   <string name="uploader_wrn_no_content_title">Nessun contenuto da caricare</string>
   <string name="uploader_wrn_no_content_text">Non è stato ricevuto alcun contenuto. Niente da caricare.</string>
-  <string name="uploader_error_forbidden_content">ownCloud non è abilitato ad accedere al contenuto condiviso</string>
+  <string name="uploader_error_forbidden_content">%1$s non è abilitato ad accedere al contenuto condiviso</string>
   <string name="uploader_info_uploading">Caricamento in corso</string>
   <string name="uploader_btn_create_dir_text">Crea cartella per il caricamento</string>
   <string name="file_list_empty">Non ci sono file in questa cartella.\nNuovi file possono essere aggiunti con l\'opzione di menu \"Carica\".</string>
@@ -87,7 +89,7 @@
   <string name="common_cancel_upload">Annulla invio</string>
   <string name="common_cancel">Annulla</string>
   <string name="common_save_exit">Salva ed esci</string>
-  <string name="common_exit">Esci da ownCloud</string>
+  <string name="common_exit">Esci da %1$s</string>
   <string name="common_error">Errore</string>
   <string name="common_loading">Caricamento in corso...</string>
   <string name="common_error_unknown">Errore sconosciuto</string>
@@ -131,17 +133,18 @@
   <string name="foreign_files_remote_text">Remoto %1$s</string>
   <string name="upload_query_move_foreign_files">Non c\'è spazio sufficiente per copiare i file selezionati nella cartella %1$s. Vuoi invece spostarli nella cartella?</string>
   <string name="use_ssl">Usa connessione sicura</string>
-  <string name="location_no_provider">ownCloud non può tracciare questo dispositivo. Controlla le impostazioni di posizionamento</string>
+  <string name="location_no_provider">%1$s non può tracciare questo dispositivo. Controlla le impostazioni di posizionamento</string>
   <string name="pincode_enter_pin_code">Inserisci il PIN dell\'applicazione</string>
   <string name="pincode_enter_new_pin_code">Inserisci il nuovo PIN dell\'applicazione</string>
-  <string name="pincode_configure_your_pin">Inserisci il PIN di ownCloud</string>
+  <string name="pincode_configure_your_pin">Inserisci il PIN di l\'applicazione</string>
   <string name="pincode_configure_your_pin_explanation">Il PIN sarà richiesto ad ogni avvio dell\'applicazione</string>
-  <string name="pincode_reenter_your_pincode">Inserisci nuovamente il PIN di ownCloud</string>
-  <string name="pincode_remove_your_pincode">Rimuovi il PIN di ownCloud</string>
-  <string name="pincode_mismatch">I PIN di ownCloud non corrispondono</string>
-  <string name="pincode_wrong">PIN di ownCloud non corretto</string>
-  <string name="pincode_removed">PIN di ownCloud rimosso</string>
-  <string name="pincode_stored">PIN di ownCloud memorizzato</string>
+  <string name="pincode_reenter_your_pincode">Inserisci nuovamente il PIN di l\'applicazione</string>
+  <string name="pincode_remove_your_pincode">Rimuovi il PIN di l\'applicazione</string>
+  <string name="pincode_mismatch">I PIN di l\'applicazione non corrispondono</string>
+  <string name="pincode_wrong">PIN di l\'applicazione non corretto</string>
+  <string name="pincode_removed">PIN di l\'applicazione rimosso</string>
+  <string name="pincode_stored">PIN di l\'applicazione memorizzato</string>
+  
   <string name="media_notif_ticker">Lettore musicale %1$s</string>
   <string name="media_state_playing">%1$s (in riproduzione)</string>
   <string name="media_state_loading">%1$s (in caricamento)</string>
@@ -181,19 +184,19 @@
   <string name="auth_nossl_plain_ok_message">L\'applicazione non è in grado di stabilire una connessione sicura al server. È comunque disponibile una connessione non sicura. Puoi continuare o annullare.</string>
   <string name="auth_connection_established">Connessione stabilita</string>
   <string name="auth_testing_connection">Prova di connessione in corso...</string>
-  <string name="auth_not_configured_title">Configurazione non corretta di ownCloud</string>
-  <string name="auth_not_configured_message">Sembra che l\'istanza di ownCloud non sia configurata correttamente. Contatta il tuo amministratore per ulteriori dettagli.</string>
+  <string name="auth_not_configured_title">Configurazione non corretta di il server</string>
+  <string name="auth_not_configured_message">Sembra che l\'istanza di il server non sia configurata correttamente. Contatta il tuo amministratore per ulteriori dettagli.</string>
   <string name="auth_unknown_error_title">Errore sconosciuto</string>
   <string name="auth_unknown_error_message">Si è verificato un errore sconosciuto. Contatta gli autori e includi i log del tuo dispositivo.</string>
   <string name="auth_unknown_host_title">Impossibile trovare l\'host</string>
   <string name="auth_unknown_host_message">Impossibile trovare l\'host digitato. Controlla il nome dell\'host e la raggiungibilità del server e prova ancora.</string>
-  <string name="auth_incorrect_path_title">Istanza di ownCloud non trovata</string>
-  <string name="auth_incorrect_path_message">L\'applicazione non può trovare un\'istanza di ownCloud al percorso specificato. Controlla il percorso e prova ancora.</string>
+  <string name="auth_incorrect_path_title">Istanza di il server non trovata</string>
+  <string name="auth_incorrect_path_message">L\'applicazione non può trovare un\'istanza di il server al percorso specificato. Controlla il percorso e prova ancora.</string>
   <string name="auth_timeout_title">Il server ha richiesto troppo tempo per rispondere</string>
   <string name="auth_incorrect_address_title">URL non valido</string>
   <string name="auth_ssl_general_error_title">Inizializzazione  SSL non riuscita</string>
   <string name="auth_ssl_unverified_server_title">Identità SSL del server non verificata</string>
-  <string name="auth_bad_oc_version_title">Versione del server ownCloud non riconosciuta</string>
+  <string name="auth_bad_oc_version_title">Versione del server il server non riconosciuta</string>
   <string name="auth_wrong_connection_title">Impossibile stabilire la connessione</string>
   <string name="auth_secure_connection">Connessione sicura stabilita</string>
   <string name="auth_unauthorized">Nome utente o password errati</string>
@@ -208,7 +211,7 @@
   <string name="crashlog_send_report">Invia segnalazione</string>
   <string name="crashlog_dont_send_report">Non inviare la segnalazione</string>
   <string name="extensions_avail_title">Estensioni disponibili!</string>
-  <string name="extensions_avail_message">Sembra che la tua istanza di ownCloud supporti le estensioni avanzate. Vuoi vedere le estensioni disponibili per Android?</string>
+  <string name="extensions_avail_message">Sembra che la tua istanza di il server supporti le estensioni avanzate. Vuoi vedere le estensioni disponibili per Android?</string>
   <string name="fd_keep_in_sync">Tieni aggiornato il file</string>
   <string name="common_share">Condividi</string>
   <string name="common_rename">Rinomina</string>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index 7e70f1e1..57f33738 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">パスワード:</string>
   <string name="main_login">ユーザー名:</string>
   <string name="main_button_login">ログイン</string>
-  <string name="main_welcome">ownCloudへようこそ</string>
+  <string name="main_welcome">へようこそ</string>
   <string name="main_files">ファイル</string>
   <string name="main_music">ミュージック</string>
   <string name="main_contacts">連絡先</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">ブックマーク</string>
   <string name="main_settings">設定</string>
   <string name="main_tit_accsetup">アカウントを設定</string>
-  <string name="main_wrn_accsetup">このデバイスには、ownCloudのアカウントがありません。このアプリケーションを使用するにはアカウントを作成してください。</string>
+  <string name="main_wrn_accsetup">このデバイスには、のアカウントがありません。このアプリケーションを使用するにはアカウントを作成してください。</string>
   <string name="about_android">%1$s アンドロイドアプリ</string>
   <string name="about_version">バージョン %1$s</string>
   <string name="actionbar_sync">アカウントを同期</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">アカウントを選択</string>
   <string name="prefs_summary_select_oc_account">利用するアカウントを選んでください。</string>
   <string name="prefs_trackmydevice">デバイスの追跡</string>
-  <string name="prefs_trackmydevice_summary_off">デバイスの位置情報をownCloudに通知</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloudはこのデバイスを追跡します</string>
+  <string name="prefs_trackmydevice_summary_off">デバイスの位置情報をに通知</string>
+  <string name="prefs_trackmydevice_summary_on">はこのデバイスを追跡します</string>
   <string name="prefs_trackmydevice_interval">更新間隔</string>
   <string name="prefs_trackmydevice_interval_summary">%1$s 分間隔で更新</string>
   <string name="prefs_accounts">アカウント</string>
   <string name="prefs_manage_accounts">アカウント管理</string>
-  <string name="prefs_pincode">ownCloudアプリのパスワード</string>
-  <string name="prefs_pincode_summary">ownCloudクライアントを保護する</string>
+  <string name="prefs_pincode">アプリのパスワード</string>
+  <string name="prefs_pincode_summary">クライアントを保護する</string>
   <string name="prefs_instant_upload">自動アップロードを有効</string>
   <string name="prefs_instant_upload_summary">カメラで撮影した画像を自動アップロード</string>
   <string name="prefs_log_title">記録を有効化</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">パスワード</string>
   <string name="setup_hint_address">WEBアドレス</string>
   <string name="setup_hint_show_password">パスワードを表示しますか？</string>
-  <string name="setup_title">ownCloudに接続</string>
+  <string name="setup_title">%1$sに接続</string>
   <string name="setup_btn_connect">接続</string>
   <string name="uploader_btn_upload_text">アップロード</string>
   <string name="uploader_top_message">アップロードディレクトリを選択:</string>
   <string name="uploader_wrn_no_account_title">アカウントが見つかりません</string>
-  <string name="uploader_wrn_no_account_text">デバイスにownCloudのアカウントがありません。まず最初にアカウントを登録してください。</string>
+  <string name="uploader_wrn_no_account_text">デバイスに%1$sのアカウントがありません。まず最初にアカウントを登録してください。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
   <string name="uploader_wrn_no_account_quit_btn_text">終了</string>
   <string name="uploader_wrn_no_content_title">アップロードするコンテンツはありません</string>
   <string name="uploader_wrn_no_content_text">コンテンツを受信しませんでした。アップロードするものはありません。</string>
-  <string name="uploader_error_forbidden_content">ownCloudで共有コンテンツへのアクセスが許可されていません。</string>
+  <string name="uploader_error_forbidden_content">%1$sで共有コンテンツへのアクセスが許可されていません。</string>
   <string name="uploader_info_uploading">アップロード中</string>
   <string name="uploader_btn_create_dir_text">アップロード用のディレクトリを作成</string>
   <string name="file_list_empty">このフォルダにはファイルがありません。\n\"アップロード\" メニューで新しいファイルを追加することができます。</string>
@@ -87,11 +87,11 @@
   <string name="common_cancel_upload">アップロードをキャンセル</string>
   <string name="common_cancel">キャンセル</string>
   <string name="common_save_exit">保存して終了</string>
-  <string name="common_exit">ownCloudを終了</string>
+  <string name="common_exit">%1$sを終了</string>
   <string name="common_error">エラー</string>
   <string name="common_loading">読込中...</string>
   <string name="common_error_unknown">不明なエラー</string>
-  <string name="about_title">ownCloudについて</string>
+  <string name="about_title">について</string>
   <string name="change_password">パスワードを変更</string>
   <string name="delete_account">アカウントを削除</string>
   <string name="create_account">アカウントを作成</string>
@@ -131,17 +131,17 @@
   <string name="foreign_files_remote_text">リモート: %1$s</string>
   <string name="upload_query_move_foreign_files">%1$s フォルダに選択されたファイルをコピーするのに十分なスペースがありません。コピーする代わりに、それらを移動させますか？</string>
   <string name="use_ssl">暗号通信を利用</string>
-  <string name="location_no_provider">ownCloudがあなたのデバイスの位置情報を取得出来ません。位置情報設定を確認してください。</string>
+  <string name="location_no_provider">%1$sがあなたのデバイスの位置情報を取得出来ません。位置情報設定を確認してください。</string>
   <string name="pincode_enter_pin_code">アプリのパスワードを入力してください</string>
   <string name="pincode_enter_new_pin_code">新しいアプリのパスワードを入力してください</string>
-  <string name="pincode_configure_your_pin">ownCloudアプリのパスワードを入力してください</string>
+  <string name="pincode_configure_your_pin">アプリのパスワードを入力してください</string>
   <string name="pincode_configure_your_pin_explanation">アプリ開始時に毎回PINが要求されます。</string>
-  <string name="pincode_reenter_your_pincode">ownCloudアプリのパスワードを再入力してください</string>
-  <string name="pincode_remove_your_pincode">ownCloudアプリのパスワードを削除</string>
-  <string name="pincode_mismatch">ownCloudアプリのパスワードが一致しません</string>
-  <string name="pincode_wrong">無効なownCloudアプリのパスワードです</string>
-  <string name="pincode_removed">ownCloudアプリのパスワードを削除しました</string>
-  <string name="pincode_stored">ownCloudアプリのパスワードを保存しました</string>
+  <string name="pincode_reenter_your_pincode">アプリのパスワードを再入力してください</string>
+  <string name="pincode_remove_your_pincode">アプリのパスワードを削除</string>
+  <string name="pincode_mismatch">アプリのパスワードが一致しません</string>
+  <string name="pincode_wrong">無効なアプリのパスワードです</string>
+  <string name="pincode_removed">アプリのパスワードを削除しました</string>
+  <string name="pincode_stored">アプリのパスワードを保存しました</string>
   <string name="media_notif_ticker">%1$s ミュージックプレーヤー</string>
   <string name="media_state_playing">%1$s (プレイ中)</string>
   <string name="media_state_loading">%1$s (読込中)</string>
@@ -181,19 +181,19 @@
   <string name="auth_nossl_plain_ok_message">サーバーとの暗号化通信を確立できませんでした。しかし、通常の通信が利用できます。続けますか？</string>
   <string name="auth_connection_established">接続が確立しました</string>
   <string name="auth_testing_connection">接続をテスト中...</string>
-  <string name="auth_not_configured_title">ownCloudサーバーの間違った設定</string>
-  <string name="auth_not_configured_message">ownCloudサーバー設定が正しくないようです。詳しくは管理者にご相談ください。</string>
+  <string name="auth_not_configured_title">サーバーの間違った設定</string>
+  <string name="auth_not_configured_message">サーバー設定が正しくないようです。詳しくは管理者にご相談ください。</string>
   <string name="auth_unknown_error_title">不明なエラーに発生しました</string>
   <string name="auth_unknown_error_message">不明なエラーが発生しました。制作者に連絡して、あなたのデバイスのログを送付してください。</string>
   <string name="auth_unknown_host_title">ホストが見つかりませんでした</string>
   <string name="auth_unknown_host_message">入力されたホストが見つかりません。ホスト名とサーバが利用できるものかどうか確認して、再度試してください。</string>
-  <string name="auth_incorrect_path_title">ownCloudのインスタンスが見つかりませんでした</string>
-  <string name="auth_incorrect_path_message">指定されたパスでownCloudのサーバが見つかりませんでした。パスを確認してもう一度試してみてください。</string>
+  <string name="auth_incorrect_path_title">のインスタンスが見つかりませんでした</string>
+  <string name="auth_incorrect_path_message">指定されたパスでのサーバが見つかりませんでした。パスを確認してもう一度試してみてください。</string>
   <string name="auth_timeout_title">サーバーからの反応がありません。</string>
   <string name="auth_incorrect_address_title">不明なURL形式</string>
   <string name="auth_ssl_general_error_title">SSLの初期化に失敗しました</string>
   <string name="auth_ssl_unverified_server_title">未認証のSSLサーバID</string>
-  <string name="auth_bad_oc_version_title">認識出来ないownCloudサーバのバージョンです</string>
+  <string name="auth_bad_oc_version_title">認識出来ないサーバのバージョンです</string>
   <string name="auth_wrong_connection_title">接続を確立できませんでした</string>
   <string name="auth_secure_connection">暗号化通信を確立しました</string>
   <string name="auth_unauthorized">間違ったユーザー名もしくはパスワード</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">レポートを送信</string>
   <string name="crashlog_dont_send_report">レポートを送信しない</string>
   <string name="extensions_avail_title">拡張機能が利用可能です！</string>
-  <string name="extensions_avail_message">ownCloudサーバーは拡張機能がサポートされているようです。androidで利用できる拡張機能を見ますか？</string>
+  <string name="extensions_avail_message">サーバーは拡張機能がサポートされているようです。androidで利用できる拡張機能を見ますか？</string>
   <string name="fd_keep_in_sync">ファイルを最新に保つ</string>
   <string name="common_share">共有</string>
   <string name="common_rename">名前を変更</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8c5ef73b..12ab64f9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">책갈피</string>
   <string name="main_settings">설정</string>
   <string name="main_tit_accsetup">계정 설정</string>
-  <string name="main_wrn_accsetup">이 장치에 ownCloud 계정이 설정되어 있지 않습니다. 이 앱을 사용하려면 계정을 설정하십시오.</string>
+  <string name="main_wrn_accsetup">이 장치에 계정이 설정되어 있지 않습니다. 이 앱을 사용하려면 계정을 설정하십시오.</string>
   <string name="actionbar_upload">업로드</string>
   <string name="actionbar_upload_from_apps">다른 앱의 콘텐츠</string>
   <string name="actionbar_upload_files">파일</string>
@@ -24,7 +24,7 @@
   <string name="prefs_select_oc_account">계정 선택</string>
   <string name="prefs_summary_select_oc_account">이 앱에서 사용할 계정을 선택하십시오.</string>
   <string name="prefs_trackmydevice">장치 추적</string>
-  <string name="prefs_trackmydevice_summary_off">ownCloud에서 현재 위치 추적하기</string>
+  <string name="prefs_trackmydevice_summary_off">에서 현재 위치 추적하기</string>
   <string name="prefs_trackmydevice_summary_on">이 앱에서 장치 위치를 추적합니다</string>
   <string name="prefs_trackmydevice_interval">업데이트 주기</string>
   <string name="prefs_trackmydevice_interval_summary">%1$s분마다 업데이트</string>
diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml
index 74c0e950..b91e390d 100644
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Slaptažodis:</string>
   <string name="main_login">Prisijungimo vardas:</string>
   <string name="main_button_login">Prisijungti</string>
-  <string name="main_welcome">Sveiki prisijungę prie savo OwnCloud</string>
+  <string name="main_welcome">Sveiki prisijungę</string>
   <string name="main_files">Failai</string>
   <string name="main_music">Muzika</string>
   <string name="main_contacts">Kontaktai</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Žymekliai</string>
   <string name="main_settings">Nustatymai</string>
   <string name="main_tit_accsetup">Nustatyti paskyrą</string>
-  <string name="main_wrn_accsetup">Jūsų prietaise nėra nė vienos ownCloud paskyros. Kad galėtumėte naudoti šią programą, turite sukurti paskyrą.</string>
+  <string name="main_wrn_accsetup">Jūsų prietaise nėra nė vienos paskyros. Kad galėtumėte naudoti šią programą, turite sukurti paskyrą.</string>
   <string name="actionbar_upload">Įkelti</string>
   <string name="actionbar_upload_from_apps">Turinys iš kitų programų</string>
   <string name="actionbar_upload_files">Failai</string>
@@ -26,8 +26,8 @@
   <string name="prefs_trackmydevice_interval">Atnaujinimo intervalas</string>
   <string name="prefs_accounts">Paskyros</string>
   <string name="prefs_manage_accounts">Tvarkyti paskyras</string>
-  <string name="prefs_pincode">ownCloud programos PIN kodas</string>
-  <string name="prefs_pincode_summary">Apsaugokite savo ownCloud klientą</string>
+  <string name="prefs_pincode">Programos PIN kodas</string>
+  <string name="prefs_pincode_summary">Apsaugokite savo klientą</string>
   <string name="prefs_instant_upload_summary">Iš karto nusiųsti nufotografuotas nuotraukas</string>
   <string name="auth_host_url">Serverio adresas</string>
   <string name="auth_username">Prisijungimo vardas</string>
@@ -40,7 +40,7 @@
   <string name="setup_hint_password">Slaptažodis</string>
   <string name="setup_hint_address">Web adresas</string>
   <string name="setup_hint_show_password">Rodyti slaptažodį?</string>
-  <string name="setup_title">Prisijunkite prie savo ownCloud</string>
+  <string name="setup_title">Prisijunkite prie savo %1$s</string>
   <string name="setup_btn_connect">Prisijungti</string>
   <string name="uploader_btn_upload_text">Įkelti</string>
   <string name="uploader_wrn_no_account_title">Paskyrų nerasta</string>
@@ -76,17 +76,17 @@
   <string name="sync_string_contacts">Kontaktai</string>
   <string name="sync_fail_ticker">Sinchronizacija nepavyko</string>
   <string name="use_ssl">Naudoti saugų prisijungimą</string>
-  <string name="location_no_provider">ownCloud negali sekti jūsų prietaiso. Patinkrinkite vietos nustatymo paslaugas</string>
+  <string name="location_no_provider">%1$s negali sekti jūsų prietaiso. Patinkrinkite vietos nustatymo paslaugas</string>
   <string name="pincode_enter_pin_code">Prašome įvesti savo programos PIN kodą</string>
   <string name="pincode_enter_new_pin_code">Prašome įvesti naują programos PIN kodą</string>
-  <string name="pincode_configure_your_pin">Įveskite ownCloud programos PIN kodą</string>
+  <string name="pincode_configure_your_pin">Įveskite taikymas programos PIN kodą</string>
   <string name="pincode_configure_your_pin_explanation">PIN bus prašomas kiekvieną kartą paleidus programą</string>
-  <string name="pincode_reenter_your_pincode">Prašome pakartoti ownCloud PIN kodą</string>
-  <string name="pincode_remove_your_pincode">Pašalinti ownCloud programos PIN kodą</string>
-  <string name="pincode_mismatch">Abu ownCloud programos PIN kodai nesutampa</string>
-  <string name="pincode_wrong">Neteisingas ownCloud programos PIN kodas</string>
-  <string name="pincode_removed">ownCloud programos PIN kodas pašalintas</string>
-  <string name="pincode_stored">ownCloud programos PIN kodas išsaugotas</string>
+  <string name="pincode_reenter_your_pincode">Prašome pakartoti taikymas PIN kodą</string>
+  <string name="pincode_remove_your_pincode">Pašalinti taikymas programos PIN kodą</string>
+  <string name="pincode_mismatch">Abu taikymas programos PIN kodai nesutampa</string>
+  <string name="pincode_wrong">Neteisingas taikymas programos PIN kodas</string>
+  <string name="pincode_removed">Taikymas programos PIN kodas pašalintas</string>
+  <string name="pincode_stored">taikymas programos PIN kodas išsaugotas</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minučių</item>
     <item>30 Minučių</item>
@@ -103,12 +103,12 @@
   <string name="auth_nossl_plain_ok_title">Saugus prisijungimas negalimas.</string>
   <string name="auth_connection_established">Ryšys užmegztas</string>
   <string name="auth_testing_connection">IÅ¡bandomas prisijungimas...</string>
-  <string name="auth_not_configured_title">Sugadinta ownCloud konfigūracija</string>
+  <string name="auth_not_configured_title">Sugadinta serverio konfigūracija</string>
   <string name="auth_unknown_error_title">Įvyko nežinoma klaida!</string>
   <string name="auth_timeout_title">Serveris per ilgai neatsako</string>
   <string name="auth_incorrect_address_title">URL adrese yra klaidų</string>
   <string name="auth_ssl_general_error_title">Nepavyko aktyvuoti SSL</string>
-  <string name="auth_bad_oc_version_title">Nežinoma ownCloud serverio versija</string>
+  <string name="auth_bad_oc_version_title">Nežinoma serverio versija</string>
   <string name="auth_wrong_connection_title">Nepavyko užmegzti ryšio</string>
   <string name="auth_secure_connection">Užmegztas saugus ryšys</string>
   <string name="crashlog_message">Programa netikėtai sustojo. Ar norite nusiųsti šio lūžimo ataskaitą programos kūrėjams?</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 955e550c..706081c3 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Kata laluan:</string>
   <string name="main_login">Nama pengguna:</string>
   <string name="main_button_login">Log masuk</string>
-  <string name="main_welcome">Selamat datang ke ownCloud</string>
+  <string name="main_welcome">Selamat datang</string>
   <string name="main_files">Fail-fail</string>
   <string name="main_music">Muzik</string>
   <string name="main_contacts">Hubungi </string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Tanda</string>
   <string name="main_settings">Tetapan-tetapan</string>
   <string name="main_tit_accsetup">Set akaun</string>
-  <string name="main_wrn_accsetup">Peranti anda tidak mempunyai akaun ownCloud. Anda perlu membina satu akaun untuk menggunakan aplikasi ini</string>
+  <string name="main_wrn_accsetup">Peranti anda tidak mempunyai akaun. Anda perlu membina satu akaun untuk menggunakan aplikasi ini</string>
   <string name="actionbar_upload">Muat naik</string>
   <string name="actionbar_upload_files">Fail-fail</string>
   <string name="actionbar_mkdir">Bina direktori</string>
@@ -34,11 +34,11 @@
   <string name="setup_hint_password">Kata laluan</string>
   <string name="setup_hint_address">Alamat sesawang</string>
   <string name="setup_hint_show_password">Tunjuk password?</string>
-  <string name="setup_title">Berhubung dengan ownCloud anda</string>
+  <string name="setup_title">Berhubung dengan %1$s anda</string>
   <string name="setup_btn_connect">Berhubung</string>
   <string name="uploader_btn_upload_text">Muat naik</string>
   <string name="uploader_wrn_no_account_title">Tiada akaun dijumpai</string>
-  <string name="uploader_wrn_no_account_text">Device anda tidak mempunyai sebarang akaun ownCloud. Mohon bina akaun dahulu.</string>
+  <string name="uploader_wrn_no_account_text">Device anda tidak mempunyai sebarang akaun %1$s. Mohon bina akaun dahulu.</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Berhenti</string>
   <string name="uploader_info_uploading">Memuatnaik</string>
   <string name="uploader_btn_create_dir_text">Bina direktori untuk proses upload</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c3594a09..42e66e44 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Wachtwoord:</string>
   <string name="main_login">Gebruikersnaam:</string>
   <string name="main_button_login">Login</string>
-  <string name="main_welcome">Welkom in je ownCloud</string>
+  <string name="main_welcome">Welkom</string>
   <string name="main_files">Bestanden</string>
   <string name="main_music">Muziek</string>
   <string name="main_contacts">Contactpersonen</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Bladwijzers</string>
   <string name="main_settings">Instellingen</string>
   <string name="main_tit_accsetup">Account configureren.</string>
-  <string name="main_wrn_accsetup">Er zijn nog geen ownCloud accounts op dit apparaat. Als je deze app wilt gebruiken zul je een account moeten aanmaken.</string>
+  <string name="main_wrn_accsetup">Er zijn nog geen accounts op dit apparaat. Als je deze app wilt gebruiken zul je een account moeten aanmaken.</string>
   <string name="about_android">%1$s Android App</string>
   <string name="about_version">versie %1$s</string>
   <string name="actionbar_sync">Account verversen</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Selecteer een account</string>
   <string name="prefs_summary_select_oc_account">Kies welke accounts de app mag gebruiken.</string>
   <string name="prefs_trackmydevice">Apparaat volgen</string>
-  <string name="prefs_trackmydevice_summary_off">Sta toe dat ownCloud je apparaat locatie volgt</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud houdt dit apparaat in de gaten</string>
+  <string name="prefs_trackmydevice_summary_off">Sta toe dat app je apparaat locatie volgt</string>
+  <string name="prefs_trackmydevice_summary_on">Houdt dit apparaat in de gaten</string>
   <string name="prefs_trackmydevice_interval">Update interval</string>
   <string name="prefs_trackmydevice_interval_summary">Ververs elke %1$s minuten</string>
   <string name="prefs_accounts">Accounts</string>
   <string name="prefs_manage_accounts">Beheer accounts</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Beveilig je ownCloud client</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">Beveilig je client</string>
   <string name="prefs_instant_upload">Schakel direct uploaden in</string>
   <string name="prefs_instant_upload_summary">Upload afbeeldingen van camera automatisch</string>
   <string name="prefs_log_title">Loggen aanzetten</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">Wachtwoord</string>
   <string name="setup_hint_address">Webadres</string>
   <string name="setup_hint_show_password">Wachtwoord tonen?</string>
-  <string name="setup_title">Verbinden met je ownCloud</string>
+  <string name="setup_title">Verbinden met je %1$s</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Uploaden</string>
   <string name="uploader_top_message">Selecteer upload map:</string>
   <string name="uploader_wrn_no_account_title">Geen account gevonden</string>
-  <string name="uploader_wrn_no_account_text">Er zijn nog geen ownCloud accounts op je apparaat. Stel eerst een account in.</string>
+  <string name="uploader_wrn_no_account_text">Er zijn nog geen %1$s accounts op je apparaat. Stel eerst een account in.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configureren</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Afsluiten</string>
   <string name="uploader_wrn_no_content_title">Geen inhoud om te uploaden</string>
   <string name="uploader_wrn_no_content_text">Er werd geen inhoud ontvangen. Niets om te uploaden.</string>
-  <string name="uploader_error_forbidden_content">ownCloud is niet toegestaan om toegang te hebben tot de publieke inhoud</string>
+  <string name="uploader_error_forbidden_content">%1$s is niet toegestaan om toegang te hebben tot de publieke inhoud</string>
   <string name="uploader_info_uploading">Uploaden</string>
   <string name="uploader_btn_create_dir_text">Maak nieuwe map voor upload</string>
   <string name="file_list_empty">Er zitten geen bestanden in deze map.\nNieuwe bestanden kunnen worden toegevoegd via de \"Upload\" menukeuze.</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Upload afbreken</string>
   <string name="common_cancel">Annuleren</string>
   <string name="common_save_exit">Opslaan &amp; Afsluiten</string>
-  <string name="common_exit">Verlaat ownCloud</string>
+  <string name="common_exit">Verlaat %1$s</string>
   <string name="common_error">Fout</string>
   <string name="common_loading">Laden...</string>
   <string name="common_error_unknown">Onbekende fout</string>
@@ -131,7 +131,7 @@
   <string name="foreign_files_remote_text">Extern: %1$s</string>
   <string name="upload_query_move_foreign_files">Er is niet genoeg ruimte om de gekopieerde bestanden ook te plaatsen in map %1$s. Wilt u ze erheen verplaatsten? </string>
   <string name="use_ssl">Gebruik veilige verbinding</string>
-  <string name="location_no_provider">ownCloud kan het apparaat niet volgen. Configureer de locatie instellingen (location settings).</string>
+  <string name="location_no_provider">%1$s kan het apparaat niet volgen. Configureer de locatie instellingen (location settings).</string>
   <string name="pincode_enter_pin_code">Voer App PIN in</string>
   <string name="pincode_enter_new_pin_code">Voer nieuwe App PIN in</string>
   <string name="pincode_configure_your_pin">Voer App PIN in</string>
@@ -139,9 +139,9 @@
   <string name="pincode_reenter_your_pincode">Voer App PIN opnieuw in</string>
   <string name="pincode_remove_your_pincode">Verwijder App PIN</string>
   <string name="pincode_mismatch">App PIN\'s komen niet overeen</string>
-  <string name="pincode_wrong">Foutieve ownCloud applicatie PIN</string>
-  <string name="pincode_removed">ownCloud App PIN verwijderd</string>
-  <string name="pincode_stored">ownCloud App PIN opgeslagen</string>
+  <string name="pincode_wrong">Foutieve applicatie PIN</string>
+  <string name="pincode_removed">App PIN verwijderd</string>
+  <string name="pincode_stored">App PIN opgeslagen</string>
   <string name="media_notif_ticker">%1$s muziekspeler</string>
   <string name="media_state_playing">%1$s (speelt)</string>
   <string name="media_state_loading">%1$s (laden)</string>
@@ -181,19 +181,19 @@
   <string name="auth_nossl_plain_ok_message">De applicatie kon geen beveiligde verbinding met de server maken. Er is echter wel een onbeveiligde verbinding beschikbaar. Je kunt verdergaan of annuleren.</string>
   <string name="auth_connection_established">Verbinding tot stand gebracht</string>
   <string name="auth_testing_connection">Probeer verbinding...</string>
-  <string name="auth_not_configured_title">Foutieve ownCloud configuratie</string>
-  <string name="auth_not_configured_message">Het lijkt erop dat je ownCloud instantie niet correct geconfigureerd is. Neem contact op met je beheerder voor meer details.</string>
+  <string name="auth_not_configured_title">Foutieve server configuratie</string>
+  <string name="auth_not_configured_message">Het lijkt erop dat je server instantie niet correct geconfigureerd is. Neem contact op met je beheerder voor meer details.</string>
   <string name="auth_unknown_error_title">Onbekende fout opgetreden!</string>
   <string name="auth_unknown_error_message">Er heeft zich een onbekend fout voorgedaan. Neem alstublieft contact op met de beheerders en voeg de logs toe van uw apparaat.</string>
   <string name="auth_unknown_host_title">Kon geen host vinden</string>
   <string name="auth_unknown_host_message">Kon de ingevoerde host niet vinden. Controleer de hostnaam en servertoegankelijkheid en probeer opnieuw.</string>
-  <string name="auth_incorrect_path_title">ownCloud instantie niet gevonden</string>
-  <string name="auth_incorrect_path_message">De applicatie kon geen instantie van ownCloud vinden op de opgegeven locatie. Controleer het pad en probeer opnieuw.</string>
+  <string name="auth_incorrect_path_title">Server instantie niet gevonden</string>
+  <string name="auth_incorrect_path_message">De applicatie kon geen instantie van server vinden op de opgegeven locatie. Controleer het pad en probeer opnieuw.</string>
   <string name="auth_timeout_title">De server had te lang nodig om te reageren</string>
   <string name="auth_incorrect_address_title">Misvormde URL</string>
   <string name="auth_ssl_general_error_title">SSL initialisatie mislukt</string>
   <string name="auth_ssl_unverified_server_title">Niet geverifieerde SSL server identiteit</string>
-  <string name="auth_bad_oc_version_title">Onherkende ownCloud server versie</string>
+  <string name="auth_bad_oc_version_title">Onherkende server versie</string>
   <string name="auth_wrong_connection_title">Kon verbinding niet tot stand brengen.</string>
   <string name="auth_secure_connection">Veilige verbinding tot stand gebracht</string>
   <string name="auth_unauthorized">Verkeerde gebruikersnaam of wachtwoord</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Rapport verzenden</string>
   <string name="crashlog_dont_send_report">Rapport niet verzenden</string>
   <string name="extensions_avail_title">Uitbreidingen aanwezig!</string>
-  <string name="extensions_avail_message">Zo te zien ondersteunt je ownCloud instantie geavanceerde uitbreidingen. Wilt je deze uitbreidingen in Android zichtbaar maken?</string>
+  <string name="extensions_avail_message">Zo te zien ondersteunt je server instantie geavanceerde uitbreidingen. Wilt je deze uitbreidingen in Android zichtbaar maken?</string>
   <string name="fd_keep_in_sync">Houd bestand actueel</string>
   <string name="common_share">Delen</string>
   <string name="common_rename">Hernoemen</string>
diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
index a2268e11..659c08ea 100644
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Senhal :</string>
   <string name="main_login">Nom o escais :</string>
   <string name="main_button_login">Login</string>
-  <string name="main_welcome">Planvengut dins mon ownCloud</string>
+  <string name="main_welcome">Planvengut</string>
   <string name="main_files">Fichièrs</string>
   <string name="main_music">Musica</string>
   <string name="main_contacts">Contactes</string>
@@ -33,7 +33,7 @@
   <string name="setup_hint_password">Senhal</string>
   <string name="setup_hint_address">Adreiça web</string>
   <string name="setup_hint_show_password">Mòstra lo senhal ?</string>
-  <string name="setup_title">Connecta a ton ownCloud</string>
+  <string name="setup_title">Connecta a ton %1$s</string>
   <string name="setup_btn_connect">Connecta</string>
   <string name="uploader_btn_upload_text">Amontcarga</string>
   <string name="uploader_wrn_no_account_title">Cap de compte trobat</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index dfc76b57..8514977e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Zakładki</string>
   <string name="main_settings">Ustawienia</string>
   <string name="main_tit_accsetup">Załóż konto</string>
-  <string name="main_wrn_accsetup">Nie wykryto kont ownCloud. Aby korzystać z tej aplikacji, musisz utworzyć konto.</string>
+  <string name="main_wrn_accsetup">Nie wykryto kont. Aby korzystać z tej aplikacji, musisz utworzyć konto.</string>
   <string name="about_android">%1$s Aplikacja Android</string>
   <string name="about_version">wersja %1$s</string>
   <string name="actionbar_sync">Odśwież konto</string>
@@ -182,12 +182,12 @@
   <string name="auth_connection_established">Połączenie nawiązane</string>
   <string name="auth_testing_connection">Testowanie połączenia…</string>
   <string name="auth_not_configured_title">Uszkodzona konfiguracja serwera</string>
-  <string name="auth_not_configured_message">Wygląda na to, że twoja instancja ownCloud nie jest poprawnie skonfigurowana. Aby uzyskać więcej informacji, skontaktuj się z administratorem.</string>
+  <string name="auth_not_configured_message">Wygląda na to, że twoja instancja serwer nie jest poprawnie skonfigurowana. Aby uzyskać więcej informacji, skontaktuj się z administratorem.</string>
   <string name="auth_unknown_error_title">Wystąpił nieznany błąd!</string>
   <string name="auth_unknown_error_message">Wystąpił nieznany błąd. Proszę skontaktować się z autorami i dodać dzienniki z urządzenia.</string>
   <string name="auth_unknown_host_title">Nie mogę znaleźć hosta</string>
   <string name="auth_unknown_host_message">Nie można znaleźć podanego hosta. Sprawdź nazwę hosta oraz dostępność serwera i spróbuj ponownie.</string>
-  <string name="auth_incorrect_path_title">Nie znaleziono instancji ownCloud</string>
+  <string name="auth_incorrect_path_title">Nie znaleziono instancji serwer</string>
   <string name="auth_incorrect_path_message">Aplikacja nie odnalazła instancji serwera pod podaną ścieżką. Sprawdź ścieżkę i spróbuj ponownie.</string>
   <string name="auth_timeout_title">Serwer zbyt długo nie odpowiadał</string>
   <string name="auth_incorrect_address_title">Zły format adresu URL</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a04ff797..bd7b6ddb 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Favoritos</string>
   <string name="main_settings">Ajustes</string>
   <string name="main_tit_accsetup">Configuração de conta</string>
-  <string name="main_wrn_accsetup">Não existem contas ownCloud no seu dispositivo. Para usar este aplicativo, você precisa criar uma.</string>
+  <string name="main_wrn_accsetup">Não existem contas no seu dispositivo. Para usar este aplicativo, você precisa criar uma.</string>
   <string name="about_android">%1$s Android App</string>
   <string name="about_version">versão %1$s</string>
   <string name="actionbar_sync">Atualização de conta</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Selecione uma conta</string>
   <string name="prefs_summary_select_oc_account">Selecione qual das suas contas você deseja utilizar.</string>
   <string name="prefs_trackmydevice">Rastreamento de dispositivo</string>
-  <string name="prefs_trackmydevice_summary_off">Habilite ownCloud para rastrear a localização do seu dispositivo</string>
-  <string name="prefs_trackmydevice_summary_on">Seu ownCloud mantém registro da localização desse dispositivo</string>
+  <string name="prefs_trackmydevice_summary_off">Habilite aplicação para rastrear a localização do seu dispositivo</string>
+  <string name="prefs_trackmydevice_summary_on">Seu aplicação mantém registro da localização desse dispositivo</string>
   <string name="prefs_trackmydevice_interval">Intervalo de atualização</string>
   <string name="prefs_trackmydevice_interval_summary">Atualizar a cada %1$s minutos</string>
   <string name="prefs_accounts">Contas</string>
   <string name="prefs_manage_accounts">Gerenciar contas</string>
-  <string name="prefs_pincode">PIN ownCloud App</string>
-  <string name="prefs_pincode_summary">Proteja seu cliente ownCloud</string>
+  <string name="prefs_pincode">PIN App</string>
+  <string name="prefs_pincode_summary">Proteja seu cliente</string>
   <string name="prefs_instant_upload">Habilitar upload instantâneo</string>
   <string name="prefs_instant_upload_summary">Instantaneamente faça upload das fotos tiradas pela câmera</string>
   <string name="prefs_log_title">Habilitar conexão</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">Senha</string>
   <string name="setup_hint_address">Endereço Web</string>
   <string name="setup_hint_show_password">Mostrar senha?</string>
-  <string name="setup_title">Conecte ao seu ownCloud</string>
+  <string name="setup_title">Conecte ao seu %1$s</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Upload</string>
   <string name="uploader_top_message">Escolher pasta para enviar:</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
-  <string name="uploader_wrn_no_account_text">Não existem contas ownCloud no seu dispositivo. Por favor, configure uma conta primeiro.</string>
+  <string name="uploader_wrn_no_account_text">Não existem contas %1$s no seu dispositivo. Por favor, configure uma conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalação</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Sair</string>
   <string name="uploader_wrn_no_content_title">Sem conteúdo para enviar</string>
   <string name="uploader_wrn_no_content_text">Nenhum foi recebido. Nada para enviar.</string>
-  <string name="uploader_error_forbidden_content">ownCloud não é permitido a acessar o conteúdo compartilhado</string>
+  <string name="uploader_error_forbidden_content">%1$s não é permitido a acessar o conteúdo compartilhado</string>
   <string name="uploader_info_uploading">Enviando</string>
   <string name="uploader_btn_create_dir_text">Criar um diretório para upload</string>
   <string name="file_list_empty">Não existe arquivos nesta pasta\nNovos arquivos podem ser adicionados com a opção do menu \"Enviar\"</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Cancelar upload</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Salvar &amp; Sair</string>
-  <string name="common_exit">Sair do ownCloud</string>
+  <string name="common_exit">Sair do %1$s</string>
   <string name="common_error">Erro</string>
   <string name="common_loading">Carregando ...</string>
   <string name="common_error_unknown">Erro desconhecido</string>
@@ -193,7 +193,7 @@
   <string name="auth_incorrect_address_title">URL mal formada</string>
   <string name="auth_ssl_general_error_title">Inicialização SSL falhou</string>
   <string name="auth_ssl_unverified_server_title">Identidade SSL do servidor não verificada</string>
-  <string name="auth_bad_oc_version_title">Versão do servidor ownCloud é irreconhecível</string>
+  <string name="auth_bad_oc_version_title">Versão do servidor é irreconhecível</string>
   <string name="auth_wrong_connection_title">Não foi possível estabelecer conexão</string>
   <string name="auth_secure_connection">Conexão segura estabelecida</string>
   <string name="auth_unauthorized">Nome de usuário e/ou senha está errada!</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Enviar relatório</string>
   <string name="crashlog_dont_send_report">Não enviar relatório</string>
   <string name="extensions_avail_title">Extensões disponíveis!</string>
-  <string name="extensions_avail_message">Parece que sua instância ownCloud está suportando extensões avançadas. Gostaria de ver extensões disponíveis para Android?</string>
+  <string name="extensions_avail_message">Parece que sua instância du servidor está suportando extensões avançadas. Gostaria de ver extensões disponíveis para Android?</string>
   <string name="fd_keep_in_sync">Manter arquivo atualizado</string>
   <string name="common_share">Compartilhar</string>
   <string name="common_rename">Renomear</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4ff3e36f..38a7d448 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Palavra-passe:</string>
   <string name="main_login">Nome de Utilizador:</string>
   <string name="main_button_login">Login</string>
-  <string name="main_welcome">Bem-vindo à sua ownCloud</string>
+  <string name="main_welcome">Bem-vindo</string>
   <string name="main_files">Ficheiros</string>
   <string name="main_music">Musica</string>
   <string name="main_contacts">Contactos</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Escolha uma conta</string>
   <string name="prefs_summary_select_oc_account">Escolha qual das suas contas deve ser usada pela app.</string>
   <string name="prefs_trackmydevice">Rastreamento de dispositivo</string>
-  <string name="prefs_trackmydevice_summary_off">Permitir que ownCloud siga a localização do seu aparelho.</string>
-  <string name="prefs_trackmydevice_summary_on">A sua ownCloud segue a localização deste aparelho.</string>
+  <string name="prefs_trackmydevice_summary_off">Permitir que aplicação siga a localização do seu aparelho.</string>
+  <string name="prefs_trackmydevice_summary_on">A sua aplicação segue a localização deste aparelho.</string>
   <string name="prefs_trackmydevice_interval">Intervalo de actualização</string>
   <string name="prefs_trackmydevice_interval_summary">Actualizar a cada %1$s minutos</string>
   <string name="prefs_accounts">Contas</string>
   <string name="prefs_manage_accounts">Gerir contas</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Proteja o seu cliente ownCloud</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">Proteja o seu cliente</string>
   <string name="prefs_instant_upload">Activar envio instantâneo</string>
   <string name="prefs_instant_upload_summary">Enviar automaticamente as fotografias tiradas pela camera</string>
   <string name="prefs_log_title">Ativar Rastreio</string>
@@ -134,14 +134,14 @@
   <string name="location_no_provider">Nao é possível detectar a sua localização. Por favor verifique se os serviços de localização/GPS estão activados.</string>
   <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</string>
   <string name="pincode_enter_new_pin_code">Por favor escreva o novo PIN da Aplicação</string>
-  <string name="pincode_configure_your_pin">Escreva o PIN da Aplicação ownCloud</string>
+  <string name="pincode_configure_your_pin">Escreva o PIN da Aplicação</string>
   <string name="pincode_configure_your_pin_explanation">O PIN vai ser pedido todas as vezes que iniciar a aplicação.</string>
-  <string name="pincode_reenter_your_pincode">Volte a inserir o ownCloud App PIN, por favor</string>
-  <string name="pincode_remove_your_pincode">Remover o PIN do ownCloud.</string>
+  <string name="pincode_reenter_your_pincode">Volte a inserir o App PIN, por favor</string>
+  <string name="pincode_remove_your_pincode">Remover o PIN do aplicação.</string>
   <string name="pincode_mismatch">Os códigos PIN introduzidos não são iguais.</string>
   <string name="pincode_wrong">Código PIN Incorrecto.</string>
-  <string name="pincode_removed">PIN da aplicação ownCloud removido</string>
-  <string name="pincode_stored">PIN da aplicação ownCloud guardado</string>
+  <string name="pincode_removed">PIN da aplicação removido</string>
+  <string name="pincode_stored">PIN da aplicação guardado</string>
   <string name="media_notif_ticker">%1$s leitor de música</string>
   <string name="media_state_playing">A tocar: %1$s</string>
   <string name="media_state_loading">%1$s (A carregar)</string>
@@ -181,19 +181,19 @@
   <string name="auth_nossl_plain_ok_message">Não foi possível estabelecer uma ligação segura ao servidor, no entanto pode continuar ou cancelar.</string>
   <string name="auth_connection_established">Ligação estabelecida</string>
   <string name="auth_testing_connection">A testar a ligação...</string>
-  <string name="auth_not_configured_title">Configuração do ownCloud incorrecta.</string>
-  <string name="auth_not_configured_message">Parece haver um ou mais erros na configuração do ownCloud, por favor contacte o administrador para mais detalhes.</string>
+  <string name="auth_not_configured_title">Configuração do servidor incorrecta.</string>
+  <string name="auth_not_configured_message">Parece haver um ou mais erros na configuração do servidor, por favor contacte o administrador para mais detalhes.</string>
   <string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
   <string name="auth_unknown_error_message">Ocorreu um erro desconhecido, por favor contacte os autores e inclua os logs de erro.</string>
   <string name="auth_unknown_host_title">Não é possível encontrar o servidor</string>
   <string name="auth_unknown_host_message">Não foi possível encontrar o host. Por favor verifique se o nome está correcto, e se o servidor está disponível e tente novamente.</string>
-  <string name="auth_incorrect_path_title">Instância ownCloud não encontrada</string>
-  <string name="auth_incorrect_path_message">Não foi possível encontrar o ownCloud no caminho dado. Por favor verifique novamente.</string>
+  <string name="auth_incorrect_path_title">Instância servidor não encontrada</string>
+  <string name="auth_incorrect_path_message">Não foi possível encontrar o servidor no caminho dado. Por favor verifique novamente.</string>
   <string name="auth_timeout_title">O servidor levou demasiado tempo a responder</string>
   <string name="auth_incorrect_address_title">URL errado</string>
   <string name="auth_ssl_general_error_title">Inicialização de SSL falhou</string>
   <string name="auth_ssl_unverified_server_title">Identidade SSL do servidor não verificada.</string>
-  <string name="auth_bad_oc_version_title">Versão do servidor ownCloud não reconhecida</string>
+  <string name="auth_bad_oc_version_title">Versão do servidor não reconhecida</string>
   <string name="auth_wrong_connection_title">Não consegue estabelecer ligação</string>
   <string name="auth_secure_connection">Ligação segura estabelecida</string>
   <string name="auth_unauthorized">Nome de utilizador/password inválida</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Enviar relatório</string>
   <string name="crashlog_dont_send_report">Não enviar relatório</string>
   <string name="extensions_avail_title">Extensões disponíveis!</string>
-  <string name="extensions_avail_message">Parece que a sua instalação do ownCloud suporta extensões avançadas. Deseja ver as extensões disponíveis para Android?</string>
+  <string name="extensions_avail_message">Parece que a sua instalação do servidor suporta extensões avançadas. Deseja ver as extensões disponíveis para Android?</string>
   <string name="fd_keep_in_sync">manter ficheiro actualizado</string>
   <string name="common_share">Partilhar</string>
   <string name="common_rename">Renomear</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bed25e02..7a1e262c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Parolă:</string>
   <string name="main_login">Nume utilizator:</string>
   <string name="main_button_login">Autentificare</string>
-  <string name="main_welcome">Bun venit în propriul tău ownCloud</string>
+  <string name="main_welcome">Bun venit</string>
   <string name="main_files">Fișiere</string>
   <string name="main_music">Muzică</string>
   <string name="main_contacts">Contacte</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Semne de carte</string>
   <string name="main_settings">Setări</string>
   <string name="main_tit_accsetup">Configurează cont</string>
-  <string name="main_wrn_accsetup">Nu există conturi ownCloud pe dispozitivul tău. Pentru a folosi această aplicație, trebuie să creezi un cont.</string>
+  <string name="main_wrn_accsetup">Nu există conturi cerere pe dispozitivul tău. Pentru a folosi această aplicație, trebuie să creezi un cont.</string>
   <string name="actionbar_upload">Încarcă</string>
   <string name="actionbar_upload_from_apps">Conținut de la alte aplicații</string>
   <string name="actionbar_upload_files">Fișiere</string>
@@ -23,8 +23,8 @@
   <string name="prefs_select_oc_account">Selectează un cont</string>
   <string name="prefs_summary_select_oc_account">Alege contul pe care ar trebui să-l folosească aplicația.</string>
   <string name="prefs_trackmydevice">Urmărire dispozitiv</string>
-  <string name="prefs_trackmydevice_summary_off">Permite ownCloud să urmărească locația dispozitivului tău</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud urmărește acest dispozitiv</string>
+  <string name="prefs_trackmydevice_summary_off">Permite cerere să urmărească locația dispozitivului tău</string>
+  <string name="prefs_trackmydevice_summary_on">Cerere urmărește acest dispozitiv</string>
   <string name="prefs_trackmydevice_interval">Interval actualizare</string>
   <string name="prefs_trackmydevice_interval_summary">Actualizare la fiecare %1$s minute</string>
   <string name="prefs_accounts">Conturi</string>
@@ -41,11 +41,11 @@
   <string name="setup_hint_password">Parolă</string>
   <string name="setup_hint_address">Adresă web</string>
   <string name="setup_hint_show_password">Afișare parolă?</string>
-  <string name="setup_title">Conectare la ownCloud</string>
+  <string name="setup_title">Conectare la %1$s</string>
   <string name="setup_btn_connect">Conectare</string>
   <string name="uploader_btn_upload_text">Încărcare</string>
   <string name="uploader_wrn_no_account_title">Nici un cont găsit</string>
-  <string name="uploader_wrn_no_account_text">Nu există conturi ownCloud pe dispozitivul tău. Te rugăm să configurezi un cont mai întâi.</string>
+  <string name="uploader_wrn_no_account_text">Nu există conturi %1$s pe dispozitivul tău. Te rugăm să configurezi un cont mai întâi.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurare</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Anulare</string>
   <string name="uploader_info_uploading">Încărcare</string>
@@ -87,14 +87,14 @@
   <string name="sync_string_contacts">Contacte</string>
   <string name="sync_fail_ticker">Sincronizarea a eșuat</string>
   <string name="use_ssl">Folosește conexiune securizată</string>
-  <string name="location_no_provider">ownCloud nu poate urmări dispozitivul tău. Te rugăm să verifici setările pentru locație.</string>
+  <string name="location_no_provider">%1$s nu poate urmări dispozitivul tău. Te rugăm să verifici setările pentru locație.</string>
   <string name="pincode_enter_pin_code">Te rugăm să specifici PIN-ul aplicației</string>
   <string name="pincode_enter_new_pin_code">Te rugăm să specifici noul PIN pentru aplicație</string>
-  <string name="pincode_remove_your_pincode">Elimină PIN-ul aplicației ownCloud</string>
-  <string name="pincode_mismatch">Cele două PIN-uri ale aplicației ownCloud nu sunt similare</string>
-  <string name="pincode_wrong">PIN-ul aplicației ownCloud este incorect</string>
-  <string name="pincode_removed">PIN-ul aplicației ownCloud a fost eliminat</string>
-  <string name="pincode_stored">PIN-ul aplicației ownCloud a fost memorat</string>
+  <string name="pincode_remove_your_pincode">Elimină PIN-ul aplicației</string>
+  <string name="pincode_mismatch">Cele două PIN-uri ale aplicației nu sunt similare</string>
+  <string name="pincode_wrong">PIN-ul aplicației este incorect</string>
+  <string name="pincode_removed">PIN-ul aplicației a fost eliminat</string>
+  <string name="pincode_stored">PIN-ul aplicației a fost memorat</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minute</item>
     <item>30 minute</item>
@@ -109,10 +109,10 @@
   <string name="auth_nossl_plain_ok_title">Conexiune securizată indisponibilă</string>
   <string name="auth_connection_established">Conexiune stabilită</string>
   <string name="auth_testing_connection">Se testează conexiunea...</string>
-  <string name="auth_not_configured_title">Configurație ownCloud incorectă</string>
-  <string name="auth_not_configured_message">Se pare că instanța ta ownCloud nu este configurată corect. Contactează administratorul pentru mai multe detalii.</string>
+  <string name="auth_not_configured_title">Configurație serverului incorectă</string>
+  <string name="auth_not_configured_message">Se pare că instanța ta serverului nu este configurată corect. Contactează administratorul pentru mai multe detalii.</string>
   <string name="auth_unknown_error_title">A apărut o eroare necunoscută!</string>
-  <string name="auth_incorrect_path_title">Instanța ownCloud nu a fost găsită</string>
+  <string name="auth_incorrect_path_title">Instanța serverului nu a fost găsită</string>
   <string name="auth_ssl_general_error_title">Inițializarea SSL a eșuat</string>
   <string name="auth_wrong_connection_title">Nu s-a putut stabili conexiunea</string>
   <string name="auth_secure_connection">Conexiune sigură stabilită</string>
diff --git a/res/values-ru-rRU/strings.xml b/res/values-ru-rRU/strings.xml
index b6061561..806f7657 100644
--- a/res/values-ru-rRU/strings.xml
+++ b/res/values-ru-rRU/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Пароль:</string>
   <string name="main_login">Имя пользователя:</string>
   <string name="main_button_login">Вход</string>
-  <string name="main_welcome">Добро пожаловать в Ваш ownCloud</string>
+  <string name="main_welcome">Добро пожаловать</string>
   <string name="main_files">Файлы</string>
   <string name="main_music">Музыка</string>
   <string name="main_contacts">Контакты</string>
@@ -11,8 +11,8 @@
   <string name="main_bookmarks">Закладки</string>
   <string name="main_settings">Настройки</string>
   <string name="main_tit_accsetup">Настройка аккаунта</string>
-  <string name="main_wrn_accsetup">На Вашем устройстве нет ownCloud-аккаунта. Для того, чтобы использовать это приложение, Вам нужно создать его.</string>
-  <string name="about_message">ownCloud Android-клиент\n\nверсия: %1$s</string>
+  <string name="main_wrn_accsetup">На Вашем устройстве нет аккаунта. Для того, чтобы использовать это приложение, Вам нужно создать его.</string>
+  <string name="about_message">%1$s Android-клиент\n\nверсия: %1$s</string>
   <string name="actionbar_sync">Обновить</string>
   <string name="actionbar_upload">Загрузка</string>
   <string name="actionbar_upload_from_apps">Содержимое из других приложений</string>
@@ -27,20 +27,20 @@
   <string name="prefs_select_oc_account">Выбрать аккаунт</string>
   <string name="prefs_summary_select_oc_account">Выберите, какой из Ваших аккаунтов должен использоваться приложением.</string>
   <string name="prefs_trackmydevice">Отслеживание устройств</string>
-  <string name="prefs_trackmydevice_summary_off">Включить ownCloud для отслеживания местоположения устройства</string>
-  <string name="prefs_trackmydevice_summary_on">Ваш ownCloud отслеживает данное устройство</string>
+  <string name="prefs_trackmydevice_summary_off">Включить применение для отслеживания местоположения устройства</string>
+  <string name="prefs_trackmydevice_summary_on">Ваш применение отслеживает данное устройство</string>
   <string name="prefs_trackmydevice_interval">Обновить интервал</string>
   <string name="prefs_trackmydevice_interval_summary">Обновлять каждые %1$s минут</string>
   <string name="prefs_accounts">Учетные записи</string>
   <string name="prefs_manage_accounts">Управление учетными записями</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Защитить Ваш ownCloud-клиент</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">Защитить Ваш клиент</string>
   <string name="prefs_instant_upload">Включить немедленную загрузку</string>
   <string name="prefs_instant_upload_summary">Мгновенно загрузить фотографии, сделанные камерой</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">URL</string>
   <string name="auth_username">Имя пользователя</string>
   <string name="auth_password">Пароль</string>
-  <string name="auth_register">Я новичок в ownCloud</string>
+  <string name="auth_register">Я новичок в %1$s</string>
   <string name="new_session_uri_error">Дан неверный URL</string>
   <string name="new_session_session_name_error">Неверное имя сессии</string>
   <string name="sync_string_files">Файлы</string>
@@ -49,16 +49,16 @@
   <string name="setup_hint_password">Пароль</string>
   <string name="setup_hint_address">Веб-адрес</string>
   <string name="setup_hint_show_password">Показать пароль?</string>
-  <string name="setup_title">Подключение к Вашему ownCloud</string>
+  <string name="setup_title">Подключение к Вашему %1$s</string>
   <string name="setup_btn_connect">Подключить</string>
   <string name="uploader_btn_upload_text">Загрузка</string>
   <string name="uploader_wrn_no_account_title">Не найден аккаунт</string>
-  <string name="uploader_wrn_no_account_text">На Вашем устройстве нет ownCloud-аккаунтов. Пожалуйста, настройте учетную запись.</string>
+  <string name="uploader_wrn_no_account_text">На Вашем устройстве нет %1$s-аккаунтов. Пожалуйста, настройте учетную запись.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Установка</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Выход</string>
   <string name="uploader_wrn_no_content_title">Нет содержимого для загрузки</string>
   <string name="uploader_wrn_no_content_text">Содержимое не было получено. Нечего загружать.</string>
-  <string name="uploader_error_forbidden_content">ownCloud не разрешен доступ к общему содержимому</string>
+  <string name="uploader_error_forbidden_content">%1$s не разрешен доступ к общему содержимому</string>
   <string name="uploader_info_uploading">Загрузка</string>
   <string name="uploader_btn_create_dir_text">Создайте каталог для загрузки</string>
   <string name="file_list_empty">В этой папке нет файлов.\nНовые файлы могут быть добавлены с помощью опции \"Загрузка\" в меню.</string>
@@ -79,7 +79,7 @@
   <string name="common_cancel_upload">Отмена загрузки</string>
   <string name="common_cancel">Отмена</string>
   <string name="common_save_exit">Сохранить &amp; Выход</string>
-  <string name="common_exit">Покинуть ownCloud</string>
+  <string name="common_exit">Покинуть %1$s</string>
   <string name="common_error">Ошибка</string>
   <string name="about_title">О программе</string>
   <string name="delete_account">Удалить аккаунт</string>
@@ -109,17 +109,17 @@
   <string name="sync_fail_in_favourites_ticker">Синхронизация файлов не удалась</string>
   <string name="sync_fail_in_favourites_content">Содержимое %1$d файлов не может быть синхронизировано (%2$d конфликты)</string>
   <string name="use_ssl">Использовать защищенное соединение</string>
-  <string name="location_no_provider">ownCloud не может отследить Ваше устройство. Пожалуйста, проверьте настройки местоположения</string>
+  <string name="location_no_provider">%1$s не может отследить Ваше устройство. Пожалуйста, проверьте настройки местоположения</string>
   <string name="pincode_enter_pin_code">Пожалуйста, введите Ваш PIN-код приложения</string>
   <string name="pincode_enter_new_pin_code">Пожалуйста, введите Ваш новый PIN-код приложения</string>
-  <string name="pincode_configure_your_pin">Введите PIN-код приложения ownCloud</string>
+  <string name="pincode_configure_your_pin">Введите PIN-код приложения</string>
   <string name="pincode_configure_your_pin_explanation">PIN будет запрашиваться каждый раз при запуске приложения</string>
-  <string name="pincode_reenter_your_pincode">Повторно введите PIN-код ownCloud-приложения, пожалуйста</string>
-  <string name="pincode_remove_your_pincode">Удалите PIN-код ownCloud-приложения</string>
-  <string name="pincode_mismatch">PIN-коды ownCloud-приложения не идентичны</string>
-  <string name="pincode_wrong">Неверный PIN-код ownCloud-приложения</string>
-  <string name="pincode_removed">PIN-код ownCloud-приложения удален</string>
-  <string name="pincode_stored">PIN-код ownCloud-приложения сохранен</string>
+  <string name="pincode_reenter_your_pincode">Повторно введите PIN-код приложения, пожалуйста</string>
+  <string name="pincode_remove_your_pincode">Удалите PIN-код приложения</string>
+  <string name="pincode_mismatch">PIN-коды приложения не идентичны</string>
+  <string name="pincode_wrong">Неверный PIN-код приложения</string>
+  <string name="pincode_removed">PIN-код приложения удален</string>
+  <string name="pincode_stored">PIN-код приложения сохранен</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 минут</item>
     <item>30 минут</item>
@@ -138,19 +138,19 @@
   <string name="auth_nossl_plain_ok_message">Приложению не удалось установить безопасное подключение к серверу. Но небезопасное соединение доступно. Вы можете продолжить или отменить.</string>
   <string name="auth_connection_established">Соединение установлено</string>
   <string name="auth_testing_connection">Тестирование соединения…</string>
-  <string name="auth_not_configured_title">Некорректная ownCloud-конфигурация</string>
-  <string name="auth_not_configured_message">Похоже, что Ваш ownCloud неправильно настроен. Обратитесь к администратору для получения дополнительной информации.</string>
+  <string name="auth_not_configured_title">Некорректная сервер-конфигурация</string>
+  <string name="auth_not_configured_message">Похоже, что Ваш сервер неправильно настроен. Обратитесь к администратору для получения дополнительной информации.</string>
   <string name="auth_unknown_error_title">Произошла неизвестная ошибка!</string>
   <string name="auth_unknown_error_message">Произошла неизвестная ошибка. Пожалуйста, свяжитесь с разработчиками и отправьте журнал с устройства.</string>
   <string name="auth_unknown_host_title">Не удалось найти хост</string>
   <string name="auth_unknown_host_message">Не удалось найти введенный хост. Пожалуйста, проверьте имя хоста и доступность сервера и попробуйте снова</string>
-  <string name="auth_incorrect_path_title">ownCloud не найден</string>
+  <string name="auth_incorrect_path_title">сервер не найден</string>
   <string name="auth_incorrect_path_message">Приложение не может найти экземпляр ownClound по предложенному пути. Пожалуйста, проверьте ​​путь и попробуйте еще раз.</string>
   <string name="auth_timeout_title">Ответ сервера занимает слишком много времени</string>
   <string name="auth_incorrect_address_title">Адрес URL неверен</string>
   <string name="auth_ssl_general_error_title">SSL-инициализация не удалась</string>
   <string name="auth_ssl_unverified_server_title">Непроверенная SSL идентификация сервера</string>
-  <string name="auth_bad_oc_version_title">Неизвестная версия сервера ownCloud </string>
+  <string name="auth_bad_oc_version_title">Неизвестная версия сервера сервер </string>
   <string name="auth_wrong_connection_title">Не удалось установить соединение</string>
   <string name="auth_secure_connection">Защищенное соединение установлено</string>
   <string name="auth_login_details">Учетные данные</string>
@@ -161,7 +161,7 @@
   <string name="crashlog_send_report">Отправить отчет</string>
   <string name="crashlog_dont_send_report">Не отправлять отчет</string>
   <string name="extensions_avail_title">Расширения доступны!</string>
-  <string name="extensions_avail_message">Похоже, ваш экземпляр ownCloud поддерживает дополнительные расширения. Хотели бы вы видеть расширения, доступные для Android?</string>
+  <string name="extensions_avail_message">Похоже, ваш экземпляр сервер поддерживает дополнительные расширения. Хотели бы вы видеть расширения, доступные для Android?</string>
   <string name="fd_keep_in_sync">Обновлять файл</string>
   <string name="common_share">Сделать общим</string>
   <string name="common_rename">Переименовать</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3236606b..8dd90fcb 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Пароль:</string>
   <string name="main_login">Пользователь:</string>
   <string name="main_button_login">Вход</string>
-  <string name="main_welcome">Добро пожаловать в ваш ownCloud</string>
+  <string name="main_welcome">Добро пожаловать</string>
   <string name="main_files">Файлы</string>
   <string name="main_music">Музыка</string>
   <string name="main_contacts">Контакты</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Закладки</string>
   <string name="main_settings">Настройки</string>
   <string name="main_tit_accsetup">Настроить аккаунт</string>
-  <string name="main_wrn_accsetup">На вашем устройстве нет ownCloud аккаунтов. Вам нужно создать аккаунт, чтобы пользоваться этим приложеним.</string>
+  <string name="main_wrn_accsetup">На вашем устройстве нет аккаунтов. Вам нужно создать аккаунт, чтобы пользоваться этим приложеним.</string>
   <string name="about_android">%1$s Приложение Андроид</string>
   <string name="about_version">Версия %1$s</string>
   <string name="actionbar_sync">Обновить учетную запись</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Выбрать аккаунт</string>
   <string name="prefs_summary_select_oc_account">Выберите, какой из ваших аккаунтов использовать приложению</string>
   <string name="prefs_trackmydevice">Отслеживание устройства</string>
-  <string name="prefs_trackmydevice_summary_off">Разрешить ownCloud отслеживать местонахождение вашего устройства</string>
-  <string name="prefs_trackmydevice_summary_on">Ваш ownCloud продолжает отслеживать это устройство</string>
+  <string name="prefs_trackmydevice_summary_off">Разрешить применение отслеживать местонахождение вашего устройства</string>
+  <string name="prefs_trackmydevice_summary_on">Ваш применение продолжает отслеживать это устройство</string>
   <string name="prefs_trackmydevice_interval">Обновить интервал</string>
   <string name="prefs_trackmydevice_interval_summary">Обновлять каждые %1$s минут</string>
   <string name="prefs_accounts">Аккаунты</string>
   <string name="prefs_manage_accounts">Управление аккаунтами</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">Защитить ваш клиент ownCloud</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">Защитить ваш клиент применение</string>
   <string name="prefs_instant_upload">Включить моментальную загрузку</string>
   <string name="prefs_instant_upload_summary">Моментально загружать фотографии, полученные с камеры</string>
   <string name="prefs_log_title">Включить запись журнала</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">Пароль</string>
   <string name="setup_hint_address">Веб адрес</string>
   <string name="setup_hint_show_password">Показать пароль?</string>
-  <string name="setup_title">Соединение с вашим ownCloud</string>
+  <string name="setup_title">Соединение с вашим %1$s</string>
   <string name="setup_btn_connect">Соединить</string>
   <string name="uploader_btn_upload_text">Загрузка</string>
   <string name="uploader_top_message">Выбрать место для загрузки:</string>
   <string name="uploader_wrn_no_account_title">Аккаунты не найдены</string>
-  <string name="uploader_wrn_no_account_text">На вашем устройстве нет аккаунтов ownCloud. Настройте сначала аккаунт.</string>
+  <string name="uploader_wrn_no_account_text">На вашем устройстве нет аккаунтов %1$s. Настройте сначала аккаунт.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Установка</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Выход</string>
   <string name="uploader_wrn_no_content_title">Нет содержимого для загрузки</string>
   <string name="uploader_wrn_no_content_text">Контент не получен. Нечего загружать.</string>
-  <string name="uploader_error_forbidden_content">ownCloud не имеет доступа к опубликованным данным</string>
+  <string name="uploader_error_forbidden_content">%1$s не имеет доступа к опубликованным данным</string>
   <string name="uploader_info_uploading">Загрузка</string>
   <string name="uploader_btn_create_dir_text">Создайте директорию для загрузки</string>
   <string name="file_list_empty">В этой папке нет файлов.\nНовые файлы могут быть добавлены с помощью пункта меню \"Загрузить\".</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Отмена загрузки</string>
   <string name="common_cancel">Отмена</string>
   <string name="common_save_exit">Сохранить &amp; Выйти</string>
-  <string name="common_exit">Выйти из ownCloud</string>
+  <string name="common_exit">Выйти из %1$s</string>
   <string name="common_error">Ошибка</string>
   <string name="common_loading">Загружается...</string>
   <string name="common_error_unknown">Неизвестная ошибка</string>
@@ -131,17 +131,17 @@
   <string name="foreign_files_remote_text">Удаленно: %1$s</string>
   <string name="upload_query_move_foreign_files">Отсутствует достаточное количество места для копирования выделенных файлов в папку %1$s. Хотите ли Вы переместить их в другое место?</string>
   <string name="use_ssl">Использовать защищённое соединение</string>
-  <string name="location_no_provider">ownCloud не может отслеживать ваше устройство. Проверьте настройки вашего местоположения</string>
+  <string name="location_no_provider">%1$s не может отслеживать ваше устройство. Проверьте настройки вашего местоположения</string>
   <string name="pincode_enter_pin_code">Вставьте PIN вашего приложения</string>
-  <string name="pincode_enter_new_pin_code">Введите новый ownCloud App PIN</string>
-  <string name="pincode_configure_your_pin">Введите ownCloud App PIN</string>
+  <string name="pincode_enter_new_pin_code">Введите новый  App PIN</string>
+  <string name="pincode_configure_your_pin">Введите  App PIN</string>
   <string name="pincode_configure_your_pin_explanation">ПИН-код будет запрашиваться каждый раз, когда вы запускаете приложение.</string>
-  <string name="pincode_reenter_your_pincode">Повторите ownCloud App PIN</string>
-  <string name="pincode_remove_your_pincode">Удалить ownCloud App PIN</string>
-  <string name="pincode_mismatch">Два ownCloud App PIN не совпадают</string>
-  <string name="pincode_wrong">Неверный ownCloud App PIN</string>
-  <string name="pincode_removed">ownCloud App PIN удалён</string>
-  <string name="pincode_stored">ownCloud App PIN сохранён</string>
+  <string name="pincode_reenter_your_pincode">Повторите App PIN</string>
+  <string name="pincode_remove_your_pincode">Удалить App PIN</string>
+  <string name="pincode_mismatch">Два App PIN не совпадают</string>
+  <string name="pincode_wrong">Неверный App PIN</string>
+  <string name="pincode_removed">App PIN удалён</string>
+  <string name="pincode_stored">App PIN сохранён</string>
   <string name="media_notif_ticker">%1$s музыкальный проигрыватель</string>
   <string name="media_state_playing">%1$s (проигрывается)</string>
   <string name="media_state_loading">%1$s (загружается)</string>
@@ -181,19 +181,19 @@
   <string name="auth_nossl_plain_ok_message">Приложение не может установить защищённое соединение с сервером. Однако доступно не защищённое соединение. Вы можете продолжить или прервать.</string>
   <string name="auth_connection_established">Соединение установлено</string>
   <string name="auth_testing_connection">Тестирование соединения...</string>
-  <string name="auth_not_configured_title">Неверная конфигурация ownCloud</string>
-  <string name="auth_not_configured_message">Похоже что ваш экземпляр ownCloud не был корректно сконфигурирован. Обратитесь за деталями к вашему администратору.</string>
+  <string name="auth_not_configured_title">Неверная конфигурация сервер</string>
+  <string name="auth_not_configured_message">Похоже что ваш экземпляр сервер не был корректно сконфигурирован. Обратитесь за деталями к вашему администратору.</string>
   <string name="auth_unknown_error_title">Произошла неизвестная ошибка!</string>
   <string name="auth_unknown_error_message">Произошла неизвестная ошибка. Свяжитесь с авторами и приложите журнал с вашего устройства.</string>
   <string name="auth_unknown_host_title">Невозможно найти сервер</string>
   <string name="auth_unknown_host_message">Невозможно найти введённый сервер. Проверьте имя сервера и его доступность, затем попробуйте ещё раз.</string>
-  <string name="auth_incorrect_path_title">Экземпляр ownCloud не найден</string>
+  <string name="auth_incorrect_path_title">Экземпляр сервер не найден</string>
   <string name="auth_incorrect_path_message">Приложение не может обнаружить ownClound по указанному пути. Проверьте путь и попробуйте ещё раз.</string>
   <string name="auth_timeout_title">Сервер слишком долго не отвечает</string>
   <string name="auth_incorrect_address_title">Неверный URL</string>
   <string name="auth_ssl_general_error_title">Ошибка инициализации SSL</string>
   <string name="auth_ssl_unverified_server_title">Непроверенный идентификатор SSL сервера</string>
-  <string name="auth_bad_oc_version_title">Неизвестная версия сервера ownCloud</string>
+  <string name="auth_bad_oc_version_title">Неизвестная версия сервера</string>
   <string name="auth_wrong_connection_title">Невозможно установить соединение</string>
   <string name="auth_secure_connection">Защищённое соединение установлено</string>
   <string name="auth_unauthorized">Неверное имя пользователя или пароль</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Отправить отчёт</string>
   <string name="crashlog_dont_send_report">Не отправлять отчёт</string>
   <string name="extensions_avail_title">Доступны расширения!</string>
-  <string name="extensions_avail_message">Похоже, ваш экземпляр ownCloud поддерживает дополнительные расширения. Хотите посмотреть доступные для андроида обновления?</string>
+  <string name="extensions_avail_message">Похоже, ваш экземпляр сервер поддерживает дополнительные расширения. Хотите посмотреть доступные для андроида обновления?</string>
   <string name="fd_keep_in_sync">Обновлять файл</string>
   <string name="common_share">Открыть доступ</string>
   <string name="common_rename">Переименовать</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 88f0c575..f9da7065 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">මුරපදය</string>
   <string name="main_login">පරිශීලක නාමය</string>
   <string name="main_button_login">ප්‍රවිශ්ටය</string>
-  <string name="main_welcome">OwnCloud වෙත ඔබව සාදරයෙන් පිළිගනිමු</string>
+  <string name="main_welcome">වෙත ඔබව සාදරයෙන් පිළිගනිමු</string>
   <string name="main_files">ගොනු</string>
   <string name="main_music">සංගීතය</string>
   <string name="main_contacts">සබඳතා</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">පිටු සළකුනු</string>
   <string name="main_settings">සිටුවම්</string>
   <string name="main_tit_accsetup">පරිශීලක ගිණුම ස්ථාපිත කරන්න</string>
-  <string name="main_wrn_accsetup">owncloud ගිණුම් මෙම යන්ත්‍රයේ නොමැත. මෙම යෙදුම භාවිතයට ගිණුමක් තිබිය යුතුය</string>
+  <string name="main_wrn_accsetup">ගිණුම් මෙම යන්ත්‍රයේ නොමැත. මෙම යෙදුම භාවිතයට ගිණුමක් තිබිය යුතුය</string>
   <string name="actionbar_upload">උඩුගත කිරීම</string>
   <string name="actionbar_upload_files">ගොනු</string>
   <string name="actionbar_mkdir">ඩිරෙක්ටරිය සාදන්න</string>
@@ -23,13 +23,13 @@
   <string name="prefs_select_oc_account">ගිණුමක් තෝරන්න</string>
   <string name="prefs_summary_select_oc_account">යෙදුම ඔබගේ ගිණුම් අතුරින් කිනම් ගිණුම භාවිතා කළ යුතුදැයි තෝරන්න</string>
   <string name="prefs_trackmydevice">මෙවලම සෙවීම</string>
-  <string name="prefs_trackmydevice_summary_off">ඔබගේ යන්ත්‍රය ඇති ස්ථානය සොයාගැනීමට අවසර ownCloudට ලබාදෙන්න</string>
-  <string name="prefs_trackmydevice_summary_on">ඔබගේ ownCloud ඔබගේ යන්ත්‍රය ඇති ස්ථානය හඹායයි</string>
+  <string name="prefs_trackmydevice_summary_off">ඔබගේ යන්ත්‍රය ඇති ස්ථානය සොයාගැනීමට අවසර ට ලබාදෙන්න</string>
+  <string name="prefs_trackmydevice_summary_on">ඔබගේ  ඔබගේ යන්ත්‍රය ඇති ස්ථානය හඹායයි</string>
   <string name="prefs_trackmydevice_interval">යාවත්කාලීන කරන කාල ප්‍රාන්තරය</string>
   <string name="prefs_trackmydevice_interval_summary">සෑම මිනිත්තු %1$s වරක් යාවත්කාලීන කරන්න</string>
   <string name="prefs_accounts">ගිණුම්</string>
   <string name="prefs_manage_accounts">ගිණුම් කළමනාකරනය</string>
-  <string name="prefs_pincode_summary">ඔබේ ownCloud සේවාලාභියා සුරකින්න</string>
+  <string name="prefs_pincode_summary">ඔබේ සේවාලාභියා සුරකින්න</string>
   <string name="prefs_instant_upload">ක්‍ෂණික උඩුගත කිරීම් සක්‍රිය කරන්න</string>
   <string name="prefs_instant_upload_summary">කැමරාවෙන් ගත් රූප ක්‍ෂණිකව උඩුගත කරන්න</string>
   <string name="auth_host_url">සේවාදායකයේ ලිපිනය</string>
@@ -43,11 +43,11 @@
   <string name="setup_hint_password">මුර පදය</string>
   <string name="setup_hint_address">අන්තර්ජාල ලිපිනය</string>
   <string name="setup_hint_show_password">මුරපදය පෙන්වන්නද?</string>
-  <string name="setup_title">ඔබගේ ownCloud හා සම්බන්ධ වන්න</string>
+  <string name="setup_title">ඔබගේ %1$s හා සම්බන්ධ වන්න</string>
   <string name="setup_btn_connect">සම්බන්ධ වන්න</string>
   <string name="uploader_btn_upload_text">උඩුගත කිරීම</string>
   <string name="uploader_wrn_no_account_title">ගිණුමක් හමු නොවුණි</string>
-  <string name="uploader_wrn_no_account_text">owncloud ගිණුම් මෙම යන්ත්‍රයේ නොමැත. කරුණාකර ගිණුමක් සාදන්න</string>
+  <string name="uploader_wrn_no_account_text">%1$s ගිණුම් මෙම යන්ත්‍රයේ නොමැත. කරුණාකර ගිණුමක් සාදන්න</string>
   <string name="uploader_wrn_no_account_setup_btn_text">ස්ථාපනය</string>
   <string name="uploader_wrn_no_account_quit_btn_text">නික්මෙන්න</string>
   <string name="uploader_info_uploading">උඩුගතවේ</string>
@@ -65,7 +65,7 @@
   <string name="common_cancel_upload">උඩුගත කිරීම අත් හරින්න</string>
   <string name="common_cancel">එපා</string>
   <string name="common_save_exit">සුරැක &amp; පිටවන්න</string>
-  <string name="common_exit">ownCloud අත්හැර යන්න</string>
+  <string name="common_exit">%1$s අත්හැර යන්න</string>
   <string name="common_error">දෝශය</string>
   <string name="about_title">පිළිබඳව</string>
   <string name="change_password">මුරපදය වෙනස් කිරීම</string>
@@ -99,13 +99,13 @@
   <string name="auth_nossl_plain_ok_title">ආරක්ෂිත සම්බන්ධතාවක් නොලැබුණි</string>
   <string name="auth_connection_established">සම්බන්ධතාවක් සාදන ලදී</string>
   <string name="auth_testing_connection">සම්බන්ධතාව පරීක්ෂා කෙරේ</string>
-  <string name="auth_not_configured_title">විකෘතිවු OwnCloud හැඩගැසුමක්</string>
+  <string name="auth_not_configured_title">විකෘතිවු හැඩගැසුමක්</string>
   <string name="auth_unknown_error_title">නොදන්නා දෝෂයක් ඇතිවිය</string>
   <string name="auth_unknown_host_title">සේවාදායකයා සොයාගත නොහැක</string>
   <string name="auth_timeout_title">සේවාදායකයා පිළිතුරු දීමට දිගු කාලයක් ගත්තේය</string>
   <string name="auth_incorrect_address_title">විකෘතිවු යොමුවක්</string>
   <string name="auth_ssl_general_error_title">SSL ආරම්භ කිරීම අසාර්ථකයි</string>
-  <string name="auth_bad_oc_version_title">හඳුනාගත නොහැකි ownCloud අනුවාදයක්</string>
+  <string name="auth_bad_oc_version_title">හඳුනාගත නොහැකි  අනුවාදයක්</string>
   <string name="auth_wrong_connection_title">සම්බන්ධයක් ඇතිකර ගැනීමට නොහැකි විය</string>
   <string name="auth_secure_connection">රක්‍ෂිත සම්බන්ධතාවක් සාදන ලදී</string>
   <string name="crashlog_send_report">වාර්තාව යවන්න</string>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index c1069f70..1aeb4be6 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Heslo:</string>
   <string name="main_login">Meno:</string>
   <string name="main_button_login">Prihlásenie</string>
-  <string name="main_welcome">Vitajte vo svojom ownCloud</string>
+  <string name="main_welcome">Vitajte</string>
   <string name="main_files">Súbory</string>
   <string name="main_music">Hudba</string>
   <string name="main_contacts">Kontakty</string>
@@ -29,13 +29,13 @@
   <string name="prefs_summary_select_oc_account">Vyberte účet pre túto aplikáciu.</string>
   <string name="prefs_trackmydevice">Sledovanie zariadenia</string>
   <string name="prefs_trackmydevice_summary_off">Povoliť sledovanie polohy zariadenia</string>
-  <string name="prefs_trackmydevice_summary_on">Váš ownCloud sleduje vašu polohu na tomto zariadení</string>
+  <string name="prefs_trackmydevice_summary_on">Váš aplikácie sleduje vašu polohu na tomto zariadení</string>
   <string name="prefs_trackmydevice_interval">Interval aktualizácie</string>
   <string name="prefs_trackmydevice_interval_summary">Aktualizácia každých %1$s minút</string>
   <string name="prefs_accounts">Účty</string>
   <string name="prefs_manage_accounts">Správa účtov</string>
-  <string name="prefs_pincode">PIN aplikácie ownCloud</string>
-  <string name="prefs_pincode_summary">Chrániť klienta ownCloud</string>
+  <string name="prefs_pincode">PIN aplikácie</string>
+  <string name="prefs_pincode_summary">Chrániť klienta aplikácie</string>
   <string name="prefs_instant_upload">Zapnúť okamžité odosielanie</string>
   <string name="prefs_instant_upload_summary">Okamžite odosielať fotky z fotoaparátu</string>
   <string name="prefs_log_delete_history_button">Zmazať históriu</string>
@@ -50,12 +50,12 @@
   <string name="setup_hint_password">Heslo</string>
   <string name="setup_hint_address">Web adresa</string>
   <string name="setup_hint_show_password">Zobraziť heslo?</string>
-  <string name="setup_title">Pripojiť k ownCloud</string>
+  <string name="setup_title">Pripojiť k %1$s</string>
   <string name="setup_btn_connect">Pripoj</string>
   <string name="uploader_btn_upload_text">Nahrať</string>
   <string name="uploader_top_message">Vyberte priečinok pre nahrané súbory:</string>
   <string name="uploader_wrn_no_account_title">Účet sa nenašiel</string>
-  <string name="uploader_wrn_no_account_text">Na tomto zariadení nie je zadaný žiadny ownCloud účet. Zadajte ho prosím.</string>
+  <string name="uploader_wrn_no_account_text">Na tomto zariadení nie je zadaný žiadny %1$s účet. Zadajte ho prosím.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavenie</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Koniec</string>
   <string name="uploader_wrn_no_content_title">Žiadny obsah pre odoslanie</string>
@@ -79,7 +79,7 @@
   <string name="common_cancel_upload">Zrušiť odosielanie</string>
   <string name="common_cancel">Zrušiť</string>
   <string name="common_save_exit">Uložiť a ukončiť</string>
-  <string name="common_exit">Opustiť ownCloud</string>
+  <string name="common_exit">Opustiť %1$s</string>
   <string name="common_error">Chyba</string>
   <string name="common_loading">Načítavam...</string>
   <string name="common_error_unknown">Neznáma chyba</string>
@@ -122,7 +122,7 @@
   <string name="foreign_files_remote_text">Vzdialené: %1$s</string>
   <string name="upload_query_move_foreign_files">Nie je dostatok miesta na kopírovanie vybraných súborov do priečinka %1$s. Želáte si miesto kopírovania zmeniť?</string>
   <string name="use_ssl">Použiť zabezpečené pripojenie</string>
-  <string name="location_no_provider">ownCloud nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
+  <string name="location_no_provider">%1$s nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
   <string name="pincode_enter_pin_code">Zadajte PIN aplikácie</string>
   <string name="pincode_enter_new_pin_code">Zadajte nový PIN aplikácie</string>
   <string name="pincode_configure_your_pin">Zadajte PIN aplikácie</string>
@@ -164,14 +164,14 @@
   <string name="auth_nossl_plain_ok_message">Aplikácia nemôže nadviazať zabezpečené spojenie so serverom. Nezabezpečené pripojenie je k dispozícii. Môžete pokračovať alebo prerušiť spojenie.</string>
   <string name="auth_connection_established">Pripojenie vytvorené</string>
   <string name="auth_testing_connection">Testovane pripojenia...</string>
-  <string name="auth_not_configured_title">Nesprávna konfigurácia ownCloud</string>
-  <string name="auth_not_configured_message">Nastavenie ownCloud nie je správne. Kontaktujte administrátora pre získanie viac informácií.</string>
+  <string name="auth_not_configured_title">Nesprávna konfigurácia servera</string>
+  <string name="auth_not_configured_message">Nastavenie servera nie je správne. Kontaktujte administrátora pre získanie viac informácií.</string>
   <string name="auth_unknown_error_title">Nastala neznáma chyba!</string>
   <string name="auth_unknown_error_message">Nastala neznáma chyba. Kontaktujte podporu a pripojte záznam z Vášho zariadenia.</string>
   <string name="auth_unknown_host_title">Nemožno nájsť hosta</string>
   <string name="auth_unknown_host_message">Nemôžm sa pripojiť k serveru. Skontrolujte nastavenia servera, či beží a skúste to znovu.</string>
-  <string name="auth_incorrect_path_title">ownCloud inštancia nebola nájdená</string>
-  <string name="auth_incorrect_path_message">Aplikácia na zadanej adrese nenašla inštanciu ownCloud. Skontrolujte cestu a skúste to znovu.</string>
+  <string name="auth_incorrect_path_title">Servera inštancia nebola nájdená</string>
+  <string name="auth_incorrect_path_message">Aplikácia na zadanej adrese nenašla inštanciu servera. Skontrolujte cestu a skúste to znovu.</string>
   <string name="auth_timeout_title">Serveru trvá odpoveď príliš dlho</string>
   <string name="auth_incorrect_address_title">Poškodená URL</string>
   <string name="auth_ssl_general_error_title">Inicializácia SSL zlyhala</string>
@@ -186,7 +186,7 @@
   <string name="crashlog_send_report">Poslať výpis</string>
   <string name="crashlog_dont_send_report">Neposlať výpis</string>
   <string name="extensions_avail_title">Sú dostupné rozšírenia.</string>
-  <string name="extensions_avail_message">Vaša inštancia ownCloud podporuje rozšírené nastavenia. Chcete zobraziť rozšírené nastavenia dosupné pre android?</string>
+  <string name="extensions_avail_message">Vaša inštancia servera podporuje rozšírené nastavenia. Chcete zobraziť rozšírené nastavenia dosupné pre android?</string>
   <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
   <string name="common_share">Zdieľaj</string>
   <string name="common_rename">Premenuj</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 132a6583..18c94607 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Geslo:</string>
   <string name="main_login">Uporabniško ime:</string>
   <string name="main_button_login">Prijava</string>
-  <string name="main_welcome">Dobrodošli v oblaku ownCloud</string>
+  <string name="main_welcome">Dobrodošli v oblaku</string>
   <string name="main_files">Datoteke</string>
   <string name="main_music">Glasba</string>
   <string name="main_contacts">Stiki</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Zaznamki</string>
   <string name="main_settings">Nastavitve</string>
   <string name="main_tit_accsetup">Nastavi račun</string>
-  <string name="main_wrn_accsetup">Na vaši napravi ni računa ownCloud. Za uporabo tega programa je treba račun ustvariti.</string>
+  <string name="main_wrn_accsetup">Na vaši napravi ni računa. Za uporabo tega programa je treba račun ustvariti.</string>
   <string name="actionbar_upload">Pošlji datoteko</string>
   <string name="actionbar_upload_from_apps">Vsebina iz drugih programov</string>
   <string name="actionbar_upload_files">Datoteke</string>
@@ -26,14 +26,14 @@
   <string name="prefs_select_oc_account">Izberi račun</string>
   <string name="prefs_summary_select_oc_account">Izberite račun, ki ga naj program uporabi.</string>
   <string name="prefs_trackmydevice">Sledenje napravi</string>
-  <string name="prefs_trackmydevice_summary_off">Omogoči sledenje mestu naprave preko oblaka ownCloud.</string>
-  <string name="prefs_trackmydevice_summary_on">Strežnik ownCloud spremlja mesto napravo</string>
+  <string name="prefs_trackmydevice_summary_off">Omogoči sledenje mestu naprave preko oblaka App.</string>
+  <string name="prefs_trackmydevice_summary_on">Strežnik App spremlja mesto napravo</string>
   <string name="prefs_trackmydevice_interval">Časovni razmik posodobitev</string>
   <string name="prefs_trackmydevice_interval_summary">Posodobi vsakih %1$s minut</string>
   <string name="prefs_accounts">Računi</string>
   <string name="prefs_manage_accounts">Upravljanje z računi</string>
-  <string name="prefs_pincode">Koda PIN programa ownCloud</string>
-  <string name="prefs_pincode_summary">Zaščitite odjemalec ownCloud</string>
+  <string name="prefs_pincode">Koda PIN programa</string>
+  <string name="prefs_pincode_summary">Zaščitite odjemalec</string>
   <string name="prefs_instant_upload">Omogoči takojšnje pošiljanje</string>
   <string name="prefs_instant_upload_summary">Takojšnje pošiljanje posnetih fotografij</string>
   <string name="prefs_log_title">Omogoči zapisovanje v dnevnik</string>
@@ -50,17 +50,17 @@
   <string name="setup_hint_password">Geslo</string>
   <string name="setup_hint_address">Spletni naslov</string>
   <string name="setup_hint_show_password">Ali naj bo geslo prikazano?</string>
-  <string name="setup_title">Poveži se z oblakom ownCloud</string>
+  <string name="setup_title">Poveži se z oblakom %1$s</string>
   <string name="setup_btn_connect">Poveži</string>
   <string name="uploader_btn_upload_text">Pošlji</string>
   <string name="uploader_top_message">Izberite mapo, v katero boste prenesli dokumente:</string>
   <string name="uploader_wrn_no_account_title">Uporabniškega računa ni mogoče najti</string>
-  <string name="uploader_wrn_no_account_text">Na napravi ni računov ownCloud. Nastaviti je treba vsaj en račun.</string>
+  <string name="uploader_wrn_no_account_text">Na napravi ni računov %1$s. Nastaviti je treba vsaj en račun.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavi</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Končaj</string>
   <string name="uploader_wrn_no_content_title">Ni vsebine za pošiljanje</string>
   <string name="uploader_wrn_no_content_text">Ni prejete vsebine. Ni datotek za pošiljanje.</string>
-  <string name="uploader_error_forbidden_content">Oblak ownCloud nima dovoljenj za dostop do vsebine v souporabi</string>
+  <string name="uploader_error_forbidden_content">Oblak %1$s nima dovoljenj za dostop do vsebine v souporabi</string>
   <string name="uploader_info_uploading">Pošiljanje</string>
   <string name="uploader_btn_create_dir_text">Ustvari mapo za pošiljanje</string>
   <string name="file_list_empty">V tej mapi ni datotek.\nNove datoteke je mogoče dodati preko možnosti menija \"Pošlji\".</string>
@@ -79,11 +79,11 @@
   <string name="common_cancel_upload">Prekliči pošiljanje</string>
   <string name="common_cancel">Prekliči</string>
   <string name="common_save_exit">Shrani in končaj</string>
-  <string name="common_exit">Zapusti ownCloud</string>
+  <string name="common_exit">Zapusti %1$s</string>
   <string name="common_error">Napaka</string>
   <string name="common_loading">Nalaganje...</string>
   <string name="common_error_unknown">Neznana napaka</string>
-  <string name="about_title">O oblaku ownCloud</string>
+  <string name="about_title">O oblaku %1$s</string>
   <string name="change_password">Spremeni geslo</string>
   <string name="delete_account">Izbriši račun</string>
   <string name="create_account">Ustvari račun</string>
@@ -121,17 +121,17 @@
   <string name="foreign_files_remote_text">Oddaljeno: %1$s</string>
   <string name="upload_query_move_foreign_files">Na strežniku ni dovolj prostora za kopiranje izbranih datotek v mapo %1$s. Ali želite datoteke raje premakniti na novo mesto? </string>
   <string name="use_ssl">Uporabi varno povezavo</string>
-  <string name="location_no_provider">Z ownCloud ni mogoče slediti napravi. Preverite nastavitve vašega mesta nahajanja.</string>
+  <string name="location_no_provider">Z %1$s ni mogoče slediti napravi. Preverite nastavitve vašega mesta nahajanja.</string>
   <string name="pincode_enter_pin_code">Vnesite kodo PIN programa</string>
   <string name="pincode_enter_new_pin_code">Vnesite novo kodo PIN programa</string>
-  <string name="pincode_configure_your_pin">Vnesite kodo PIN programa ownCloud</string>
+  <string name="pincode_configure_your_pin">Vnesite kodo PIN programa</string>
   <string name="pincode_configure_your_pin_explanation">Koda PIN bo zahtevana vsakič pred zagonom programa.</string>
-  <string name="pincode_reenter_your_pincode">Ponovno vnesite kodo PIN programa ownCloud</string>
-  <string name="pincode_remove_your_pincode">Odstrani kodo PIN programa ownCloud</string>
-  <string name="pincode_mismatch">Vrednosti kodo PIN programa ownCloud nista enaki</string>
-  <string name="pincode_wrong">Nepravilen kodo PIN programa ownCloud</string>
-  <string name="pincode_removed">Koda PIN programa ownCloud je odstranjena</string>
-  <string name="pincode_stored">Koda PIN programa ownCloud je shranjena</string>
+  <string name="pincode_reenter_your_pincode">Ponovno vnesite kodo PIN programa</string>
+  <string name="pincode_remove_your_pincode">Odstrani kodo PIN programa</string>
+  <string name="pincode_mismatch">Vrednosti kodo PIN programa nista enaki</string>
+  <string name="pincode_wrong">Nepravilen kodo PIN programa</string>
+  <string name="pincode_removed">Koda PIN programa je odstranjena</string>
+  <string name="pincode_stored">Koda PIN programa je shranjena</string>
   <string name="media_state_playing">%1$s (predvajanja)</string>
   <string name="media_state_loading">%1$s (nalaganja)</string>
   <string name="media_err_nothing_to_play">Medijskih datotek ni bilo mogoče najti</string>
@@ -160,19 +160,19 @@
   <string name="auth_nossl_plain_ok_message">Programu ni uspelo vzpostaviti varne povezave s strežnikom. Nadaljujete lahko z ne-varno povezavo ali pa prekinete.</string>
   <string name="auth_connection_established">Povezava je vzpostavljena</string>
   <string name="auth_testing_connection">Preizkušanje povezave ...</string>
-  <string name="auth_not_configured_title">Nastavitve ownCloud so napačno oblikovane</string>
-  <string name="auth_not_configured_message">Zdi se, da vaš ownCloud ni pravilno nastavljen. Za dodatna pojasnila se obrnite na skrbnika.</string>
+  <string name="auth_not_configured_title">Nastavitve servera so napačno oblikovane</string>
+  <string name="auth_not_configured_message">Zdi se, da vaš servera ni pravilno nastavljen. Za dodatna pojasnila se obrnite na skrbnika.</string>
   <string name="auth_unknown_error_title">Prišlo je do neznane napake</string>
   <string name="auth_unknown_error_message">Prišlo je do neznane napake. Na napako opozorite razvijalce in jim posredujete dnevniške zapise z naprave.</string>
   <string name="auth_unknown_host_title">Gostitelja ni mogoče najti</string>
   <string name="auth_unknown_host_message">Vpisanega gostitelja ni mogoče najti. Preveriti je treba ime gostitelja in razpoložljivost strežnika.</string>
-  <string name="auth_incorrect_path_title">Namestitve ownCloud ni mogoče najti</string>
-  <string name="auth_incorrect_path_message">Na podani poti ni bilo mogoče najti namestitve ownCloud. Preverite vpisano pot in poskusite znova.</string>
+  <string name="auth_incorrect_path_title">Namestitve servera ni mogoče najti</string>
+  <string name="auth_incorrect_path_message">Na podani poti ni bilo mogoče najti namestitve servera. Preverite vpisano pot in poskusite znova.</string>
   <string name="auth_timeout_title">Strežnik je potreboval preveč časa za odgovor</string>
   <string name="auth_incorrect_address_title">Napačno oblikovan naslov URL</string>
   <string name="auth_ssl_general_error_title">Začenjanje SSL je spodletelo</string>
   <string name="auth_ssl_unverified_server_title">Istovetnost strežnika SSL ni preverjena</string>
-  <string name="auth_bad_oc_version_title">Neprepoznana različica strežnika ownCloud</string>
+  <string name="auth_bad_oc_version_title">Neprepoznana različica strežnika servera</string>
   <string name="auth_wrong_connection_title">Povezave ni mogoče vzpostaviti</string>
   <string name="auth_secure_connection">Varna povezava je vzpostavljena</string>
   <string name="auth_not_found">Podana je bila napačna pot</string>
@@ -181,7 +181,7 @@
   <string name="crashlog_send_report">Pošlji poročilo</string>
   <string name="crashlog_dont_send_report">Ne pošlji poročila</string>
   <string name="extensions_avail_title">Na voljo so razširitve!</string>
-  <string name="extensions_avail_message">Videti je, da različica oblaka ownCloud podpira napredne razširitve. Ali želite pregledati razširitve za okolje Android?</string>
+  <string name="extensions_avail_message">Videti je, da različica oblaka servera podpira napredne razširitve. Ali želite pregledati razširitve za okolje Android?</string>
   <string name="fd_keep_in_sync">Datoteka naj bo posodobljena</string>
   <string name="common_share">Souporaba</string>
   <string name="common_rename">Preimenuj</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2313a993..d546ea0d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Lösenord:</string>
   <string name="main_login">Användare:</string>
   <string name="main_button_login">Logga in</string>
-  <string name="main_welcome">Välkommen till ownCloud</string>
+  <string name="main_welcome">Välkommen</string>
   <string name="main_files">Filer</string>
   <string name="main_music">Musik</string>
   <string name="main_contacts">Kontakter</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Bokmärken</string>
   <string name="main_settings">Inställningar</string>
   <string name="main_tit_accsetup">Skapa konto</string>
-  <string name="main_wrn_accsetup">Det finns inget konto för ownCloud på denna enhet. För att kunna använda ownCloud så måste du skapa ett konto.</string>
+  <string name="main_wrn_accsetup">Det finns inget konto för applikation på denna enhet. För att kunna använda applikation så måste du skapa ett konto.</string>
   <string name="about_android">%1$s Android App</string>
   <string name="about_version">version %1$s</string>
   <string name="actionbar_sync">Uppdatera konto</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Välj ett konto</string>
   <string name="prefs_summary_select_oc_account">Välj det konto som du vill använda.</string>
   <string name="prefs_trackmydevice">Spåra enhet</string>
-  <string name="prefs_trackmydevice_summary_off">Aktivera ownCloud att spåra din enhets plats</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud spårar denna enhet</string>
+  <string name="prefs_trackmydevice_summary_off">Aktivera applikation att spåra din enhets plats</string>
+  <string name="prefs_trackmydevice_summary_on">applikation spårar denna enhet</string>
   <string name="prefs_trackmydevice_interval">Uppdateringsintervall</string>
   <string name="prefs_trackmydevice_interval_summary">Uppdatera var %1$s minut</string>
   <string name="prefs_accounts">Konton</string>
   <string name="prefs_manage_accounts">Hantera konton</string>
-  <string name="prefs_pincode">ownCloud PIN</string>
-  <string name="prefs_pincode_summary">Skydda ownCloud-klienten</string>
+  <string name="prefs_pincode">applikation PIN</string>
+  <string name="prefs_pincode_summary">Skydda applikation-klienten</string>
   <string name="prefs_instant_upload">Aktivera direktuppladdning</string>
   <string name="prefs_instant_upload_summary">Direktuppladdning av kamerabilder</string>
   <string name="prefs_log_title">Aktivera loggning</string>
@@ -134,14 +134,14 @@
   <string name="location_no_provider">%1$s  kan inte spåra denna enhet. Kontrollera dina platsinställningar</string>
   <string name="pincode_enter_pin_code">Ange din PIN</string>
   <string name="pincode_enter_new_pin_code">Ange din nya PIN</string>
-  <string name="pincode_configure_your_pin">Ange ownCloud PIN</string>
+  <string name="pincode_configure_your_pin">Ange applikation PIN</string>
   <string name="pincode_configure_your_pin_explanation">Din PIN måste anges varje gång du startar programmet.</string>
-  <string name="pincode_reenter_your_pincode">Ange ownCloud PIN igen</string>
-  <string name="pincode_remove_your_pincode">Radera ownCloud PIN</string>
-  <string name="pincode_mismatch">Båda ownCloud PIN är inte lika</string>
-  <string name="pincode_wrong">Felaktig ownCloud PIN</string>
-  <string name="pincode_removed">ownCloud PIN raderad</string>
-  <string name="pincode_stored">ownCloud PIN sparad</string>
+  <string name="pincode_reenter_your_pincode">Ange applikation PIN igen</string>
+  <string name="pincode_remove_your_pincode">Radera applikation PIN</string>
+  <string name="pincode_mismatch">Båda applikation PIN är inte lika</string>
+  <string name="pincode_wrong">Felaktig applikationd PIN</string>
+  <string name="pincode_removed">applikation PIN raderad</string>
+  <string name="pincode_stored">applikation PIN sparad</string>
   <string name="media_notif_ticker">%1$ musikspelare</string>
   <string name="media_state_playing">%1$s (spelar)</string>
   <string name="media_state_loading">%1$s (buffrar)</string>
@@ -182,18 +182,18 @@
   <string name="auth_connection_established">Anslutning etablerad</string>
   <string name="auth_testing_connection">Testar anslutning...</string>
   <string name="auth_not_configured_title">Felaktig konfiguration</string>
-  <string name="auth_not_configured_message">Det verkar som om din version av ownCloud inte är korrekt konfigurerad. Kontakta din administratör för mer information.</string>
+  <string name="auth_not_configured_message">Det verkar som om din version av server inte är korrekt konfigurerad. Kontakta din administratör för mer information.</string>
   <string name="auth_unknown_error_title">Okänt fel inträffade!</string>
   <string name="auth_unknown_error_message">Ett okänt fel uppstod. Vänligen kontakta behörig och inkludera loggar från enheten.</string>
   <string name="auth_unknown_host_title">Kunde inte hitta server</string>
   <string name="auth_unknown_host_message">Kunde inte hitta angiven server. Kontrollera serverns tillgänglighet och försök igen.</string>
-  <string name="auth_incorrect_path_title">Ingen version av ownCloud kan hittas</string>
-  <string name="auth_incorrect_path_message">Applikationen kunde inte hitta någon version av ownCloud i angiven sökväg. Kontrollera sökvägen och försök igen.</string>
+  <string name="auth_incorrect_path_title">Ingen version av server kan hittas</string>
+  <string name="auth_incorrect_path_message">Applikationen kunde inte hitta någon version av server i angiven sökväg. Kontrollera sökvägen och försök igen.</string>
   <string name="auth_timeout_title">Servern svarar inte</string>
   <string name="auth_incorrect_address_title">Felaktig URL</string>
   <string name="auth_ssl_general_error_title">Misslyckad initiering av SSL</string>
   <string name="auth_ssl_unverified_server_title">Obekräftad SSL-identitet</string>
-  <string name="auth_bad_oc_version_title">Okänd ownCloud serverversion</string>
+  <string name="auth_bad_oc_version_title">Okänd server serverversion</string>
   <string name="auth_wrong_connection_title">Kunde inte etablera anslutning</string>
   <string name="auth_secure_connection">Säker anslutning etablerad</string>
   <string name="auth_unauthorized">Felaktigt användarnamn eller lösenord</string>
@@ -208,7 +208,7 @@
   <string name="crashlog_send_report">Skicka rapport</string>
   <string name="crashlog_dont_send_report">Skicka inte rapport</string>
   <string name="extensions_avail_title">Tillägg finns tillgängliga!</string>
-  <string name="extensions_avail_message">Det verkar som att din version av ownCloud stödjer avancerade tillägg. Vill du se tilläggen tillgängliga för Android?</string>
+  <string name="extensions_avail_message">Det verkar som att din version av server stödjer avancerade tillägg. Vill du se tilläggen tillgängliga för Android?</string>
   <string name="fd_keep_in_sync">HÃ¥ll filen uppdaterad</string>
   <string name="common_share">Dela</string>
   <string name="common_rename">Byt namn</string>
diff --git a/res/values-ta-rLK/strings.xml b/res/values-ta-rLK/strings.xml
index 60be3ae0..d6c4b895 100644
--- a/res/values-ta-rLK/strings.xml
+++ b/res/values-ta-rLK/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">கடவுச்சொல்:</string>
   <string name="main_login">பயனாளர் பெயர்</string>
   <string name="main_button_login">புகுபதிகை</string>
-  <string name="main_welcome">உங்களுடைய ownCloud இற்கு வரவேற்கின்றோம்</string>
+  <string name="main_welcome">உங்களுடைய இற்கு வரவேற்கின்றோம்</string>
   <string name="main_files">கோப்புகள்</string>
   <string name="main_music">இசை</string>
   <string name="main_contacts">தொடர்புகள்</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">பக்க அடையாளங்கள்</string>
   <string name="main_settings">அமைப்புகள்</string>
   <string name="main_tit_accsetup">கணக்கு அமைப்பு</string>
-  <string name="main_wrn_accsetup">உங்களுடைய சாதனத்தில் ownCloud கணக்குகள் இல்லை. இந்த செயலிகளை பயன்படுத்துவதற்கு நீங்கள் கணக்கொன்றை உருவாக்க வேண்டும்.</string>
+  <string name="main_wrn_accsetup">உங்களுடைய சாதனத்தில் கணக்குகள் இல்லை. இந்த செயலிகளை பயன்படுத்துவதற்கு நீங்கள் கணக்கொன்றை உருவாக்க வேண்டும்.</string>
   <string name="actionbar_upload">பதிவேற்றுக</string>
   <string name="actionbar_upload_from_apps">மற்ற செயலிகளிலிருந்து உள்ளடக்கம்</string>
   <string name="actionbar_upload_files">கோப்புகள்</string>
@@ -25,14 +25,14 @@
   <string name="prefs_select_oc_account">கணக்கொன்றை தெரிவுசெய்க</string>
   <string name="prefs_summary_select_oc_account">உங்களுடைய எந்த கணக்கு செயலியை பயன்படுத்தும் என்பதை தெரிவுசெய்க</string>
   <string name="prefs_trackmydevice">சாதனம் கண்காணிப்பு</string>
-  <string name="prefs_trackmydevice_summary_off">உங்களுடைய சாதனத்தின் இருப்பிடத்தை அறிவதற்கு ownCloud ஐ இயலுமைப்படுத்துக</string>
-  <string name="prefs_trackmydevice_summary_on">உங்களுடைய ownCloud ஆனது  இந்த சாதனத்தின் கண்காணிப்புகளை வைத்துக்கொள்ளும்,</string>
+  <string name="prefs_trackmydevice_summary_off">உங்களுடைய சாதனத்தின் இருப்பிடத்தை அறிவதற்கு ஐ இயலுமைப்படுத்துக</string>
+  <string name="prefs_trackmydevice_summary_on">உங்களுடைய ஆனது  இந்த சாதனத்தின் கண்காணிப்புகளை வைத்துக்கொள்ளும்,</string>
   <string name="prefs_trackmydevice_interval">இடைவேலையை இற்றைப்படுத்துக</string>
   <string name="prefs_trackmydevice_interval_summary">ஒவ்வொரு %1$s நிமிடங்களையும் இற்றைப்படுத்துக</string>
   <string name="prefs_accounts">கணக்குகள்</string>
   <string name="prefs_manage_accounts">கணக்குகளை நிர்வகிக்க</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">உங்களுடைய ownCloud சேவைப் பயனரை பாதுகாக்க</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">உங்களுடைய சேவைப் பயனரை பாதுகாக்க</string>
   <string name="prefs_instant_upload">உடனடி பதிவேற்றலை இயலுமைப்படுத்துக</string>
   <string name="prefs_instant_upload_summary">கமராவினால் எடுக்கப்பட்ட படங்கள் உடனடியாக பதிவேற்றப்பட்டன</string>
   <string name="auth_host_url">சேவையக முகவரி</string>
@@ -46,16 +46,16 @@
   <string name="setup_hint_password">கடவுச்சொல்</string>
   <string name="setup_hint_address">வலைய முகவரி</string>
   <string name="setup_hint_show_password">கடவுச்சொல்லை தெரியப்படுத்தவா?</string>
-  <string name="setup_title">உங்களுடைய ownCloud இற்கு இணைக்க</string>
+  <string name="setup_title">உங்களுடைய %1$s இற்கு இணைக்க</string>
   <string name="setup_btn_connect">இணைக்க</string>
   <string name="uploader_btn_upload_text">பதிவேற்றுக</string>
   <string name="uploader_wrn_no_account_title">ஒரு கணக்கும் அறியப்படவில்லை</string>
-  <string name="uploader_wrn_no_account_text">உங்களுடைய சாதனத்தில் ownCloud கணக்குகள் இல்லை. தயவுசெய்து முதலில் ஒரு கணக்கை அமைக்கவும்</string>
+  <string name="uploader_wrn_no_account_text">உங்களுடைய சாதனத்தில் %1$s கணக்குகள் இல்லை. தயவுசெய்து முதலில் ஒரு கணக்கை அமைக்கவும்</string>
   <string name="uploader_wrn_no_account_setup_btn_text">அமைப்பு</string>
   <string name="uploader_wrn_no_account_quit_btn_text">விலகுக</string>
   <string name="uploader_wrn_no_content_title">பதிவேற்றுவதற்கு உள்ளடக்கங்கள் இல்லை</string>
   <string name="uploader_wrn_no_content_text">ஒரு உள்ளடக்கமும் பெறப்படவில்லை. பதிவேற்றுவதற்கு ஒன்றும் இல்லை</string>
-  <string name="uploader_error_forbidden_content">பகிரப்பட்ட உள்ளடக்ககங்களை அணுகுவதற்கு ownCloud  அனுமதிக்கமாட்டாது</string>
+  <string name="uploader_error_forbidden_content">பகிரப்பட்ட உள்ளடக்ககங்களை அணுகுவதற்கு %1$s  அனுமதிக்கமாட்டாது</string>
   <string name="uploader_info_uploading">பதிவேற்றல்</string>
   <string name="uploader_btn_create_dir_text">பதிவேற்றுவதற்கு அடைவை உருவாக்குக</string>
   <string name="file_list_empty">இந்த கோப்புறையில் எந்த கோப்பும் இல்லை. \"பதிவேற்றல்\" பட்டி தெரிவு மூலம் புதிய கோப்புகளை பதிவேற்றமுடியும்.</string>
@@ -103,17 +103,17 @@
   <string name="sync_conflicts_in_favourites_ticker">முரன்பாடுகள் கண்டுப்பிடிக்கப்பட்டன</string>
   <string name="sync_fail_in_favourites_content">கோப்புகள் %1$d இலுள்ள உள்ளடக்கங்களை ஒத்திசைவாக்கமுடியாது (%2$d முரன்பாடுகள்) </string>
   <string name="use_ssl">பாதுகாப்பான இணைப்பை பயன்படுத்துக</string>
-  <string name="location_no_provider">ownCloud  இனால் உங்களுடைய சாதனத்தை கண்காணிக்க முடியவில்லை. தயவுசெய்து உங்களுடைய இருப்பிட அமைப்புக்களை சரிபார்க்கவும்</string>
+  <string name="location_no_provider">%1$s இனால் உங்களுடைய சாதனத்தை கண்காணிக்க முடியவில்லை. தயவுசெய்து உங்களுடைய இருப்பிட அமைப்புக்களை சரிபார்க்கவும்</string>
   <string name="pincode_enter_pin_code">தயவுசெய்து உங்களுடைய App PIN ஐ உள்ளிடுக</string>
   <string name="pincode_enter_new_pin_code">தயவுசெய்து உங்களுடைய புதிய App PIN ஐ உள்ளிடுக</string>
-  <string name="pincode_configure_your_pin">ownCloud இன் App PIN ஐ உள்ளிடுக</string>
+  <string name="pincode_configure_your_pin">இன் App PIN ஐ உள்ளிடுக</string>
   <string name="pincode_configure_your_pin_explanation">செயலி தொடங்கும் ஒவ்வொரு நேரமும் PIN கேட்கப்படுகின்றது.</string>
-  <string name="pincode_reenter_your_pincode">தயவுசெய்து மீண்டும் ownCloud App PIN ஐ உள்ளிடுக</string>
-  <string name="pincode_remove_your_pincode">உங்களுடைய ownCloud App PIN ஐ அகற்றுக</string>
-  <string name="pincode_mismatch">இரண்டு ownCloud App PIN களும் ஒன்றே அல்ல</string>
-  <string name="pincode_wrong">தவறான ownCloud App PIN </string>
-  <string name="pincode_removed">ownCloud App PIN அகற்றப்பட்டது</string>
-  <string name="pincode_stored">ownCloud App PIN சேமிக்கப்பட்டது</string>
+  <string name="pincode_reenter_your_pincode">தயவுசெய்து மீண்டும் App PIN ஐ உள்ளிடுக</string>
+  <string name="pincode_remove_your_pincode">உங்களுடைய App PIN ஐ அகற்றுக</string>
+  <string name="pincode_mismatch">இரண்டு App PIN களும் ஒன்றே அல்ல</string>
+  <string name="pincode_wrong">தவறான App PIN </string>
+  <string name="pincode_removed">App PIN அகற்றப்பட்டது</string>
+  <string name="pincode_stored">App PIN சேமிக்கப்பட்டது</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 நிமிடங்கள்</item>
     <item>30நிமிடங்கள்</item>
@@ -132,26 +132,26 @@
   <string name="auth_nossl_plain_ok_message">செயலியினால் சேவையகத்துடன் பாதுகாப்பான இணைப்பை ஏற்படுத்த முடியவில்லை.  பாதுகாப்பற்ற இணைப்புகளும் காணப்படுகின்றன. நீங்கள் தொடரலாம் அல்லது இரத்துசெய்யலாம்.</string>
   <string name="auth_connection_established">இணைப்பு நிறுவப்பட்டது</string>
   <string name="auth_testing_connection">இணைப்பு சோதிக்கப்படுகிறது.....</string>
-  <string name="auth_not_configured_title">பிறழ்வான ownCloud தகவமைப்பு</string>
-  <string name="auth_not_configured_message">உங்களுடைய ownCloud சரியாக தகவமைக்கப்படாததாக தெரிகிறது. மேலதிக தகவல்களுக்கு நிர்வாகியை தொடர்புகொள்ளவும்</string>
+  <string name="auth_not_configured_title">பிறழ்வான தகவமைப்பு</string>
+  <string name="auth_not_configured_message">உங்களுடைய சரியாக தகவமைக்கப்படாததாக தெரிகிறது. மேலதிக தகவல்களுக்கு நிர்வாகியை தொடர்புகொள்ளவும்</string>
   <string name="auth_unknown_error_title">அறியப்படாத வழு ஏற்பட்டுள்ளது!</string>
   <string name="auth_unknown_error_message">அறியப்படாத வழு ஏற்பட்டுள்ளது. தயவுசெய்து உங்களுடைய சாதனத்தினூடாக ஆசிரியரையும் சேர்க்கப்பட்டுள்ள பதிகையையும் தொடர்புகொள்க.</string>
   <string name="auth_unknown_host_title">ஓம்புனரை கண்டுப்பிடிக்கமுடியவில்லை</string>
   <string name="auth_unknown_host_message">நுழைக்கப்பட்ட ஓம்புனரை கண்டுப்பிடிக்கமுடியவில்லை. தயவுசெய்து ஓம்புனர் பெயரையும் சேவையகத்தின் வழங்குதலையும் சரிப்பார்த்து மீண்டும் முயற்சிக்கவும்.</string>
-  <string name="auth_incorrect_path_title">ownCloud  காணப்படவில்லை</string>
+  <string name="auth_incorrect_path_title"> காணப்படவில்லை</string>
   <string name="auth_incorrect_path_message">தரப்பட்ட பாதையினூடாக செயலியினால் ownClound ஐ கண்டுப்பிடிக்க முடியவில்லை. தயவுசெய்து உங்களுடைய பாதையை சரிபார்த்து மீண்டும் முயற்சிக்கவும்.</string>
   <string name="auth_timeout_title">இந்த சேவையகம் பதில் கொடுப்பதற்கு நீண்ட நேரம் எடுக்கின்றது</string>
   <string name="auth_incorrect_address_title">பிறழ்வான URL</string>
   <string name="auth_ssl_general_error_title">SSL இன் தொடக்கநிலை தோல்வியுற்றது</string>
   <string name="auth_ssl_unverified_server_title">உறுதிப்படுத்தப்படாத SSL சேவையகத்தின் அடையாளம்</string>
-  <string name="auth_bad_oc_version_title">அங்கீகரிக்கப்படாத ownCloud சேவையகம் பதிப்பு</string>
+  <string name="auth_bad_oc_version_title">அங்கீகரிக்கப்படாத சேவையகம் பதிப்பு</string>
   <string name="auth_wrong_connection_title">இணைப்பை நிறுவமுடியாது</string>
   <string name="auth_secure_connection">பாதுகாப்பான இணைப்பு உருவாக்கப்பட்டது.</string>
   <string name="crashlog_message">செயலி எதிர்பாராமல் முடிவுற்றது. உங்களுக்கு முறிவு அறிக்கை ஒன்றை சமர்ப்பிப்பதற்கு விருப்பம்மா?</string>
   <string name="crashlog_send_report">அறிக்கையை அனுப்பவும்</string>
   <string name="crashlog_dont_send_report">அறிக்கையை அனுப்பவேண்டாம்</string>
   <string name="extensions_avail_title">நீட்சிகள் காணப்படுகின்றன!</string>
-  <string name="extensions_avail_message">உங்களுடைய ownCloud  முன்னேற்றமான நீட்சிக்கு ஆதரவளிப்பதாக தெரிகிறது. android க்கு நீட்சிகள் இருக்கின்றனவா என அறிய ஆவலா?</string>
+  <string name="extensions_avail_message">உங்களுடைய முன்னேற்றமான நீட்சிக்கு ஆதரவளிப்பதாக தெரிகிறது. android க்கு நீட்சிகள் இருக்கின்றனவா என அறிய ஆவலா?</string>
   <string name="fd_keep_in_sync">நவீன கோப்பை வைத்திருக்கவும்</string>
   <string name="common_share">பகிர்வு</string>
   <string name="common_rename">பெயர்மாற்றம்</string>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index 14098b76..ee92fd29 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">รหัสผ่าน:</string>
   <string name="main_login">ชื่อผู้ใช้:</string>
   <string name="main_button_login">เข้าสู่ระบบ</string>
-  <string name="main_welcome">ยินดีต้อนรับเข้าสู่ ownCloud ของคุณ</string>
+  <string name="main_welcome">ยินดีต้อนรับ</string>
   <string name="main_files">ไฟล์</string>
   <string name="main_music">เพลง</string>
   <string name="main_contacts">ข้อมูลผู้ติดต่อ</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">รายการโปรด</string>
   <string name="main_settings">ตั้งค่า</string>
   <string name="main_tit_accsetup">ตั้งค่าบัญชี</string>
-  <string name="main_wrn_accsetup">ไม่มีบัญชี ownCloud ของคุณอยู่บนอุปกรณ์ของคุณ หากต้องการใช้งานแอปตัวนี้ คุณจำเป็นต้องสร้างบัญชีใหม่</string>
+  <string name="main_wrn_accsetup">ไม่มีบัญชีของคุณอยู่บนอุปกรณ์ของคุณ หากต้องการใช้งานแอปตัวนี้ คุณจำเป็นต้องสร้างบัญชีใหม่</string>
   <string name="actionbar_upload">อัพโหลดไฟล์</string>
   <string name="actionbar_upload_from_apps">เนื้อหาจากแอปฯอื่นๆ</string>
   <string name="actionbar_upload_files">ไฟล์</string>
@@ -25,14 +25,14 @@
   <string name="prefs_select_oc_account">เลือกบัญชี</string>
   <string name="prefs_summary_select_oc_account">เลือกบัญชีที่ต้องการใช้งานกับแอปตัวนี้</string>
   <string name="prefs_trackmydevice">ตรวจหาอุปกรณ์</string>
-  <string name="prefs_trackmydevice_summary_off">เปิดให้ ownCloud ตรวจหาตำแหน่งที่อยู่อุปกรณ์ของคุณ</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud กำลังติดตามอุปกรณ์นี้อยู่</string>
+  <string name="prefs_trackmydevice_summary_off">เปิดให้ ตรวจหาตำแหน่งที่อยู่อุปกรณ์ของคุณ</string>
+  <string name="prefs_trackmydevice_summary_on">กำลังติดตามอุปกรณ์นี้อยู่</string>
   <string name="prefs_trackmydevice_interval">ช่วงเวลาการอัพเดท</string>
   <string name="prefs_trackmydevice_interval_summary">อัพเดททุก %1$s นาที</string>
   <string name="prefs_accounts">บัญชี</string>
   <string name="prefs_manage_accounts">บริหารจัดการบัญชี</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">ป้องกันโปรแกรมไคลเอนต์ ownCloud ของคุณ</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">ป้องกันโปรแกรมไคลเอนต์ ของคุณ</string>
   <string name="prefs_instant_upload">เปิดใช้งานระบบอัพโหลดได้ทันที</string>
   <string name="prefs_instant_upload_summary">อัพโหลดรูปภาพจากกล้องขึ้นไปทันที</string>
   <string name="auth_host_url">ที่อยู่เซิร์ฟเวอร์</string>
@@ -46,16 +46,16 @@
   <string name="setup_hint_password">รหัสผ่าน</string>
   <string name="setup_hint_address">ที่อยู่เว็บ</string>
   <string name="setup_hint_show_password">แสดงรหัสผ่าน?</string>
-  <string name="setup_title">เชื่อมต่อกับ ownCloud ของคุณ</string>
+  <string name="setup_title">เชื่อมต่อกับ %1$s ของคุณ</string>
   <string name="setup_btn_connect">เชื่อมต่อ</string>
   <string name="uploader_btn_upload_text">อัพโหลด</string>
   <string name="uploader_wrn_no_account_title">ไม่พบบัญชีที่ต้องการ</string>
-  <string name="uploader_wrn_no_account_text">ไม่มีบัญชี ownCloud บนอุปกรณ์ของคุณ กรุณาตั้งค่าบัญชีของคุณก่อน</string>
+  <string name="uploader_wrn_no_account_text">ไม่มีบัญชี %1$s บนอุปกรณ์ของคุณ กรุณาตั้งค่าบัญชีของคุณก่อน</string>
   <string name="uploader_wrn_no_account_setup_btn_text">ตั้งค่า</string>
   <string name="uploader_wrn_no_account_quit_btn_text">ออก</string>
   <string name="uploader_wrn_no_content_title">ยังไม่มีเนื้อหาให้ต้องอัพโหลด</string>
   <string name="uploader_wrn_no_content_text">ยังไม่ได้รับเนื้อหา ไม่มีอะไรให้ต้องอัพโหลด</string>
-  <string name="uploader_error_forbidden_content">ownCloud ไม่อนุญาตให้เข้าถึงเนื้อหาที่ถูกแชร์ไว้</string>
+  <string name="uploader_error_forbidden_content">%1$s ไม่อนุญาตให้เข้าถึงเนื้อหาที่ถูกแชร์ไว้</string>
   <string name="uploader_info_uploading">กำลังอัพโหลด</string>
   <string name="uploader_btn_create_dir_text">สร้างไดเร็กทอรี่สำหรับอัพโหลด</string>
   <string name="file_list_empty">ยังไม่มีไฟล์อยู่ในโฟลเดอร์นี้.\nสามารถเพิ่มไฟล์ใหม่ได้จากตัวเลือกในเมนู \"อัพโหลด\".</string>
@@ -74,7 +74,7 @@
   <string name="common_cancel_upload">ยกเลิกการอัพโหลด</string>
   <string name="common_cancel">ยกเลิก</string>
   <string name="common_save_exit">บันทึก &amp; ออก</string>
-  <string name="common_exit">ออกจาก ownCloud</string>
+  <string name="common_exit">ออกจาก%1$s</string>
   <string name="common_error">ข้อผิดพลาด</string>
   <string name="about_title">เกี่ยวกับเรา</string>
   <string name="change_password">เปลี่ยนรหัสผ่าน</string>
@@ -112,17 +112,17 @@
   <string name="foreign_files_remote_text">ปลายทาง: %1$s</string>
   <string name="upload_query_move_foreign_files">ไม่มีพื้นที่เหลือเพียงพอสำหรับคัดลอกแฟ้มข้อมูลที่เลือกไว้ไปที่โฟลเดอร์ %1$s คุณต้องการย้ายมันแทนหรือไม่</string>
   <string name="use_ssl">ใช้การเชื่อมต่อที่มีการรักษาความปลอดภัย</string>
-  <string name="location_no_provider">ownCloud ไม่สามารถตรวจหาอุปกรณ์ของคุณได้ กรุณาตรวจสอบการตั้งค่าตำแหน่งที่อยู่ของคุณ</string>
+  <string name="location_no_provider">%1$s ไม่สามารถตรวจหาอุปกรณ์ของคุณได้ กรุณาตรวจสอบการตั้งค่าตำแหน่งที่อยู่ของคุณ</string>
   <string name="pincode_enter_pin_code">กรุณาใส่ PIN แอปของคุณ</string>
   <string name="pincode_enter_new_pin_code">กรุณาใส่รหัส PIN แอปตัวใหม่ของคุณ</string>
-  <string name="pincode_configure_your_pin">กรอกรหัส PIN ของ ownCloud App</string>
+  <string name="pincode_configure_your_pin">กรอกรหัส PIN ของ  App</string>
   <string name="pincode_configure_your_pin_explanation">หมายเลข PIN ดังกล่าวจะถูกร้องขอทุกครั้งที่เริ่มใช้งานแอปฯ</string>
-  <string name="pincode_reenter_your_pincode">กรุณากรอกรหัส PIN ของแอป ownCloud ใหม่อีกครั้ง</string>
-  <string name="pincode_remove_your_pincode">ลบรหัส PIN แอป ของ ownCloud ของคุณ</string>
-  <string name="pincode_mismatch">รหัส ownCloud App API ไม่ตรงกัน</string>
-  <string name="pincode_wrong">รหัส PIN ownCloud App ไม่ถูกต้อง</string>
-  <string name="pincode_removed">รหัส PIN แอปสำหรับ ownCloud ถูกลบออกแล้ว</string>
-  <string name="pincode_stored">จัดเก็บรหัส PIN แอป ของ ownCloud แล้ว</string>
+  <string name="pincode_reenter_your_pincode">กรุณากรอกรหัส PIN ของแอป  App ใหม่อีกครั้ง</string>
+  <string name="pincode_remove_your_pincode">ลบรหัส PIN แอป ของ App ของคุณ</string>
+  <string name="pincode_mismatch">รหัส App API ไม่ตรงกัน</string>
+  <string name="pincode_wrong">รหัส PIN App ไม่ถูกต้อง</string>
+  <string name="pincode_removed">รหัส PIN แอปสำหรับ   ถูกลบออกแล้ว</string>
+  <string name="pincode_stored">จัดเก็บรหัส PIN แอป ของ  แล้ว</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 นาที</item>
     <item>30 นาที</item>
@@ -141,19 +141,19 @@
   <string name="auth_nossl_plain_ok_message">แอพพลิเคชั่นยังไม่ได้ติดตั้งการเชื่อมต่อแบบปลอดภัยกับเซิร์ฟเวอร์ ถึงแม้ว่าจะมีการเชื่อมต่อแบบที่ยังไม่ได้กำหนดให้มีความปลอดภัย คุณสามารถดำเนินการต่อไป หรือยกเลิกได้</string>
   <string name="auth_connection_established">ติดตั้งการเชื่อมต่อแล้ว</string>
   <string name="auth_testing_connection">กำลังทดสอบการเชื่อมต่อ...</string>
-  <string name="auth_not_configured_title">การกำหนดค่า Malformed ownCloud</string>
-  <string name="auth_not_configured_message">ดูเหมือนว่าค่าตัวอย่าง ownCloud ของคุณยังไม่ได้ถูกกำหนดค่าอย่างถูกต้อง กรุณาติดต่อผู้ดูแลระบบของคุณ สำหรับรายละเอียดเพิ่มเติม</string>
+  <string name="auth_not_configured_title">การกำหนดค่า Malformed เซิร์ฟเวอร์</string>
+  <string name="auth_not_configured_message">ดูเหมือนว่าค่าตัวอย่างเซิร์ฟเวอร์ ของคุณยังไม่ได้ถูกกำหนดค่าอย่างถูกต้อง กรุณาติดต่อผู้ดูแลระบบของคุณ สำหรับรายละเอียดเพิ่มเติม</string>
   <string name="auth_unknown_error_title">เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ!</string>
   <string name="auth_unknown_error_message">เกิดข้อผิดพลาดโดยไม่ทราบสาเหตุ กรุณาติดต่อเจ้าของและดูบันทึกข้อมูลการใช้งานจากอุปกรณ์ของคุณ</string>
   <string name="auth_unknown_host_title">ไม่พบโฮสต์ที่ต้องการ</string>
   <string name="auth_unknown_host_message">ไม่พบโฮสต์ตามข้อมูลที่กรอก กรุณาตรวจสอบชื่อโฮสต์และเซิร์ฟเวอร์ที่สามารถใช้งานได้ แล้วลองใหม่อีกครั้ง</string>
-  <string name="auth_incorrect_path_title">ไม่พบค่าตัวอย่าง ownCloud</string>
-  <string name="auth_incorrect_path_message">แอพพลิเคชั่นไม่สามารถค้นพบค่าตัวอย่าง ownCloud ตามตำแหน่งพาธที่ระบุไว้ได้ กรุณาตรวจสอบตำแหน่งของคุณ แล้วลองใหม่อีกครั้ง</string>
+  <string name="auth_incorrect_path_title">ไม่พบค่าตัวอย่างเซิร์ฟเวอร์</string>
+  <string name="auth_incorrect_path_message">แอพพลิเคชั่นไม่สามารถค้นพบค่าตัวอย่าง เซิร์ฟเวอร์ ตามตำแหน่งพาธที่ระบุไว้ได้ กรุณาตรวจสอบตำแหน่งของคุณ แล้วลองใหม่อีกครั้ง</string>
   <string name="auth_timeout_title">เซิร์ฟเวอร์ดังกล่าวใช้เวลาตอบสนองนานเกินไป</string>
   <string name="auth_incorrect_address_title">Malformed URL</string>
   <string name="auth_ssl_general_error_title">การเตรียมใช้งาน SSL ล้มเหลว</string>
   <string name="auth_ssl_unverified_server_title">ข้อมูลการเข้าใช้งานเซิร์ฟเวอร์ SSL ยังไม่ได้ยืนยันความถูกต้อง</string>
-  <string name="auth_bad_oc_version_title">รุ่นของเซิร์ฟเวอร์ ownCloud ไม่เป็นที่รู้จัก</string>
+  <string name="auth_bad_oc_version_title">รุ่นของเซิร์ฟเวอร์เซิร์ฟเวอร์ ไม่เป็นที่รู้จัก</string>
   <string name="auth_wrong_connection_title">ไม่สามารถเชื่อมต่อได้</string>
   <string name="auth_secure_connection">ดำเนินการติดตั้งการเชื่อมต่อแบบปลอดภัยเรียบร้อย</string>
   <string name="auth_not_found">กรอกตำแหน่งพาธไม่ถูกต้อง</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 40606839..70d61cab 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Parola:</string>
   <string name="main_login">Kullanıcı Adı:</string>
   <string name="main_button_login">Giriş</string>
-  <string name="main_welcome">ownCloud\'ınıza hoşgeldiniz</string>
+  <string name="main_welcome">karşılama</string>
   <string name="main_files">Dosyalar</string>
   <string name="main_music">Müzik</string>
   <string name="main_contacts">Kişi Rehberi</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Yer Ä°mleri</string>
   <string name="main_settings">Ayarlar</string>
   <string name="main_tit_accsetup">Kurulum Hesabi</string>
-  <string name="main_wrn_accsetup">Cihazınızda ownCloud hesabı bulunmamaktadır. Bu uygulamayı kullanabilmeniz için ownCloud hesabı oluşturmalısınız.</string>
+  <string name="main_wrn_accsetup">Cihazınızda App hesabı bulunmamaktadır. Bu uygulamayı kullanabilmeniz için App hesabı oluşturmalısınız.</string>
   <string name="actionbar_upload">Dosya yükle</string>
   <string name="actionbar_upload_from_apps">Diğer uygulamalardan içerik</string>
   <string name="actionbar_upload_files">Dosyalar</string>
@@ -25,13 +25,13 @@
   <string name="prefs_select_oc_account">Oturum seç</string>
   <string name="prefs_summary_select_oc_account">Uygulamanın hangi hesaplarınızı kullanması gerektiğini  seçiniz.</string>
   <string name="prefs_trackmydevice">Cihaz takibi</string>
-  <string name="prefs_trackmydevice_summary_off">Cihazınınızın konumunu takip etmesi için ownCloud\'u aktif edin</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud\'unuz bu cihazı takip etmektedir</string>
+  <string name="prefs_trackmydevice_summary_off">Cihazınınızın konumunu takip etmesi için App\'u aktif edin</string>
+  <string name="prefs_trackmydevice_summary_on">App\'unuz bu cihazı takip etmektedir</string>
   <string name="prefs_trackmydevice_interval">Güncelleme aralığı</string>
   <string name="prefs_trackmydevice_interval_summary">Her %1$s dakikada güncelle</string>
   <string name="prefs_accounts">Hesaplar</string>
   <string name="prefs_manage_accounts">Hesapları yönet</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
+  <string name="prefs_pincode">App PIN</string>
   <string name="prefs_pincode_summary">Ä°stemcinizi koruyun</string>
   <string name="prefs_instant_upload">Anında yükleme etkinleştir</string>
   <string name="prefs_instant_upload_summary">Anında çekilen fotoğrafları yükle</string>
@@ -46,17 +46,17 @@
   <string name="setup_hint_password">Şifre:</string>
   <string name="setup_hint_address">Web adres</string>
   <string name="setup_hint_show_password">Şifre göster?</string>
-  <string name="setup_title">ownCloud\'nıza bağlanin</string>
+  <string name="setup_title">%1$s\'nıza bağlanin</string>
   <string name="setup_btn_connect">Bağlan</string>
   <string name="uploader_btn_upload_text">Yükle</string>
   <string name="uploader_top_message">Yükleme dizinini seçiniz:</string>
   <string name="uploader_wrn_no_account_title">Hesap bulunamadi</string>
-  <string name="uploader_wrn_no_account_text">Cihazınızda ownCloud hesabı bulunmamaktadır. Lütfen öncelikle bir hesap ayarı giriniz.</string>
+  <string name="uploader_wrn_no_account_text">Cihazınızda %1$s hesabı bulunmamaktadır. Lütfen öncelikle bir hesap ayarı giriniz.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Kurulum</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Çıkış</string>
   <string name="uploader_wrn_no_content_title">Yüklenecek içerik yok</string>
   <string name="uploader_wrn_no_content_text">Yüklenecek içerik yok. Yüklenecek dosya yok.</string>
-  <string name="uploader_error_forbidden_content">ownCloud, paylaşılan içeriğe erişim izni vermiyor</string>
+  <string name="uploader_error_forbidden_content">%1$s, paylaşılan içeriğe erişim izni vermiyor</string>
   <string name="uploader_info_uploading">Yükleniyor</string>
   <string name="uploader_btn_create_dir_text">Yükleme için dizin oluştur</string>
   <string name="file_list_empty">Klasörde dosya yok. Yeni dosyalar yükle\'ye tıklayarak eklenebilir.</string>
@@ -117,17 +117,17 @@
   <string name="foreign_files_remote_text">Uzak: %1$s</string>
   <string name="upload_query_move_foreign_files">Seçilen dosyaları %1$s dizinine kopyalamak için yeterli alan yok. Bunun yerine dosyayı taşımak ister misiniz?</string>
   <string name="use_ssl">Güvenli bağlanti kullan</string>
-  <string name="location_no_provider">ownCloud cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
+  <string name="location_no_provider">%1$s cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
   <string name="pincode_enter_pin_code">Lütfen uygulama PIN\'ınızı giriniz</string>
   <string name="pincode_enter_new_pin_code">Lütfen yeni uygulama PIN\'ınızı giriniz</string>
-  <string name="pincode_configure_your_pin">ownCloud App PIN giriniz</string>
+  <string name="pincode_configure_your_pin">App PIN giriniz</string>
   <string name="pincode_configure_your_pin_explanation">PIN uygulama yeniden başladığında tekrar sorulacak</string>
-  <string name="pincode_reenter_your_pincode">Lütfen, ownCloud App PIN ni tekrar giriniz</string>
-  <string name="pincode_remove_your_pincode">ownCloud App PIN\'nizi kaldırınız.</string>
-  <string name="pincode_mismatch">Her iki ownCloud App PIN aynı değil.</string>
-  <string name="pincode_wrong">Yanlış ownCloud App PIN</string>
-  <string name="pincode_removed">ownCloud App PIN kaldırıldı</string>
-  <string name="pincode_stored">ownCloud App PIN saklandı</string>
+  <string name="pincode_reenter_your_pincode">Lütfen, App PIN ni tekrar giriniz</string>
+  <string name="pincode_remove_your_pincode">App PIN\'nizi kaldırınız.</string>
+  <string name="pincode_mismatch">Her iki App PIN aynı değil.</string>
+  <string name="pincode_wrong">Yanlış App PIN</string>
+  <string name="pincode_removed">App PIN kaldırıldı</string>
+  <string name="pincode_stored">App PIN saklandı</string>
   <string name="media_notif_ticker">%1$s müzik çalar</string>
   <string name="media_state_playing">%1$s (oynatılıyor)</string>
   <string name="media_state_loading">%1$s (yükleniyor)</string>
@@ -157,19 +157,19 @@
   <string name="auth_nossl_plain_ok_message">Uygulama sunucu ile güvenli bağlantı kuramadı. Buna rağmen güvensiz bağlantı mevcut. Devam edebilirsiniz veya iptal edebilirsiniz.</string>
   <string name="auth_connection_established">Bağlantı kuruldu</string>
   <string name="auth_testing_connection">Bağlantı kontrol ediliyor ...</string>
-  <string name="auth_not_configured_title">Hatalı ownCloud ayarı.</string>
-  <string name="auth_not_configured_message">Görünüşe bakılırsa ownCloud servisiniz doğru ayarlanmamış. Detaylı bilgi için sistem yöneticinize başvurunuz.</string>
+  <string name="auth_not_configured_title">Hatalı sunucu ayarı.</string>
+  <string name="auth_not_configured_message">Görünüşe bakılırsa sunucu servisiniz doğru ayarlanmamış. Detaylı bilgi için sistem yöneticinize başvurunuz.</string>
   <string name="auth_unknown_error_title">Bilinmeyen hata oluştu.</string>
   <string name="auth_unknown_error_message">Bilinmeyen hata oluştu. Lütfen cihazınızdaki hata kayıtlarını ekleyerek programı yazan kişiyle irtibata geçiniz.</string>
   <string name="auth_unknown_host_title">Anabilgisayar bulunamadı</string>
   <string name="auth_unknown_host_message">Girilen anabilgisayar bulunamadı. Anabilgisayaradı ve sunucu kullanılabilirliğini kontrol edin ve yeniden deneyin.</string>
-  <string name="auth_incorrect_path_title">ownCloud servisi bulunamadı.</string>
-  <string name="auth_incorrect_path_message">Uygulama verilen dizin yolunda ownCloud bulamadı. Lütfen dizin yolunu kontrol edin ve tekrar deneyin.</string>
+  <string name="auth_incorrect_path_title">sunucu servisi bulunamadı.</string>
+  <string name="auth_incorrect_path_message">Uygulama verilen dizin yolunda sunucu bulamadı. Lütfen dizin yolunu kontrol edin ve tekrar deneyin.</string>
   <string name="auth_timeout_title">Sunucu çok geç cevap veriyor</string>
   <string name="auth_incorrect_address_title">Hatalı biçimlendirilmiş URL</string>
   <string name="auth_ssl_general_error_title">SSL başlatılmasında hata</string>
   <string name="auth_ssl_unverified_server_title">Doğrulanmamış SSL sunucu kimliğini</string>
-  <string name="auth_bad_oc_version_title">Bilinmeyen ownCloud sunucu sürümü</string>
+  <string name="auth_bad_oc_version_title">Bilinmeyen sunucu sürümü</string>
   <string name="auth_wrong_connection_title">Bağlantı kurulamadı</string>
   <string name="auth_secure_connection">Güvenli bağlantı sağlandı.</string>
   <string name="auth_not_found">Hatalı dosya yolu</string>
@@ -178,7 +178,7 @@
   <string name="crashlog_send_report">Rapor gönder</string>
   <string name="crashlog_dont_send_report">Rapor gönderme</string>
   <string name="extensions_avail_title">Eklentiler mevcut!</string>
-  <string name="extensions_avail_message">Görünen o ki ownCloud servisiniz gelişmiş eklentileri desteklemektedir. Android için mevcut olan eklentileri görmek ister misiniz ?</string>
+  <string name="extensions_avail_message">Görünen o ki sunucu servisiniz gelişmiş eklentileri desteklemektedir. Android için mevcut olan eklentileri görmek ister misiniz ?</string>
   <string name="fd_keep_in_sync">Dosyayı güncel tut </string>
   <string name="common_share">Paylaş</string>
   <string name="common_rename">İsim değiştir.</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8dadb3ba..a421e0bd 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Пароль:</string>
   <string name="main_login">Ім\'я користувача</string>
   <string name="main_button_login">Логін</string>
-  <string name="main_welcome">Вітаємо у Вашому ownCloud</string>
+  <string name="main_welcome">Ласкаво просимо</string>
   <string name="main_files">Файли</string>
   <string name="main_music">Музика</string>
   <string name="main_contacts">Контакти</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Закладки</string>
   <string name="main_settings">Налаштування</string>
   <string name="main_tit_accsetup">Налаштування облікового запису</string>
-  <string name="main_wrn_accsetup">На Вашому пристрої відсутні облікові запси ownCloud. Для того, щоб користуватися цим ПО, Вам потрібно створити обліковий запис.</string>
+  <string name="main_wrn_accsetup">На Вашому пристрої відсутні облікові запси App. Для того, щоб користуватися цим ПО, Вам потрібно створити обліковий запис.</string>
   <string name="actionbar_upload">Відвантажити</string>
   <string name="actionbar_upload_from_apps">Вміст із інших програм</string>
   <string name="actionbar_upload_files">Файли</string>
@@ -25,14 +25,14 @@
   <string name="prefs_select_oc_account">Обрати обліковий запис</string>
   <string name="prefs_summary_select_oc_account">Оберіть, який із облікових записів повинна використовувати програма.</string>
   <string name="prefs_trackmydevice">Стеження за пристроєм</string>
-  <string name="prefs_trackmydevice_summary_off">Дозволити ownCloud стежити за місцезнаходженням Вашого пристрою</string>
-  <string name="prefs_trackmydevice_summary_on">Ваш ownCloud стежить за цим пристроєм</string>
+  <string name="prefs_trackmydevice_summary_off">Дозволити App стежити за місцезнаходженням Вашого пристрою</string>
+  <string name="prefs_trackmydevice_summary_on">Ваш App стежить за цим пристроєм</string>
   <string name="prefs_trackmydevice_interval">Інтервал оновлення</string>
   <string name="prefs_trackmydevice_interval_summary">Оновлювати кожні %1$s хвилин</string>
   <string name="prefs_accounts">Облікові записи</string>
   <string name="prefs_manage_accounts">Управління обліковими записами</string>
-  <string name="prefs_pincode">ownCloud програмний PIN</string>
-  <string name="prefs_pincode_summary">Захист Вашог ownCloud клієнта</string>
+  <string name="prefs_pincode">App програмний PIN</string>
+  <string name="prefs_pincode_summary">Захист Вашог App клієнта</string>
   <string name="prefs_instant_upload">Включити негайне завантаження</string>
   <string name="prefs_instant_upload_summary">Негайно завантажувати фото, зроблені камерою</string>
   <string name="auth_host_url">Адреса сервера</string>
@@ -46,16 +46,16 @@
   <string name="setup_hint_password">Пароль</string>
   <string name="setup_hint_address">Веб адреса</string>
   <string name="setup_hint_show_password">Показувати пароль?</string>
-  <string name="setup_title">Підключитись до Вашого ownCloud</string>
+  <string name="setup_title">Підключитись до Вашого %1$s</string>
   <string name="setup_btn_connect">З\'єднати</string>
   <string name="uploader_btn_upload_text">Відвантажити</string>
   <string name="uploader_wrn_no_account_title">Не знайдено облікового запису</string>
-  <string name="uploader_wrn_no_account_text">На Вашому пристрої відсутні облікові записи ownCloud. Будь ласка, спочатку створіть запис.</string>
+  <string name="uploader_wrn_no_account_text">На Вашому пристрої відсутні облікові записи %1$s. Будь ласка, спочатку створіть запис.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Налаштування</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Вийти</string>
   <string name="uploader_wrn_no_content_title">Відсутні дані для завантаження</string>
   <string name="uploader_wrn_no_content_text">Не отримано даних. Нічого завантажувати.</string>
-  <string name="uploader_error_forbidden_content">ownCloud не може отримати доступ до спільного контенту</string>
+  <string name="uploader_error_forbidden_content">%1$s не може отримати доступ до спільного контенту</string>
   <string name="uploader_info_uploading">Завантаження</string>
   <string name="uploader_btn_create_dir_text">Створити теку для завантаження</string>
   <string name="file_list_empty">В цьому каталозі відсутні файли.\nНові файли можна додати через опцію меню \"Завантаження\".</string>
@@ -74,7 +74,7 @@
   <string name="common_cancel_upload">Перервати завантаження</string>
   <string name="common_cancel">Відмінити</string>
   <string name="common_save_exit">Зберегти &amp; Вихід</string>
-  <string name="common_exit">Вийти з ownCloud</string>
+  <string name="common_exit">Вийти з %1$s</string>
   <string name="common_error">Помилка</string>
   <string name="about_title">Про</string>
   <string name="change_password">Змінити пароль</string>
@@ -113,17 +113,17 @@
   <string name="foreign_files_remote_text">Віддалено: %1$s</string>
   <string name="upload_query_move_foreign_files">Недостатньо місця для копіювання обраних файлів у теку %1$s. Чи бажаєте ви перемістити їх замість копіювання?</string>
   <string name="use_ssl">Використовувати безпечне з\'єднання</string>
-  <string name="location_no_provider">ownCloud не може стежити за Вашим пристроєм. Будь ласка, перевірте свої налаштування місцезнаходження</string>
+  <string name="location_no_provider">%1$s не може стежити за Вашим пристроєм. Будь ласка, перевірте свої налаштування місцезнаходження</string>
   <string name="pincode_enter_pin_code">Будь ласка, введіть свій програмний PIN</string>
   <string name="pincode_enter_new_pin_code">Будь ласка, введіть новий програмний PIN</string>
   <string name="pincode_configure_your_pin">Введіть програмний PIN</string>
   <string name="pincode_configure_your_pin_explanation">PIN необхідно буде вводити щоразу при запуску цієї програми</string>
-  <string name="pincode_reenter_your_pincode">Повторно введіть ownCloud програмний PIN, будь ласка</string>
-  <string name="pincode_remove_your_pincode">Видалити свій ownCloud програмний PIN</string>
-  <string name="pincode_mismatch">Обидва ownCloud програмних PIN не однакові</string>
-  <string name="pincode_wrong">Не вірний ownCloud програмний PIN</string>
-  <string name="pincode_removed">ownCloud програмний PIN видалено</string>
-  <string name="pincode_stored">ownCloud програмний PIN збережено</string>
+  <string name="pincode_reenter_your_pincode">Повторно введіть App програмний PIN, будь ласка</string>
+  <string name="pincode_remove_your_pincode">Видалити свій App програмний PIN</string>
+  <string name="pincode_mismatch">Обидва App програмних PIN не однакові</string>
+  <string name="pincode_wrong">Не вірний App програмний PIN</string>
+  <string name="pincode_removed">App програмний PIN видалено</string>
+  <string name="pincode_stored">App програмний PIN збережено</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 хвилин</item>
     <item>30 хвилин</item>
@@ -142,19 +142,19 @@
   <string name="auth_nossl_plain_ok_message">Програма не може встановити безпечне з\'єднання з сервером. Проте, не захищене з\'єднання можливе. Ви можете продовжити або відмінити.</string>
   <string name="auth_connection_established">З\'єднання встановлено</string>
   <string name="auth_testing_connection">Перевірка з\'єднання…</string>
-  <string name="auth_not_configured_title">Не вірні налаштування ownCloud </string>
-  <string name="auth_not_configured_message">Здається, Ваш ownCloud примірник не правильно налаштовано. Зверніться до адміністратора для більш докладної інформації.</string>
+  <string name="auth_not_configured_title">Не вірні налаштування сервер </string>
+  <string name="auth_not_configured_message">Здається, Ваш сервер примірник не правильно налаштовано. Зверніться до адміністратора для більш докладної інформації.</string>
   <string name="auth_unknown_error_title">Виникла невідома помилка!</string>
   <string name="auth_unknown_error_message">Виникла невідома помилка. Будь ласка, зв\'яжіться з авторами та надайте лог-файли з Вашого пристрою.</string>
   <string name="auth_unknown_host_title">Не вдалося знайти хост</string>
   <string name="auth_unknown_host_message">Не вдалося знайти визначений хост. Будь ласка, перевірте ім\'я хосту і доступність серверу та спробуйте ще.</string>
-  <string name="auth_incorrect_path_title">Не знайдено примірник ownCloud</string>
+  <string name="auth_incorrect_path_title">Не знайдено примірник сервер</string>
   <string name="auth_incorrect_path_message">Програмі не вдалося знайти примірник ownClound за вказаною адресою. Будь ласка, перевірте адресу та спробуйте ще.</string>
   <string name="auth_timeout_title">Сервер занадто довго не відповідає</string>
   <string name="auth_incorrect_address_title">Пошкоджений URL</string>
   <string name="auth_ssl_general_error_title">Помилка SSL ініціалізації</string>
   <string name="auth_ssl_unverified_server_title">Неперевірена SSL ідентифікація серверу</string>
-  <string name="auth_bad_oc_version_title">Не вдалося визначити версію ownCloud серверу</string>
+  <string name="auth_bad_oc_version_title">Не вдалося визначити версію сервер серверу</string>
   <string name="auth_wrong_connection_title">Не вдалося встановити з\'єднання</string>
   <string name="auth_secure_connection">Встановлено захищене з\'єднання</string>
   <string name="auth_not_found">Вказано невірний шлях</string>
@@ -163,7 +163,7 @@
   <string name="crashlog_send_report">Надіслати доповідь</string>
   <string name="crashlog_dont_send_report">Не  відсилати доповідь</string>
   <string name="extensions_avail_title">Розширення доступні!</string>
-  <string name="extensions_avail_message">Здається, що Ваш примірник ownCloud підтримує додаткові розширення. Чи бажаєте Ви переглянути розширення, доступні для Андроід?</string>
+  <string name="extensions_avail_message">Здається, що Ваш примірник сервер підтримує додаткові розширення. Чи бажаєте Ви переглянути розширення, доступні для Андроід?</string>
   <string name="fd_keep_in_sync">Оновлювати файл</string>
   <string name="common_share">Поділитися</string>
   <string name="common_rename">Перейменувати</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2d60a061..f9da95c0 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">Mật khẩu:</string>
   <string name="main_login">Tên người dùng:</string>
   <string name="main_button_login">Đăng nhập</string>
-  <string name="main_welcome">Chào mừng bạn đến với OwnCloud</string>
+  <string name="main_welcome">Chào đón</string>
   <string name="main_files">Tập tin</string>
   <string name="main_music">Âm nhạc</string>
   <string name="main_contacts">Danh bạ</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">Đánh dấu</string>
   <string name="main_settings">Cài đặt</string>
   <string name="main_tit_accsetup">Thiết lập tài khoản</string>
-  <string name="main_wrn_accsetup">Trên thiết bị của bạn không có tài khoản ownCloud. Để sử dụng ứng dụng này bạn cần phải tạo một tài khoản.</string>
+  <string name="main_wrn_accsetup">Trên thiết bị của bạn không có tài khoản App. Để sử dụng ứng dụng này bạn cần phải tạo một tài khoản.</string>
   <string name="about_android">%1$s Ứng dụng trên Android</string>
   <string name="about_version">phiên bản %1$s</string>
   <string name="actionbar_sync">Cập nhật lại tài khoản</string>
@@ -29,14 +29,14 @@
   <string name="prefs_select_oc_account">Chọn một tài khoản</string>
   <string name="prefs_summary_select_oc_account">Chọn, các tài khoản của bạn và các ứng dụng nên sử dụng.</string>
   <string name="prefs_trackmydevice">Thiết bị theo dõi</string>
-  <string name="prefs_trackmydevice_summary_off">Bật tính năng ownCloud để theo dõi vị trí thiết bị của bạn</string>
-  <string name="prefs_trackmydevice_summary_on">ownCloud tiếp tục theo dõi thiết bị này</string>
+  <string name="prefs_trackmydevice_summary_off">Bật tính năng App để theo dõi vị trí thiết bị của bạn</string>
+  <string name="prefs_trackmydevice_summary_on">App tiếp tục theo dõi thiết bị này</string>
   <string name="prefs_trackmydevice_interval">Cập nhật khoảng thời gian</string>
   <string name="prefs_trackmydevice_interval_summary">Đã cập nhập được %1$s</string>
   <string name="prefs_accounts">Tài khoản</string>
   <string name="prefs_manage_accounts">Quản lý tài khoản</string>
-  <string name="prefs_pincode">Mã PIN ứng dụng ownCloud</string>
-  <string name="prefs_pincode_summary">Bảo vệ ownCloud client của bạn</string>
+  <string name="prefs_pincode">Mã PIN ứng dụng App</string>
+  <string name="prefs_pincode_summary">Bảo vệ App client của bạn</string>
   <string name="prefs_instant_upload">Kích hoạt tính năng tải lên ngay lập tức</string>
   <string name="prefs_instant_upload_summary">Ngay lập tức tải lên các hình ảnh được chụp bởi camera</string>
   <string name="prefs_log_title">Bật chế độ nhật trình</string>
@@ -57,17 +57,17 @@
   <string name="setup_hint_password">Mật khẩu</string>
   <string name="setup_hint_address">Địa chỉ Web</string>
   <string name="setup_hint_show_password">Hiện mật khẩu ?</string>
-  <string name="setup_title">Kết nối tới ownCloud của bạn </string>
+  <string name="setup_title">Kết nối tới %1$s của bạn </string>
   <string name="setup_btn_connect">Kết nối</string>
   <string name="uploader_btn_upload_text">Tải lên</string>
   <string name="uploader_top_message">Chọn thư mục tải lên:</string>
   <string name="uploader_wrn_no_account_title">Không tìm thấy tài khoản</string>
-  <string name="uploader_wrn_no_account_text">Trên thiết bị của bạn không có tài khoản ownCloud .Bước đầu tiên hãy thiết lập một tài khoản.</string>
+  <string name="uploader_wrn_no_account_text">Trên thiết bị của bạn không có tài khoản %1$s. Bước đầu tiên hãy thiết lập một tài khoản.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Cài đặt</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Thoát</string>
   <string name="uploader_wrn_no_content_title">Không có nội dung tải lên</string>
   <string name="uploader_wrn_no_content_text">Không có nội dung được nhận. Không có gì để tải lên.</string>
-  <string name="uploader_error_forbidden_content">ownCloud không cho phép truy cập vào các nội dung chia sẻ</string>
+  <string name="uploader_error_forbidden_content">%1$s không cho phép truy cập vào các nội dung chia sẻ</string>
   <string name="uploader_info_uploading">Đang tải lên</string>
   <string name="uploader_btn_create_dir_text">Tạo thư mục để tải lên</string>
   <string name="file_list_empty">Không có các tập tin trong thư mục này ⏎ tập tin mới có thể được thêm vào với tùy chọn trình đơn \"Tải lên\".</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">Hủy upload</string>
   <string name="common_cancel">Hủy</string>
   <string name="common_save_exit">Lưu &amp; Thoát</string>
-  <string name="common_exit">Rời khỏi ownCloud</string>
+  <string name="common_exit">Rời khỏi %1$s</string>
   <string name="common_error">Lỗi</string>
   <string name="common_loading">Đang tải...</string>
   <string name="common_error_unknown">Lỗi chưa biết</string>
@@ -130,17 +130,17 @@
   <string name="foreign_files_remote_text">Từ xa: %1$s</string>
   <string name="upload_query_move_foreign_files">Không đủ chỗ trống để chép các tập tin đã chọn vào thư mục %1$s. Bạn có muốn di chuyển chúng thay vì sao chép?</string>
   <string name="use_ssl">Sử dụng kết nối an toàn</string>
-  <string name="location_no_provider">ownCloud không thể theo dõi điện thoại của bạn. Vui lòng kiểm tra cài đặt vị trí của bạn</string>
+  <string name="location_no_provider">%1$s không thể theo dõi điện thoại của bạn. Vui lòng kiểm tra cài đặt vị trí của bạn</string>
   <string name="pincode_enter_pin_code">Vui lòng, nhập mã PIN ứng dụng của bạn</string>
   <string name="pincode_enter_new_pin_code">Vui lòng, nhập mã PIN mới của ứng dụng</string>
-  <string name="pincode_configure_your_pin">Nhập mã PIN ứng dụng ownCloud</string>
+  <string name="pincode_configure_your_pin">Nhập mã PIN ứng dụng App</string>
   <string name="pincode_configure_your_pin_explanation">Mã PIN sẽ được yêu cầu mỗi khi ứng dụng được bật </string>
-  <string name="pincode_reenter_your_pincode">Vui lòng nhập lại mã PIN ứng dụng ownCloud</string>
-  <string name="pincode_remove_your_pincode">Hủy mã PIN ứng dụng ownCloud của bạn</string>
-  <string name="pincode_mismatch">Mã PIN ứng dụng ownCloud không được trùng</string>
-  <string name="pincode_wrong">Mã PIN ứng dụng ownCloud không đúng</string>
-  <string name="pincode_removed">Mã PIN ứng dụng ownCloud đã bị xóa</string>
-  <string name="pincode_stored">Mã PIN ứng dụng ownCloud đã được lưu trữ</string>
+  <string name="pincode_reenter_your_pincode">Vui lòng nhập lại mã PIN ứng dụng App</string>
+  <string name="pincode_remove_your_pincode">Hủy mã PIN ứng dụng App của bạn</string>
+  <string name="pincode_mismatch">Mã PIN ứng dụng App không được trùng</string>
+  <string name="pincode_wrong">Mã PIN ứng dụng App không đúng</string>
+  <string name="pincode_removed">Mã PIN ứng dụng App đã bị xóa</string>
+  <string name="pincode_stored">Mã PIN ứng dụng App đã được lưu trữ</string>
   <string name="media_notif_ticker">%1$s trình phát nhạc</string>
   <string name="media_state_playing">%1$s (đang phát)</string>
   <string name="media_state_loading">%1$s (đang tải)</string>
@@ -180,19 +180,19 @@
   <string name="auth_nossl_plain_ok_message">Ứng dụng không thể thiết lập một kết nối an toàn đến máy chủ. Một kết nối không an toàn đang có giá trị. Bạn có thể tiếp tục hoặc hủy bỏ.</string>
   <string name="auth_connection_established">Kết nối đã thiết lập</string>
   <string name="auth_testing_connection">Đang kiểm tra kết nối...</string>
-  <string name="auth_not_configured_title">Thay đổi cấu hình ownCloud </string>
-  <string name="auth_not_configured_message">Có vẻ như phiên bản ownCloud của bạn cấu hình không đúng. Liên hệ với quản trị viên để biết thêm chi tiết.</string>
+  <string name="auth_not_configured_title">Thay đổi cấu hình máy chủ </string>
+  <string name="auth_not_configured_message">Có vẻ như phiên bản máy chủ của bạn cấu hình không đúng. Liên hệ với quản trị viên để biết thêm chi tiết.</string>
   <string name="auth_unknown_error_title">Không xác định được lỗi!</string>
   <string name="auth_unknown_error_message">Lỗi không xác định. Vui lòng liên hệ tác giả và gửi kèm theo logs từ thiết bị của bạn.</string>
   <string name="auth_unknown_host_title">Không thể tìm thấy máy chủ</string>
   <string name="auth_unknown_host_message">Không thể tìm thấy máy chủ. Xin vui lòng kiểm tra hostname, máy chủ có giá trị và thử lại.</string>
-  <string name="auth_incorrect_path_title">Phiên bản ownCloud không tìm thấy</string>
+  <string name="auth_incorrect_path_title">Phiên bản máy chủ không tìm thấy</string>
   <string name="auth_incorrect_path_message">Ứng dụng không thể tìm thấy phiên bản ownClound tại đường dẫn đã cho. Xin vui lòng kiểm tra đường dẫn của bạn và thử lại.</string>
   <string name="auth_timeout_title">Máy chủ đã quá dài để đáp ứng</string>
   <string name="auth_incorrect_address_title">Thay đổi URL</string>
   <string name="auth_ssl_general_error_title">SSL khởi tạo thất bại</string>
   <string name="auth_ssl_unverified_server_title">Chưa được xác minh danh tính của máy chủ SSL</string>
-  <string name="auth_bad_oc_version_title">Không chấp nhận phiên bản máy chủ ownCloud</string>
+  <string name="auth_bad_oc_version_title">Không chấp nhận phiên bản máy chủ</string>
   <string name="auth_wrong_connection_title">Không thể thiết lập kết nối</string>
   <string name="auth_secure_connection">Kết nối an toàn đã được thiết lập</string>
   <string name="auth_unauthorized">Sai tên người dùng hoặc mật khẩu</string>
@@ -207,7 +207,7 @@
   <string name="crashlog_send_report">Gửi báo cáo</string>
   <string name="crashlog_dont_send_report">Không gửi báo cáo</string>
   <string name="extensions_avail_title">Phần mở rộng có giá trị!</string>
-  <string name="extensions_avail_message">Hình như phiên bản ownCloud của bạn có hỗ trợ các phần mở rộng nâng cao. Bạn có muốn thấy các phần mở rộng có giá trị trên Android?</string>
+  <string name="extensions_avail_message">Hình như phiên bản máy chủ của bạn có hỗ trợ các phần mở rộng nâng cao. Bạn có muốn thấy các phần mở rộng có giá trị trên Android?</string>
   <string name="fd_keep_in_sync">Giữ tập tin cập nhật</string>
   <string name="common_share">Chia sẻ</string>
   <string name="common_rename">Sửa tên</string>
diff --git a/res/values-zh-rBG/strings.xml b/res/values-zh-rBG/strings.xml
index e0392394..864c05cd 100644
--- a/res/values-zh-rBG/strings.xml
+++ b/res/values-zh-rBG/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">密码</string>
   <string name="main_login">用户名：</string>
   <string name="main_button_login">登录</string>
-  <string name="main_welcome">欢迎来到您的 ownCloud</string>
+  <string name="main_welcome">欢迎来到您的</string>
   <string name="main_files">文件</string>
   <string name="main_music">音乐</string>
   <string name="main_contacts">联系人</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">书签</string>
   <string name="main_settings">设置</string>
   <string name="main_tit_accsetup">设置帐号</string>
-  <string name="main_wrn_accsetup">您的设备上没有 ownCloud 帐号。要使用此应用，您需要创建一个帐号。</string>
+  <string name="main_wrn_accsetup">您的设备上没有 帐号。要使用此应用，您需要创建一个帐号。</string>
   <string name="actionbar_upload">上传</string>
   <string name="actionbar_upload_from_apps">其他应用的内容</string>
   <string name="actionbar_upload_files">文件</string>
@@ -25,14 +25,14 @@
   <string name="prefs_select_oc_account">选择一个帐号</string>
   <string name="prefs_summary_select_oc_account">选择应用应使用您哪个帐号。</string>
   <string name="prefs_trackmydevice">跟踪设备</string>
-  <string name="prefs_trackmydevice_summary_off">让 ownCloud 跟踪您的设备位置</string>
-  <string name="prefs_trackmydevice_summary_on">您的 ownCloud 正跟踪着此设备</string>
+  <string name="prefs_trackmydevice_summary_off">让 跟踪您的设备位置</string>
+  <string name="prefs_trackmydevice_summary_on">您的 正跟踪着此设备</string>
   <string name="prefs_trackmydevice_interval">更新周期</string>
   <string name="prefs_trackmydevice_interval_summary">每 %1$s 分钟更新</string>
   <string name="prefs_accounts">帐号</string>
   <string name="prefs_manage_accounts">管理帐号</string>
-  <string name="prefs_pincode">ownCloud 应用 PIN</string>
-  <string name="prefs_pincode_summary">保护您的 ownCloud 客户端</string>
+  <string name="prefs_pincode">App 应用 PIN</string>
+  <string name="prefs_pincode_summary">保护您的 App 客户端</string>
   <string name="prefs_instant_upload">启用即时上传</string>
   <string name="prefs_instant_upload_summary">即时上传相机拍下的相片</string>
   <string name="auth_host_url">服务器地址</string>
@@ -46,16 +46,16 @@
   <string name="setup_hint_password">密码</string>
   <string name="setup_hint_address">网址</string>
   <string name="setup_hint_show_password">显示密码？</string>
-  <string name="setup_title">连接到您的 ownCloud</string>
+  <string name="setup_title">连接到您的 %1$s</string>
   <string name="setup_btn_connect">连接</string>
   <string name="uploader_btn_upload_text">上传</string>
   <string name="uploader_wrn_no_account_title">没有找到帐号</string>
-  <string name="uploader_wrn_no_account_text">您的设备上没有 ownCloud 帐号。请先设置一个帐号。</string>
+  <string name="uploader_wrn_no_account_text">您的设备上没有 %1$s 帐号。请先设置一个帐号。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">设置</string>
   <string name="uploader_wrn_no_account_quit_btn_text">退出</string>
   <string name="uploader_wrn_no_content_title">没有要上传的内容</string>
   <string name="uploader_wrn_no_content_text">没有接收到内容。没有东西可以上传。</string>
-  <string name="uploader_error_forbidden_content">ownCloud 不允许访问共享内容</string>
+  <string name="uploader_error_forbidden_content">%1$s 不允许访问共享内容</string>
   <string name="uploader_info_uploading">上传中</string>
   <string name="uploader_btn_create_dir_text">创建上传文件夹</string>
   <string name="file_list_empty">此文件夹中没有文件。⏎ 可以通过 \"上传\" 菜单选项添加新文件。</string>
@@ -74,7 +74,7 @@
   <string name="common_cancel_upload">取消上传</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">保存 &amp; 退出</string>
-  <string name="common_exit">离开 ownCloud</string>
+  <string name="common_exit">离开 %1$s</string>
   <string name="common_error">出错</string>
   <string name="common_loading">加载中...</string>
   <string name="common_error_unknown">未知错误...</string>
@@ -115,17 +115,17 @@
   <string name="foreign_files_remote_text">远程：%1$s</string>
   <string name="upload_query_move_foreign_files">空间不足以复制选定的文件到 %1$s 文件夹。要改为移动选定文件吗？</string>
   <string name="use_ssl">使用安全连接</string>
-  <string name="location_no_provider">ownCloud 不能跟踪您的设备。请检查您的位置设置</string>
+  <string name="location_no_provider">%1$s 不能跟踪您的设备。请检查您的位置设置</string>
   <string name="pincode_enter_pin_code">请插入您的应用 PIN</string>
   <string name="pincode_enter_new_pin_code">请插入您的新应用 PIN</string>
-  <string name="pincode_configure_your_pin">输入 ownCloud 应用 PIN</string>
+  <string name="pincode_configure_your_pin">输入 App 应用 PIN</string>
   <string name="pincode_configure_your_pin_explanation">将在每次应用程序启动时请求 PIN </string>
-  <string name="pincode_reenter_your_pincode">请重新输入 ownCloud 应用 PIN</string>
-  <string name="pincode_remove_your_pincode">移除您的 ownCloud 应用 PIN</string>
-  <string name="pincode_mismatch">两次 ownCloud 应用 PIN 不相同</string>
-  <string name="pincode_wrong">错误的 ownCloud 应用 PIN</string>
-  <string name="pincode_removed">ownCloud 应用 PIN 已移除</string>
-  <string name="pincode_stored">ownCloud 应用 PIN 已存储</string>
+  <string name="pincode_reenter_your_pincode">请重新输入 App 应用 PIN</string>
+  <string name="pincode_remove_your_pincode">移除您的 App 应用 PIN</string>
+  <string name="pincode_mismatch">两次 App 应用 PIN 不相同</string>
+  <string name="pincode_wrong">错误的 App 应用 PIN</string>
+  <string name="pincode_removed">App 应用 PIN 已移除</string>
+  <string name="pincode_stored">App 应用 PIN 已存储</string>
   <string name="media_err_io">媒体文件不能被读取</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 分钟</item>
@@ -145,19 +145,19 @@
   <string name="auth_nossl_plain_ok_message">应用未能建立到服务器的安全连接。但是非安全连接可用。您可以继续或取消。</string>
   <string name="auth_connection_established">连接已建立</string>
   <string name="auth_testing_connection">测试连接...</string>
-  <string name="auth_not_configured_title">ownCloud 配置格式不正确</string>
-  <string name="auth_not_configured_message">似乎您的 ownCloud 实例未正确配置。详情联系您的管理员。</string>
+  <string name="auth_not_configured_title">服务器 配置格式不正确</string>
+  <string name="auth_not_configured_message">似乎您的服务器 实例未正确配置。详情联系您的管理员。</string>
   <string name="auth_unknown_error_title">发生了未知错误！</string>
   <string name="auth_unknown_error_message">发生了未知错误。请联系作者并发送您的设备日志。</string>
   <string name="auth_unknown_host_title">未能找到主机</string>
   <string name="auth_unknown_host_message">不能找到输入的主机。请检查主机名和服务器是否可访问并重试。</string>
-  <string name="auth_incorrect_path_title">ownCloud 实例未找到</string>
-  <string name="auth_incorrect_path_message">应用未能找到指定路径的 ownCloud 实例。请检查您的路径并重试。</string>
+  <string name="auth_incorrect_path_title">服务器 实例未找到</string>
+  <string name="auth_incorrect_path_message">应用未能找到指定路径的服务器 实例。请检查您的路径并重试。</string>
   <string name="auth_timeout_title">服务器响应时间太长</string>
   <string name="auth_incorrect_address_title">网址格式不正确</string>
   <string name="auth_ssl_general_error_title">SSL 初始化失败</string>
   <string name="auth_ssl_unverified_server_title">未验证的 SSL 服务器身份</string>
-  <string name="auth_bad_oc_version_title">未知 ownCloud 服务器版本</string>
+  <string name="auth_bad_oc_version_title">未知服务器 服务器版本</string>
   <string name="auth_wrong_connection_title">不能建立连接</string>
   <string name="auth_secure_connection">安全连接已建立</string>
   <string name="auth_not_found">路径错误</string>
@@ -166,7 +166,7 @@
   <string name="crashlog_send_report">发送报告</string>
   <string name="crashlog_dont_send_report">不发送报告</string>
   <string name="extensions_avail_title">有扩展可用！</string>
-  <string name="extensions_avail_message">看起来您的 ownCloud 实例支持高级扩展。您想要查看 Android 可用的扩展吗？</string>
+  <string name="extensions_avail_message">看起来您的 服务器 实例支持高级扩展。您想要查看 Android 可用的扩展吗？</string>
   <string name="fd_keep_in_sync">保持文件最新</string>
   <string name="common_share">分享</string>
   <string name="common_rename">重命名</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1128cc2d..ef6816ec 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3,7 +3,7 @@
   <string name="main_password">密码：</string>
   <string name="main_login">用户名：</string>
   <string name="main_button_login">登陆</string>
-  <string name="main_welcome">欢迎来到你的 ownCloud</string>
+  <string name="main_welcome">欢迎来到你的</string>
   <string name="main_files">文件</string>
   <string name="main_music">音乐</string>
   <string name="main_contacts">联系人</string>
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">书签</string>
   <string name="main_settings">设置</string>
   <string name="main_tit_accsetup">设置账号</string>
-  <string name="main_wrn_accsetup">设备上无 ownCloud 账号，要使用此 App，需要先创建一个账号。</string>
+  <string name="main_wrn_accsetup">设备上无  账号，要使用此 App，需要先创建一个账号。</string>
   <string name="about_version">版本：%1</string>
   <string name="actionbar_sync">刷新帐户</string>
   <string name="actionbar_upload">上传</string>
@@ -28,14 +28,14 @@
   <string name="prefs_select_oc_account">选择账号</string>
   <string name="prefs_summary_select_oc_account">选择程序使用的账号</string>
   <string name="prefs_trackmydevice">设备跟踪</string>
-  <string name="prefs_trackmydevice_summary_off">用 ownCloud 跟踪您设备的位置</string>
-  <string name="prefs_trackmydevice_summary_on">您的 ownCloud 将跟踪设备的位置</string>
+  <string name="prefs_trackmydevice_summary_off">用 跟踪您设备的位置</string>
+  <string name="prefs_trackmydevice_summary_on">您的  将跟踪设备的位置</string>
   <string name="prefs_trackmydevice_interval">更新间隔</string>
   <string name="prefs_trackmydevice_interval_summary">每%1$s分钟更新一次</string>
   <string name="prefs_accounts">账号</string>
   <string name="prefs_manage_accounts">管理账号</string>
-  <string name="prefs_pincode">ownCloud App PIN</string>
-  <string name="prefs_pincode_summary">保护您的owncloud客户端</string>
+  <string name="prefs_pincode">App PIN</string>
+  <string name="prefs_pincode_summary">保护您的App客户端</string>
   <string name="prefs_instant_upload">开启即时上传</string>
   <string name="prefs_instant_upload_summary">即时上传相机拍摄的照片</string>
   <string name="prefs_log_title">开启日志</string>
@@ -53,7 +53,7 @@
   <string name="setup_hint_password">密码</string>
   <string name="setup_hint_address">网络地址</string>
   <string name="setup_hint_show_password">显示密码？</string>
-  <string name="setup_title">连接到你的 ownCloud</string>
+  <string name="setup_title">连接到你的 %1$s</string>
   <string name="setup_btn_connect">连接</string>
   <string name="uploader_btn_upload_text">上传</string>
   <string name="uploader_top_message">选择上传目录：</string>
@@ -63,7 +63,7 @@
   <string name="uploader_wrn_no_account_quit_btn_text">退出</string>
   <string name="uploader_wrn_no_content_title">没有上传的内容</string>
   <string name="uploader_wrn_no_content_text">没有接收到内容，无可上传。</string>
-  <string name="uploader_error_forbidden_content">ownCloud未被允许访问共享内容。</string>
+  <string name="uploader_error_forbidden_content">%1$s未被允许访问共享内容。</string>
   <string name="uploader_info_uploading">上传</string>
   <string name="uploader_btn_create_dir_text">创建上传文件夹</string>
   <string name="file_list_empty">文件夹为空\n可以使用上传按钮来增加文件</string>
@@ -82,7 +82,7 @@
   <string name="common_cancel_upload">取消上传</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">保存并退出</string>
-  <string name="common_exit">离开ownCloud。</string>
+  <string name="common_exit">离开%1$s。</string>
   <string name="common_error">错误</string>
   <string name="common_loading">加载中...</string>
   <string name="common_error_unknown">未知错误</string>
@@ -126,17 +126,17 @@
   <string name="foreign_files_remote_text">远程:%1$s</string>
   <string name="upload_query_move_foreign_files">没有足够的空间来将选定的文件复制到%1$s文件夹. 是否使用使用移动来代替复制?</string>
   <string name="use_ssl">使用安全链接</string>
-  <string name="location_no_provider">ownCloud不能跟踪你的设备。请检查你的位置设置。</string>
+  <string name="location_no_provider">%1$s 不能跟踪你的设备。请检查你的位置设置。</string>
   <string name="pincode_enter_pin_code">请输入您的App PIN码</string>
   <string name="pincode_enter_new_pin_code">请输入新的App PIN码</string>
-  <string name="pincode_configure_your_pin">输入ownCloud App PIN码</string>
+  <string name="pincode_configure_your_pin">输入 App PIN码</string>
   <string name="pincode_configure_your_pin_explanation">每次应用启动时都会请求PIN码</string>
-  <string name="pincode_reenter_your_pincode">再次输入ownCloud App PIN码</string>
-  <string name="pincode_remove_your_pincode">移除ownCloud App PIN码</string>
-  <string name="pincode_mismatch">两次ownCloud App PIN码不同</string>
-  <string name="pincode_wrong">ownCloud App PIN码不正确</string>
-  <string name="pincode_removed">ownCloud App PIN码已移除</string>
-  <string name="pincode_stored">ownCloud App PIN码已保存。</string>
+  <string name="pincode_reenter_your_pincode">再次输入 App PIN码</string>
+  <string name="pincode_remove_your_pincode">移除 App PIN码</string>
+  <string name="pincode_mismatch">两次 App PIN码不同</string>
+  <string name="pincode_wrong">App PIN码不正确</string>
+  <string name="pincode_removed">App PIN码已移除</string>
+  <string name="pincode_stored">App PIN码已保存。</string>
   <string name="media_notif_ticker">%1$s 音乐播放器</string>
   <string name="media_state_playing">%1$s (播放中)</string>
   <string name="media_state_loading">%1$s (载入中)</string>
@@ -176,19 +176,19 @@
   <string name="auth_nossl_plain_ok_message">应用无法建立安全链接到服务器，但是未加密连接可用，你可以继续或取消。</string>
   <string name="auth_connection_established">连接已建立。</string>
   <string name="auth_testing_connection">测试连接……</string>
-  <string name="auth_not_configured_title">ownCloud配置不正确。</string>
-  <string name="auth_not_configured_message">看起来owncloud实例配置不正确，请联系您的管理员获取更多信息。</string>
+  <string name="auth_not_configured_title">服务器配置不正确。</string>
+  <string name="auth_not_configured_message">看起来服务器实例配置不正确，请联系您的管理员获取更多信息。</string>
   <string name="auth_unknown_error_title">发生未知错误！</string>
   <string name="auth_unknown_error_message">发生未知错误，请联系作者并包括您设备上的日志。</string>
   <string name="auth_unknown_host_title">无法找到服务器</string>
   <string name="auth_unknown_host_message">无法找到输入的服务器，请检查主机名以及服务器可用性后重试</string>
-  <string name="auth_incorrect_path_title">未发现ownCloud实例</string>
-  <string name="auth_incorrect_path_message">应用未在指定路径发现ownCloud实例，请检查路径后重试。</string>
+  <string name="auth_incorrect_path_title">未发现服务器实例</string>
+  <string name="auth_incorrect_path_message">应用未在指定路径发现服务器实例，请检查路径后重试。</string>
   <string name="auth_timeout_title">看起来服务器不太给力</string>
   <string name="auth_incorrect_address_title">网址不正确</string>
   <string name="auth_ssl_general_error_title">SSL初始化失败</string>
   <string name="auth_ssl_unverified_server_title">未经证实的SSL服务器ID</string>
-  <string name="auth_bad_oc_version_title">不可辨识的owncloud服务器版本</string>
+  <string name="auth_bad_oc_version_title">不可辨识的服务器服务器版本</string>
   <string name="auth_wrong_connection_title">无法建立连接</string>
   <string name="auth_secure_connection">加密连接已建立</string>
   <string name="auth_unauthorized">用户名或密码错误！</string>
@@ -199,7 +199,7 @@
   <string name="crashlog_send_report">发送报告</string>
   <string name="crashlog_dont_send_report">不发送报告</string>
   <string name="extensions_avail_title">有效扩展！</string>
-  <string name="extensions_avail_message">你的 ownCloud 支持高级扩展，要查看 Android 支持的扩展吗？</string>
+  <string name="extensions_avail_message">你的av 支持高级扩展，要查看 Android 支持的扩展吗？</string>
   <string name="fd_keep_in_sync">保证文件更新</string>
   <string name="common_share">共享</string>
   <string name="common_rename">重命名</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 86c9e22e..c6113e1f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -11,7 +11,7 @@
   <string name="main_bookmarks">書籤</string>
   <string name="main_settings">設定</string>
   <string name="main_tit_accsetup">設定帳號</string>
-  <string name="main_wrn_accsetup">您尚未在裝置上設定您的 ownCloud 帳號，您必需建立一組帳號才能繼續使用。</string>
+  <string name="main_wrn_accsetup">您尚未在裝置上設定您的  帳號，您必需建立一組帳號才能繼續使用。</string>
   <string name="about_android">%1$s Android 應用程式</string>
   <string name="about_version">版本 %1$s</string>
   <string name="actionbar_sync">更新檔案列表</string>
@@ -36,7 +36,7 @@
   <string name="prefs_accounts">帳號</string>
   <string name="prefs_manage_accounts">管理帳號</string>
   <string name="prefs_pincode">App 密碼</string>
-  <string name="prefs_pincode_summary">保護您的ownCloud用戶端</string>
+  <string name="prefs_pincode_summary">保護您的 App 用戶端</string>
   <string name="prefs_instant_upload">啟用即時上傳</string>
   <string name="prefs_instant_upload_summary">即時上傳照相機拍攝的圖片</string>
   <string name="prefs_log_title">啟用記錄</string>
@@ -62,7 +62,7 @@
   <string name="uploader_btn_upload_text">上傳</string>
   <string name="uploader_top_message">選取上傳目錄:</string>
   <string name="uploader_wrn_no_account_title">找不到帳號</string>
-  <string name="uploader_wrn_no_account_text">在您的裝置上找不到ownCloud的帳號. 請先設定一組帳號.</string>
+  <string name="uploader_wrn_no_account_text">在您的裝置上找不到 %1$s 的帳號. 請先設定一組帳號.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
   <string name="uploader_wrn_no_account_quit_btn_text">離開</string>
   <string name="uploader_wrn_no_content_title">沒有上載的內容</string>
@@ -87,7 +87,7 @@
   <string name="common_cancel_upload">取消上傳</string>
   <string name="common_cancel">取消</string>
   <string name="common_save_exit">儲存並離開</string>
-  <string name="common_exit">離開ownCloud</string>
+  <string name="common_exit">離開%1$s</string>
   <string name="common_error">錯誤</string>
   <string name="common_loading">載入 …</string>
   <string name="common_error_unknown">未知的錯誤</string>
@@ -193,7 +193,7 @@
   <string name="auth_incorrect_address_title">URL 不正確</string>
   <string name="auth_ssl_general_error_title">SSL 初始化失敗</string>
   <string name="auth_ssl_unverified_server_title">未經驗證的 SSL 伺服器身份</string>
-  <string name="auth_bad_oc_version_title">無法辨識的ownCloud伺服器版本</string>
+  <string name="auth_bad_oc_version_title">無法辨識的伺服器版本</string>
   <string name="auth_wrong_connection_title">無法建立連線</string>
   <string name="auth_secure_connection">安全連線已建立</string>
   <string name="auth_unauthorized">錯誤的使用者或密碼</string>
diff --git a/res/values/setup.xml b/res/values/setup.xml
index 3aaf6c72..d65bff5d 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- App name -->
+    <!-- App name  and other strings-->
     <string name="app_name">ownCloud</string>
+    <string name="account_type">owncloud</string>
+    <string name="authority">org.owncloud</string>
+    <string name ="db_file">owncloud.db</string>
+    <string name ="db_name">ownCloud</string>
+    <string name ="data_folder"></string>
+    <string name ="log_name">Owncloud_</string>
     
     <!-- Server URL -->
     <string name="server_url"></string>
diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml
index 26704234..eb250052 100644
--- a/res/xml/authenticator.xml
+++ b/res/xml/authenticator.xml
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:accountType="owncloud"
+                       android:accountType="@string/account_type"
                        android:icon="@drawable/icon"
                        android:label="@string/app_name"
                        android:smallIcon="@drawable/icon">  
diff --git a/res/xml/syncadapter_files.xml b/res/xml/syncadapter_files.xml
index 03fedbf8..25b018c2 100644
--- a/res/xml/syncadapter_files.xml
+++ b/res/xml/syncadapter_files.xml
@@ -22,7 +22,7 @@
 <!-- for the SyncAdapter. -->
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="org.owncloud"
-    android:accountType="owncloud"
+    android:contentAuthority="@string/authority"
+    android:accountType="@string/account_type"
     android:supportsUploading="true"
 />
diff --git a/src/com/owncloud/android/DisplayUtils.java b/src/com/owncloud/android/DisplayUtils.java
index d2939c87..1ee898b3 100644
--- a/src/com/owncloud/android/DisplayUtils.java
+++ b/src/com/owncloud/android/DisplayUtils.java
@@ -32,7 +32,7 @@ import java.util.Set;
  */
 public class DisplayUtils {
     
-    private static String TAG = DisplayUtils.class.getSimpleName(); 
+    //private static String TAG = DisplayUtils.class.getSimpleName(); 
     
     private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
 
diff --git a/src/com/owncloud/android/Log_OC.java b/src/com/owncloud/android/Log_OC.java
index 1e2937cb..5a1be298 100644
--- a/src/com/owncloud/android/Log_OC.java
+++ b/src/com/owncloud/android/Log_OC.java
@@ -29,40 +29,40 @@ public class Log_OC {
 
     public static void d(String TAG, String message){
         Log.d(TAG, message);
-        appendLog(TAG+" : "+message);
+        appendLog(TAG + " : " + message);
     }
     public static void d(String TAG, String message, Exception e) {
         Log.d(TAG, message, e);
-        appendLog(TAG+" : "+ message+" Exception : "+e.getStackTrace());
+        appendLog(TAG + " : " + message + " Exception : "+ e.getStackTrace());
     }
     public static void e(String TAG, String message){
         Log.e(TAG, message);
-        appendLog(TAG+" : "+message);
+        appendLog(TAG + " : " + message);
     }
     
     public static void e(String TAG, String message, Throwable e) {
         Log.e(TAG, message, e);
-        appendLog(TAG+" : "+ message+" Exception : "+e.getStackTrace());
+        appendLog(TAG+" : " + message +" Exception : " + e.getStackTrace());
     }
     
     public static void v(String TAG, String message){
         Log.v(TAG, message);
-        appendLog(TAG+" : "+message);
+        appendLog(TAG+" : "+ message);
     }
     
     public static void w(String TAG, String message) {
         Log.w(TAG,message); 
-        appendLog(TAG+" : "+message);
+        appendLog(TAG+" : "+ message);
     }
     
     public static void wtf(String TAG, String message) {
         Log.wtf(TAG,message); 
-        appendLog(TAG+" : "+message);
+        appendLog(TAG+" : "+ message);
     }
     
     public static void startLogging(String logPath) {
         folder = new File(logPath);
-        logFile = new File(folder+File.separator+"log.txt");
+        logFile = new File(folder + File.separator + "log.txt");
         
         if (!folder.exists()) {
             folder.mkdirs();
@@ -81,10 +81,10 @@ public class Log_OC {
     }
     
     public static void stopLogging() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss",Locale.getDefault());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault());
         String currentDateandTime = sdf.format(new Date());
         if (logFile != null) {
-            logFile.renameTo(new File(folder+File.separator+"Owncloud_"+currentDateandTime+".log"));
+            logFile.renameTo(new File(folder + File.separator + MainApp.getLogName() + currentDateandTime+".log"));
           
             isEnabled = false;
             try {
diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
new file mode 100644
index 00000000..6cd88fe1
--- /dev/null
+++ b/src/com/owncloud/android/MainApp.java
@@ -0,0 +1,105 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android;
+
+import android.app.Application;
+import android.content.Context;
+/**
+ * Main Application of the project
+ * 
+ * Contains methods to build the "static" strings. These strings were before constants in different classes
+ * 
+ * @author masensio
+ */
+public class MainApp extends Application {
+
+    private static Context mContext;
+
+    public void onCreate(){
+        super.onCreate();
+        MainApp.mContext = getApplicationContext();
+    }
+
+    public static Context getAppContext() {
+        return MainApp.mContext;
+    }
+
+    // Methods to obtain Strings referring app_name 
+    //   From AccountAuthenticator 
+    //   public static final String ACCOUNT_TYPE = "owncloud";    
+    public static String getAccountType() {
+        return getAppContext().getResources().getString(R.string.account_type);
+    }
+    
+    //  From AccountAuthenticator 
+    //  public static final String AUTHORITY = "org.owncloud";
+    public static String getAuthority() {
+        return getAppContext().getResources().getString(R.string.authority);
+    }
+    
+    //  From AccountAuthenticator
+    //  public static final String AUTH_TOKEN_TYPE = "org.owncloud";
+    public static String getAuthTokenType() {
+        return getAppContext().getResources().getString(R.string.authority);
+    }
+    
+    //  From AccountAuthenticator
+    //  public static final String AUTH_TOKEN_TYPE_PASSWORD = "owncloud.password";
+    public static String getAuthTokenTypePass() {
+        return getAppContext().getResources().getString(R.string.account_type) + ".password";
+    }
+    
+    //  From AccountAuthenticator
+    //  public static final String AUTH_TOKEN_TYPE_ACCESS_TOKEN = "owncloud.oauth2.access_token";
+    public static String getAuthTokenTypeAccessToken() {
+        return getAppContext().getResources().getString(R.string.account_type) + ".oauth2.access_token";
+    }
+    
+    //  From AccountAuthenticator
+    //  public static final String AUTH_TOKEN_TYPE_REFRESH_TOKEN = "owncloud.oauth2.refresh_token";
+    public static String getAuthTokenTypeRefreshToken() {
+        return getAppContext().getResources().getString(R.string.account_type) + ".oauth2.refresh_token";
+    }
+    
+    //  From AccountAuthenticator
+    //  public static final String AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE = "owncloud.saml.web_sso.session_cookie";
+    public static String getAuthTokenTypeSamlSessionCookie() {
+        return getAppContext().getResources().getString(R.string.account_type) +  ".saml.web_sso.session_cookie";
+    }
+    
+    //  From ProviderMeta 
+    //  public static final String DB_FILE = "owncloud.db";
+    public static String getDBFile() {
+        return getAppContext().getResources().getString(R.string.db_file);
+    }
+    
+    //  From ProviderMeta
+    //  private final String mDatabaseName = "ownCloud";
+    public static String getDBName() {
+        return getAppContext().getResources().getString(R.string.db_name);
+    }
+     
+    //  data_folder
+    public static String getDataFolder() {
+        return getAppContext().getResources().getString(R.string.data_folder);
+    }
+    
+    // log_name
+    public static String getLogName() {
+        return getAppContext().getResources().getString(R.string.log_name);
+    }
+}
diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 0ff09079..7dc64909 100644
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -95,7 +95,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         mParents.add("");
         if (prepareStreamsToUpload()) {
             mAccountManager = (AccountManager) getSystemService(Context.ACCOUNT_SERVICE);
-            Account[] accounts = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+            Account[] accounts = mAccountManager.getAccountsByType(MainApp.getAccountType());
             if (accounts.length == 0) {
                 Log_OC.i(TAG, "No ownCloud account is available");
                 showDialog(DIALOG_NO_ACCOUNT);
@@ -137,7 +137,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                         // Settings.ADD_ACCOUNT_SETTINGS
                         // and Settings.EXTRA_AUTHORITIES
                         Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
-                        intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTHORITY });
+                        intent.putExtra("authorities", new String[] { MainApp.getAuthTokenType() });
                         startActivityForResult(intent, REQUEST_CODE_SETUP_ACCOUNT);
                     } else {
                         // since in API7 there is no direct call for
@@ -158,15 +158,15 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             });
             return builder.create();
         case DIALOG_MULTIPLE_ACCOUNT:
-            CharSequence ac[] = new CharSequence[mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];
+            CharSequence ac[] = new CharSequence[mAccountManager.getAccountsByType(MainApp.getAccountType()).length];
             for (int i = 0; i < ac.length; ++i) {
-                ac[i] = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[i].name;
+                ac[i] = mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name;
             }
             builder.setTitle(R.string.common_choose_account);
             builder.setItems(ac, new OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    mAccount = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[which];
+                    mAccount = mAccountManager.getAccountsByType(MainApp.getAccountType())[which];
                     mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
                     populateDirectoryList();
                 }
@@ -271,7 +271,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             if (resultCode == RESULT_CANCELED) {
                 finish();
             }
-            Account[] accounts = mAccountManager.getAccountsByType(AccountAuthenticator.AUTH_TOKEN_TYPE);
+            Account[] accounts = mAccountManager.getAccountsByType(MainApp.getAuthTokenType());
             if (accounts.length == 0) {
                 showDialog(DIALOG_NO_ACCOUNT);
             } else {
diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java
index 85e9a235..5d798917 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticator.java
+++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 
 /**
  *  Authenticator for ownCloud accounts.
@@ -40,14 +41,15 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
      * Is used by android system to assign accounts to authenticators. Should be
      * used by application and all extensions.
      */
-    public static final String ACCOUNT_TYPE = "owncloud";
-    public static final String AUTHORITY = "org.owncloud";
-    public static final String AUTH_TOKEN_TYPE = "org.owncloud";
-    public static final String AUTH_TOKEN_TYPE_PASSWORD = "owncloud.password";
-    public static final String AUTH_TOKEN_TYPE_ACCESS_TOKEN = "owncloud.oauth2.access_token";
-    public static final String AUTH_TOKEN_TYPE_REFRESH_TOKEN = "owncloud.oauth2.refresh_token";
-    public static final String AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE = "owncloud.saml.web_sso.session_cookie";
-
+    /* These constants are now in MainApp
+         public static final String ACCOUNT_TYPE = "owncloud";
+         public static final String AUTHORITY = "org.owncloud";
+         public static final String AUTH_TOKEN_TYPE = "org.owncloud";
+         public static final String AUTH_TOKEN_TYPE_PASSWORD = "owncloud.password";
+         public static final String AUTH_TOKEN_TYPE_ACCESS_TOKEN = "owncloud.oauth2.access_token";
+         public static final String AUTH_TOKEN_TYPE_REFRESH_TOKEN = "owncloud.oauth2.refresh_token";
+         public static final String AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE = "owncloud.saml.web_sso.session_cookie";
+    */
     public static final String KEY_AUTH_TOKEN_TYPE = "authTokenType";
     public static final String KEY_REQUIRED_FEATURES = "requiredFeatures";
     public static final String KEY_LOGIN_OPTIONS = "loginOptions";
@@ -176,7 +178,7 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
         /// check if required token is stored
         final AccountManager am = AccountManager.get(mContext);
         String accessToken;
-        if (authTokenType.equals(AUTH_TOKEN_TYPE_PASSWORD)) {
+        if (authTokenType.equals(MainApp.getAuthTokenTypePass())) {
             accessToken = am.getPassword(account);
         } else {
             accessToken = am.peekAuthToken(account, authTokenType);
@@ -184,7 +186,7 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
         if (accessToken != null) {
             final Bundle result = new Bundle();
             result.putString(AccountManager.KEY_ACCOUNT_NAME, account.name);
-            result.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
+            result.putString(AccountManager.KEY_ACCOUNT_TYPE, MainApp.getAccountType());
             result.putString(AccountManager.KEY_AUTHTOKEN, accessToken);
             return result;
         }
@@ -249,18 +251,18 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
 
     private void validateAccountType(String type)
             throws UnsupportedAccountTypeException {
-        if (!type.equals(ACCOUNT_TYPE)) {
+        if (!type.equals(MainApp.getAccountType())) {
             throw new UnsupportedAccountTypeException();
         }
     }
 
     private void validateAuthTokenType(String authTokenType)
             throws UnsupportedAuthTokenTypeException {
-        if (!authTokenType.equals(AUTH_TOKEN_TYPE) &&
-            !authTokenType.equals(AUTH_TOKEN_TYPE_PASSWORD) &&
-            !authTokenType.equals(AUTH_TOKEN_TYPE_ACCESS_TOKEN) &&
-            !authTokenType.equals(AUTH_TOKEN_TYPE_REFRESH_TOKEN) &&
-            !authTokenType.equals(AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE)) {
+        if (!authTokenType.equals(MainApp.getAuthTokenType()) &&
+            !authTokenType.equals(MainApp.getAuthTokenTypePass()) &&
+            !authTokenType.equals(MainApp.getAuthTokenTypeAccessToken()) &&
+            !authTokenType.equals(MainApp.getAuthTokenTypeRefreshToken()) &&
+            !authTokenType.equals(MainApp.getAuthTokenTypeSamlSessionCookie())) {
             throw new UnsupportedAuthTokenTypeException();
         }
     }
diff --git a/src/com/owncloud/android/authentication/AccountAuthenticatorService.java b/src/com/owncloud/android/authentication/AccountAuthenticatorService.java
index c6a77d55..4c91f6e4 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticatorService.java
+++ b/src/com/owncloud/android/authentication/AccountAuthenticatorService.java
@@ -25,7 +25,7 @@ import android.os.IBinder;
 public class AccountAuthenticatorService extends Service {
 
     private AccountAuthenticator mAuthenticator;
-    static final public String ACCOUNT_TYPE = "owncloud";
+    //static final public String ACCOUNT_TYPE = "owncloud";
 
     @Override
     public void onCreate() {
diff --git a/src/com/owncloud/android/authentication/AccountUtils.java b/src/com/owncloud/android/authentication/AccountUtils.java
index 47269bc3..3b79c39b 100644
--- a/src/com/owncloud/android/authentication/AccountUtils.java
+++ b/src/com/owncloud/android/authentication/AccountUtils.java
@@ -18,6 +18,7 @@
 
 package com.owncloud.android.authentication;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 import android.accounts.Account;
@@ -48,7 +49,7 @@ public class AccountUtils {
      */
     public static Account getCurrentOwnCloudAccount(Context context) {
         Account[] ocAccounts = AccountManager.get(context).getAccountsByType(
-                AccountAuthenticator.ACCOUNT_TYPE);
+                MainApp.getAccountType());
         Account defaultAccount = null;
 
         SharedPreferences appPreferences = PreferenceManager
@@ -77,7 +78,7 @@ public class AccountUtils {
     
     public static boolean exists(Account account, Context context) {
         Account[] ocAccounts = AccountManager.get(context).getAccountsByType(
-                AccountAuthenticator.ACCOUNT_TYPE);
+                MainApp.getAccountType());
 
         if (account != null && account.name != null) {
             for (Account ac : ocAccounts) {
@@ -98,7 +99,7 @@ public class AccountUtils {
     public static boolean accountsAreSetup(Context context) {
         AccountManager accMan = AccountManager.get(context);
         Account[] accounts = accMan
-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+                .getAccountsByType(MainApp.getAccountType());
         return accounts.length > 0;
     }
     
@@ -107,7 +108,7 @@ public class AccountUtils {
         boolean result = false;
         if (accountName != null) {
             Account[] ocAccounts = AccountManager.get(context).getAccountsByType(
-                    AccountAuthenticator.ACCOUNT_TYPE);
+                    MainApp.getAccountType());
             boolean found = false;
             for (Account account : ocAccounts) {
                 found = (account.name.equals(accountName));
@@ -159,10 +160,10 @@ public class AccountUtils {
      */
     public static String getWebdavPath(OwnCloudVersion version, String authTokenType) {
         if (version != null) {
-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(authTokenType)) {
+            if (MainApp.getAuthTokenTypeAccessToken().equals(authTokenType)) {
                 return ODAV_PATH;
             }
-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(authTokenType)) {
+            if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(authTokenType)) {
                 return SAML_SSO_PATH;
             }
             if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e0d48a33..0b722c8c 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -52,6 +52,7 @@ import android.widget.TextView.OnEditorActionListener;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
 import com.owncloud.android.network.OwnCloudClientUtils;
@@ -272,7 +273,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);
             mAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);
             if (mAuthTokenType == null) {
-                mAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;
+                mAuthTokenType =  MainApp.getAuthTokenTypePass();
                 
             }
 
@@ -310,7 +311,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes
 
-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) || 
+        if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) || 
                 !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {
             mOAuth2Check.setVisibility(View.GONE);
         }
@@ -362,7 +363,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             @Override
             public boolean onTouch(View view, MotionEvent event) {
                 if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                    if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) &&
+                    if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) &&
                             mHostUrlInput.hasFocus()) {
                         checkOcServer();
                     }
@@ -395,11 +396,11 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
                 samlWebSsoRequired = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));            
             }
             if (oAuthRequired) {
-                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;
+                mAuthTokenType = MainApp.getAuthTokenTypeAccessToken();
             } else if (samlWebSsoRequired) {
-                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE;
+                mAuthTokenType = MainApp.getAuthTokenTypeSamlSessionCookie();
             } else {
-                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;
+                mAuthTokenType = MainApp.getAuthTokenTypePass();
             }
         }
     
@@ -408,7 +409,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mUsernameInput.setText(userName);
         }
         
-        mOAuth2Check.setChecked(AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType));
+        mOAuth2Check.setChecked(MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType));
         
     }
 
@@ -481,10 +482,10 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     protected void onResume() {
         super.onResume();
         if (mAction == ACTION_UPDATE_TOKEN && mJustCreated && getIntent().getBooleanExtra(EXTRA_ENFORCED_UPDATE, false)) {
-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {
+            if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) {
                 //Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();
                 showAuthMessage(getString(R.string.auth_expired_oauth_token_toast));
-            } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {
+            } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {
                 //Toast.makeText(this, R.string.auth_expired_saml_sso_token_toast, Toast.LENGTH_LONG).show();
                 showAuthMessage(getString(R.string.auth_expired_saml_sso_token_toast));
             } else {
@@ -684,9 +685,9 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             return;
         }
 
-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {
+        if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) {
             startOauthorization();
-        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) { 
+        } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) { 
             startSamlBasedFederatedSingleSignOnAuthorization();
         } else {
             checkBasicAuthorization();
@@ -780,7 +781,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);
 
         } else if (operation instanceof ExistenceCheckOperation)  {
-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {
+            if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {
                 onSamlBasedFederatedSingleSignOnAuthorizationStart(operation, result);
                 
             } else {
@@ -1165,12 +1166,12 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);
         response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);
         
-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) { 
+        if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) { 
             response.putString(AccountManager.KEY_AUTHTOKEN, mAuthToken);
             // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention
             mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);
             
-        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {
+        } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {
             String username = getUserNameForSamlSso();
             if (!mUsernameInput.getText().toString().equals(username)) {
                 // fail - not a new account, but an existing one; disallow
@@ -1205,8 +1206,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      */
     private boolean createAccount() {
         /// create and save new ownCloud account
-        boolean isOAuth = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType);
-        boolean isSaml =  AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType);
+        boolean isOAuth = MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType);
+        boolean isSaml =  MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType);
 
         Uri uri = Uri.parse(mHostBaseUrl);
         String username = mUsernameInput.getText().toString().trim();
@@ -1220,7 +1221,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (uri.getPort() >= 0) {
             accountName += ":" + uri.getPort();
         }
-        mAccount = new Account(accountName, AccountAuthenticator.ACCOUNT_TYPE);
+        mAccount = new Account(accountName, MainApp.getAccountType());
         if (AccountUtils.exists(mAccount, getApplicationContext())) {
             // fail - not a new account, but an existing one; disallow
             RemoteOperationResult result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_NEW); 
@@ -1249,10 +1250,10 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             /// prepare result to return to the Authenticator
             //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done
             final Intent intent = new Intent();       
-            intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);
+            intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    MainApp.getAccountType());
             intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);
             /*if (!isOAuth)
-                intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); */
+                intent.putExtra(AccountManager.KEY_AUTHTOKEN,   MainApp.getAccountType()); */
             intent.putExtra(AccountManager.KEY_USERDATA,        username);
             if (isOAuth || isSaml) {
                 mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);
@@ -1272,11 +1273,11 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             /// immediately request for the synchronization of the new account
             Bundle bundle = new Bundle();
             bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-            ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);
+            ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);
             syncAccount();
 //          Bundle bundle = new Bundle();
 //          bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-//          ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);
+//          ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);
             return true;
         }
     }
@@ -1483,9 +1484,9 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     public void onCheckClick(View view) {
         CheckBox oAuth2Check = (CheckBox)view;
         if (oAuth2Check.isChecked()) {
-            mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;
+            mAuthTokenType = MainApp.getAuthTokenTypeAccessToken();
         } else {
-            mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;
+            mAuthTokenType = MainApp.getAuthTokenTypePass();
         }
         adaptViewAccordingToAuthenticationMethod();
     }
@@ -1496,14 +1497,14 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * the current authorization method.
      */
     private void adaptViewAccordingToAuthenticationMethod () {
-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {
+        if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) {
             // OAuth 2 authorization
             mOAuthAuthEndpointText.setVisibility(View.VISIBLE);
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);
             mUsernameInput.setVisibility(View.GONE);
             mPasswordInput.setVisibility(View.GONE);
             
-        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {
+        } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {
             // SAML-based web Single Sign On
             mOAuthAuthEndpointText.setVisibility(View.GONE);
             mOAuthTokenEndpointText.setVisibility(View.GONE);
@@ -1549,7 +1550,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             }
             
         } else if (actionId == EditorInfo.IME_ACTION_NEXT && inputField != null && inputField.equals(mHostUrlInput)) {
-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {
+            if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {
                 checkOcServer();
             }
         }
@@ -1650,12 +1651,12 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         /// immediately request for the synchronization of the new account
         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-        ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);
+        ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);
     }
     
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) &&
+        if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) &&
                 mHostUrlInput.hasFocus() && event.getAction() == MotionEvent.ACTION_DOWN) {
             checkOcServer();
         }
diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 5f6321d8..a067f107 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -25,9 +25,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
-import com.owncloud.android.DisplayUtils;
 import com.owncloud.android.Log_OC;
-import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.utils.FileStorageUtils;
 
@@ -274,7 +273,7 @@ public class FileDataStorageManager implements DataStorageManager {
         ContentProviderResult[] results = null;
         try {
             if (getContentResolver() != null) {
-                results = getContentResolver().applyBatch(ProviderMeta.AUTHORITY_FILES, operations);
+                results = getContentResolver().applyBatch(MainApp.getAuthority(), operations);
 
             } else {
                 results = getContentProvider().applyBatch(operations);
@@ -594,7 +593,7 @@ public class FileDataStorageManager implements DataStorageManager {
             /// 3. apply updates in batch
             try {
                 if (getContentResolver() != null) {
-                    getContentResolver().applyBatch(ProviderMeta.AUTHORITY_FILES, operations);
+                    getContentResolver().applyBatch(MainApp.getAuthority(), operations);
 
                 } else {
                     getContentProvider().applyBatch(operations);
diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java
index 889d1dbf..8f535629 100644
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -18,6 +18,7 @@
 package com.owncloud.android.db;
 
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -34,7 +35,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 public class DbHandler {
     private SQLiteDatabase mDB;
     private OpenerHelper mHelper;
-    private final String mDatabaseName = "ownCloud";
+    private final String mDatabaseName; // = "ownCloud";
     private final int mDatabaseVersion = 3;
 
     private final String TABLE_INSTANT_UPLOAD = "instant_upload";
@@ -45,6 +46,7 @@ public class DbHandler {
     public DbHandler(Context context) {
         mHelper = new OpenerHelper(context);
         mDB = mHelper.getWritableDatabase();
+        mDatabaseName = MainApp.getDBName();
     }
 
     public void close() {
diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java
index b8058b89..a082a84e 100644
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/com/owncloud/android/db/ProviderMeta.java
@@ -17,6 +17,8 @@
  */
 package com.owncloud.android.db;
 
+import com.owncloud.android.MainApp;
+
 import android.net.Uri;
 import android.provider.BaseColumns;
 
@@ -28,8 +30,10 @@ import android.provider.BaseColumns;
  */
 public class ProviderMeta {
 
-    public static final String AUTHORITY_FILES = "org.owncloud";
-    public static final String DB_FILE = "owncloud.db";
+    /* These constants are now in MainApp
+        public static final String AUTHORITY_FILES = "org.owncloud";
+        public static final String DB_FILE = "owncloud.db";
+    */
     public static final String DB_NAME = "filelist";
     public static final int DB_VERSION = 4;
 
@@ -39,11 +43,11 @@ public class ProviderMeta {
     static public class ProviderTableMeta implements BaseColumns {
         public static final String DB_NAME = "filelist";
         public static final Uri CONTENT_URI = Uri.parse("content://"
-                + AUTHORITY_FILES + "/");
+                + MainApp.getAuthority() + "/");
         public static final Uri CONTENT_URI_FILE = Uri.parse("content://"
-                + AUTHORITY_FILES + "/file");
+                + MainApp.getAuthority() + "/file");
         public static final Uri CONTENT_URI_DIR = Uri.parse("content://"
-                + AUTHORITY_FILES + "/dir");
+                + MainApp.getAuthority() + "/dir");
 
         public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.owncloud.file";
         public static final String CONTENT_TYPE_ITEM = "vnd.android.cursor.item/vnd.owncloud.file";
diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index fa8662f3..2f753762 100644
--- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@ -20,7 +20,6 @@ package com.owncloud.android.files;
 
 import java.io.File;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.services.FileUploader;
@@ -38,6 +37,7 @@ import android.provider.MediaStore.Images.Media;
 import android.webkit.MimeTypeMap;
 
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.utils.FileStorageUtils;
 
 public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
@@ -52,6 +52,9 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         Log_OC.d(TAG, "Received: " + intent.getAction());
+        
+        FileUploader fileUploader = new FileUploader();
+        
         if (intent.getAction().equals(android.net.ConnectivityManager.CONNECTIVITY_ACTION)) {
             handleConnectivityAction(context, intent);
         }else if (intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) {
@@ -60,7 +63,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
         } else if (intent.getAction().equals(NEW_PHOTO_ACTION)) {
             handleNewPhotoAction(context, intent);
             Log_OC.d(TAG, "OFFICIAL processed: android.hardware.action.NEW_PICTURE");
-        } else if (intent.getAction().equals(FileUploader.UPLOAD_FINISH_MESSAGE)) {
+        } else if (intent.getAction().equals(fileUploader.getUploadFinishMessage())) {
             handleUploadFinished(context, intent);
         } else {
             Log_OC.e(TAG, "Incorrect intent sent: " + intent.getAction());
@@ -157,7 +160,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
                     String file_path = c.getString(c.getColumnIndex("path"));
                     File f = new File(file_path);
                     if (f.exists()) {
-                        Account account = new Account(account_name, AccountAuthenticator.ACCOUNT_TYPE);
+                        Account account = new Account(account_name, MainApp.getAccountType());
 
                         String mimeType = null;
                         try {
diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index e07a17b5..07c4257c 100644
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -28,7 +28,6 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -60,6 +59,7 @@ import android.os.Process;
 import android.widget.RemoteViews;
 
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 
@@ -68,8 +68,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
     public static final String EXTRA_ACCOUNT = "ACCOUNT";
     public static final String EXTRA_FILE = "FILE";
     
-    public static final String DOWNLOAD_ADDED_MESSAGE = "DOWNLOAD_ADDED";
-    public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";
+    private static final String DOWNLOAD_ADDED_MESSAGE = "DOWNLOAD_ADDED";
+    private static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";
     public static final String EXTRA_DOWNLOAD_RESULT = "RESULT";    
     public static final String EXTRA_FILE_PATH = "FILE_PATH";
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";
@@ -92,6 +92,14 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
     private int mLastPercent;
     
     
+    public String getDownloadAddedMessage() {
+        return getClass().getName().toString() + DOWNLOAD_ADDED_MESSAGE;
+    }
+    
+    public String getDownloadFinishMessage() {
+        return getClass().getName().toString() + DOWNLOAD_FINISH_MESSAGE;
+    }
+    
     /**
      * Builds a key for mPendingDownloads from the account and file to download
      * 
@@ -467,7 +475,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
             boolean needsToUpdateCredentials = (downloadResult.getCode() == ResultCode.UNAUTHORIZED ||
                                                 // (downloadResult.isTemporalRedirection() && downloadResult.isIdPRedirection()
                                                   (downloadResult.isIdPRedirection()
-                                                        && AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mDownloadClient.getAuthTokenType())));
+                                                        && MainApp.getAuthTokenTypeSamlSessionCookie().equals(mDownloadClient.getAuthTokenType())));
             if (needsToUpdateCredentials) {
                 // let the user update credentials with one click
                 Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class);
@@ -515,7 +523,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
      * @param downloadResult    Result of the download operation
      */
     private void sendBroadcastDownloadFinished(DownloadFileOperation download, RemoteOperationResult downloadResult) {
-        Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);
+        Intent end = new Intent(getDownloadFinishMessage());
         end.putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult.isSuccess());
         end.putExtra(ACCOUNT_NAME, download.getAccount().name);
         end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());
@@ -530,7 +538,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
      * @param download          Added download operation
      */
     private void sendBroadcastNewDownload(DownloadFileOperation download) {
-        Intent added = new Intent(DOWNLOAD_ADDED_MESSAGE);
+        Intent added = new Intent(getDownloadAddedMessage());
         added.putExtra(ACCOUNT_NAME, download.getAccount().name);
         added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());
         added.putExtra(EXTRA_FILE_PATH, download.getSavePath());
diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index fd1412c1..8a63a6ee 100644
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -56,6 +56,9 @@ public class FileObserverService extends Service {
     private static Map<String, OwnCloudFileObserver> mObserversMap;
     private static DownloadCompletedReceiverBis mDownloadReceiver;
     private IBinder mBinder = new LocalBinder();
+    
+    private String mDownloadAddedMessage;
+    private String mDownloadFinishMessage;
 
     public class LocalBinder extends Binder {
         FileObserverService getService() {
@@ -67,9 +70,14 @@ public class FileObserverService extends Service {
     public void onCreate() {
         super.onCreate();
         mDownloadReceiver = new DownloadCompletedReceiverBis();
+        
+        FileDownloader downloader = new FileDownloader();
+        mDownloadAddedMessage = downloader.getDownloadAddedMessage();
+        mDownloadFinishMessage= downloader.getDownloadFinishMessage();
+        
         IntentFilter filter = new IntentFilter();
-        filter.addAction(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
-        filter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);        
+        filter.addAction(mDownloadAddedMessage);
+        filter.addAction(mDownloadFinishMessage);        
         registerReceiver(mDownloadReceiver, filter);
         
         mObserversMap = new HashMap<String, OwnCloudFileObserver>();
@@ -259,12 +267,12 @@ public class FileObserverService extends Service {
             String downloadPath = intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH);
             OwnCloudFileObserver observer = mObserversMap.get(downloadPath);
             if (observer != null) {
-                if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE) &&
+                if (intent.getAction().equals(mDownloadFinishMessage) &&
                         new File(downloadPath).exists()) {  // the download could be successful. not; in both cases, the file could be down, due to a former download or upload   
                     observer.startWatching();
                     Log_OC.d(TAG, "Watching again " + downloadPath);
                 
-                } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
+                } else if (intent.getAction().equals(mDownloadAddedMessage)) {
                     observer.stopWatching();
                     Log_OC.d(TAG, "Disabling observance of " + downloadPath);
                 } 
diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index c606b687..55aefbd3 100644
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -70,6 +70,7 @@ import android.webkit.MimeTypeMap;
 import android.widget.RemoteViews;
 
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.ui.activity.FailedUploadActivity;
@@ -83,7 +84,7 @@ import eu.alefzero.webdav.WebdavClient;
 
 public class FileUploader extends Service implements OnDatatransferProgressListener {
 
-    public static final String UPLOAD_FINISH_MESSAGE = "UPLOAD_FINISH";
+    private static final String UPLOAD_FINISH_MESSAGE = "UPLOAD_FINISH";
     public static final String EXTRA_UPLOAD_RESULT = "RESULT";
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";
     public static final String EXTRA_OLD_REMOTE_PATH = "OLD_REMOTE_PATH";
@@ -126,6 +127,11 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
     private int mLastPercent;
     private RemoteViews mDefaultNotificationContentView;
 
+    
+    public String getUploadFinishMessage() {
+        return getClass().getName().toString() + UPLOAD_FINISH_MESSAGE;
+    }
+    
     /**
      * Builds a key for mPendingUploads from the account and file to upload
      * 
@@ -814,7 +820,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
             boolean needsToUpdateCredentials = (uploadResult.getCode() == ResultCode.UNAUTHORIZED ||
                     //(uploadResult.isTemporalRedirection() && uploadResult.isIdPRedirection() && 
                     (uploadResult.isIdPRedirection() &&
-                            AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mUploadClient.getAuthTokenType())));
+                            MainApp.getAuthTokenTypeSamlSessionCookie().equals(mUploadClient.getAuthTokenType())));
             if (needsToUpdateCredentials) {
                 // let the user update credentials with one click
                 Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class);
@@ -897,7 +903,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
      * @param uploadResult Result of the upload operation
      */
     private void sendFinalBroadcast(UploadFileOperation upload, RemoteOperationResult uploadResult) {
-        Intent end = new Intent(UPLOAD_FINISH_MESSAGE);
+        Intent end = new Intent(getUploadFinishMessage());
         end.putExtra(EXTRA_REMOTE_PATH, upload.getRemotePath()); // real remote
                                                                  // path, after
                                                                  // possible
diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java
index 75aed4ac..43104d08 100644
--- a/src/com/owncloud/android/network/OwnCloudClientUtils.java
+++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java
@@ -32,7 +32,6 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
@@ -41,6 +40,7 @@ import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 
 import eu.alefzero.webdav.WebdavClient;
 
@@ -96,17 +96,17 @@ public class OwnCloudClientUtils {
         boolean isSamlSso = am.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_SAML_WEB_SSO) != null;
         WebdavClient client = createOwnCloudClient(uri, appContext, !isSamlSso);
         if (isOauth2) {    
-            String accessToken = am.blockingGetAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, false);
+            String accessToken = am.blockingGetAuthToken(account, MainApp.getAuthTokenTypeAccessToken(), false);
             client.setBearerCredentials(accessToken);   // TODO not assume that the access token is a bearer token
         
         } else if (isSamlSso) {    // TODO avoid a call to getUserData here
-            String accessToken = am.blockingGetAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE, false);
+            String accessToken = am.blockingGetAuthToken(account, MainApp.getAuthTokenTypeSamlSessionCookie(), false);
             client.setSsoSessionCookie(accessToken);
             
         } else {
             String username = account.name.substring(0, account.name.lastIndexOf('@'));
             //String password = am.getPassword(account);
-            String password = am.blockingGetAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD, false);
+            String password = am.blockingGetAuthToken(account, MainApp.getAuthTokenTypePass(), false);
             client.setBasicCredentials(username, password);
         }
         
@@ -122,14 +122,14 @@ public class OwnCloudClientUtils {
         WebdavClient client = createOwnCloudClient(uri, appContext, !isSamlSso);
         
         if (isOauth2) {    // TODO avoid a call to getUserData here
-            AccountManagerFuture<Bundle> future =  am.getAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, null, currentActivity, null, null);
+            AccountManagerFuture<Bundle> future =  am.getAuthToken(account, MainApp.getAuthTokenTypeAccessToken(), null, currentActivity, null, null);
             Bundle result = future.getResult();
             String accessToken = result.getString(AccountManager.KEY_AUTHTOKEN);
             if (accessToken == null) throw new AuthenticatorException("WTF!");
             client.setBearerCredentials(accessToken);   // TODO not assume that the access token is a bearer token
 
         } else if (isSamlSso) {    // TODO avoid a call to getUserData here
-            AccountManagerFuture<Bundle> future =  am.getAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE, null, currentActivity, null, null);
+            AccountManagerFuture<Bundle> future =  am.getAuthToken(account, MainApp.getAuthTokenTypeSamlSessionCookie(), null, currentActivity, null, null);
             Bundle result = future.getResult();
             String accessToken = result.getString(AccountManager.KEY_AUTHTOKEN);
             if (accessToken == null) throw new AuthenticatorException("WTF!");
@@ -138,8 +138,8 @@ public class OwnCloudClientUtils {
         } else {
             String username = account.name.substring(0, account.name.lastIndexOf('@'));
             //String password = am.getPassword(account);
-            //String password = am.blockingGetAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD, false);
-            AccountManagerFuture<Bundle> future =  am.getAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD, null, currentActivity, null, null);
+            //String password = am.blockingGetAuthToken(account, MainApp.getAuthTokenTypePass(), false);
+            AccountManagerFuture<Bundle> future =  am.getAuthToken(account, MainApp.getAuthTokenTypePass(), null, currentActivity, null, null);
             Bundle result = future.getResult();
             String password = result.getString(AccountManager.KEY_AUTHTOKEN);
             client.setBasicCredentials(username, password);
diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java
index 4d7bceef..191bde0a 100644
--- a/src/com/owncloud/android/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/operations/RemoteOperation.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import org.apache.commons.httpclient.Credentials;
 
 import com.owncloud.android.Log_OC;
-import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.network.BearerCredentials;
 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
@@ -254,9 +254,9 @@ public abstract class RemoteOperation implements Runnable {
                     boolean bearerAuthorization = (cred != null && cred instanceof BearerCredentials);
                     boolean samlBasedSsoAuthorization = (cred == null && ssoSessionCookie != null);
                     if (bearerAuthorization) {
-                        am.invalidateAuthToken(AccountAuthenticator.ACCOUNT_TYPE, ((BearerCredentials)cred).getAccessToken());
+                        am.invalidateAuthToken(MainApp.getAccountType(), ((BearerCredentials)cred).getAccessToken());
                     } else if (samlBasedSsoAuthorization ) {
-                        am.invalidateAuthToken(AccountAuthenticator.ACCOUNT_TYPE, ssoSessionCookie);
+                        am.invalidateAuthToken(MainApp.getAccountType(), ssoSessionCookie);
                     } else {
                         am.clearPassword(mAccount);
                     }
diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 67c7389e..0236a139 100644
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
-import org.apache.commons.httpclient.Header;
 import org.apache.http.HttpStatus;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index bd2b8072..b933be4d 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -21,6 +21,7 @@ package com.owncloud.android.providers;
 import java.util.HashMap;
 
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
 import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 
@@ -83,15 +84,17 @@ public class FileContentProvider extends ContentProvider {
     private static final int SINGLE_FILE = 1;
     private static final int DIRECTORY = 2;
     private static final int ROOT_DIRECTORY = 3;
-    private static final UriMatcher mUriMatcher;
-    static {
-        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, null, ROOT_DIRECTORY);
-        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/", SINGLE_FILE);
-        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/#", SINGLE_FILE);
-        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "dir/#", DIRECTORY);
-    }
+    
+    private UriMatcher mUriMatcher;
+//    static {
+//        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+//        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, null, ROOT_DIRECTORY);
+//        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/", SINGLE_FILE);
+//        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/#", SINGLE_FILE);
+//        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "dir/#", DIRECTORY);
+//    }
 
+    
     @Override
     public int delete(Uri uri, String where, String[] whereArgs) {
         SQLiteDatabase db = mDbHelper.getWritableDatabase();
@@ -151,6 +154,14 @@ public class FileContentProvider extends ContentProvider {
     @Override
     public boolean onCreate() {
         mDbHelper = new DataBaseHelper(getContext());
+        
+        String authority = getContext().getResources().getString(R.string.authority);
+        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        mUriMatcher.addURI(authority, null, ROOT_DIRECTORY);
+        mUriMatcher.addURI(authority, "file/", SINGLE_FILE);
+        mUriMatcher.addURI(authority, "file/#", SINGLE_FILE);
+        mUriMatcher.addURI(authority, "dir/#", DIRECTORY);
+        
         return true;
     }
 
diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index e9f7a9b6..72414028 100644
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -19,7 +19,6 @@
 package com.owncloud.android.syncadapter;
 
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.Date;
 
 import org.apache.http.HttpRequest;
diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 49f88f97..0d4e4c5a 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -27,8 +27,8 @@ import java.util.Map;
 import org.apache.jackrabbit.webdav.DavException;
 
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -38,7 +38,6 @@ import com.owncloud.android.operations.SynchronizeFolderOperation;
 import com.owncloud.android.operations.UpdateOCVersionOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
-import com.owncloud.android.utils.FileStorageUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountsException;
@@ -227,7 +226,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             if (result.getCode() == RemoteOperationResult.ResultCode.UNAUTHORIZED ||
                    // (result.isTemporalRedirection() && result.isIdPRedirection() &&
                     ( result.isIdPRedirection() && 
-                            AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(getClient().getAuthTokenType()))) {
+                            MainApp.getAuthTokenTypeSamlSessionCookie().equals(getClient().getAuthTokenType()))) {
                 mSyncResult.stats.numAuthExceptions++;
                 
             } else if (result.getException() instanceof DavException) {
@@ -288,7 +287,9 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
      * @param dirRemotePath     Remote path of a folder that was just synchronized (with or without success)
      */
     private void sendStickyBroadcast(boolean inProgress, String dirRemotePath, RemoteOperationResult result) {
-        Intent i = new Intent(FileSyncService.SYNC_MESSAGE);
+        FileSyncService fileSyncService = new FileSyncService();
+        
+        Intent i = new Intent(fileSyncService.getSyncMessage());
         i.putExtra(FileSyncService.IN_PROGRESS, inProgress);
         i.putExtra(FileSyncService.ACCOUNT_NAME, getAccount().name);
         if (dirRemotePath != null) {
@@ -312,7 +313,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                                              (  mLastFailedResult.getCode() == ResultCode.UNAUTHORIZED ||
                                                 // (mLastFailedResult.isTemporalRedirection() && mLastFailedResult.isIdPRedirection() && 
                                                 ( mLastFailedResult.isIdPRedirection() && 
-                                                 AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(getClient().getAuthTokenType()))
+                                                 MainApp.getAuthTokenTypeSamlSessionCookie().equals(getClient().getAuthTokenType()))
                                              )
                                            );
         // TODO put something smart in the contentIntent below for all the possible errors
diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java
index f6c70dcb..d3472658 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncService.java
@@ -34,6 +34,9 @@ public class FileSyncService extends Service {
     public static final String ACCOUNT_NAME = "ACCOUNT_NAME";
     public static final String SYNC_RESULT = "SYNC_RESULT";
 
+    public String getSyncMessage(){
+        return getClass().getName().toString() + SYNC_MESSAGE;
+    }
     /*
      * {@inheritDoc}
      */
diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index 2c3448d6..a98c38e7 100644
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -50,8 +50,8 @@ import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.ui.activity.FileActivity.AccountCreationCallback;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 
 import com.owncloud.android.R;
 
@@ -96,10 +96,10 @@ public class AccountSelectActivity extends SherlockListActivity implements
                 /// the account set as default changed since this activity was created 
             
                 // trigger synchronization
-                ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY);
+                ContentResolver.cancelSync(null, MainApp.getAuthTokenType());
                 Bundle bundle = new Bundle();
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-                ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), AccountAuthenticator.AUTHORITY, bundle);
+                ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this), MainApp.getAuthTokenType(), bundle);
                 
                 // restart the main activity
                 Intent i = new Intent(this, FileDisplayActivity.class);
@@ -137,10 +137,10 @@ public class AccountSelectActivity extends SherlockListActivity implements
             /*Intent intent = new Intent(
                     android.provider.Settings.ACTION_ADD_ACCOUNT);
             intent.putExtra("authorities",
-                    new String[] { AccountAuthenticator.AUTHORITY });
+                    new String[] { MainApp.getAuthTokenType() });
             startActivity(intent);*/
             AccountManager am = AccountManager.get(getApplicationContext());
-            am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
+            am.addAccount(MainApp.getAccountType(), 
                             null,
                             null, 
                             null, 
@@ -175,7 +175,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
         
         String accountName = map.get("NAME");
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-        Account accounts[] = am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+        Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
         for (Account a : accounts) {
             if (a.name.equals(accountName)) {
                 if (item.getItemId() == R.id.change_password) {
@@ -196,7 +196,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
     private void populateAccountList() {
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
         Account accounts[] = am
-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+                .getAccountsByType(MainApp.getAccountType());
         LinkedList<HashMap<String, String>> ll = new LinkedList<HashMap<String, String>>();
         for (Account a : accounts) {
             HashMap<String, String> h = new HashMap<String, String>();
@@ -221,7 +221,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
             String accountName = "";
             if (a == null) {
                 Account[] accounts = AccountManager.get(this)
-                        .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+                        .getAccountsByType(MainApp.getAccountType());
                 if (accounts.length != 0)
                     accountName = accounts[0].name;
                 AccountUtils.setCurrentOwnCloudAccount(this, accountName);
diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 2e47ce0b..1faf8b1f 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -30,8 +30,8 @@ import android.webkit.MimeTypeMap;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 
@@ -173,7 +173,7 @@ public abstract class FileActivity extends SherlockFragmentActivity {
      */
     private void createFirstAccount() {
         AccountManager am = AccountManager.get(getApplicationContext());
-        am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
+        am.addAccount(MainApp.getAccountType(), 
                         null,
                         null, 
                         null, 
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index db47d465..e66ab605 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -58,8 +58,8 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -137,6 +137,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
     private OCFile mWaitingToPreview;
     private Handler mHandler;
+    
+    private String mDownloadAddedMessage;
+    private String mDownloadFinishMessage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -146,6 +149,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
 
         mHandler = new Handler();
+        
+        FileDownloader downloader = new FileDownloader();
+        mDownloadAddedMessage = downloader.getDownloadAddedMessage();
+        mDownloadFinishMessage= downloader.getDownloadFinishMessage();
 
         /// bindings to transference services
         mUploadConnection = new ListServiceConnection(); 
@@ -187,6 +194,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS, according to the official documentation
         setSupportProgressBarIndeterminateVisibility(false);    // always AFTER setContentView(...) ; to work around bug in its implementation
         
+        
+        
         Log_OC.d(TAG, "onCreate() end");
     }
 
@@ -397,12 +406,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                 // the user browsed to other file ; forget the automatic preview 
                 mWaitingToPreview = null;
 
-            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
+            } else if (downloadEvent.equals(mDownloadAddedMessage)) {
                 // grant that the right panel updates the progress bar
                 detailsFragment.listenForTransferProgress();
                 detailsFragment.updateFileDetails(true, false);
 
-            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
+            } else if (downloadEvent.equals(mDownloadFinishMessage)) {
                 //  update the right panel
                 boolean detailsFragmentChanged = false;
                 if (waitedPreview) {
@@ -470,12 +479,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     }
 
     private void startSynchronization() {
-        ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY);   // cancel the current synchronizations of any ownCloud account
+        ContentResolver.cancelSync(null, MainApp.getAuthTokenType());   // cancel the current synchronizations of any ownCloud account
         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         ContentResolver.requestSync(
                 getAccount(),
-                AccountAuthenticator.AUTHORITY, bundle);
+                MainApp.getAuthTokenType(), bundle);
     }
 
 
@@ -620,19 +629,22 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         super.onResume();
         Log_OC.e(TAG, "onResume() start");
 
+        FileUploader fileUploader = new FileUploader();
+        FileSyncService fileSyncService = new FileSyncService();
+        
         // Listen for sync messages
-        IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);
+        IntentFilter syncIntentFilter = new IntentFilter(fileSyncService.getSyncMessage());
         mSyncBroadcastReceiver = new SyncBroadcastReceiver();
         registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
 
         // Listen for upload messages
-        IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
+        IntentFilter uploadIntentFilter = new IntentFilter(fileUploader.getUploadFinishMessage());
         mUploadFinishReceiver = new UploadFinishReceiver();
         registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
 
         // Listen for download messages
-        IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
-        downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
+        IntentFilter downloadIntentFilter = new IntentFilter(mDownloadAddedMessage);
+        downloadIntentFilter.addAction(mDownloadFinishMessage);
         mDownloadFinishReceiver = new DownloadFinishReceiver();
         registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
     
diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java
index 8540bb28..45ed279d 100644
--- a/src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/src/com/owncloud/android/ui/activity/LandingActivity.java
@@ -17,7 +17,6 @@
 package com.owncloud.android.ui.activity;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.ui.adapter.LandingScreenAdapter;
 
 import android.accounts.Account;
@@ -33,6 +32,8 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 import android.widget.Toast;
+
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 
 /**
@@ -114,7 +115,7 @@ public class LandingActivity extends SherlockFragmentActivity implements
         case DialogInterface.BUTTON_POSITIVE:
             Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
             intent.putExtra("authorities",
-                    new String[] { AccountAuthenticator.AUTHORITY });
+                    new String[] { MainApp.getAuthTokenType() });
             startActivity(intent);
             break;
         case DialogInterface.BUTTON_NEGATIVE:
@@ -150,7 +151,7 @@ public class LandingActivity extends SherlockFragmentActivity implements
     private boolean accountsAreSetup() {
         AccountManager accMan = AccountManager.get(this);
         Account[] accounts = accMan
-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+                .getAccountsByType(MainApp.getAccountType());
         return accounts.length > 0;
     }
 
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 15ae7760..2ba0d0f7 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -17,7 +17,6 @@
  */
 package com.owncloud.android.ui.activity;
 
-import java.io.File;
 import java.util.Vector;
 
 import android.content.Intent;
@@ -25,7 +24,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
-import android.os.Environment;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
index edcd2b3a..1822ce0a 100644
--- a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
@@ -17,18 +17,11 @@
 
 package com.owncloud.android.ui.dialog;
 
-import java.io.InputStream;
-import java.util.Scanner;
-
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.net.Uri;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.webkit.WebView;
-import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 5380a883..07f274ee 100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -206,7 +206,8 @@ public class FileDetailFragment extends FileFragment implements
     public void onResume() {
         super.onResume();
         mUploadFinishReceiver = new UploadFinishReceiver();
-        IntentFilter filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
+        FileUploader fileUploader = new FileUploader();
+        IntentFilter filter = new IntentFilter(fileUploader.getUploadFinishMessage());
         getActivity().registerReceiver(mUploadFinishReceiver, filter);
 
     }
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index ef1e977c..7c9ccd69 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -16,8 +16,6 @@
  */
 package com.owncloud.android.ui.preview;
 
-import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -84,7 +82,10 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
 
     private boolean mFullScreen;
     
-
+    private String mDownloadAddedMessage;
+    private String mDownloadFinishMessage;
+    
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -102,6 +103,10 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         } else {
             mRequestWaitingForBinder = false;
         }
+        
+        FileDownloader downloader = new FileDownloader();
+        mDownloadAddedMessage = downloader.getDownloadAddedMessage();
+        mDownloadFinishMessage= downloader.getDownloadFinishMessage();
     }
 
     private void initViewPager() {
@@ -218,8 +223,9 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         super.onResume();
         //Log.e(TAG, "ACTIVITY, ONRESUME");
         mDownloadFinishReceiver = new DownloadFinishReceiver();
-        IntentFilter filter = new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
-        filter.addAction(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
+        
+        IntentFilter filter = new IntentFilter(mDownloadFinishMessage);
+        filter.addAction(mDownloadAddedMessage);
         registerReceiver(mDownloadFinishReceiver, filter);
     }
 
@@ -378,7 +384,7 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
                 boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false);
                 //boolean isOffscreen =  Math.abs((mViewPager.getCurrentItem() - position)) <= mViewPager.getOffscreenPageLimit();
                 
-                if (position >= 0 && intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
+                if (position >= 0 && intent.getAction().equals(mDownloadFinishMessage)) {
                     if (downloadWasFine) {
                         mPreviewImagePagerAdapter.updateFile(position, file);   
                         
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 291bd4a0..578c56e8 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -56,7 +56,6 @@ import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoveFileOperation;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 29553c41..55399525 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -25,6 +25,7 @@ import android.net.Uri;
 import android.os.Environment;
 import android.os.StatFs;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 
@@ -34,11 +35,11 @@ import com.owncloud.android.datamodel.OCFile;
  * @author David A. Velasco
  */
 public class FileStorageUtils {
-    private static final String LOG_TAG = "FileStorageUtils";
+    //private static final String LOG_TAG = "FileStorageUtils";
 
     public static final String getSavePath(String accountName) {
         File sdCard = Environment.getExternalStorageDirectory();
-        return sdCard.getAbsolutePath() + "/owncloud/" + Uri.encode(accountName, "@");
+        return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
         // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B
     }
 
@@ -48,7 +49,7 @@ public class FileStorageUtils {
 
     public static final String getTemporalPath(String accountName) {
         File sdCard = Environment.getExternalStorageDirectory();
-        return sdCard.getAbsolutePath() + "/owncloud/tmp/" + Uri.encode(accountName, "@");
+        return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/tmp/" + Uri.encode(accountName, "@");
             // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B
     }
 
@@ -66,7 +67,7 @@ public class FileStorageUtils {
     }
     
     public static final String getLogPath()  {
-        return Environment.getExternalStorageDirectory() + File.separator + "owncloud" + File.separator + "log";
+        return Environment.getExternalStorageDirectory() + File.separator + MainApp.getDataFolder() + File.separator + "log";
     }
 
     public static String getInstantUploadFilePath(Context context, String fileName) {
diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index f25e3906..c0eba542 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -42,8 +42,8 @@ import org.apache.http.HttpStatus;
 import org.apache.http.params.CoreProtocolPNames;
 
 import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.network.BearerAuthScheme;
 import com.owncloud.android.network.BearerCredentials;
 
@@ -72,7 +72,7 @@ public class WebdavClient extends HttpClient {
         getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
         mFollowRedirects = true;
         mSsoSessionCookie = null;
-        mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;
+        mAuthTokenType = MainApp.getAuthTokenTypePass();
     }
 
     public void setBearerCredentials(String accessToken) {
@@ -85,7 +85,7 @@ public class WebdavClient extends HttpClient {
         mCredentials = new BearerCredentials(accessToken);
         getState().setCredentials(AuthScope.ANY, mCredentials);
         mSsoSessionCookie = null;
-        mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;
+        mAuthTokenType = MainApp.getAuthTokenTypeAccessToken();
     }
 
     public void setBasicCredentials(String username, String password) {
@@ -97,7 +97,7 @@ public class WebdavClient extends HttpClient {
         mCredentials = new UsernamePasswordCredentials(username, password);
         getState().setCredentials(AuthScope.ANY, mCredentials);
         mSsoSessionCookie = null;
-        mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;
+        mAuthTokenType = MainApp.getAuthTokenTypePass();
     }
     
     public void setSsoSessionCookie(String accessToken) {
@@ -105,7 +105,7 @@ public class WebdavClient extends HttpClient {
         getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
         mSsoSessionCookie = accessToken;
         mCredentials = null;
-        mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE;
+        mAuthTokenType = MainApp.getAuthTokenTypeSamlSessionCookie();
     }