From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 5 Jul 2013 07:22:52 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.4.3~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/04c2311131508ed1c34f5a53d1016b04814dcdd8?hp=50bf276b586689aff00bb022f5dd90d04e1e17ef

Merge branch 'master' into develop
---

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d0b3cf06..9ba6f321 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -13,9 +13,13 @@
   <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="about_android">%1$s Android Aplikazioa</string>
+  <string name="about_version">%1$s bertsioa</string>
+  <string name="actionbar_sync">Freskatu kontua</string>
   <string name="actionbar_upload">Igo fitxategia</string>
   <string name="actionbar_upload_from_apps">Beste app-en edukia</string>
   <string name="actionbar_upload_files">Fitxategiak</string>
+  <string name="actionbar_open_with">Ireki honekin</string>
   <string name="actionbar_mkdir">Sortu karpeta</string>
   <string name="actionbar_search">Bilatu</string>
   <string name="actionbar_settings">Ezarpenak</string>
@@ -36,6 +40,11 @@
   <string name="prefs_pincode_summary">Babestu zure ownCloud 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>
+  <string name="prefs_log_summary">Arazoen erregistroa gordetzeko erabiltzen da</string>
+  <string name="prefs_log_title_history">Erregistro historia</string>
+  <string name="prefs_log_summary_history">Honek gordetako erregistroak bistaratzen ditu.</string>
+  <string name="prefs_log_delete_history_button">Ezabatu historia</string>
   <string name="auth_host_url">Zerbitzariaren helbidea</string>
   <string name="auth_username">Erabiltzaile izena</string>
   <string name="auth_password">Pasahitza</string>
@@ -68,6 +77,7 @@
   <string name="filedetails_created">Sortuta:</string>
   <string name="filedetails_modified">Aldatuta:</string>
   <string name="filedetails_download">Deskargatu</string>
+  <string name="filedetails_sync_file">Freskatu fitxaegia</string>
   <string name="filedetails_redownload">Birdeskargatzen</string>
   <string name="filedetails_renamed_in_upload_msg">Fitxategiaren izena %1$sra aldatu da igotzean</string>
   <string name="common_yes">Bai</string>
@@ -141,6 +151,14 @@
   <string name="media_err_malformed">Euskarri fitxategia ezin da kodetu</string>
   <string name="media_err_timeout">Denbora gehiegi erreproduzitzen saiatzen</string>
   <string name="media_err_invalid_progressive_playback">Euskarri fitxategia ezin da jariotu</string>
+  <string name="media_err_security_ex">Segurtasun errorea %1$s erreproduzitzen saiatzean</string>
+  <string name="media_err_io_ex">Sarrera errorea %1$s erreproduzitzen saiatzean</string>
+  <string name="media_err_unexpected">Ezusteko errorea %1$s erreproduzitzen saiatzean</string>
+  <string name="media_previous_description">Aurreko pista botoia</string>
+  <string name="media_rewind_description">Atzeratu botoia</string>
+  <string name="media_play_pause_description">Erreproduzitu edo pausatu botoia</string>
+  <string name="media_forward_description">Azkar aurreratu botoia</string>
+  <string name="media_next_description">Hurrengo pista botoia</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 Minutu</item>
     <item>30 Minutu</item>
@@ -151,12 +169,14 @@
     <item>30</item>
     <item>60</item>
   </string-array>
+  <string name="auth_trying_to_login">Saioa hasten saiatzen...</string>
   <string name="auth_no_net_conn_title">Ez dago sare konexiorik</string>
   <string name="auth_no_net_conn_message">Ez da sare konexiorik antzeman, egiaztatu zure interneteko konexioa eta saiatu berriz.</string>
   <string name="auth_connect_anyway">Konektatu hala ere</string>
   <string name="auth_nossl_plain_ok_title">Konexio segurua ez dago eskuragarri</string>
   <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 frogatzen...</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_unknown_error_title">Errore ezezagun bat gertatu da</string>
@@ -225,6 +245,10 @@
   <string name="ssl_validator_label_signature">Sinadura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmoa:</string>
   <string name="placeholder_sentence">Hau leku-marka da</string>
+  <string name="placeholder_filetype">PNG Irudia</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
+  <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Igo irudiak bakarrik WIFIren bidez</string>
   <string name="instant_upload_path">/BerehalakoIgoerak</string>
   <string name="conflict_title">Igoera konfliktoa</string>
