From: masensio <masensio@solidgear.es>
Date: Mon, 28 Apr 2014 10:10:37 +0000 (+0200)
Subject: Merge branch 'develop' into refactor_update_filelist_from_database
X-Git-Tag: oc-android-1.7.0_signed~309^2~67
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/77ead554d44016c751cc12b678d95ed017aba7f8?hp=44dae87d2f5610108f87018dfa86e01cfc89c259

Merge branch 'develop' into refactor_update_filelist_from_database
---

diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 50ce61be..1f1ebf57 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -17,6 +17,10 @@
   <string name="prefs_manage_accounts">Spravovat účty</string>
   <string name="prefs_pincode">PIN aplikace</string>
   <string name="prefs_pincode_summary">Chraňte svého klienta</string>
+  <string name="prefs_instant_upload">Okamžité nahrání obrázků</string>
+  <string name="prefs_instant_upload_summary">Okamžitě nahrávat vytvořené fotografie</string>
+  <string name="prefs_instant_video_upload">Okamžité nahrávání videa</string>
+  <string name="prefs_instant_video_upload_summary">Okamžitě odesílat nahrané video</string>
   <string name="prefs_log_title">Povolit logování</string>
   <string name="prefs_log_summary">Použito k zaznamenávání problémů</string>
   <string name="prefs_log_title_history">Historie logování</string>
@@ -178,7 +182,7 @@
   <string name="rename_server_fail_msg">Přejmenování nelze dokončit</string>
   <string name="sync_file_fail_msg">Vzdálený soubor nemohl být zkontrolován</string>
   <string name="sync_file_nothing_to_do_msg">Obsah souboru je již synchronizován</string>
-  <string name="create_dir_fail_msg">Adresář nelze vytvořit</string>
+  <string name="create_dir_fail_msg">Adresář nemohl být vytvořen</string>
   <string name="filename_forbidden_characters">Zakázané znaky: / \\ &lt; &gt; : \" | ? *</string>
   <string name="wait_a_moment">Počkejte chvíli</string>
   <string name="filedisplay_unexpected_bad_get_content">Neočekávaný problém - zkuste zvolit soubor jinou aplikací</string>
@@ -246,4 +250,5 @@
   <string name="activity_chooser_send_file_title">Odeslat</string>
   <string name="copy_link">Zkopírovat odkaz</string>
   <string name="clipboard_text_copied">Zkopírováno do schránky</string>
+  <string name="error_cant_bind_to_operations_service">Kritická chyba: operace nelze provést</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 34c4af26..1401b32a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -221,7 +221,7 @@
   <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">Carica le immagini solo via WiFi</string>
-  <string name="instant_video_upload_on_wifi">Carica i video solo via WiFi</string>
+  <string name="instant_video_upload_on_wifi">Carica i video solo tramite WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Conflitto di aggiornamento</string>
   <string name="conflict_message">Il file remoto %s non è sincronizzato con il file locale. Se continui, il contenuto del file sarà sostituito sul server.</string>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index c674ba2a..9b1332b8 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -17,6 +17,10 @@
   <string name="prefs_manage_accounts">Správa účtov</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">Okamžité nahratie obrázka</string>
+  <string name="prefs_instant_upload_summary">Okamžite nahrať obrázok zaznamenaný fotoaparátom</string>
+  <string name="prefs_instant_video_upload">Okamžité nahranie videa</string>
+  <string name="prefs_instant_video_upload_summary">Okamžite nahrať video zaznamenané fotoaparátom</string>
   <string name="prefs_log_title">Povoliť logovanie</string>
   <string name="prefs_log_summary">Toto je použité pre logovanie problémov</string>
   <string name="prefs_log_title_history">História logovania</string>
@@ -35,6 +39,7 @@
   <string name="sync_string_files">Súbory</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 nahrávanie:</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 %1$s účet. Zadajte ho prosím.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavenie</string>
@@ -92,6 +97,7 @@
   <string name="sync_fail_in_favourites_ticker">Automatická synchronizácia súborov zlyhala</string>
   <string name="sync_fail_in_favourites_content">Obsah %1$d súborov nemohol byť synchronizovaný (%2$d konfliktov)</string>
   <string name="sync_foreign_files_forgotten_ticker">Niektoré lokálne súbory boli zabudnuté</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d súborov z %2$s priečinkov sa nepodarilo skopírovať do</string>
   <string name="sync_current_folder_was_removed">Priečinok %1$s už existuje</string>
   <string name="foreign_files_move">Premiestniť všetko</string>
   <string name="foreign_files_success">Všetky súbory boli premiestnené</string>
@@ -127,6 +133,7 @@
   <string name="media_rewind_description">Tlačidlo pretáčania</string>
   <string name="media_play_pause_description">Tlačidlo prehrávania / pauzy</string>
   <string name="media_forward_description">Tlačidlo \"rýchlo vpred\"</string>
+  <string name="auth_getting_authorization">Kontrolujem poverenia...</string>
   <string name="auth_trying_to_login">Pokus o pripojenie...</string>
   <string name="auth_no_net_conn_title">Bez sieťového pripojenia</string>
   <string name="auth_nossl_plain_ok_title">Nie je k dispozícii bezpečné pripojenie</string>
