--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
+inside android.R.layout.preference. -->
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+android:id/checkbox"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:layout_gravity="center"
+android:focusable="false"
+android:clickable="false" />
\ No newline at end of file
<string name="auth_username">Gebruikersnaam</string>
<string name="auth_password">Wagwoord</string>
<string name="file_list_seconds_ago">sekondes gelede</string>
+ <string name="common_yes">Ja</string>
+ <string name="common_no">Nee</string>
<string name="common_ok">OK</string>
<string name="common_cancel">Kanseleer</string>
<string name="common_error">Fout</string>
<string name="file_list_seconds_ago">منذ ثواني</string>
<string name="file_list_empty">لا يوجد شيء هنا. إرفع بعض الملفات!</string>
<string name="file_list_loading">جاري التحميل ...</string>
+ <string name="file_list_folder">مجلد</string>
+ <string name="file_list_folders">مجلدات</string>
+ <string name="file_list_file">ملف</string>
+ <string name="file_list_files">ملفات</string>
<string name="filedetails_select_file">اضغظ على الملف ليتم عرض خيارات أكثر</string>
<string name="filedetails_size">الحجم :</string>
<string name="filedetails_type">النوع :</string>
<string name="file_list_folder">папка</string>
<string name="file_list_folders">папки</string>
<string name="file_list_file">файл</string>
+ <string name="file_list_files">файл</string>
<string name="filedetails_select_file">Натисни върху файл, за да видиш допълнителна информация.</string>
<string name="filedetails_size">Размер:</string>
<string name="filedetails_type">Тип:</string>
<string name="auth_redirect_non_secure_connection_title">Сигурна връзка е пренасочена по несигурен път.</string>
<string name="actionbar_logger">Доклади</string>
<string name="log_send_history_button">Изпрати История</string>
- <string name="log_mail_subject">ownCloud Android доклади</string>
- <string name="log_progress_dialog_text">Зареждане на информация...</string>
<string name="saml_authentication_required_text">Нужна е идентификация</string>
<string name="saml_authentication_wrong_pass">Грешна парола</string>
<string name="actionbar_move">Премести</string>
<string name="auth_redirect_non_secure_connection_title">Bezpečné spojení je přesměrováno na nezabezpečenou trasu.</string>
<string name="actionbar_logger">Logy</string>
<string name="log_send_history_button">Odeslat historii</string>
- <string name="log_mail_subject">Logy aplikace ownCloud pro Android</string>
- <string name="log_progress_dialog_text">Načítám data...</string>
+ <string name="log_send_no_mail_app">Nebyla nalezena žádná aplikace pro zasílání logů. Nainstalujte poštovní aplikaci!</string>
+ <string name="log_send_mail_subject">%1$s logy aplikace pro Android</string>
+ <string name="log_progress_dialog_text">Načítání dat…</string>
<string name="saml_authentication_required_text">Vyžadováno přihlášení</string>
<string name="saml_authentication_wrong_pass">Nesprávné heslo</string>
<string name="actionbar_move">Přesunout</string>
<string name="auth_redirect_non_secure_connection_title">Sikker forbindelse videredirigeres til en usikker rute.</string>
<string name="actionbar_logger">Logge</string>
<string name="log_send_history_button">Send historik</string>
- <string name="log_mail_subject">App-logregistreringer for ownCloud Android</string>
- <string name="log_progress_dialog_text">Indlæser data...</string>
+ <string name="log_send_no_mail_app">Der blev ikke fundet apps, der kan sende logge. Installér mail-app\'en!</string>
+ <string name="log_send_mail_subject">%1$s Android-app - logge</string>
+ <string name="log_progress_dialog_text">Indlæser data ...</string>
<string name="saml_authentication_required_text">Godkendelse påkrævet</string>
<string name="saml_authentication_wrong_pass">Forkert kodeord</string>
<string name="actionbar_move">Flyt</string>
<string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird auf eine unsichere Route weitergeleitet.</string>
<string name="actionbar_logger">Protokolle</string>
<string name="log_send_history_button">Verlauf senden</string>
- <string name="log_mail_subject">Protokolle der ownCloud-Android-App</string>
- <string name="log_progress_dialog_text">Daten werden geladen …</string>
+ <string name="log_send_no_mail_app">Keine App zum Versenden der Meldungen gefunden. Bitte installieren Sie die Mail-App!</string>
+ <string name="log_send_mail_subject">%1$s Android-App Meldungen</string>
+ <string name="log_progress_dialog_text">Lade Daten…</string>
<string name="saml_authentication_required_text">Legitimierung benötigt</string>
<string name="saml_authentication_wrong_pass">Falsches Passwort</string>
<string name="actionbar_move">Verschieben</string>
<string name="forbidden_permissions_move">um diese Datei zu verschieben</string>
<string name="prefs_category_instant_uploading">Sofortiges Hochladen</string>
<string name="prefs_category_security">Sicherheit</string>
- <string name="prefs_instant_video_upload_path_title">Upload-Verzeichnis für Videos</string>
+ <string name="prefs_instant_video_upload_path_title">Verzeichnis zum Hochladen der Videos</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird auf eine unsichere Route weitergeleitet.</string>
<string name="actionbar_logger">Protokolle</string>
<string name="log_send_history_button">Verlauf senden</string>
- <string name="log_mail_subject">Protokolle der ownCloud-Android-App</string>
- <string name="log_progress_dialog_text">Daten werden geladen …</string>
+ <string name="log_send_no_mail_app">Keine App zum Versenden der Meldungen gefunden. Bitte installiere die Mail-App!</string>
+ <string name="log_send_mail_subject">%1$s Android-App Meldungen</string>
+ <string name="log_progress_dialog_text">Lade Daten…</string>
<string name="saml_authentication_required_text">Legitimierung benötigt</string>
<string name="saml_authentication_wrong_pass">Falsches Passwort</string>
<string name="actionbar_move">Verschieben</string>
<string name="forbidden_permissions_move">um diese Datei zu verschieben</string>
<string name="prefs_category_instant_uploading">Sofortiges Hochladen</string>
<string name="prefs_category_security">Sicherheit</string>
+ <string name="prefs_instant_video_upload_path_title">Verzeichnis zum Hochladen der Videos</string>
</resources>
<string name="actionbar_settings">Ρυθμίσεις</string>
<string name="actionbar_see_details">Λεπτομέρειες</string>
<string name="actionbar_send_file">Αποστολή</string>
+ <string name="actionbar_sort">Ταξινόμηση</string>
+ <string name="actionbar_sort_title">Ταξινόμηση κατά</string>
<string-array name="actionbar_sortby">
<item>A-Z</item>
<item>Νεότερο - Παλαιότερο</item>
<string name="prefs_recommend">Προτείνετε σε φίλο</string>
<string name="prefs_feedback">Σχόλια </string>
<string name="prefs_imprint">Αποτύπωμα</string>
+ <string name="prefs_remember_last_share_location">Αποθήκευση σημείου διαμοιρασμού</string>
+ <string name="prefs_remember_last_upload_location_summary">Αποθήκευση τελευταίου σημείου διαμοιρασμού μεταφόρτωσης</string>
<string name="recommend_subject">Δοκιμάστε %1$s στο κινητό σας!</string>
<string name="recommend_text">Θα ήθελα να σε προσκαλέσω να χρησιμοποιήσεις το %1$s στο κινητό σου!\nΛήψη εδώ: %2$s</string>
<string name="auth_check_server">Έλεγχος Διακομιστή</string>
<string name="auth_redirect_non_secure_connection_title">Ασφαλής σύνδεση ανακατευθύνεται σε μια μη ασφαλή διαδρομή.</string>
<string name="actionbar_logger">Αρχεία καταγραφών</string>
<string name="log_send_history_button">Αποστολή ιστορικού</string>
- <string name="log_mail_subject">αρχεία καταγραφής της εφαρμογής ownCloud Android</string>
+ <string name="log_send_no_mail_app">Δεν εντοπίστηκε εφαρμογή αποστολής αναφορών συστήματος. Εγκαταστήστε το mail app!</string>
+ <string name="log_send_mail_subject">%1$s αναφορές του Android app</string>
<string name="log_progress_dialog_text">Φόρτωση δεδομένων....</string>
<string name="saml_authentication_required_text">Απαιτείται πιστοποίηση</string>
<string name="saml_authentication_wrong_pass">Εσφαλμένο συνθηματικό</string>
<string name="forbidden_permissions_move">για μετακίνηση αυτού του αρχείου</string>
<string name="prefs_category_instant_uploading">Στιγμιαίες Μεταφορτώσεις</string>
<string name="prefs_category_security">Ασφάλεια</string>
+ <string name="prefs_instant_video_upload_path_title">Διαδρομή Μεταφόρτωσης Βίντεο</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
<string name="actionbar_logger">Logs</string>
<string name="log_send_history_button">Send History</string>
- <string name="log_mail_subject">ownCloud Android app logs</string>
- <string name="log_progress_dialog_text">Loading data...</string>
+ <string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
+ <string name="log_send_mail_subject">%1$s Android app logs</string>
+ <string name="log_progress_dialog_text">Loading data…</string>
<string name="saml_authentication_required_text">Authentication required</string>
<string name="saml_authentication_wrong_pass">Incorrect password</string>
<string name="actionbar_move">Move</string>
<string name="auth_redirect_non_secure_connection_title">La conexión segura está siendo desviada por una ruta insegura.</string>
<string name="actionbar_logger">Logs</string>
<string name="log_send_history_button">Enviar historial</string>
- <string name="log_mail_subject">Logs de las apps ownCloud Android</string>
+ <string name="log_send_no_mail_app">No se ha encontrado una app para enviar logs. Instale la app mail!</string>
+ <string name="log_send_mail_subject">Se han encontrado %1$s logs de la app Android</string>
<string name="log_progress_dialog_text">Cargando datos...</string>
<string name="saml_authentication_required_text">Se necesita autenticación</string>
<string name="saml_authentication_wrong_pass">Contraseña incorrecta</string>
<string name="auth_redirect_non_secure_connection_title">Turvaline ühendus suunatakse läbi turvamata ühenduse.</string>
<string name="actionbar_logger">Logid</string>
<string name="log_send_history_button">Saada ajalugu</string>
- <string name="log_mail_subject">ownCloud Android rakenduse logid</string>
- <string name="log_progress_dialog_text">Andmete laadimine...</string>
<string name="saml_authentication_required_text">Autentimine on vajalik</string>
<string name="saml_authentication_wrong_pass">Vale parool</string>
<string name="actionbar_move">Tõsta ümber</string>
<string name="downloader_download_file_not_found">Fitxategia jadanik ez dago eskuragarri zerbitzarian</string>
<string name="prefs_category_accounts">Kontuak</string>
<string name="prefs_add_account">Gehitu kontua</string>
- <string name="log_mail_subject">ownCloud Android programaren egunerokoak</string>
- <string name="log_progress_dialog_text">Datuak kargatzen...</string>
<string name="saml_authentication_required_text">Autentikazioa beharrezkoa</string>
<string name="saml_authentication_wrong_pass">Pasahitz okerra</string>
<string name="actionbar_move">Mugitu</string>
<string name="filedetails_sync_file">Päivitä tiedosto</string>
<string name="filedetails_renamed_in_upload_msg">Tiedoston nimeksi muutettiin %1$s siirron yhteydessä</string>
<string name="action_share_file">Jaa linkki</string>
+ <string name="action_unshare_file">Poista linkin jako</string>
<string name="common_yes">Kyllä</string>
<string name="common_no">Ei</string>
<string name="common_ok">OK</string>
<string name="auth_testing_connection">Testataan yhteyttä...</string>
<string name="auth_not_configured_title">Väärin tehdyt palvelin-asetukset</string>
<string name="auth_account_not_new">Laitteella on jo tili samalle käyttäjälle ja palvelimelle</string>
+ <string name="auth_account_not_the_same">Syötetty käyttäjä ei täsmää tämän tilin käyttäjän kanssa</string>
<string name="auth_unknown_error_title">Tuntematon virhe</string>
<string name="auth_unknown_host_title">Isäntää ei löydy</string>
<string name="auth_incorrect_path_title">Palvelin-instanssia ei löydetty</string>
<string name="auth_redirect_non_secure_connection_title">Salattu yhteys on ohjattu uudelleen salaamatonta reittiä pitkin.</string>
<string name="actionbar_logger">Lokit</string>
<string name="log_send_history_button">Lähetä historia</string>
- <string name="log_mail_subject">ownCloudin Android-sovelluksen lokit</string>
- <string name="log_progress_dialog_text">Ladataan tietoja...</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_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>
<string name="actionbar_move">Siirrä</string>
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="actionbar_upload">Lähetä</string>
+ <string name="actionbar_open_with">Avaa sovelluksessa</string>
+ <string name="actionbar_mkdir">Luo kansio</string>
+ <string name="actionbar_settings">Asetukset</string>
+ <!--TODO re-enable when server-side folder size calculation is available
+ <item>Biggest - Smallest</item>-->
+ <string name="prefs_category_more">Lisää</string>
+ <string name="prefs_manage_accounts">Hallitse tilejä</string>
+ <string name="prefs_pincode">Sovelluksen PIN</string>
+ <string name="prefs_help">Apua</string>
+ <string name="auth_host_url">http://esimerkki.fi/palvelu/</string>
+ <string name="auth_username">Käyttäjätunnus</string>
+ <string name="auth_password">Salasana</string>
+ <string name="uploader_btn_upload_text">Lähetä</string>
+ <string name="file_list_empty">Ei sisältöä. Siirrä tänne jotakin!</string>
+ <string name="file_list_loading">Ladataan...</string>
+ <string name="file_list_folder">kansio</string>
+ <string name="file_list_folders">kansiot</string>
+ <string name="file_list_file">tiedosto</string>
+ <string name="file_list_files">Tiedostot</string>
+ <string name="action_share_file">Jaa linkki</string>
+ <string name="action_unshare_file">Poista linkin jako</string>
+ <string name="common_yes">KYLLÄ</string>
+ <string name="common_no">EI</string>
+ <string name="common_ok">Ok</string>
+ <string name="common_cancel">Peruuta</string>
+ <string name="common_error">Virhe</string>
+ <string name="pincode_wrong">Virheellinen PIN</string>
+ <string name="pincode_removed">Sovelluksen PIN poistettu</string>
+ <string name="pincode_stored">Sovelluksen PIN tallennettu</string>
+ <string name="auth_account_not_the_same">Syötetty käyttäjä ei täsmää tämän tilin käyttäjän kanssa</string>
+ <string name="auth_unsupported_auth_method">Palvelin ei tue tätä autentikointitapaa</string>
+ <string name="common_rename">Nimeä uudelleen</string>
+ <string name="ssl_validator_label_L">Sijainti:</string>
+ <string name="conflict_overwrite">Ylikirjoita</string>
+ <string name="copy_link">Kopioi linkki</string>
+ <string name="empty"></string>
+ <string name="actionbar_move">Siirrä</string>
+ <string name="folder_picker_choose_button_text">Valitse</string>
+ <string name="move_file_invalid_overwrite">Tiedosto on jo kohdekansiossa.</string>
+</resources>
<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>
- <string name="media_event_done">%1$s pourcentage de lecture finie</string>
+ <string name="media_event_done">Lecture de %1$s terminée</string>
<string name="media_err_nothing_to_play">Fichier média introuvable </string>
<string name="media_err_no_account">Aucun compte n\'a été trouvé</string>
<string name="media_err_not_in_owncloud">Le fichier n\'est pas dans un compte valide</string>
<string name="auth_redirect_non_secure_connection_title">La connexion sécurisée est redirigée via une route non-sécurisée.</string>
<string name="actionbar_logger">Journaux</string>
<string name="log_send_history_button">Envoyer l\'historique</string>
- <string name="log_mail_subject">Journaux de l\'application Android ownCloud</string>
+ <string name="log_send_mail_subject">Journaux de l\'application Android %1$s</string>
<string name="log_progress_dialog_text">Chargement des données...</string>
<string name="saml_authentication_required_text">Authentification requise</string>
<string name="saml_authentication_wrong_pass">Mot de passe incorrect</string>
<string name="forbidden_permissions_move">de déplacer ce fichier</string>
<string name="prefs_category_instant_uploading">Téléchargements instantanés</string>
<string name="prefs_category_security">Sécurité</string>
+ <string name="prefs_instant_video_upload_path_title">Chemin d\'accès pour le téléversement</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">A conexión segura está a ser redirixida a unha ruta non segura.</string>
<string name="actionbar_logger">Rexistros</string>
<string name="log_send_history_button">Enviar o historial</string>
- <string name="log_mail_subject">Rexistros da app ownCloud Android</string>
+ <string name="log_send_no_mail_app">Non se atopou unha aplicación para enviar os rexistros. Instale unha aplicación de correo!</string>
+ <string name="log_send_mail_subject">Rexistros da aplicación %1$s Android</string>
<string name="log_progress_dialog_text">Cargando os datos...</string>
<string name="saml_authentication_required_text">Requírese autenticación</string>
<string name="saml_authentication_wrong_pass">Contrasinal incorrecto</string>
<string name="clipboard_text_copied">Bemásolva a vágólapra</string>
<string name="empty"></string>
<string name="prefs_category_accounts">Fiókok</string>
+ <string name="prefs_add_account">Fiók hozzáadása</string>
+ <string name="actionbar_logger">Naplók</string>
<string name="saml_authentication_required_text">Felhasználóazonosítás szükséges</string>
<string name="saml_authentication_wrong_pass">Hibás jelszó</string>
+ <string name="actionbar_move">Mozgatás</string>
<string name="folder_picker_choose_button_text">Válasszon</string>
<string name="prefs_category_security">Biztonság</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">Sambungan aman dialihkan ke rute yang tidak aman.</string>
<string name="actionbar_logger">Log</string>
<string name="log_send_history_button">Kirim Riwayat</string>
- <string name="log_mail_subject">Log apl ownCloud Android</string>
- <string name="log_progress_dialog_text">Memuat data...</string>
<string name="saml_authentication_required_text">Diperlukan otentikasi</string>
<string name="saml_authentication_wrong_pass">Sandi salah</string>
<string name="actionbar_move">Pindah</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="prefs_help">Aiuto</string>
- <string name="prefs_recommend">Consiglia ad un amico</string>
+ <string name="prefs_recommend">Consiglia a un amico</string>
<string name="prefs_feedback">Segnalazioni</string>
<string name="prefs_imprint">Imprint</string>
<string name="prefs_remember_last_share_location">Ricorda la posizione della condivisione</string>
<string name="auth_redirect_non_secure_connection_title">La connessione sicura è rediretta su un percorso non sicuro.</string>
<string name="actionbar_logger">Registri</string>
<string name="log_send_history_button">Invia cronologia</string>
- <string name="log_mail_subject">Registri applicazione ownCloud Android</string>
+ <string name="log_send_no_mail_app">Non è stata trovata alcuna applicazione per l\'invio dei registri. Installa l\'applicazione mail!</string>
+ <string name="log_send_mail_subject">Registri applicazione %1$s Android</string>
<string name="log_progress_dialog_text">Caricamento dati in corso...</string>
<string name="saml_authentication_required_text">Autenticazione richiesta</string>
<string name="saml_authentication_wrong_pass">Password errata</string>
<string name="auth_redirect_non_secure_connection_title">暗号化接続は非暗号化接続にリダイレクトされました。</string>
<string name="actionbar_logger">ログ</string>
<string name="log_send_history_button">ログを送信</string>
- <string name="log_mail_subject">ownCloud Android アプリログ</string>
- <string name="log_progress_dialog_text">読込中 ...</string>
<string name="saml_authentication_required_text">認証を必要とする</string>
<string name="saml_authentication_wrong_pass">無効なパスワード</string>
<string name="actionbar_move">移動</string>
<string name="forbidden_permissions_move">このファイルを移動</string>
<string name="prefs_category_instant_uploading">自動アップロード</string>
<string name="prefs_category_security">セキュリティ</string>
+ <string name="prefs_instant_video_upload_path_title">動画のアップロードパス</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<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>
<!--TODO re-enable when server-side folder size calculation is available
<item>Biggest - Smallest</item>-->
+ <string name="prefs_category_more">ಇನ್ನಷ್ಟು</string>
+ <string name="prefs_help">ಸಹಾಯ</string>
+ <string name="prefs_imprint">ಮುದ್ರೆ</string>
+ <string name="auth_username">ಬಳಕೆಯ ಹೆಸರು</string>
+ <string name="auth_password">ಗುಪ್ತ ಪದ</string>
+ <string name="sync_string_files">ಕಡತಗಳು</string>
+ <string name="uploader_btn_upload_text">ಪೇರಿಸು</string>
+ <string name="filedetails_download">ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ</string>
+ <string name="action_share_file">ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು</string>
+ <string name="common_yes">ಹೌದು</string>
+ <string name="common_no">ಇಲ್ಲ</string>
+ <string name="common_ok">ಸರಿ</string>
+ <string name="common_cancel_upload">ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ</string>
+ <string name="common_cancel">ರದ್ದು</string>
+ <string name="common_error">ತಪ್ಪಾಗಿದೆ</string>
+ <string name="common_error_unknown">ಗೊತ್ತಿಲ್ಲದ ದೋಷ</string>
+ <string name="change_password">ಗುಪ್ತ ಪದವನ್ನು ಬದಲಾಯಿಸಿ</string>
+ <string name="common_rename">ಮರುಹೆಸರಿಸು</string>
+ <string name="common_remove">ತೆಗೆದುಹಾಕಿ</string>
+ <string name="activity_chooser_send_file_title">ಕಳುಹಿಸಿ</string>
<string name="empty"></string>
+ <string name="saml_authentication_required_text">ದೃಢೀಕರಣ ಅಗತ್ಯವಿದೆ</string>
+ <string name="saml_authentication_wrong_pass">ದುರ್ಬಲ ಗುಪ್ತಪದ</string>
+ <string name="folder_picker_choose_button_text">ಆಯ್ಕೆ</string>
+ <string name="prefs_category_security">ಭದ್ರತೆ</string>
</resources>
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--TODO re-enable when server-side folder size calculation is available
+ <item>Biggest - Smallest</item>-->
+ <string name="empty"></string>
+</resources>
<string name="actionbar_settings">Nustatymai</string>
<string name="actionbar_see_details">Informacija</string>
<string name="actionbar_send_file">Siųsti</string>
+ <string name="actionbar_sort">Rikiuoti</string>
+ <string name="actionbar_sort_title">Rikiuoti pagal</string>
+ <string-array name="actionbar_sortby">
+ <item>A-Z</item>
+ <item>Naujausi - Seniausi</item>
+ </string-array>
<!--TODO re-enable when server-side folder size calculation is available
<item>Biggest - Smallest</item>-->
<string name="prefs_category_general">Bendras</string>
<string name="prefs_recommend">Rekomenduoti draugui</string>
<string name="prefs_feedback">Atsiliepimai</string>
<string name="prefs_imprint">Imprint</string>
+ <string name="prefs_remember_last_share_location">Prisiminti bendrinimo vietą</string>
+ <string name="prefs_remember_last_upload_location_summary">Prisiminti paskutinio bendrinimo įkėlimo vietą</string>
<string name="recommend_subject">Išbandykite %1$s savo išmaniajame telefone!</string>
<string name="auth_check_server">Patikrinti Serverį</string>
<string name="auth_host_url">Serverio adresas </string>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="actionbar_upload">Байршуулах</string>
+ <string name="actionbar_upload_files">Файлууд</string>
+ <string name="actionbar_settings">Тохиргоо</string>
<!--TODO re-enable when server-side folder size calculation is available
<item>Biggest - Smallest</item>-->
+ <string name="prefs_category_general">Ерөнхий</string>
+ <string name="auth_username">Хэрэглэгчийн нэр</string>
+ <string name="auth_password">Нууц үг</string>
+ <string name="sync_string_files">Файлууд</string>
+ <string name="uploader_btn_upload_text">Байршуулах</string>
+ <string name="create_account">Аккаунт үүсгэх</string>
+ <string name="common_remove">Устгах</string>
<string name="empty"></string>
+ <string name="prefs_category_security">Аюулгүй байдал</string>
</resources>
<string name="prefs_add_account">Legg til en konto</string>
<string name="actionbar_logger">Logger</string>
<string name="log_send_history_button">Send historikk</string>
- <string name="log_mail_subject">logger for ownCloud Android app</string>
- <string name="log_progress_dialog_text">Laster data...</string>
<string name="saml_authentication_required_text">Autentisering kreves</string>
<string name="saml_authentication_wrong_pass">Feil passord</string>
<string name="actionbar_move">Flytt</string>
<string name="auth_redirect_non_secure_connection_title">De beveiligde verbinding is omgeleid naar een onveilige route.</string>
<string name="actionbar_logger">Logs</string>
<string name="log_send_history_button">Verstuur geschiedenis</string>
- <string name="log_mail_subject">ownCloud Android app logs</string>
+ <string name="log_send_no_mail_app">Geen app voor versturen van logs gevonden. Installeer de mail app!</string>
+ <string name="log_send_mail_subject">%1$s Android app logs</string>
<string name="log_progress_dialog_text">Laden data...</string>
<string name="saml_authentication_required_text">Authenticatie vereist</string>
<string name="saml_authentication_wrong_pass">Onjuist wachtwoord</string>
<string name="forbidden_permissions_move">om dit bestand te verplaatsen</string>
<string name="prefs_category_instant_uploading">Directe uploads</string>
<string name="prefs_category_security">Beveiliging</string>
+ <string name="prefs_instant_video_upload_path_title">Upload Video Pad</string>
</resources>
<string name="prefs_recommend">Poleć znajomemu</string>
<string name="prefs_feedback">Wsparcie</string>
<string name="prefs_imprint">Stopka</string>
+ <string name="prefs_remember_last_share_location">Zapamiętaj położenie udostępnienia</string>
<string name="recommend_subject">Wypróbuj %1$s na swoim smartphonie!</string>
<string name="recommend_text">Chciałbym zaprosić Cię do używania %1$s na swoim smartfonie!\nŚciągnij tutaj: %2$s</string>
<string name="auth_check_server">Sprawdź serwer</string>
<string name="auth_redirect_non_secure_connection_title">Bezpieczne połączenie jest przekierowywane przez niezabezpieczone trasy.</string>
<string name="actionbar_logger">Logi</string>
<string name="log_send_history_button">Wyślij historię</string>
- <string name="log_mail_subject">Logi aplikacji ownCloud Android</string>
+ <string name="log_send_mail_subject">%1$s Logi aplikacji Android</string>
<string name="log_progress_dialog_text">Ładuję dane...</string>
<string name="saml_authentication_required_text">Wymagana autoryzacja</string>
<string name="saml_authentication_wrong_pass">Złe hasło</string>
<string name="forbidden_permissions_move">aby przenieść ten plik</string>
<string name="prefs_category_instant_uploading">Automatyczne wysyłanie</string>
<string name="prefs_category_security">Bezpieczeństwo</string>
+ <string name="prefs_instant_video_upload_path_title">Katalog wysyłania dla wideo</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">Conexão segura esta redirecionada para uma rota não segura.</string>
<string name="actionbar_logger">Logs</string>
<string name="log_send_history_button">Enviar Histórico</string>
- <string name="log_mail_subject">Logs do aplicativo ownCloud Android</string>
- <string name="log_progress_dialog_text">Carregamento de dados...</string>
+ <string name="log_send_no_mail_app">Não foi encontrado nenhum app para envio de logs. Instale o mail app!</string>
+ <string name="log_send_mail_subject">%1$s logs do Android app</string>
+ <string name="log_progress_dialog_text">Carregando dados...</string>
<string name="saml_authentication_required_text">Autenticação é requerida</string>
<string name="saml_authentication_wrong_pass">Senha incorreta</string>
<string name="actionbar_move">Mover</string>
<string name="prefs_imprint">Imprint</string>
<string name="prefs_remember_last_share_location">Lembrar localização de partilha</string>
<string name="prefs_remember_last_upload_location_summary">Lembrar da última localização de envio de partilha</string>
- <string name="recommend_subject">Experimente %1$s no seu smartphone!</string>
+ <string name="recommend_subject">Test %1$s no seu smartphone!</string>
<string name="recommend_text">Quero convidar-te a usares %1$s no teu smartphone!\nFaz download aqui: %2$s</string>
<string name="auth_check_server">Verificar Servidor</string>
<string name="auth_host_url">Endereço do servidor https://..</string>
<string name="uploader_error_forbidden_content">O %1$s não está autorizado a aceder aos ficheiro partilhados.</string>
<string name="uploader_info_uploading">A enviar</string>
<string name="file_list_seconds_ago">segundos atrás</string>
- <string name="file_list_empty">Vazio. Envie alguma coisa!</string>
+ <string name="file_list_empty">Aqui não existe nada. Envie alguma coisa!</string>
<string name="file_list_loading">A carregar ...</string>
<string name="local_file_list_empty">Não existem ficheiros nesta pasta.</string>
<string name="file_list_folder">pasta</string>
<string name="file_list_folders">pastas</string>
<string name="file_list_file">ficheiro</string>
<string name="file_list_files">ficheiros</string>
- <string name="filedetails_select_file">Clique no ficheiro para visualizar informação adicional.</string>
+ <string name="filedetails_select_file">Toque num ficheiro para visualizar a informação adicional.</string>
<string name="filedetails_size">Tamanho:</string>
<string name="filedetails_type">Tipo:</string>
<string name="filedetails_created">Criado:</string>
<string name="filedetails_modified">Modificado:</string>
<string name="filedetails_download">Transferir</string>
<string name="filedetails_sync_file">Atualizar ficheiro</string>
- <string name="filedetails_renamed_in_upload_msg">O nome do ficheiro foi alterado para %1$s durante o envio.</string>
+ <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado para %1$s durante o envio.</string>
<string name="action_share_file">Partilhar a hiperligação</string>
<string name="action_unshare_file">Deixar de partilhar a ligação</string>
<string name="common_yes">Sim</string>
<string name="common_no">Não</string>
- <string name="common_ok">OK</string>
+ <string name="common_ok">ACEITAR</string>
<string name="common_cancel_download">Cancelar a transferência</string>
<string name="common_cancel_upload">Cancelar o envio</string>
<string name="common_cancel">Cancelar</string>
<string name="upload_chooser_title">Enviar de ...</string>
<string name="uploader_info_dirname">Nome da pasta</string>
<string name="uploader_upload_in_progress_ticker">A enviar ...</string>
- <string name="uploader_upload_in_progress_content">A enviar %1$d%% , %2$s completo.</string>
- <string name="uploader_upload_succeeded_ticker">Carregado com sucesso</string>
- <string name="uploader_upload_succeeded_content_single">%1$s foi carregado com sucesso</string>
- <string name="uploader_upload_failed_ticker">Carregamento falhou</string>
+ <string name="uploader_upload_in_progress_content">%1$d%% A enviar %2$s</string>
+ <string name="uploader_upload_succeeded_ticker">Envio bem sucedido</string>
+ <string name="uploader_upload_succeeded_content_single">%1$s foi enviado com sucesso</string>
+ <string name="uploader_upload_failed_ticker">Não foi possível enviar</string>
<string name="uploader_upload_failed_content_single">O envio do ficheiro %1$s não foi concluído.</string>
<string name="uploader_upload_failed_credentials_error">Falha no carregamento, é necessário fazer novo login</string>
<string name="downloader_download_in_progress_ticker">A transferir ...</string>
- <string name="downloader_download_in_progress_content">%1$d%% A decarregar %2$s</string>
- <string name="downloader_download_succeeded_ticker">Descarga com sucesso</string>
+ <string name="downloader_download_in_progress_content">%1$d%% A transferir %2$s</string>
+ <string name="downloader_download_succeeded_ticker">Transferência bem sucedida</string>
<string name="downloader_download_succeeded_content">%1$s foi descarregado com sucesso</string>
<string name="downloader_download_failed_ticker">Descarga falhou</string>
<string name="downloader_download_failed_content">O descarregamento %1$s não foi possível descarregar</string>
- <string name="downloader_not_downloaded_yet">Não transferido</string>
- <string name="downloader_download_failed_credentials_error">Falha no download, é necessário fazer login </string>
+ <string name="downloader_not_downloaded_yet">Ainda não foi transferido</string>
+ <string name="downloader_download_failed_credentials_error">Não foi possível transferir, tem de iniciar a sessão novamente</string>
<string name="common_choose_account">Escolha a conta</string>
<string name="sync_fail_ticker">Falhou a sincronização</string>
<string name="sync_fail_ticker_unauthorized">Falhou a sincronização, necessita fazer um novo login</string>
<string name="sync_foreign_files_forgotten_explanation">Tal como na versão 1.3.16, os ficheiros que foram enviados deste dispositivo são copiados para a pasta local %1$s para prevenir perda de dados quando um ficheiro é partilhado com várias contas.\n\nDevido a esta alteração, todos os ficheiros das versões anteriores foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão deste processo durante a sincronização da conta. Pode deixar o ficheiro(s) como estão e remover o link para %3$s, ou mover o(s) ficheiro(s) para a pasta %1$s e guardar o link para %4$s. \n\nEm baixo estão listados ficheiro(s) locais e remotos em %5$s que foram ligados.</string>
<string name="sync_current_folder_was_removed">A pasta %1$s já não existe</string>
<string name="foreign_files_move">Mover Todos</string>
- <string name="foreign_files_success">Todos os ficheiros foram movidos</string>
+ <string name="foreign_files_success">Foram movidos todos os ficheiros</string>
<string name="foreign_files_fail">Não foi possível mover alguns ficheiros</string>
<string name="foreign_files_local_text">Local: %1$s</string>
<string name="foreign_files_remote_text">Remoto: %1$s</string>
<string name="upload_query_move_foreign_files">Não existe espaço disponível para copiar o ficheiro seleccionado para a pasta %1$s . Em vez disso deseja mover o ficheiro?</string>
- <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</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 App PIN, por favor</string>
- <string name="pincode_remove_your_pincode">Remover o PIN do aplicação.</string>
+ <string name="pincode_enter_pin_code">Por favor, insira o PIN da App</string>
+ <string name="pincode_configure_your_pin">Insira o PIN da App</string>
+ <string name="pincode_configure_your_pin_explanation">O PIN será pedido sempre que a app seja iniciada.</string>
+ <string name="pincode_reenter_your_pincode">Por favor, reinsira o PIN da App</string>
+ <string name="pincode_remove_your_pincode">Remover o seu PIN da App</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 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>
+ <string name="media_state_playing">%1$s (a reproduzir)</string>
+ <string name="media_state_loading">%1$s (a carregar)</string>
<string name="media_event_done">%1$s leitura terminada</string>
<string name="media_err_nothing_to_play">Não foi encontrado nenhum ficheiro de média</string>
<string name="media_err_no_account">Não foi fornecida conta</string>
<string name="auth_redirect_non_secure_connection_title">Ligação segura é redireccionada para um caminho inseguro.</string>
<string name="actionbar_logger">Registos de Alterações</string>
<string name="log_send_history_button">Enviar Histórico</string>
- <string name="log_mail_subject">Registos das alterações da app ownCloud Android</string>
- <string name="log_progress_dialog_text">A carregar os dados ...</string>
+ <string name="log_send_no_mail_app">Não foi encontrado o aplicativo para envio de registos . Instale app e-mail!</string>
+ <string name="log_send_mail_subject">%1$s Android Aplicação de Registyos</string>
+ <string name="log_progress_dialog_text">A carregar os dados...</string>
<string name="saml_authentication_required_text">Autenticação necessária</string>
<string name="saml_authentication_wrong_pass">Palavra-passe errada</string>
<string name="actionbar_move">Mover</string>
<string name="forbidden_permissions_move">para mover este ficheiro</string>
<string name="prefs_category_instant_uploading">Envios Instantâneos</string>
<string name="prefs_category_security">Segurança</string>
+ <string name="prefs_instant_video_upload_path_title">Envio do Caminho do Vídeo</string>
</resources>
<string name="downloader_download_file_not_found">Fișierul nu mai este disponibil pe server</string>
<string name="prefs_category_accounts">Conturi</string>
<string name="prefs_add_account">Adaugă cont</string>
- <string name="log_progress_dialog_text">Se încarcă datele...</string>
<string name="saml_authentication_required_text">Autentificare necesară</string>
<string name="saml_authentication_wrong_pass">Parolă greșită</string>
<string name="actionbar_move">Mutare</string>
<string name="prefs_recommend">Рекомендовать другу</string>
<string name="prefs_feedback">Обратная связь</string>
<string name="prefs_imprint">Штамп</string>
+ <string name="prefs_remember_last_share_location">Запомнить расположение публикации</string>
+ <string name="prefs_remember_last_upload_location_summary">Запомнить расположение загрузки последней публикации</string>
<string name="recommend_subject">Попробуйте %1$s на вашем смартфоне!</string>
<string name="recommend_text">Хочу предложить вам использовать %1$s на смартфоне!\nЗагрузить можно здесь: %2$s
</string>
<string name="auth_redirect_non_secure_connection_title">Защищённое соединение перенаправлено по незащищённому маршруту</string>
<string name="actionbar_logger">Журналы</string>
<string name="log_send_history_button">История Отправлений</string>
- <string name="log_mail_subject">Журналы Андроид-приложения ownCloud</string>
- <string name="log_progress_dialog_text">Загружаются данные...</string>
+ <string name="log_send_no_mail_app">Приложение для отправки журнала не найдено. Установите почтовое приложение!</string>
+ <string name="log_send_mail_subject">Журналы приложения %1$s для Android</string>
+ <string name="log_progress_dialog_text">Загрузка данных…</string>
<string name="saml_authentication_required_text">Требуется аутентификация </string>
<string name="saml_authentication_wrong_pass">Неправильный пароль</string>
<string name="actionbar_move">Переместить</string>
<string name="forbidden_permissions_move">переместить этот файл</string>
<string name="prefs_category_instant_uploading">Мгновенные загрузки</string>
<string name="prefs_category_security">Безопасность</string>
+ <string name="prefs_instant_video_upload_path_title">Путь для загрузки Видео</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">Zabezpečené pripojenie je presmerované na nezabezpečenú trasu.</string>
<string name="actionbar_logger">Logy</string>
<string name="log_send_history_button">Odoslať históriu</string>
- <string name="log_mail_subject">Logy aplikácie ownCloud pre Android</string>
- <string name="log_progress_dialog_text">Nahrávam dáta...</string>
<string name="saml_authentication_required_text">Vyžaduje sa overenie</string>
<string name="saml_authentication_wrong_pass">Nesprávne heslo</string>
<string name="actionbar_move">Presunúť</string>
<string name="auth_redirect_non_secure_connection_title">Varna povezava je preusmerjena preko ne-varne poti.</string>
<string name="actionbar_logger">Dnevnik</string>
<string name="log_send_history_button">Pošlji zgodovino</string>
- <string name="log_mail_subject">Dnevnik programa ownCloud</string>
+ <string name="log_send_no_mail_app">Ni nameščenega poštnega programa za pošiljanje dnevnikov.</string>
+ <string name="log_send_mail_subject">%1$s dnevniki programa</string>
<string name="log_progress_dialog_text">Poteka nalaganje podatkov ...</string>
<string name="saml_authentication_required_text">Zahtevana je overitev</string>
<string name="saml_authentication_wrong_pass">Napačno geslo</string>
<string name="forbidden_permissions_move">med premikanjem datoteke</string>
<string name="prefs_category_instant_uploading">Takojšnje pošiljanje v oblak</string>
<string name="prefs_category_security">Varnost</string>
+ <string name="prefs_instant_video_upload_path_title">Pot videa za pošiljanje</string>
</resources>
<string name="downloader_download_file_not_found">Filen är inte längre tillgänglig på servern</string>
<string name="prefs_category_accounts">Konton</string>
<string name="prefs_add_account">Lägg till konto</string>
- <string name="log_progress_dialog_text">Laddar data...</string>
<string name="saml_authentication_required_text">Autentisering krävs</string>
<string name="saml_authentication_wrong_pass">Fel lösenord</string>
<string name="actionbar_move">Flytta</string>
<string name="auth_redirect_non_secure_connection_title">Güvenli bağlantı, güvenli olmayan bir rotaya yönlendirildi.</string>
<string name="actionbar_logger">Günlükler</string>
<string name="log_send_history_button">Geçmişi Gönder</string>
- <string name="log_mail_subject">ownCloud Android uygulama kayıtları</string>
- <string name="log_progress_dialog_text">Veri yükleniyor...</string>
+ <string name="log_send_no_mail_app">Logları göndermek için uygulama bulunamadı. Eposta uygulamasını yükleyin!</string>
+ <string name="log_send_mail_subject">%1$s Android uygulama kayıtları</string>
+ <string name="log_progress_dialog_text">Yükleniyor...</string>
<string name="saml_authentication_required_text">Kimlik doğrulama gerekli</string>
<string name="saml_authentication_wrong_pass">Hatalı parola</string>
<string name="actionbar_move">Taşı</string>
<string name="forbidden_permissions_move">bu dosyayı taşımak için</string>
<string name="prefs_category_instant_uploading">Anında Yüklemeler</string>
<string name="prefs_category_security">Güvenlik</string>
+ <string name="prefs_instant_video_upload_path_title">Video Yükleme Yolu</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">Безпечне підключення перенаправляється через незабезпечений маршрут.</string>
<string name="actionbar_logger">Журнали</string>
<string name="log_send_history_button">Надіслати історію</string>
- <string name="log_mail_subject">Журнали Android-додатка ownCloud</string>
- <string name="log_progress_dialog_text">Завантаження даних...</string>
<string name="saml_authentication_required_text">Потрібна аутентифікація</string>
<string name="saml_authentication_wrong_pass">Невірний пароль</string>
<string name="actionbar_move">Перемістити</string>
<string name="about_version">版本：%1$s</string>
<string name="actionbar_sync">刷新帐户</string>
<string name="actionbar_upload">上传</string>
- <string name="actionbar_upload_from_apps">来自其它app的内容</string>
+ <string name="actionbar_upload_from_apps">来自其它应用的内容</string>
<string name="actionbar_upload_files">文件</string>
- <string name="actionbar_open_with">打开</string>
- <string name="actionbar_mkdir">增加文件夹</string>
+ <string name="actionbar_open_with">打开方式</string>
+ <string name="actionbar_mkdir">新建文件夹</string>
<string name="actionbar_settings">设置</string>
<string name="actionbar_see_details">详细信息</string>
<string name="actionbar_send_file">发送</string>
+ <string name="actionbar_sort">排序</string>
+ <string name="actionbar_sort_title">排序方式</string>
+ <string-array name="actionbar_sortby">
+ <item>A - Z</item>
+ <item>新 - 旧</item>
+ </string-array>
<!--TODO re-enable when server-side folder size calculation is available
<item>Biggest - Smallest</item>-->
<string name="prefs_category_general">常规</string>
<string name="prefs_accounts">账号</string>
<string name="prefs_manage_accounts">管理账号</string>
<string name="prefs_pincode">App PIN</string>
- <string name="prefs_pincode_summary">保护您的App客户端</string>
+ <string name="prefs_pincode_summary">保护客户端</string>
<string name="prefs_instant_upload">即时图片上传</string>
<string name="prefs_instant_upload_summary">即时上传相机拍摄的图片</string>
- <string name="prefs_instant_video_upload">立即上传视频</string>
+ <string name="prefs_instant_video_upload">即时上传视频</string>
<string name="prefs_instant_video_upload_summary">即时上传由相机拍摄的视频</string>
<string name="prefs_log_title">开启日志</string>
- <string name="prefs_log_summary">这过去是日志问题</string>
+ <string name="prefs_log_summary">用于记录问题</string>
<string name="prefs_log_title_history">日志历史</string>
<string name="prefs_log_summary_history">这显示已经保存的日志</string>
<string name="prefs_log_delete_history_button">删除历史</string>
<string name="prefs_recommend">推荐给朋友</string>
<string name="prefs_feedback">反馈</string>
<string name="prefs_imprint">版本说明</string>
- <string name="recommend_subject">在您的智能手机上试用一下 %1$s！</string>
- <string name="recommend_text">“我邀请你使用在你的智能手机上使用 %1$s，在这下载：%2$s”
- </string>
+ <string name="prefs_remember_last_share_location">记住共享位置</string>
+ <string name="prefs_remember_last_upload_location_summary">记住上次共享上传的位置</string>
+ <string name="recommend_subject">在您的智能手机上试用 %1$s！</string>
+ <string name="recommend_text">我邀请你在智能手机上使用 %1$s\n下载路径：%2$s</string>
<string name="auth_check_server">检查服务器</string>
<string name="auth_host_url">服务器地址 https://...</string>
<string name="auth_username">用户名</string>
<string name="auth_password">密码</string>
- <string name="auth_register">新增到 %1$s?</string>
+ <string name="auth_register">初次使用 %1$s?</string>
<string name="sync_string_files">文件</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">设备上未找到账号，请先创建账号。</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">没æ\9c\89æ\8e¥æ\94¶å\88°å\86\85容ï¼\8cæ\97 å\8f¯ä¸\8aä¼ 。</string>
+ <string name="uploader_wrn_no_content_title">没有需要上传的内容</string>
+ <string name="uploader_wrn_no_content_text">没æ\9c\89æ\8e¥æ\94¶å\88°å\86\85容ï¼\8c没æ\9c\89é\9c\80è¦\81ä¸\8aä¼ ç\9a\84å\86\85容。</string>
<string name="uploader_error_forbidden_content">%1$s未被允许访问共享内容。</string>
<string name="uploader_info_uploading">上传</string>
- <string name="file_list_seconds_ago">秒前</string>
+ <string name="file_list_seconds_ago">几秒前</string>
<string name="file_list_empty">这里还什么都没有。上传些东西吧！</string>
<string name="file_list_loading">载入中....</string>
<string name="local_file_list_empty">在该文件夹中不存在文件。</string>
<string name="file_list_folders">文件夹</string>
<string name="file_list_file">文件</string>
<string name="file_list_files">文件</string>
- <string name="filedetails_select_file">点击一个文件æ\9d¥æ\98¾ç¤ºé¢\9då¤\96ç\9a\84ä¿¡æ\81¯ã\80\82</string>
+ <string name="filedetails_select_file">点击一个文件å\8f¯ä»¥æ\98¾ç¤ºé¢\9då¤\96ç\9a\84ä¿¡æ\81¯ã\80\82</string>
<string name="filedetails_size">大小：</string>
<string name="filedetails_type">类型：</string>
<string name="filedetails_created">创建于：</string>
- <string name="filedetails_modified">已修改：</string>
+ <string name="filedetails_modified">修改于：</string>
<string name="filedetails_download">下载</string>
<string name="filedetails_sync_file">刷新文件</string>
<string name="filedetails_renamed_in_upload_msg">上传过程中文件被更名为了 %1$s</string>
<string name="action_share_file">分享链接</string>
- <string name="action_unshare_file">å\8f\96æ¶\88å\85±享链接</string>
+ <string name="action_unshare_file">å\8f\96æ¶\88å\88\86享链接</string>
<string name="common_yes">是</string>
<string name="common_no">否</string>
- <string name="common_ok">OK</string>
+ <string name="common_ok">确定</string>
<string name="common_cancel_download">取消下载</string>
<string name="common_cancel_upload">取消上传</string>
<string name="common_cancel">取消</string>
<string name="delete_account">删除账号</string>
<string name="create_account">创建账号</string>
<string name="upload_chooser_title">上传自...</string>
- <string name="uploader_info_dirname">目录名称</string>
+ <string name="uploader_info_dirname">文件夹名称</string>
<string name="uploader_upload_in_progress_ticker">上传...</string>
<string name="uploader_upload_in_progress_content">%1$d%% 上传 %2$s</string>
<string name="uploader_upload_succeeded_ticker">上传成功</string>
<string name="uploader_upload_succeeded_content_single">%1$s 成功上传</string>
<string name="uploader_upload_failed_ticker">上传失败</string>
- <string name="uploader_upload_failed_content_single">1$上传未能完成</string>
+ <string name="uploader_upload_failed_content_single">%1$s 未能成功上传</string>
<string name="uploader_upload_failed_credentials_error">上传失败，您需要重新登录</string>
- <string name="downloader_download_in_progress_ticker">下载中……</string>
+ <string name="downloader_download_in_progress_ticker">下载中...</string>
<string name="downloader_download_in_progress_content">%1$d%% 下载中 %2$s</string>
<string name="downloader_download_succeeded_ticker">下载成功</string>
- <string name="downloader_download_succeeded_content">%1$s 成功下载</string>
+ <string name="downloader_download_succeeded_content">成功下载 %1$s </string>
<string name="downloader_download_failed_ticker">下载失败</string>
- <string name="downloader_download_failed_content">下载1$s 未能完成</string>
+ <string name="downloader_download_failed_content">%1$s 下载未能完成</string>
<string name="downloader_not_downloaded_yet">未下载完毕</string>
<string name="downloader_download_failed_credentials_error">下载失败，您需要重新登录</string>
<string name="common_choose_account">选择账户</string>
<string name="sync_fail_ticker">同步失败</string>
<string name="sync_fail_ticker_unauthorized">同步失败，您需要重新登录</string>
<string name="sync_fail_content"> %1$s同步未完成。</string>
- <string name="sync_fail_content_unauthorized">密码错误%1$s</string>
+ <string name="sync_fail_content_unauthorized">%1$s 的密码错误</string>
<string name="sync_conflicts_in_favourites_ticker">发现冲突</string>
<string name="sync_conflicts_in_favourites_content">%1$d 文件无法同步</string>
<string name="sync_fail_in_favourites_ticker">文件同步失败</string>
- <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(与 %2$d 冲突)</string>
+ <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(%2$d 冲突)</string>
<string name="sync_foreign_files_forgotten_ticker">某些本地文件已被遗忘</string>
<string name="sync_foreign_files_forgotten_content">%2$s 目录中的 %1$d 个文件不能被复制到</string>
<string name="sync_foreign_files_forgotten_explanation">从 1.3.16 版起，从此设备上传的文件将被复制到本地的 %1$s 文件夹，以防止某个单一文件在多个账户间同步而造成的数据损失。\n\n 由于此项变化，此应用之前的版本上传的全部文件都已被复制到了 %2$s 文件夹。然而，账户同步期间有一个错误阻止了此操作的完成。您可能想保持文件不动，并移除指向 %3$s 的链接，或将文件移动到 %1$s 文件夹中并保持其到 %4$s 的链接。下面列出的是本地文件，以及它们被链接到的 %5$s 中的远程文件。</string>
- <string name="sync_current_folder_was_removed">文件夹%1$s 不存在</string>
+ <string name="sync_current_folder_was_removed">文件夹%1$s 已经不存在</string>
<string name="foreign_files_move">移动所有</string>
<string name="foreign_files_success">所有文件已被移动</string>
<string name="foreign_files_fail">某些文件无法被移动</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="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>
<string name="media_play_pause_description">播放暂停按钮</string>
<string name="media_forward_description">快进按钮</string>
<string name="auth_getting_authorization">正在认证...</string>
- <string name="auth_trying_to_login">尝试登录</string>
+ <string name="auth_trying_to_login">尝试登录...</string>
<string name="auth_no_net_conn_title">没有网络连接</string>
- <string name="auth_nossl_plain_ok_title">安全链接无效。</string>
+ <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">服务器配置不正确。</string>
+ <string name="auth_not_configured_title">服务器配置不正确</string>
<string name="auth_account_not_new">此设备中已经存在同名同服务器的帐号</string>
<string name="auth_account_not_the_same">输入用户与此帐户的用户不符</string>
<string name="auth_unknown_error_title">发生未知错误！</string>
- <string name="auth_unknown_host_title">无法找到服务器</string>
+ <string name="auth_unknown_host_title">无法找到主机</string>
<string name="auth_incorrect_path_title">未发现服务器实例</string>
<string name="auth_timeout_title">看起来服务器不太给力</string>
<string name="auth_incorrect_address_title">网址不正确</string>
<string name="auth_ssl_unverified_server_title">无法验证 SSL 服务器的身份</string>
<string name="auth_bad_oc_version_title">不可辨识的服务器服务器版本</string>
<string name="auth_wrong_connection_title">无法建立连接</string>
- <string name="auth_secure_connection">å\8a å¯\86连接已建立</string>
- <string name="auth_unauthorized">用户名或密码错误！</string>
+ <string name="auth_secure_connection">å®\89å\85¨连接已建立</string>
+ <string name="auth_unauthorized">用户名或密码错误</string>
<string name="auth_oauth_error">认证不成功</string>
<string name="auth_oauth_error_access_denied">访问被认证服务器拒绝</string>
<string name="auth_wtf_reenter_URL">意外状态；请再次输入服务器的地址</string>
<string name="auth_expired_oauth_token_toast">你的授权已经过期。请重新授权。</string>
- <string name="auth_expired_basic_auth_toast">请输入当前密码：</string>
+ <string name="auth_expired_basic_auth_toast">请输入当前密码</string>
<string name="auth_expired_saml_sso_token_toast">您的会话超时了，请重新连接</string>
<string name="auth_connecting_auth_server">正在连接到认证服务器....</string>
<string name="auth_unsupported_auth_method">服务器不支持这种验证方式</string>
<string name="filename_empty">文件名不能为空</string>
<string name="wait_a_moment">请稍候</string>
<string name="filedisplay_unexpected_bad_get_content">未知问题；请试试用其他程序选择此文件</string>
- <string name="filedisplay_no_file_selected">未选择文件。</string>
+ <string name="filedisplay_no_file_selected">未选择文件</string>
<string name="activity_chooser_title">发送链接给 …</string>
<string name="oauth_check_onoff">使用oAuth2登陆</string>
<string name="oauth_login_connection">连接oAuth2 服务器...</string>
<string name="ssl_validator_header">站点身份无法验证</string>
- <string name="ssl_validator_reason_cert_not_trusted">不受信任的服务器证书</string>
- <string name="ssl_validator_reason_cert_expired">服务器证书过期</string>
- <string name="ssl_validator_reason_cert_not_yet_valid">服务器证书过新</string>
- <string name="ssl_validator_reason_hostname_not_verified">主机名与证书中的记录不匹配</string>
+ <string name="ssl_validator_reason_cert_not_trusted">- 不受信任的服务器证书</string>
+ <string name="ssl_validator_reason_cert_expired">- 服务器证书过期</string>
+ <string name="ssl_validator_reason_cert_not_yet_valid">- 服务器证书时间比当前时间还晚</string>
+ <string name="ssl_validator_reason_hostname_not_verified">- 主机名与证书中的记录不匹配</string>
<string name="ssl_validator_question">是否信任此证书？</string>
<string name="ssl_validator_not_saved">证书无法保存</string>
<string name="ssl_validator_btn_details_see">详细信息</string>
<string name="placeholder_filesize">389字节</string>
<string name="placeholder_timestamp">2012/05/18 下午12:23 </string>
<string name="placeholder_media_time">12:23:45</string>
- <string name="instant_upload_on_wifi">仅通过WIFI上传图片。</string>
- <string name="instant_video_upload_on_wifi">仅在 WIFI 下上传视频</string>
+ <string name="instant_upload_on_wifi">仅通过 WIFI 上传图片。</string>
+ <string name="instant_video_upload_on_wifi">仅通过 WIFI 上传视频</string>
<string name="instant_upload_path">/InstantUpload</string>
<string name="conflict_title">上传冲突</string>
<string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
<string name="conflict_overwrite">覆盖</string>
<string name="conflict_dont_upload">不上传</string>
<string name="preview_image_description">图片预览</string>
- <string name="preview_image_error_unknown_format">不能显示图片</string>
+ <string name="preview_image_error_unknown_format">无法显示图片</string>
<string name="error__upload__local_file_not_copied">无法复制 %1$s 到本地目录 %2$s</string>
+ <string name="prefs_instant_upload_path_title">上传路径</string>
<string name="share_link_no_support_share_api">抱歉，共享功能未启用。请联系管理员。</string>
<string name="share_link_file_no_exist">无法共享。请检查文件是否存在</string>
<string name="share_link_file_error">共享文件或目录出错</string>
<string name="network_error_connect_timeout_exception">等待服务器响应时发生了一个错误，此操作无法完成</string>
<string name="network_host_not_available">服务器不可用，此操作无法完成</string>
<string name="empty"></string>
- <string name="forbidden_permissions">你没有许可%s</string>
+ <string name="forbidden_permissions">你没有权限%s</string>
<string name="forbidden_permissions_rename">重命名该文件</string>
<string name="forbidden_permissions_delete">删除该文件</string>
- <string name="share_link_forbidden_permissions">å\88\86享该文件</string>
+ <string name="share_link_forbidden_permissions">å\85±享该文件</string>
<string name="unshare_link_forbidden_permissions">取消共享该文件</string>
<string name="forbidden_permissions_create">创建文件</string>
- <string name="uploader_upload_forbidden_permissions">上传此文件夹</string>
+ <string name="uploader_upload_forbidden_permissions">在此文件夹上传</string>
<string name="downloader_download_file_not_found">该文件在服务器上不可用</string>
<string name="prefs_category_accounts">账号</string>
<string name="prefs_add_account">添加账号</string>
+ <string name="auth_redirect_non_secure_connection_title">安全连接被重定向到非安全路径.</string>
<string name="actionbar_logger">日志</string>
<string name="log_send_history_button">发送历史</string>
- <string name="log_mail_subject">ownCloud安卓客户端日志</string>
- <string name="log_progress_dialog_text">加载数据中...</string>
+ <string name="log_send_no_mail_app">未找到可以发送日志的程序。请安装 mail!</string>
+ <string name="log_send_mail_subject">%1$s Android 程序日志</string>
+ <string name="log_progress_dialog_text">载入数据...</string>
<string name="saml_authentication_required_text">需要认证</string>
<string name="saml_authentication_wrong_pass">错误密码</string>
<string name="actionbar_move">移动</string>
<string name="file_list_empty_moving">这里还什么都没有。上传些东西吧！</string>
- <string name="folder_picker_choose_button_text">选择(&C)...</string>
+ <string name="folder_picker_choose_button_text">选择</string>
<string name="move_file_not_found">无法移动。请检查文件是否存在</string>
- <string name="move_file_invalid_into_descendent">b不能够把一个目录移动到它的下级</string>
+ <string name="move_file_invalid_into_descendent">无法把一个目录移动到它的下级</string>
<string name="move_file_invalid_overwrite">该文件已经存在在目标文件夹</string>
<string name="move_file_error">尝试移动该文件或文件夹时发生错误</string>
<string name="forbidden_permissions_move">移动该文件</string>
+ <string name="prefs_category_instant_uploading">即时上传</string>
<string name="prefs_category_security">安全</string>
+ <string name="prefs_instant_video_upload_path_title">视频上传路径</string>
</resources>
<string name="auth_redirect_non_secure_connection_title">安全連線被轉向到一個非安全的連線</string>
<string name="actionbar_logger">紀錄</string>
<string name="log_send_history_button">傳送歷史記錄</string>
- <string name="log_mail_subject">ownCloud Android 應用程式記錄</string>
+ <string name="log_send_no_mail_app">找不到可以傳送記錄的電子郵件程式. 請安裝電子郵件軟體!</string>
+ <string name="log_send_mail_subject">%1$s Android 應用程式記錄</string>
<string name="log_progress_dialog_text">資料載入中...</string>
<string name="saml_authentication_required_text">必須驗證</string>
<string name="saml_authentication_wrong_pass">密碼錯誤</string>
<string name="forbidden_permissions_move">移動這個檔案</string>
<string name="prefs_category_instant_uploading">即時上傳</string>
<string name="prefs_category_security">安全性</string>
+ <string name="prefs_instant_video_upload_path_title">影片上傳路徑</string>
</resources>
<string name="actionbar_logger">Logs</string>
<string name="log_send_history_button">Send History</string>
- <string name="log_mail_subject">ownCloud Android app logs</string>
- <string name="log_progress_dialog_text">Loading data...</string>
+ <string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
+ <string name="log_send_mail_subject">%1$s Android app logs</string>
+ <string name="log_progress_dialog_text">Loading data…</string>
<string name="saml_authentication_required_text">Authentication required</string>
<string name="saml_authentication_wrong_pass">Wrong password</string>
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
+import android.media.ExifInterface;
import android.media.ThumbnailUtils;
import android.net.Uri;
import android.os.AsyncTask;
if (bitmap != null) {
thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
+
+ // Rotate image, obeying exif tag
+ thumbnail = BitmapUtils.rotateImage(thumbnail, mFile.getStoragePath());
// Add thumbnail to cache
addBitmapToCache(imageKey, thumbnail);
mThumbnailsDiskCacheLock.notifyAll(); // Wake any waiting threads
}
}
-
+
}
+++ /dev/null
-package com.owncloud.android.ui;
-
-import android.content.Context;
-import android.preference.CheckBoxPreference;
-import android.view.View;
-
-public class LongClickableCheckBoxPreference extends CheckBoxPreference implements View.OnLongClickListener {
-
- public LongClickableCheckBoxPreference(Context context) {
- super(context);
- }
-
- @Override
- public boolean onLongClick(View v) {
- return true;
- }
-}
--- /dev/null
+package com.owncloud.android.ui;
+
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.view.View;
+
+import com.owncloud.android.R;
+
+public class RadioButtonPreference extends CheckBoxPreference implements View.OnLongClickListener {
+
+ public RadioButtonPreference(Context context) {
+ super(context, null, android.R.attr.checkBoxPreferenceStyle);
+ setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
+ }
+
+ @Override
+ public boolean onLongClick(View v) {
+ return true;
+ }
+}
import android.accounts.AccountManager;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
/**
* Called, when the user selected something for uploading
+ *
*/
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
- requestSimpleUpload(data, resultCode);
-
+ //getClipData is only supported on api level 16+, Jelly Bean
+ if (data.getData() == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){
+ for( int i = 0; i < data.getClipData().getItemCount(); i++){
+ Intent intent = new Intent();
+ intent.setData(data.getClipData().getItemAt(i).getUri());
+ requestSimpleUpload(intent, resultCode);
+ }
+ }else {
+ requestSimpleUpload(data, resultCode);
+ }
} else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
requestMultipleUpload(data, resultCode);
} else if (item == 1) {
Intent action = new Intent(Intent.ACTION_GET_CONTENT);
action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
+ //Intent.EXTRA_ALLOW_MULTIPLE is only supported on api level 18+, Jelly Bean
+ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+ action.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+ }
startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),
ACTION_SELECT_CONTENT_FROM_APPS);
}
import java.lang.reflect.Field;
import java.util.ArrayList;
+import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
import android.os.AsyncTask;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
+import android.widget.Toast;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
private static final String MAIL_ATTACHMENT_TYPE = "text/plain";
+ private static final String KEY_LOG_TEXT = "LOG_TEXT";
+
private static final String TAG = LogHistoryActivity.class.getSimpleName();
private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
private String mLogPath = FileStorageUtils.getLogPath();
private File logDIR = null;
+ private String mLogText;
@Override
actionBar.setDisplayHomeAsUpEnabled(true);
Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
Button sendHistoryButton = (Button) findViewById(R.id.sendLogHistoryButton);
+ TextView logTV = (TextView) findViewById(R.id.logTV);
deleteHistoryButton.setOnClickListener(new OnClickListener() {
}
});
- if (mLogPath != null) {
- logDIR = new File(mLogPath);
- }
-
- if (logDIR != null && logDIR.isDirectory()) {
- // Show a dialog while log data is being loaded
- showLoadingDialog();
-
- TextView logTV = (TextView) findViewById(R.id.logTV);
+ if (savedInstanceState == null) {
+ if (mLogPath != null) {
+ logDIR = new File(mLogPath);
+ }
- // Start a new thread that will load all the log data
- LoadingLogTask task = new LoadingLogTask(logTV);
- task.execute();
+ if (logDIR != null && logDIR.isDirectory()) {
+ // Show a dialog while log data is being loaded
+ showLoadingDialog();
+ // Start a new thread that will load all the log data
+ LoadingLogTask task = new LoadingLogTask(logTV);
+ task.execute();
+ }
+ } else {
+ mLogText = savedInstanceState.getString(KEY_LOG_TEXT);
+ logTV.setText(mLogText);
}
}
*/
private void sendMail() {
+ // For the moment we need to consider the possibility that setup.xml
+ // does not include the "mail_logger" entry. This block prevents that
+ // compilation fails in this case.
String emailAddress;
try {
Class<?> stringClass = R.string.class;
Field mailLoggerField = stringClass.getField("mail_logger");
- int emailAddressId = (Integer)mailLoggerField.get(null);
+ int emailAddressId = (Integer) mailLoggerField.get(null);
emailAddress = getString(emailAddressId);
-
} catch (Exception e) {
emailAddress = "";
}
-
+
ArrayList<Uri> uris = new ArrayList<Uri>();
// Convert from paths to Android friendly Parcelable Uri's
for (String file : Log_OC.getLogFileNames())
{
- if (new File(mLogPath + File.separator, file).exists()) {
- Uri u = Uri.parse("file://" + mLogPath + File.separator + file);
- uris.add(u);
+ File logFile = new File(mLogPath, file);
+ if (logFile.exists()) {
+ uris.add(Uri.fromFile(logFile));
}
}
Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
- // Explicitly only use Gmail to send
- intent.setClassName("com.google.android.gm","com.google.android.gm.ComposeActivityGmail");
- intent.putExtra(Intent.EXTRA_EMAIL, new String[]{ emailAddress });
- intent.putExtra(Intent.EXTRA_SUBJECT, getText(R.string.log_mail_subject));
+ intent.putExtra(Intent.EXTRA_EMAIL, emailAddress);
+ String subject = String.format(getString(R.string.log_send_mail_subject), getString(R.string.app_name));
+ intent.putExtra(Intent.EXTRA_SUBJECT, subject);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setType(MAIL_ATTACHMENT_TYPE);
intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
-
- if (intent.resolveActivity(getPackageManager()) != null) {
+ try {
startActivity(intent);
+ } catch (ActivityNotFoundException e) {
+ Toast.makeText(this, getString(R.string.log_send_no_mail_app), Toast.LENGTH_LONG).show();
+ Log_OC.i(TAG, "Could not find app for sending log history.");
}
+
}
/**
if (textViewReference != null && result != null) {
final TextView logTV = textViewReference.get();
if (logTV != null) {
- logTV.setText(result);
+ mLogText = result;
+ logTV.setText(mLogText);
dismissLoadingDialog();
}
}
loading.dismiss();
}
}
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+ /// global state
+ outState.putString(KEY_LOG_TEXT, mLogText);
+ }
}
\ No newline at end of file
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.db.DbHandler;
import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.ui.LongClickableCheckBoxPreference;
+import com.owncloud.android.ui.RadioButtonPreference;
import com.owncloud.android.utils.DisplayUtils;
ListAdapter listAdapter = listView.getAdapter();
Object obj = listAdapter.getItem(position);
- if (obj != null && obj instanceof LongClickableCheckBoxPreference) {
+ if (obj != null && obj instanceof RadioButtonPreference) {
mShowContextMenu = true;
- mAccountName = ((LongClickableCheckBoxPreference) obj).getKey();
+ mAccountName = ((RadioButtonPreference) obj).getKey();
Preferences.this.openContextMenu(listView);
return false;
}
});
-
+
+ // Load package info
+ String temp;
+ try {
+ PackageInfo pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
+ temp = pkg.versionName;
+ } catch (NameNotFoundException e) {
+ temp = "";
+ Log_OC.e(TAG, "Error while showing about dialog", e);
+ }
+ final String appVersion = temp;
+
// Register context menu for list of preferences.
registerForContextMenu(getListView());
@Override
public boolean onPreferenceClick(Preference preference) {
String feedbackMail =(String) getText(R.string.mail_feedback);
- String feedback =(String) getText(R.string.prefs_feedback);
+ String feedback =(String) getText(R.string.prefs_feedback) + " - android v" + appVersion;
Intent intent = new Intent(Intent.ACTION_SENDTO);
intent.setType("text/plain");
intent.putExtra(Intent.EXTRA_SUBJECT, feedback);
pAboutApp = (Preference) findPreference("about_app");
if (pAboutApp != null) {
pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
- PackageInfo pkg;
- try {
- pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
- pAboutApp.setSummary(String.format(getString(R.string.about_version), pkg.versionName));
- } catch (NameNotFoundException e) {
- Log_OC.e(TAG, "Error while showing about dialog", e);
- }
+ pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
}
loadInstantUploadPath();
else {
for (Account a : accounts) {
- LongClickableCheckBoxPreference accountPreference = new LongClickableCheckBoxPreference(this);
+ RadioButtonPreference accountPreference = new RadioButtonPreference(this);
accountPreference.setKey(a.name);
// Handle internationalized domain names
accountPreference.setTitle(DisplayUtils.convertIdn(a.name, false));
AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
for (Account a : accounts) {
- CheckBoxPreference p = (CheckBoxPreference) findPreference(a.name);
+ RadioButtonPreference p = (RadioButtonPreference) findPreference(a.name);
if (key.equals(a.name)) {
boolean accountChanged = !p.isChecked();
p.setChecked(true);
private static final int INITIAL_HIDE_DELAY = 0; // immediate hide
private ExtendedViewPager mViewPager;
- private PreviewImagePagerAdapter mPreviewImagePagerAdapter;
+ private PreviewImagePagerAdapter mPreviewImagePagerAdapter;
+ private int mSavedPosition = 0;
+ private boolean mHasSavedPosition = false;
private boolean mRequestWaitingForBinder;
}
mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), parentFolder, getAccount(), getStorageManager());
mViewPager = (ExtendedViewPager) findViewById(R.id.fragmentPager);
- int position = mPreviewImagePagerAdapter.getFilePosition(getFile());
+ int position = mHasSavedPosition ? mSavedPosition : mPreviewImagePagerAdapter.getFilePosition(getFile());
position = (position >= 0) ? position : 0;
mViewPager.setAdapter(mPreviewImagePagerAdapter);
mViewPager.setOnPageChangeListener(this);
*/
@Override
public void onPageSelected(int position) {
+ mSavedPosition = position;
+ mHasSavedPosition = true;
if (mDownloaderBinder == null) {
mRequestWaitingForBinder = true;
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.utils.BitmapUtils;
import com.owncloud.android.utils.TouchImageViewCustom;
private static final String TAG = PreviewImageFragment.class.getSimpleName();
private boolean mIgnoreFirstSavedState;
+
+ private LoadBitmapTask mLoadBitmapTask = null;
/**
public void onStart() {
super.onStart();
if (getFile() != null) {
- BitmapLoader bl = new BitmapLoader(mImageView, mMessageView, mProgressWheel);
- bl.execute(new String[]{getFile().getStoragePath()});
+ mLoadBitmapTask = new LoadBitmapTask(mImageView, mMessageView, mProgressWheel);
+ mLoadBitmapTask.execute(new String[]{getFile().getStoragePath()});
}
}
+ @Override
+ public void onStop() {
+ super.onStop();
+ if (mLoadBitmapTask != null) {
+ mLoadBitmapTask.cancel(true);
+ mLoadBitmapTask = null;
+ }
+
+ }
+
/**
* {@inheritDoc}
*/
finish();
}
-
- private class BitmapLoader extends AsyncTask<String, Void, Bitmap> {
+
+ private class LoadBitmapTask extends AsyncTask<String, Void, Bitmap> {
/**
* Weak reference to the target {@link ImageView} where the bitmap will be loaded into.
*
* @param imageView Target {@link ImageView} where the bitmap will be loaded into.
*/
- public BitmapLoader(ImageViewCustom imageView, TextView messageView, ProgressBar progressWheel) {
+ public LoadBitmapTask(ImageViewCustom imageView, TextView messageView, ProgressBar progressWheel) {
mImageViewRef = new WeakReference<ImageViewCustom>(imageView);
mMessageViewRef = new WeakReference<TextView>(messageView);
mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);
String storagePath = params[0];
try {
+ if (isCancelled()) return result;
+
File picture = new File(storagePath);
if (picture != null) {
- //Decode file into a bitmap in real size for being able to make zoom on the image
+ // Decode file into a bitmap in real size for being able to make zoom on
+ // the image
result = BitmapFactory.decodeStream(new FlushedInputStream
(new BufferedInputStream(new FileInputStream(picture))));
}
+ if (isCancelled()) return result;
+
if (result == null) {
mErrorMessageId = R.string.preview_image_error_unknown_format;
Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath);
+ } else {
+ // Rotate image, obeying exif tag.
+ result = BitmapUtils.rotateImage(result, storagePath);
}
} catch (OutOfMemoryError e) {
Log_OC.e(TAG, "Out of memory occured for file " + storagePath, e);
- // If out of memory error when loading image, try to load it scaled
+ if (isCancelled()) return result;
+
+ // If out of memory error when loading or rotating image, try to load it scaled
result = loadScaledImage(storagePath);
if (result == null) {
mErrorMessageId = R.string.preview_image_error_unknown_format;
Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath);
+ } else {
+ // Rotate scaled image, obeying exif tag
+ result = BitmapUtils.rotateImage(result, storagePath);
}
} catch (NoSuchFieldError e) {
mErrorMessageId = R.string.common_error_unknown;
- Log_OC.e(TAG, "Error from access to unexisting field despite protection; file " + storagePath, e);
+ Log_OC.e(TAG, "Error from access to unexisting field despite protection; file "
+ + storagePath, e);
} catch (Throwable t) {
mErrorMessageId = R.string.common_error_unknown;
Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t);
}
+
return result;
}
@Override
+ protected void onCancelled(Bitmap result) {
+ if (result != null) {
+ result.recycle();
+ }
+ }
+
+ @Override
protected void onPostExecute(Bitmap result) {
hideProgressWheel();
if (result != null) {
showErrorMessage();
}
}
-
+
@SuppressLint("InlinedApi")
private void showLoadedImage(Bitmap result) {
if (mImageViewRef != null) {
*/
package com.owncloud.android.utils;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
import android.graphics.BitmapFactory.Options;
+import android.media.ExifInterface;
/**
* Utility class with methods for decoding Bitmaps.
return inSampleSize;
}
+ /**
+ * Rotate bitmap according to EXIF orientation.
+ * Cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/
+ * @param bitmap Bitmap to be rotated
+ * @param storagePath Path to source file of bitmap. Needed for EXIF information.
+ * @return correctly EXIF-rotated bitmap
+ */
+ public static Bitmap rotateImage(Bitmap bitmap, String storagePath){
+ Bitmap resultBitmap = bitmap;
+
+ try
+ {
+ ExifInterface exifInterface = new ExifInterface(storagePath);
+ int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 1);
+
+ Matrix matrix = new Matrix();
+
+ // 1: nothing to do
+
+ // 2
+ if (orientation == ExifInterface.ORIENTATION_FLIP_HORIZONTAL)
+ {
+ matrix.postScale(-1.0f, 1.0f);
+ }
+ // 3
+ else if (orientation == ExifInterface.ORIENTATION_ROTATE_180)
+ {
+ matrix.postRotate(180);
+ }
+ // 4
+ else if (orientation == ExifInterface.ORIENTATION_FLIP_VERTICAL)
+ {
+ matrix.postScale(1.0f, -1.0f);
+ }
+ // 5
+ else if (orientation == ExifInterface.ORIENTATION_TRANSPOSE)
+ {
+ matrix.postRotate(-90);
+ matrix.postScale(1.0f, -1.0f);
+ }
+ // 6
+ else if (orientation == ExifInterface.ORIENTATION_ROTATE_90)
+ {
+ matrix.postRotate(90);
+ }
+ // 7
+ else if (orientation == ExifInterface.ORIENTATION_TRANSVERSE)
+ {
+ matrix.postRotate(90);
+ matrix.postScale(1.0f, -1.0f);
+ }
+ // 8
+ else if (orientation == ExifInterface.ORIENTATION_ROTATE_270)
+ {
+ matrix.postRotate(270);
+ }
+
+ // Rotate the bitmap
+ resultBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+ if (resultBitmap != bitmap) {
+ bitmap.recycle();
+ }
+ }
+ catch (Exception exception)
+ {
+ Log_OC.e("BitmapUtil", "Could not rotate the image: " + storagePath);
+ }
+ return resultBitmap;
+ }
+
+
}
projects / pub / Android / ownCloud.git / commitdiff