@@ -232,6 +256,19 @@
   <string name="conflict_keep_both">Mantendu biak</string>
   <string name="conflict_overwrite">Gainidatzi</string>
   <string name="conflict_dont_upload">Ez igo</string>
+  <string name="preview_image_description">Irudi aurreikuspena</string>
+  <string name="preview_image_error_unknown_format">Ezin da irudi hau erakutsi</string>
+  <string name="preview_image_error_out_of_memory">\"Ez dago orrialde hau erakusteko memoria aski</string>
   <!--we need to improve the communication of errors to the user-->
   <string name="error__upload__local_file_not_copied">%1$s ezin da %2$s bertako karpetara kopiatu</string>
+  <string name="actionbar_failed_instant_upload">UnekoIgoerak huts egin du\"</string>
+  <string name="failed_upload_headline_text">Uneko igoerek huts egin dute</string>
+  <string name="failed_upload_headline_hint">Huts egindako igoeren laburpena</string>
+  <string name="failed_upload_all_cb">Hautatu dena</string>
+  <string name="failed_upload_headline_retryall_btn">Berriz saiatu hautatutakoak</string>
+  <string name="failed_upload_headline_delete_all_btn">kendu hautatutakoak igoera-ilaratik</string>
+  <string name="failed_upload_retry_text">Berriz saiatu irudia igotzen:</string>
+  <string name="failed_upload_load_more_images">Kargatu irudi gehiago</string>
+  <string name="failed_upload_failure_text">Hutsegite mezua:</string>
+  <string name="failed_upload_quota_exceeded_text">Egiaztatu zure konfigurazioa, agian zure kuota muga gainditu  duzu.</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c9adcaf8..4e95d6a0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -200,6 +200,9 @@
   <string name="auth_oauth_error_access_denied">Dostęp zabroniony przez serwer autoryzacji</string>
   <string name="auth_not_found">Wprowadzono nieprawidłową ścieżkę</string>
   <string name="auth_internal">Wewnętrzny błąd serwera, kod %1$d</string>
+  <string name="auth_wtf_reenter_URL">Nieoczekiwany stan; Proszę wpisz adres URL serwera ponownie</string>
+  <string name="auth_expired_oauth_token_toast">Twoja sesja wygasła.\nProszę zaloguj się ponownie</string>
+  <string name="auth_expired_basic_auth_toast">Zapisane dane logowania są nieprawidłowe.\nWprowadź nowe dane logowania.</string>
   <string name="crashlog_message">Aplikacja została nieoczekiwanie zakończona. Czy chcesz przesłać raport awarii?</string>
   <string name="crashlog_send_report">Wyślij raport</string>
   <string name="crashlog_dont_send_report">Nie wysyłaj raportu</string>
@@ -229,6 +232,8 @@
   <string name="oauth_host_url">oAuth2 URL</string>
   <string name="oauth_check_onoff">Loguj przez oAuth2</string>
   <string name="oauth_login_connection">Łączenie z serwerem oAuth2...</string>
+  <string name="oauth_code_validation_message">Proszę Otwórz przeglądarkę internetową i przejdź do:\n%1$s.\nSprawdź ten kod tam:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Połączenie do tego adresu URL jest niedostępne.</string>
   <string name="ssl_validator_title">Uwaga</string>
   <string name="ssl_validator_header">Nie można zweryfikować tożsamości strony</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Certyfikat serwera jest niezaufany</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c1ab57c7..730eaf28 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -16,6 +16,7 @@
   <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>
+  <string name="actionbar_open_with">Odpri z:</string>
   <string name="actionbar_mkdir">Ustvari mapo</string>
   <string name="actionbar_search">Poišči</string>
   <string name="actionbar_settings">Nastavitve</string>
@@ -36,6 +37,9 @@
   <string name="prefs_pincode_summary">Zaščitite odjemalec ownCloud</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>
+  <string name="prefs_log_title_history">Zgodovina</string>
+  <string name="prefs_log_delete_history_button">Izbriši zgodovino</string>
   <string name="auth_host_url">Naslov strežnika</string>
   <string name="auth_username">Uporabniško ime</string>
   <string name="auth_password">Geslo</string>
@@ -51,6 +55,7 @@
   <string name="setup_title">Poveži se z oblakom ownCloud</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_setup_btn_text">Nastavi</string>