@@ -155,6 +162,8 @@
   <string name="auth_connecting_auth_server">Pripájam sa na autentifikačný server...</string>
   <string name="auth_unsupported_auth_method">Server nepodporuje túto autentifikačnú metódu</string>
   <string name="auth_unsupported_multiaccount">%1$s nepodporuje viacero účtov</string>
+  <string name="auth_fail_get_user_name">Váš server nevracia správne používateľské id, kontaktujte prosím správcu systému\n\t</string>
+  <string name="auth_can_not_auth_against_server">Nie je možné urobiť overenie voči tomuto serveru</string>
   <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
   <string name="common_rename">Premenuj</string>
   <string name="common_remove">Odober</string>
@@ -171,6 +180,7 @@
   <string name="rename_server_fail_msg">Nie je možné premenovať</string>
   <string name="sync_file_fail_msg">Vzdialený súbor nemohol byť prekontrolovaný</string>
   <string name="sync_file_nothing_to_do_msg">Obsah súboru je zosynchronizovaný</string>
+  <string name="create_dir_fail_msg">Priečinok nie je možné vytvoriť</string>
   <string name="filename_forbidden_characters">Zakázané znaky: / \\ &lt; &gt; : \" | ? *</string>
   <string name="wait_a_moment">Počkať chvíľu</string>
   <string name="filedisplay_unexpected_bad_get_content">Neočakávaný problém; skúste vybrať súbor inou aplikáciou</string>
@@ -200,6 +210,8 @@
   <string name="ssl_validator_label_validity_to">Do: </string>
   <string name="ssl_validator_label_signature">Podpis:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmus:</string>
+  <string name="ssl_validator_null_cert">Certifikát nemohol byť zobrazený.</string>
+  <string name="ssl_validator_no_info_about_error">- Žiadne informácie o tejto chybe</string>
   <string name="placeholder_sentence">Toto je \"placeholder\"</string>
   <string name="placeholder_filename">placeholder.txt</string>
   <string name="placeholder_filetype">PNG obrázok</string>
@@ -207,6 +219,7 @@
   <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">Odoslať fotografie iba cez WiFi</string>
+  <string name="instant_video_upload_on_wifi">Nahrávať videá len cez WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">Konflikt pri aktualizácii</string>
   <string name="conflict_message">Vzdialený súbor %s nie je zosynchronizovaný s lokálnym. Pokračovanie prepíše obsah súboru na serveri.</string>
@@ -233,4 +246,5 @@
   <string name="activity_chooser_send_file_title">Odoslať</string>
   <string name="copy_link">Kopíruj odkaz</string>
   <string name="clipboard_text_copied">Skopírované do \"clipboard\"</string>
+  <string name="error_cant_bind_to_operations_service">Kritická chyba: nemožno vykonať operácie</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 83e74c75..2f55bbd7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -33,7 +33,7 @@
   <string name="recommend_subject">%1$s uygulamasını akıllı telefonunda dene!</string>
   <string name="recommend_text">\"Sana, akıllı telefonunda kullanmak üzere %1$s daveti yapıyorum!\nBuradan indirebilirsin: %2$s\"</string>
   <string name="auth_check_server">Sunucuyu kontrol et</string>
-  <string name="auth_host_url">Sunucu Adresi https://…</string>
+  <string name="auth_host_url">Sunucu adresi https://…</string>
   <string name="auth_username">Kullanıcı Adı:</string>
   <string name="auth_password">Parola:</string>
   <string name="auth_register">%1$s senin için yeni mi?</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0a281d57..10cf57a5 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2,6 +2,7 @@
 <resources>
   <string name="actionbar_upload">上傳</string>
   <string name="actionbar_upload_files">文件</string>
+  <string name="actionbar_mkdir">新文件夾</string>
   <string name="actionbar_settings">設定</string>
   <string name="actionbar_send_file">傳送</string>
   <string name="prefs_category_general">一般</string>
@@ -16,16 +17,26 @@
   <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>
+  <string name="filedetails_select_file">按一下文件顯示更多資料。</string>
   <string name="filedetails_size">大小</string>
   <string name="filedetails_type">類別</string>
   <string name="filedetails_created">建立於:</string>
   <string name="filedetails_modified">修改於:</string>
   <string name="filedetails_download">下載</string>
-  <string name="common_yes">Yes</string>
-  <string name="common_no">No</string>
+  <string name="common_yes">是</string>
+  <string name="common_no">否</string>
   <string name="common_ok">確定</string>
   <string name="common_cancel">取消</string>
+  <string name="common_save_exit">儲存然係離開</string>
   <string name="common_error">錯誤</string>
+  <string name="create_account">開新帳戶</string>
+  <string name="uploader_info_dirname">資料夾名稱</string>
+  <string name="uploader_upload_succeeded_ticker">上載成功</string>
+  <string name="uploader_upload_failed_ticker">上載失敗</string>
+  <string name="downloader_download_in_progress_ticker">下載中</string>
+  <string name="downloader_download_succeeded_ticker">下載成功</string>
+  <string name="downloader_download_failed_ticker">下載失敗</string>
   <string name="common_choose_account">選擇帳戶</string>
+  <string name="auth_no_net_conn_title">無網絡連線</string>
   <string name="activity_chooser_send_file_title">傳送</string>
 </resources>