From: masensio <masensio@solidgear.es>
Date: Wed, 27 May 2015 11:10:15 +0000 (+0200)
Subject: Merge branch 'develop' into remove_ActionBarSherlock
X-Git-Tag: oc-android-1.7.2~1^2~23^2~37^2~3^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e7493203deca0edc7edeb5fb26f2774ede84a479?hp=d58e131dc59baf7ae895749ac5e05a274a10d500

Merge branch 'develop' into remove_ActionBarSherlock
---

diff --git a/owncloud-android-library b/owncloud-android-library
index 67d80002..e48aa9c3 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 67d800027c70baf6a299570b3aa76a1eb6760ca9
+Subproject commit e48aa9c30447d67b0f8ee2054e1fc826108fc5ec
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index acc4970d..181a0bab 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -305,4 +305,5 @@ správce systému.</string>
   <string name="subject_token">%1$s sdílí \"%2$s\" s vámi</string>
   <string name="auth_refresh_button">Obnovit připojení</string>
   <string name="auth_host_address">Adresa serveru</string>
+  <string name="common_error_out_memory">Nedostatek paměti</string>
 </resources>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 48871b5e..620ba0eb 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -306,4 +306,5 @@
   <string name="subject_token">%1$s hat „%2$s“ mit Ihnen geteilt</string>
   <string name="auth_refresh_button">Verbindung aktualisieren</string>
   <string name="auth_host_address">Serveradresse</string>
+  <string name="common_error_out_memory">Nicht genügend Speicher</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 31c9ab5b..3f7f4917 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -306,4 +306,5 @@
   <string name="subject_token">%1$s hat „%2$s“ mit Dir geteilt</string>
   <string name="auth_refresh_button">Verbindung aktualisieren</string>
   <string name="auth_host_address">Serveradresse</string>
+  <string name="common_error_out_memory">Nicht genügend Speicher</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index eb00336e..3b810e60 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -306,4 +306,5 @@
   <string name="subject_token">%1$s μοιράστηκε \"%2$s\" μαζί σας</string>
   <string name="auth_refresh_button">Ανανέωση σύνδεσης</string>
   <string name="auth_host_address">Διεύθυνση διακομιστή</string>
+  <string name="common_error_out_memory">Δεν υπάρχει αρκετή μνήμη</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d8163f3e..f7f155c6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -23,6 +23,7 @@
   <string name="prefs_category_more">More</string>
   <string name="prefs_accounts">Accounts</string>
   <string name="prefs_manage_accounts">Manage Accounts</string>
+  <string name="prefs_passcode">Passcode lock</string>
   <string name="prefs_instant_upload">Instant picture uploads</string>
   <string name="prefs_instant_upload_summary">Instantly upload pictures taken by camera</string>
   <string name="prefs_instant_video_upload">Instant video uploads</string>
@@ -126,6 +127,15 @@
   <string name="foreign_files_local_text">Local: %1$s</string>
   <string name="foreign_files_remote_text">Remote: %1$s</string>
   <string name="upload_query_move_foreign_files">There is not enough space to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
+  <string name="pass_code_enter_pass_code">Please, insert your passcode</string>
+  <string name="pass_code_configure_your_pass_code">Enter your passcode</string>
+  <string name="pass_code_configure_your_pass_code_explanation">The passcode will be requested every time the app is started</string>
+  <string name="pass_code_reenter_your_pass_code">Please, reenter your passcode</string>
+  <string name="pass_code_remove_your_pass_code">Remove your passcode</string>
+  <string name="pass_code_mismatch">The passcodes are not the same</string>
+  <string name="pass_code_wrong">Incorrect passcode</string>
+  <string name="pass_code_removed">Passcode removed</string>
+  <string name="pass_code_stored">Passcode stored</string>
   <string name="media_notif_ticker">%1$s music player</string>
   <string name="media_state_playing">%1$s (playing)</string>
   <string name="media_state_loading">%1$s (loading)</string>
@@ -201,6 +211,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Unexpected problem; please select the file from a different app</string>
   <string name="filedisplay_no_file_selected">No file was selected</string>
   <string name="activity_chooser_title">Send link to …</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Copying file from private storage</string>
   <string name="oauth_check_onoff">Log in with oAuth2</string>
   <string name="oauth_login_connection">Connecting to oAuth2 server…</string>
   <string name="ssl_validator_header">The identity of the site could not be verified</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a9d379a8..de0703da 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -306,4 +306,5 @@
   <string name="subject_token">%1$s compartió \"%2$s\" contigo</string>
   <string name="auth_refresh_button">Refrescar la conexión</string>
   <string name="auth_host_address">Dirección del servidor</string>