@@ -78,6 +83,7 @@
   <string name="common_save_exit">Shrani in končaj</string>
   <string name="common_exit">Zapusti ownCloud</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="delete_account">Izbriši račun</string>
@@ -98,6 +104,7 @@
   <string name="downloader_download_succeeded_content">%1$s je uspešno prejet</string>
   <string name="downloader_download_failed_ticker">Prejemanje je spodletelo</string>
   <string name="downloader_download_failed_content">Prejemanja %1$s ni mogoče dokončati</string>
+  <string name="downloader_not_downloaded_yet">Prenos še ni zaključen</string>
   <string name="common_choose_account">Izbor računa</string>
   <string name="sync_string_contacts">Stiki</string>
   <string name="sync_fail_ticker">Usklajevanje je spodletelo</string>
@@ -126,6 +133,16 @@
   <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="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>
+  <string name="media_err_no_account">Niste navedli uporabniškega računa</string>
+  <string name="media_err_not_in_owncloud">Dokument ni shranjen pod veljaven račun.</string>
+  <string name="media_err_unsupported">Medijski kodek ni podprt</string>
+  <string name="media_err_io">Medijske datoteke ni bilo mogoče prebrati.</string>
+  <string name="media_err_malformed">Medijska datoteka ni pravilno kodirana.</string>
+  <string name="media_err_invalid_progressive_playback">Medijske datoteke ni mogoče predvajati</string>
+  <string name="media_err_unknown">Medijske datoteke ni mogoče predvajati s predvajalnikom Stock media player</string>
   <string-array name="prefs_trackmydevice_intervall_keys">
     <item>15 minut</item>
     <item>30 minut</item>
@@ -210,6 +227,9 @@
   <string name="ssl_validator_label_signature">Podpis:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritem:</string>
   <string name="placeholder_sentence">To je vsebnik predmetov.</string>
+  <string name="placeholder_filesize">389 KB</string>
+  <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
+  <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Pošiljaj slike le preko povezav Wi-Fi</string>
   <string name="instant_upload_path">/NeposrednoNalaganje</string>
   <string name="conflict_title">Posodobi podatke spora</string>
@@ -217,6 +237,11 @@
   <string name="conflict_keep_both">Ohrani obe</string>
   <string name="conflict_overwrite">Prepiši</string>
   <string name="conflict_dont_upload">Ne pošlji</string>
+  <string name="preview_image_description">Predogled slike</string>
+  <string name="preview_image_error_unknown_format">Te slike ni mogoče prikazati</string>
   <!--we need to improve the communication of errors to the user-->
   <string name="error__upload__local_file_not_copied">Datoteke %1$s ni mogoče kopirati v krajevno mapo %2$s.</string>
+  <string name="failed_upload_all_cb">izberi vse</string>
+  <string name="failed_upload_load_more_images">Naloži več slik</string>
+  <string name="failed_upload_failure_text">Sporočilo o napaki:</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ac844e07..c91cb8dd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -41,6 +41,10 @@
   <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>
+  <string name="prefs_log_summary">Används för att logga problem</string>
+  <string name="prefs_log_title_history">Logghistorik</string>
+  <string name="prefs_log_summary_history">Visar sparade loggar</string>
+  <string name="prefs_log_delete_history_button">Radera historik</string>
   <string name="auth_host_url">Serveradress</string>
   <string name="auth_username">Användare</string>
   <string name="auth_password">Lösenord</string>
@@ -73,6 +77,7 @@
   <string name="filedetails_created">Skapad:</string>
   <string name="filedetails_modified">Ändrad:</string>
   <string name="filedetails_download">Ladda ner</string>
+  <string name="filedetails_sync_file">Ladda om fil</string>
   <string name="filedetails_redownload">Ladda ner igen</string>
   <string name="filedetails_renamed_in_upload_msg">Filen bytte namn till %1$s under uppladdningen</string>
   <string name="common_yes">Ja</string>
@@ -94,7 +99,7 @@
   <string name="uploader_upload_in_progress_ticker">Laddar upp ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% Laddar upp %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Uppladdning klar</string>
-  <string name="uploader_upload_succeeded_content_single">%1$s var uppladdade</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s laddades upp</string>
   <string name="uploader_upload_succeeded_content_multiple">%1$d filer uppladdade</string>
   <string name="uploader_upload_failed_ticker">Misslyckad uppladdning</string>
   <string name="uploader_upload_failed_content_single">Uppladdning av %1$s kunde inte slutföras</string>
