From: masensio <masensio@solidgear.es>
Date: Tue, 14 Jan 2014 10:12:31 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_saml_authentication
X-Git-Tag: oc-android-1.5.5~73^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b5ca58b712f9404d0afa00a7915ec183fa3ea29a?hp=8f0128cbab3127d64493beb7ba8c817fabc2e1b5

Merge branch 'develop' into refactor_remote_saml_authentication
---

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 82ce14f3..a4d671c5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -3,12 +3,12 @@
   <string name="about_android">App Android %1$s</string>
   <string name="about_version">versión %1$s</string>
   <string name="actionbar_sync">Actualizar cuenta</string>
-  <string name="actionbar_upload">Subir archivo</string>
+  <string name="actionbar_upload">Subir</string>
   <string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string>
   <string name="actionbar_upload_files">Archivos</string>
   <string name="actionbar_open_with">Abrir con</string>
   <string name="actionbar_mkdir">Crear directorio</string>
-  <string name="actionbar_settings">Ajustes</string>
+  <string name="actionbar_settings">Configuración</string>
   <string name="actionbar_see_details">Detalles</string>
   <string name="prefs_category_general">General</string>
   <string name="prefs_category_more">Más</string>
@@ -16,7 +16,7 @@
   <string name="prefs_manage_accounts">Gestionar cuentas</string>
   <string name="prefs_pincode">PIN de aplicación </string>
   <string name="prefs_pincode_summary">Proteja su cliente</string>
-  <string name="prefs_instant_upload">Habilita la subida instantánea</string>
+  <string name="prefs_instant_upload">Habilitar la subida instantánea</string>
   <string name="prefs_instant_upload_summary">Subir instantáneamente las fotos tomadas por la cámara</string>
   <string name="prefs_log_title">Habilitar registro</string>
   <string name="prefs_log_summary">Esto es usado para registrar problemas</string>
@@ -45,7 +45,7 @@
   <string name="uploader_wrn_no_content_title">No hay contenido para subir</string>
   <string name="uploader_wrn_no_content_text">Ningún contenido ha sido recibido. No hay nada que subir.</string>
   <string name="uploader_error_forbidden_content">%1$s no está autorizado para acceder al contenido compartido</string>
-  <string name="uploader_info_uploading">Enviando</string>
+  <string name="uploader_info_uploading">Subiendo...</string>
   <string name="file_list_empty">No hay archivos en esta carpeta.\nPuedes añadir nuevos archivos con la opción \"Subir\" del menú.</string>
   <string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml
index 663c462a..eefd16d8 100644
--- a/res/values-sr-rSP/strings.xml
+++ b/res/values-sr-rSP/strings.xml
@@ -2,16 +2,52 @@
 <resources>
   <string name="actionbar_upload">Pošalji</string>
   <string name="actionbar_upload_files">Fajlovi</string>
+  <string name="actionbar_mkdir">Novi folder</string>
   <string name="actionbar_settings">Podešavanja</string>
+  <string name="actionbar_see_details">Detaljnije</string>
+  <string name="prefs_category_general">Opšte</string>
+  <string name="prefs_accounts">Nalozi</string>
+  <string name="prefs_manage_accounts">Upravljaj nalozima</string>
   <string name="prefs_help">Pomoć</string>
   <string name="auth_username">Korisničko ime</string>
   <string name="auth_password">Lozinka</string>
   <string name="sync_string_files">Fajlovi</string>
   <string name="uploader_btn_upload_text">Pošalji</string>
+  <string name="uploader_wrn_no_account_title">Nalog nije nađen</string>
+  <string name="uploader_info_uploading">Å alje se</string>
+  <string name="filedetails_size">Veličina:</string>
+  <string name="filedetails_type">Tip:</string>
   <string name="filedetails_download">Preuzmi</string>
   <string name="common_yes">Da</string>
   <string name="common_no">Ne</string>
   <string name="common_cancel">Otkaži</string>
   <string name="common_error">Greška</string>
   <string name="change_password">Izmeni lozinku</string>
+  <string name="delete_account">Ukloni nalog</string>
+  <string name="create_account">Novi nalog</string>
+  <string name="uploader_upload_in_progress_ticker">Otpremanje...</string>
+  <string name="uploader_upload_succeeded_ticker">Uspešno otpremljeno</string>
+  <string name="uploader_upload_failed_ticker">Otpremanje nije uspelo</string>
+  <string name="downloader_download_in_progress_ticker">Preuzimanje...</string>
+  <string name="downloader_download_succeeded_ticker">Uspešno preuzeto</string>
+  <string name="downloader_download_failed_ticker">Preuzimanje nije uspelo</string>
+  <string name="common_choose_account">Odaberite nalog</string>
+  <string name="auth_no_net_conn_title">Nema konekcije</string>
+  <string name="auth_nossl_plain_ok_title">Sigurna konekcija nije dostupna.</string>
+  <string name="auth_connection_established">Konekcija uspostavljena</string>
+  <string name="common_rename">Preimenij</string>
+  <string name="common_remove">Ukloni</string>
+  <string name="confirmation_remove_alert">Da li želite da uklonite %1$s ?</string>
+  <string name="remove_success_msg">Uklanjanje je uspelo</string>
+  <string name="remove_fail_msg">Uklanjanje nije uspelo</string>
+  <string name="wait_a_moment">Molim pričekajte</string>
+  <string name="ssl_validator_btn_details_see">Detaljnije</string>
+  <string name="ssl_validator_btn_details_hide">Sakrij</string>
+  <string name="ssl_validator_label_O">Organizacija:</string>
+  <string name="ssl_validator_label_C">Država:</string>
+  <string name="ssl_validator_label_L">Lokacija:</string>
+  <string name="ssl_validator_label_validity_from">Od:</string>
+  <string name="ssl_validator_label_validity_to">Za:</string>
+  <string name="ssl_validator_label_signature">Potpis:</string>
+  <string name="conflict_keep_both">Zadrži oboje</string>
 </resources>