+  <string name="common_error_out_memory">No hay suficiente memoria</string>
 </resources>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index c45a019f..0b6a8350 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -36,6 +36,7 @@
   <string name="prefs_help">Ohje</string>
   <string name="prefs_recommend">Suosittele kaverille</string>
   <string name="prefs_feedback">Palaute</string>
+  <string name="prefs_imprint">Tiedot</string>
   <string name="prefs_remember_last_share_location">Muista jaon sijainti</string>
   <string name="prefs_remember_last_upload_location_summary">Muista viimeisin jaon lähetyssijainti</string>
   <string name="recommend_subject">Kokeile %1$sia älypuhelimellasi!</string>
@@ -201,6 +202,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Odottamaton ongelma; kokeile valita tiedosto toisella sovelluksella</string>
   <string name="filedisplay_no_file_selected">Tiedostoa ei valittu</string>
   <string name="activity_chooser_title">Lähetä linkki…</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Kopioidaan tiedostoa yksityisestä tallennustilasta</string>
   <string name="oauth_check_onoff">Kirjaudu oAuth2:lla</string>
   <string name="oauth_login_connection">Yhdistetään oAuth2-palvelimeen…</string>
   <string name="ssl_validator_header">Sivuston identiteetin vahvistaminen ei onnistunut</string>
@@ -229,6 +231,7 @@
   <string name="ssl_validator_no_info_about_error">- Ei lisätietoja virheestä</string>
   <string name="placeholder_filetype">PNG-kuva</string>
   <string name="placeholder_filesize">389 kt</string>
+  <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Lähetä kuvat vain WiFi-verkossa</string>
   <string name="instant_video_upload_on_wifi">Lähetä videot vain wifi-yhteydellä</string>
   <string name="instant_upload_path">/InstantUpload</string>
@@ -242,6 +245,7 @@
   <string name="prefs_instant_upload_path_title">Lähetyspolku</string>
   <string name="share_link_no_support_share_api">Jakaminen ei ole käytössä palvelimellasi. Ota yhteys
 		ylläpitäjään.</string>
+  <string name="share_link_file_no_exist">Jakaminen epäonnistui. Varmista, että tiedosto on olemassa</string>
   <string name="share_link_file_error">Virhe tiedoston tai kansion jakamista yrittäessä</string>
   <string name="share_link_password_title">Anna salasana</string>
   <string name="share_link_empty_password">Salasana on pakko antaa</string>
@@ -268,6 +272,7 @@
   <string name="actionbar_logger">Lokit</string>
   <string name="log_send_history_button">Lähetä historia</string>
   <string name="log_send_no_mail_app">Lokien lähettämistä varten ei löytynyt sovellusta. Asenna sähköpostisovellus!</string>
+  <string name="log_send_mail_subject">%1$sin Android-sovelluksen lokit</string>
   <string name="log_progress_dialog_text">Ladataan tietoja…</string>
   <string name="saml_authentication_required_text">Tunnistautuminen vaaditaan</string>
   <string name="saml_authentication_wrong_pass">Väärä salasana</string>
@@ -282,4 +287,5 @@
   <string name="subject_token">%1$s jakoi kohteen \"%2$s\" kanssasi</string>
   <string name="auth_refresh_button">Päivitä yhteys</string>
   <string name="auth_host_address">Palvelimen osoite</string>
+  <string name="common_error_out_memory">Muistia ei ole riittävästi</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6c8122f6..91c83ea8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -23,7 +23,7 @@
   <string name="prefs_category_more">Plus</string>
   <string name="prefs_accounts">Comptes</string>
   <string name="prefs_manage_accounts">Gestion des comptes</string>
-  <string name="prefs_passcode">Code de verrouillage</string>
+  <string name="prefs_passcode">Code de sécurité</string>
   <string name="prefs_instant_upload">Téléversement immédiat des photos</string>
   <string name="prefs_instant_upload_summary">Téléverser immédiatement les photos prises par la caméra</string>
   <string name="prefs_instant_video_upload">Téléversement immédiat des vidéos</string>
@@ -167,7 +167,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="auth_connection_established">Connexion établie</string>
   <string name="auth_testing_connection">Test de connexion</string>
   <string name="auth_not_configured_title">Configuration du serveur erronée</string>
-  <string name="auth_account_not_new">Un compte pour les même utilisateur et serveur existe déjà sur cet appareil</string>
+  <string name="auth_account_not_new">Un compte pour les mêmes utilisateur et serveur existe déjà sur cet appareil</string>
   <string name="auth_account_not_the_same">L\'utilisateur entré ne correspond pas à l\'utilisateur de ce compte</string>
   <string name="auth_unknown_error_title">Une erreur inconnue s\'est produite.</string>
   <string name="auth_unknown_host_title">Impossible de trouver l\'hôte</string>