@@ -110,6 +115,7 @@
   <string name="sync_string_contacts">Kontakter</string>
   <string name="sync_fail_ticker">Synkroniseringen misslyckades</string>
   <string name="sync_fail_content">Synkronisering av %1$s kunde inte slutföras</string>
+  <string name="sync_fail_content_unauthorized">Ogiltiga inloggningsuppgifter för %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Konflikter uppstod</string>
   <string name="sync_conflicts_in_favourites_content">%1$d Flaggad som HÃ¥ll-filen-uppdaterad kan inte synkas</string>
   <string name="sync_fail_in_favourites_ticker">Filer flaggade som HÃ¥ll-filen-uppdaterad misslyckades</string>
@@ -166,12 +172,14 @@
     <item>30</item>
     <item>60</item>
   </string-array>
+  <string name="auth_trying_to_login">Försöker logga in...</string>
   <string name="auth_no_net_conn_title">Ingen anslutning till nätverket</string>
   <string name="auth_no_net_conn_message">Ingen nätverksanslutning har upptäckts, kontrollera din Internet-anslutning och försök igen.</string>
   <string name="auth_connect_anyway">Anslut ändå</string>
   <string name="auth_nossl_plain_ok_title">Säker anslutning inte tillgänglig.</string>
   <string name="auth_nossl_plain_ok_message">Applikationen kunde inte etablera en krypterad anslutning till servern. Okrypterad anslutning kan finnas tillgänglig. Du kan fortsätta eller avbryta.</string>
   <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_unknown_error_title">Okänt fel uppstod</string>
@@ -187,8 +195,14 @@
   <string name="auth_bad_oc_version_title">Okänd ownCloud 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">Ogiltiga inloggningsuppgifter</string>
+  <string name="auth_oauth_error">Behörighet saknas</string>
+  <string name="auth_oauth_error_access_denied">Nekad åtkomst av server</string>
   <string name="auth_not_found">Felaktig  sökväg angavs</string>
   <string name="auth_internal">Internt serverfel, kod %1$d</string>
+  <string name="auth_wtf_reenter_URL">Oväntat tillstånd; Ange serverns URL igen</string>
+  <string name="auth_expired_oauth_token_toast">Din inloggning har gått ut.\nVar god, logga in igen</string>
+  <string name="auth_expired_basic_auth_toast">Dina sparade uppgifter är felaktiga.\nVar god ange aktuella uppgifter</string>
   <string name="crashlog_message">Applikationen avslutades oväntat. Vill du skicka en felrapport?</string>
   <string name="crashlog_send_report">Skicka rapport</string>
   <string name="crashlog_dont_send_report">Skicka inte rapport</string>
@@ -215,6 +229,11 @@
   <string name="wait_a_moment">Var god vänta</string>
   <string name="filedisplay_unexpected_bad_get_content">Oväntat problem; prova annat program för aktuell fil</string>
   <string name="filedisplay_no_file_selected">Ingen fil vald</string>
+  <string name="oauth_host_url">oAuth2 URL</string>
+  <string name="oauth_check_onoff">Logga in med oAuth2.</string>
+  <string name="oauth_login_connection">Ansluter till oAuth2 servern…</string>
+  <string name="oauth_code_validation_message">Öppna en webbläsare och gå till:\n%1$s.\nAnge denna kod för validering:\n%2$s</string>
+  <string name="oauth_connection_url_unavailable">Anslutning till denna URL är inte tillgänglig.</string>
   <string name="ssl_validator_title">Varning</string>
   <string name="ssl_validator_header">Webbplatsens identitet kunde inte verifieras</string>
   <string name="ssl_validator_reason_cert_not_trusted">- Servercertifikatet är inte tillförlitligt</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f439af4f..876c8b62 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -4,6 +4,7 @@
   <string name="main_music">సంగీతం</string>
   <string name="main_settings">అమరికలు</string>
   <string name="actionbar_settings">అమరికలు</string>
+  <string name="auth_host_url">సేవకి చిరునామా</string>
   <string name="auth_username">వాడుకరి పేరు</string>
   <string name="auth_password">సంకేతపదం</string>
   <string name="setup_hint_username">వాడుకరి పేరు</string>