@@ -310,4 +310,5 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="subject_token">%1$s a partagé \"%2$s\" avec vous</string>
   <string name="auth_refresh_button">Actualiser la connexion</string>
   <string name="auth_host_address">Adresse du serveur</string>
+  <string name="common_error_out_memory">Mémoire insuffisante</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index a06206f1..2e8f23a0 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -307,4 +307,5 @@ Descárgueo de aquí: %2$s</string>
   <string name="subject_token">%1$s compartiu «%2$s» con vostede</string>
   <string name="auth_refresh_button">Actualizar a conexión</string>
   <string name="auth_host_address">Enderezo do servidor</string>
+  <string name="common_error_out_memory">Non hai memoria abondo</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d375b12e..51d8ef0f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -306,4 +306,5 @@
   <string name="subject_token">%1$s ha condiviso \"%2$s\" con te</string>
   <string name="auth_refresh_button">Aggiorna la connessione</string>
   <string name="auth_host_address">Indirizzo del server</string>
+  <string name="common_error_out_memory">Memoria insufficiente</string>
 </resources>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index 64cf7a19..b8144867 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -23,6 +23,7 @@
   <string name="prefs_category_more">Mer</string>
   <string name="prefs_accounts">Kontoer</string>
   <string name="prefs_manage_accounts">HÃ¥ndter kontoer</string>
+  <string name="prefs_passcode">Passordlås</string>
   <string name="prefs_instant_upload">Umiddelbare bildeopplastninger</string>
   <string name="prefs_instant_upload_summary">Last opp bilder tatt av kameraet umiddelbart</string>
   <string name="prefs_instant_video_upload">Umiddelbare video-opplastninger</string>
@@ -126,6 +127,15 @@
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Ekstern: %1$s</string>
   <string name="upload_query_move_foreign_files">Det er ikke nok plass til å kopiere de valgte filene inn i mappen %1$s. Vil du flytte dem i stedet? </string>
+  <string name="pass_code_enter_pass_code">Legg inn passordet ditt</string>
+  <string name="pass_code_configure_your_pass_code">Skriv inn passordet ditt</string>
+  <string name="pass_code_configure_your_pass_code_explanation">Passordet vil bli krevd hver gang appen startes</string>
+  <string name="pass_code_reenter_your_pass_code">Skriv inn passordet på nytt</string>
+  <string name="pass_code_remove_your_pass_code">Fjern passordet ditt</string>
+  <string name="pass_code_mismatch">Passordene er ikke like</string>
+  <string name="pass_code_wrong">Feil passord</string>
+  <string name="pass_code_removed">Passord fjernet</string>
+  <string name="pass_code_stored">Passord lagret</string>
   <string name="media_notif_ticker">%1$s musikkspiller</string>
   <string name="media_state_playing">%1$s (spiller)</string>
   <string name="media_state_loading">%1$s (laster)</string>
@@ -201,6 +211,7 @@
   <string name="filedisplay_unexpected_bad_get_content">Uforventet problem; vennligst velg filen fra en annen applikasjon</string>
   <string name="filedisplay_no_file_selected">Ingen fil ble valgt</string>
   <string name="activity_chooser_title">Send lenke til ...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Kopierer fil fra privat lager</string>
   <string name="oauth_check_onoff">Logg inn med oAuth2</string>
   <string name="oauth_login_connection">Kobler til oAuth2 server...</string>
   <string name="ssl_validator_header">Identiteten til siden kunne ikke verifiseres</string>
@@ -295,4 +306,5 @@
   <string name="subject_token">%1$s har delt \"%2$s\" med deg</string>
   <string name="auth_refresh_button">Oppfrisk forbindelse</string>
   <string name="auth_host_address">Server-adresse</string>
+  <string name="common_error_out_memory">Ikke nok minne</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1174c470..0ab33ba1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -309,4 +309,5 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="subject_token">%1$s deelde \"%2$s\" met u</string>
   <string name="auth_refresh_button">Verversen verbinding</string>
   <string name="auth_host_address">Serveradres</string>
+  <string name="common_error_out_memory">Niet voldoende geheugen</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 92dbc894..7d7e96ba 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -306,4 +306,5 @@
   <string name="subject_token">%1$s compartilhou \"%2$s\" com você</string>
   <string name="auth_refresh_button">Reinicializar conexão</string>
   <string name="auth_host_address">Endereço do servidor</string>
+  <string name="common_error_out_memory">Não há memoria suficiente</string>
 </resources>