From: jabarros Date: Thu, 7 Aug 2014 15:34:15 +0000 (+0200) Subject: Merge branch 'develop' into accounts_view X-Git-Tag: oc-android-1.7.0_signed~227^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b154fba6ee7e2dfb77ff10e20c20c080758d2a1d?hp=c4359ce3931cd2d54f0798d69b538ec98de619c2 Merge branch 'develop' into accounts_view Conflicts: res/values/strings.xml --- diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index d85eb899..6df2e9aa 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -60,4 +60,12 @@ The third party software included and used by this project is: A binary JAR file must be generated from this linked project and included in the ownCloud client APK. See http://http://actionbarsherlock.com/ + + * TouchImageView, commit 6dbeac4f11936185ba374c73144ac431c23c9aab + Copyright (c) 2012 Michael Ortiz + Licensed under MIT License + JAR file libs/touch-image-view.jar has been generated by ownCloud Inc., including without + modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes. + See https://github.com/MikeOrtiz/TouchImageView + \ No newline at end of file diff --git a/libs/touch-image-view.jar b/libs/touch-image-view.jar new file mode 100644 index 00000000..539f6151 Binary files /dev/null and b/libs/touch-image-view.jar differ diff --git a/owncloud-android-library b/owncloud-android-library index 6b155fb8..e43e43f5 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 6b155fb8029973af08751cf42a77b4a4afd0536d +Subproject commit e43e43f51a895c591b72aaef8f36ef5595d18dba diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml index c5dbef12..4236d070 100644 --- a/res/layout/list_fragment.xml +++ b/res/layout/list_fragment.xml @@ -17,11 +17,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + android:layout_weight="1" > + android:layout_height="match_parent" /> - + android:visibility="gone" > - + + + + + + + diff --git a/res/layout/preview_image_activity.xml b/res/layout/preview_image_activity.xml index 9f8b1196..d712b7f4 100644 --- a/res/layout/preview_image_activity.xml +++ b/res/layout/preview_image_activity.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - - Wagwoord OK Kanseleer + diff --git a/res/values-ak/strings.xml b/res/values-ak/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-ak/strings.xml +++ b/res/values-ak/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-am-rET/strings.xml b/res/values-am-rET/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-am-rET/strings.xml +++ b/res/values-am-rET/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index d818174f..72c0c17c 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -49,7 +49,8 @@ لم يتم استلام أي محتوى. لا شيء للرفع. %1$s غير مسموح له بالوصول للمحتوى المشارك يتم الرفع - لا توجد ملفات في هذا المجلد.\nيمكن إنشاء ملف جديد باختيار \"رفع\" القائمة. + لا يوجد شيء هنا. إرفع بعض الملفات! + جاري التحميل ... اضغظ على الملف ليتم عرض خيارات أكثر الحجم : النوع : @@ -247,4 +248,5 @@ حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية تعذر إكمال العملية، الخادم غير متوفر + diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 9107610f..9f339b4d 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -5,4 +5,5 @@ Не Добра Памылка + diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml index b014e255..92832098 100644 --- a/res/values-bg-rBG/strings.xml +++ b/res/values-bg-rBG/strings.xml @@ -49,7 +49,9 @@ Не беше получено съдържание. Няма какво да се качи. %1$s няма разрешен достъп до споделеното съдържание. Качване - Няма файлове в тази папка.\nНови файлове могат да бъдат добавени от опцията \"Качи\" в менюто. + Тук няма нищо. Качете нещо! + Зареждане... + Няма файлове в тази папка. Натисни върху файл, за да видиш допълнителна информация. Размер: Тип: @@ -248,6 +250,7 @@ Настъпи грешка при свързването със сървъра, операцията не е изпълнена. Настъпи грешка при свързването със сървъра, операцията не е изпълнена. Неуспешно завършена операция, сървърът не е достъпен. + Нямаш разрешен достъп до %s за преименуване на този файл за изтриване на този файл diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 8ece22a6..3e2189e7 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -17,6 +17,7 @@ সেট-আপ বন্ধ আপলোড করা হচ্ছে + এখানে কিছুই নেই। কিছু আপলোড করুন ! আয়তনঃ ধরণঃ তৈরীর নির্ঘন্টঃ @@ -34,4 +35,5 @@ পূনঃনামকরণ অপসারণ পাঠাও + diff --git a/res/values-bn-rIN/strings.xml b/res/values-bn-rIN/strings.xml index d19b15f5..82e09674 100644 --- a/res/values-bn-rIN/strings.xml +++ b/res/values-bn-rIN/strings.xml @@ -5,9 +5,11 @@ সেটিংস ইউজারনেম ফাইলস + লোড করা হচ্ছে... ডাউনলোড করুন বাতিল করা ভুল ফোল্ডারের নাম পুনঃনামকরণ + diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 8cb0bfde..30f5ce22 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -1,4 +1,5 @@ Nova fascikla + diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 0d463e9f..a3dada0c 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -49,7 +49,7 @@ No s\'ha rebut cap contingut. Res per pujar %1$s no pot accedir al contingut compartit S\'està pujant - No hi ha fitxers en aquesta carpeta.\nPodeu afegir fitxers a través de l\'opció \"Puja\" del menú. + Res per aquí. Pugeu alguna cosa! Feu clic en un fitxer per mostrar informació addicional. Mida: Tipus: @@ -248,4 +248,5 @@ Hi ha hagut un error esperant al servidor, l\'operació no s\'ha pogut realitzar Hi ha hagut un error esperant el servidor, l\'operació no s\'ha pogut realitzar La operació no s\'ha pogut completar, no es pot accedir al servidor + diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml index b81125b4..19ea2ffb 100644 --- a/res/values-cs-rCZ/strings.xml +++ b/res/values-cs-rCZ/strings.xml @@ -49,7 +49,9 @@ Neobdržen žádný obsah. Nic k odeslání. %1$s nemá právo přistupovat ke sdílenému obsahu Odesílání - Ve složce nejsou žádné soubory.\nNové soubory mohou být přidány pomocí volby \"Odeslat\". + Žádný obsah. Nahrajte něco. + Načítám... + V tomto adresáři nejsou žádné soubory. Více informací získáte klepnutím na soubor. Velikost: Typ: @@ -187,7 +189,7 @@ Obsah souboru je již synchronizován Adresář nemohl být vytvořen Zakázané znaky: / \\ < > : \" | ? * - Název souboru nemůže být prázdný. + Název nemůže být prázdný. Počkejte chvíli Neočekávaný problém - zkuste zvolit soubor jinou aplikací Žádný soubor nebyl vybrán @@ -248,4 +250,13 @@ Při čekání na odpověď serveru se vyskytla chyba, operace nemohla být dokončena Při čekání na odpověď serveru se vyskytla chyba, operace nemohla být dokončena Operace nemohla být dokončena. Server není dostupný + + Nejsou dostupná potřebná oprávnění %s + přejmenovat tento soubor + smazat tento soubor + sdílet tento soubor + zrušit sdílení tohoto souboru + vytvořit tento soubor + nahrávat do tohoto adresáře + Soubor není již více dostupný na tomto serveru diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml index 18083d89..7582370a 100644 --- a/res/values-cy-rGB/strings.xml +++ b/res/values-cy-rGB/strings.xml @@ -25,7 +25,7 @@ Heb dderbyn cynnwys. Dim cynnwys i lwytho i fyny Does dim mynediad gan %1$s i gynnwys a rennir Yn llwytho i fyny - Does dim ffeilau yn y blygell hon.\nGellir ychwanegu rhai newydd drwy ddewis \"Llwytho i fyny\" yn y ddewislen. + Does dim byd fan hyn. Llwythwch rhywbeth i fyny! Tapiwch ffeil i ddangos gwybodaeth ychwanegol Maint: Math: @@ -139,4 +139,5 @@ Trosysgrifio Peidio llwytho i fyny Anfon + diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 310e39c1..24227f04 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -49,7 +49,8 @@ Intet indhold blev modtaget. Intet at uploade. %1$s er ikke tilladt adgang til delt indhold Uploader - Der er ingen filer i denne mappe.\nNye filer kan tilføjes med menu valgmuligheden \"Upload\". + Her er tomt. Upload noget! + Indlæser... Tryk på en fil for at vise yderligere information. Størelse: Type: @@ -248,4 +249,13 @@ Der opstod en fejl mens vi ventede på serveren, handlingen kunne ikke gennemføres Der opstod en fejl mens vi ventede på serveren, handlingen kunne ikke gennemføres Handlingen kunne ikke gennemføres, serveren er utilgængelig + + Du har ikke rettigheden %s + til at omdøbe denne fil + til at slette denne fil + til at dele denne fil + til at stoppe deling af denne fil + til at oprette filen + til at overføre til denne mappe + Filen er ikke længere tilgængelig på serveren diff --git a/res/values-de-rAT/strings.xml b/res/values-de-rAT/strings.xml index 53f0028e..f0d482f3 100644 --- a/res/values-de-rAT/strings.xml +++ b/res/values-de-rAT/strings.xml @@ -7,4 +7,5 @@ Dateien Herunterladen Abbrechen + diff --git a/res/values-de-rCH/strings.xml b/res/values-de-rCH/strings.xml index 04492966..15d59720 100644 --- a/res/values-de-rCH/strings.xml +++ b/res/values-de-rCH/strings.xml @@ -40,7 +40,7 @@ Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen. %1$s darf den freigegebenen Inhalt nicht nutzen. Lade hoch - Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der Menüfunktion «Hochladen» hinzugefügt werden. + Alles leer. Laden Sie etwas hoch! Klicken Sie auf eine Datei für weitere Informationen. Grösse: Art: @@ -195,4 +195,5 @@ Bildvorschau Senden In die Zwischenablage kopiert + diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml index c326101d..9bbd03c5 100644 --- a/res/values-de-rDE/strings.xml +++ b/res/values-de-rDE/strings.xml @@ -49,7 +49,9 @@ Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen. %1$s darf den freigegebenen Inhalt nicht nutzen. Lade hoch - Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der Menüfunktion \"Hochladen\" hinzugefügt werden. + Alles leer. Laden Sie etwas hoch! + Lade… + Es befinden sich keine Dateien in diesem Ordner. Klicken Sie auf eine Datei für weitere Informationen. Größe: Art: @@ -248,6 +250,7 @@ Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden Die Operation kann nicht abgeschlossen werden, der Server ist nicht erreichbar + Sie haben keine Berechtigung %s diese Datei umzubenennen diese Datei zu löschen diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 258e0e31..5e18cfa6 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -49,7 +49,9 @@ Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen. %1$s darf den freigegebenen Inhalt nicht nutzen. Lade hoch - Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der \"Hochladen\" Menüfunktion hinzugefügt werden. + Alles leer. Lade etwas hoch! + Lade... + Es befinden sich keine Dateien in diesem Ordner. Klicken Sie auf eine Datei für weitere Informationen. Größe: Art: @@ -248,6 +250,7 @@ Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation kann nicht ausgeführt werden Die Operation kann nicht abgeschlossen werden, der Server ist nicht erreichbar + Du hast keine Berechtigung %s diese Datei umzubenennen diese Datei zu löschen diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 09344c96..4f86e90a 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -49,7 +49,9 @@ Δεν ελήφθη περιεχόμενο. Δεν υπάρχει τίποτα να μεταφορτώσετε. Ο %1$s δεν επιτρέπεται να έχει πρόσβαση στο κοινόχρηστο περιεχόμενο Μεταφόρτωση - Δεν υπάρχουν αρχεία σε αυτόν τον φάκελο.\nΝέα αρχεία μπορούν να προστεθούν με την επιλογή \"Μεταφόρτωση\" του μενού. + Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι! + Φόρτωση ... + Δεν υπάρχουν αρχεία σε αυτό τον φάκελο. Αγγίξτε κάποιο αρχείο για να προβάλετε περισσότερες πληροφορίες. Μέγεθος: Τύπος: @@ -248,6 +250,7 @@ Ένα σφάλμα προέκυψε κατά την αναμονή για το διακομιστή, η λειτουργία δεν ήταν επιτυχής Ένα σφάλμα προέκυψε κατά την αναμονή για το διακομιστή, η λειτουργία δεν ήταν επιτυχής Η λειτουργία δεν ήταν δυνατό να ολοκληρωθεί, ο διακομιστής δεν είναι διαθέσιμος + Δεν έχετε πρόσβαση %s για να μετονομάσετε αυτό το αρχείο για να διαγράψετε αυτό το αρχείο diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 928fb55d..3dea2229 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -49,7 +49,9 @@ No content was received. Nothing to upload. %1$s is not allowed to access the shared content Uploading - There are no files in this folder.\nNew files can be added with the \"Upload\" menu option. + Nothing in here. Upload something! + Loading... + There are no files in this folder. Tap on a file to display additional information. Size: Type: @@ -248,6 +250,7 @@ An error occurred whilst waiting for the server, the operation couldn\'t be done An error occurred whilst waiting for the server, the operation couldn\'t been done The operation couldn\'t be completed, server is unavailable + You do not have permission %s to rename this file to delete this file diff --git a/res/values-en-rNZ/strings.xml b/res/values-en-rNZ/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-en-rNZ/strings.xml +++ b/res/values-en-rNZ/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml index 085b883a..7ef1f5a0 100644 --- a/res/values-eo/strings.xml +++ b/res/values-eo/strings.xml @@ -34,7 +34,7 @@ Neniu enhavo riceviĝis. Nenio alŝutota. $1%s ne estas permesata aliri la kunhavigitan enhavon Alŝutante - Neniu dosiero estas en ĉi tiu dosierujo.\nNovajn dosierojn vi povas aldoni per la menuero “Alŝuti”. + Nenio estas ĉi tie. Alŝutu ion! Grando: Tipo: Kreita je: @@ -181,4 +181,5 @@ Kopii ligilon Kopiita en la tondejon Eraro okazis dum konekto al la servilo. + diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml index d9fecccc..b5ebf63f 100644 --- a/res/values-es-rAR/strings.xml +++ b/res/values-es-rAR/strings.xml @@ -49,7 +49,7 @@ No se recibió ningún contenido. No hay nada para subir. %1$s no está autorizado para acceder al contenido compartido Subiendo - No hay archivos en este directorio.\nPodés agregar archivos a través de la opción del menú \"Subir\". + No hay nada. ¡Subí contenido! Pulsá sobre un archivo para mostrar información adicional. Tamaño: Tipo: @@ -224,4 +224,5 @@ Previsualización de imagen Mandar Copiado al portapapeles + diff --git a/res/values-es-rBO/strings.xml b/res/values-es-rBO/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rBO/strings.xml +++ b/res/values-es-rBO/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es-rCL/strings.xml b/res/values-es-rCL/strings.xml index 341aa737..d40b4595 100644 --- a/res/values-es-rCL/strings.xml +++ b/res/values-es-rCL/strings.xml @@ -14,6 +14,7 @@ Proteger su cliente Subida instantánea de imagenes Subida instantánea de imágenes tomadas con la cámara + Ayuda Dirección del servidor https://... Usuario Clave @@ -30,7 +31,6 @@ No se ha recibido ningún contenido. No hay nada para subir. %1$s no esta autorizado para acceder al contenido compartido Subiendo - No hay archivos en esta carpeta.\nPuede añadir archivos nuevos con la opción \"Subir\" del menú. Seleccione un archivo para desplegar información adicional. Tamaño: Tipo: @@ -165,4 +165,5 @@ Sobre-escribir No subir %1$s no pudo ser copiado a la carpeta local %2$s + diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rCO/strings.xml +++ b/res/values-es-rCO/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es-rCR/strings.xml b/res/values-es-rCR/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rCR/strings.xml +++ b/res/values-es-rCR/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es-rEC/strings.xml b/res/values-es-rEC/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rEC/strings.xml +++ b/res/values-es-rEC/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml index 09da13bb..5d8b169f 100644 --- a/res/values-es-rMX/strings.xml +++ b/res/values-es-rMX/strings.xml @@ -43,7 +43,7 @@ Ningún contenido ha sido recibido. No hay nada que subir. %1$s no está autorizado para acceder al contenido compartido Enviando - No hay archivos en esta carpeta.\nPuedes añadir nuevos archivos con la opción \"Subir\" del menú. + No hay nada aquí. ¡Suba algo! Pulsa sobre un archivo para mostrar información adicional. Tamaño: Tipo: @@ -211,4 +211,5 @@ Previsualización de imagen Enviar Copiado al portapapeles + diff --git a/res/values-es-rPE/strings.xml b/res/values-es-rPE/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rPE/strings.xml +++ b/res/values-es-rPE/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es-rPY/strings.xml b/res/values-es-rPY/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rPY/strings.xml +++ b/res/values-es-rPY/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es-rUY/strings.xml b/res/values-es-rUY/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-es-rUY/strings.xml +++ b/res/values-es-rUY/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 7f8ec50a..de3293c6 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -29,14 +29,14 @@ Ayuda Recomendar a un amigo Mensajes de retroalimentación - Imprimir + pie de imprenta Prueba %1$s en tu smarthphone! - \"¡Quiero invitarlo a usar %1$s en su smartphone!\nDescárguelo aquí: %2$s\"\n\t + \"¡Quiero invitarle a usar %1$s en su smartphone!\nDescárguelo aquí: %2$s\"\n\t Compruebe el servidor. Dirección del servidor https://… Nombre de usuario Contraseña - New to %1$s? + Nuevo para %1$s? Archivos Conectar Subir @@ -49,7 +49,9 @@ Ningún contenido ha sido recibido. No hay nada que subir. %1$s no está autorizado para acceder al contenido compartido Subiendo... - No hay archivos en esta carpeta.\nPuedes añadir nuevos archivos con la opción \"Subir\" del menú. + No hay nada aquí. ¡Suba algo! + Cargando... + No hay archivos en esta carpeta. Pulsa sobre un archivo para mostrar información adicional. Tamaño: Tipo: @@ -248,6 +250,7 @@ Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar La operación no se pudo completar; el servidor no está disponible + No tiene permiso %s para renombrar este archivo para eliminar este archivo diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index e2907320..f408ff85 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -49,7 +49,8 @@ Sisu ei saadud. Pole midagi üles laadida. %1$sile pole lubatud ligipääs jagatud sisule Üleslaadimine - Selles kaustas pole ühtegi faili.\nUusi faile saab lisada kasutades menüü valikut \"Lae üles\". + Siin pole midagi. Lae midagi üles! + Laen ... Lisainfo vaatamiseks vajuta failile. Suurus: Tüüp: @@ -248,4 +249,13 @@ Serverilt vastuse ootamisel tekkis tõrge, toimingu sooritamine ebaõnnestus Serverilt vastuse ootamisel tekkis tõrge, toimingu sooritamine ebaõnnestus Toimingu lõpetamine ebaõnnestus, server pole saadaval + + Sul ei ole %s õigusi + selle faili ümbernimetamiseks + selle faili kustutamiseks + faili jagamiseks + faili jagamise lõpetamiseks + faili loomiseks + sellesse kausta laadimiseks + Fail ei ole serveris enam kättesaadav diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index 64bd780c..a9461fc0 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -2,4 +2,5 @@ Deskargatu Ezeztatu + diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 8835e8da..022d79d6 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -49,7 +49,9 @@ Ez da edukirik jaso. Ez dago ezer igotzeko. %1$s-(e)k ez du baimenik elkarbanatutako edukian sartzeko Igotzen - Ez dago fitxategirik karpeta honetan.\nFitxategi berriak \"Igo\" menu aukerarekin gehi daitezke. + Ez dago ezer. Igo zerbait! + Kargatzen... + Ez dago fitxategirik karpeta honetan. Sakatu fitxategi baten gainean informazio gehiago lortzeko Tamaina: Mota: @@ -248,6 +250,7 @@ Errore bat gertatu da zerbitzariaren zain egon bitartean, ezin izan da eragiketa burutu Errore bat gertatu da zerbitzariaren zain egon bitartean, ezin izan da eragiketa burutu Eragiketa ezin izan da burutu, zerbitzaria ez dago erabilgarri + Ez daukazu baimenik %s fitxategia berrizendatzeko fitxategia ezabatzeko diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 24ce082d..10aca1f4 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -43,7 +43,8 @@ هیچ مطلبی دریافت نشده است. هیچ‌‌چیزی بارگزاری نشده. %1$s اجازه ی دسترسی به محتوای مشترک را نمی دهد در حال بارگزاری - هیچ فایل در این پوشه نیست.\nفایل های جدید می توانند بوسیله ی گزینه ی \"بارگزاری\" در لیست اضافه کنید. + اینجا هیچ چیز نیست. + درحال بارگذاری... روی هر فایل کلیک کنید تا اطلاعات اضافی نمایش داده شود. اندازه نوع: @@ -216,4 +217,5 @@ در حین حذف اشتراک گذاری این فایل یا پوشه خطایی رخ داده است ارسال کپی به کلیپ بورد + diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml index ab4754f8..b7a19ef6 100644 --- a/res/values-fi-rFI/strings.xml +++ b/res/values-fi-rFI/strings.xml @@ -48,7 +48,9 @@ Sisältöä ei saatu. Ei lähetettävää palvelimelle. %1$silla ei ole oikeuksia jaettuun sisältöön Lähetetään - Tässä kansiossa ei ole tiedostoja.\nUusia tiedostoja voi lisätä käyttäen valikon \"Lähetä\"-toimintoa. + Täällä ei ole mitään. Lähetä tänne jotakin! + Ladataan... + Tässä kansiossa ei ole tiedostoja Napauta tiedostoa nähdäksesi lisätietoja. Koko: Tyyppi: @@ -225,6 +227,7 @@ Virhe palvelimen vastausta odottaessa, toimintoa ei voitu suorittaa Virhe palvelimen vastausta odottaessa, toimintoa ei voitu suorittaa Toimintoa ei voi suorittaa loppuun, palvelin ei ole käytettävissä + Sinulla ei ole oikeutta %s nimetä tiedostoa uudelleen poistaa tiedostoa diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index e749dd97..4e44daa6 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -49,7 +49,8 @@ Aucun contenu reçu. Rien à envoyer. %1$s n\'est pas autorisé à accéder au contenu partagé Téléversement - Ce répertoire ne contient aucun fichier.\nDe nouveaux fichiers peuvent être importés en cliquant sur le bouton « Téléverser un fichier » du menu des options + Il n\'y a rien ici ! Envoyez donc quelque chose :) + Chargement… Effleurez un fichier pour afficher les informations complémentaires Taille : Type : @@ -248,4 +249,13 @@ Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée. Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée. L\'opération n\'a pas pu être terminée, le serveur n\'est pas disponible. + + Vous ne possédez pas les droits suffisants %s + afin de renommer ce fichier + afin d’effacer ce fichier + afin de partager ce fichier + afin de ne plus partager ce fichier + afin de créer ce fichier + afin d’importer dans ce répertoire + Ce fichier n’est plus disponible sur le serveur diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 9c3dcc91..2bc0b281 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -49,7 +49,9 @@ Non se recibiu contido. Non hai nada para enviar. %1$s non ten permiso para acceder ao contido compartido Enviando - Non hai ficheiros neste cartafol.\nOs novos ficheiros pódense engadir ca opción do menú «Enviar». + Aquí non hai nada. Envíe algo! + Cargando... + Non hai ficheiros neste cartafol. Prema nun ficheiro para que amose a información adicional. Tamaño: Tipo: @@ -248,6 +250,7 @@ Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin A operación non se completou, o servidor non está dispoñíbel + Non ten permisos %s para renomear este ficheiro para eliminar este ficheiro diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index f9733a51..a00eccb6 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -26,7 +26,7 @@ לא התקבל תוכן. אין מה להעלות. ל־%1$s אין הרשאה לגשת לתוכן המשותף שלך בהעלאה - אין קבצים בתיקייה זו.\nניתן להוסיף קבצים חדשים בעזרת האפשרות „העלאה“ מהתפריט. + אין כאן שום דבר. אולי ברצונך להעלות משהו? יש לגעת בקובץ כדי להציג פרטים נוספים. גודל: סוג: @@ -157,4 +157,5 @@ לשכתב לא להעלות שליחה + diff --git a/res/values-hi-rIN/strings.xml b/res/values-hi-rIN/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-hi-rIN/strings.xml +++ b/res/values-hi-rIN/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index d5597756..ae5d92d9 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -10,4 +10,5 @@ अपलोड त्रुटि भेजें + diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 030c66a2..e51e255e 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -13,6 +13,7 @@ Poveži Učitaj Izlaz + Nema ničega u ovoj mapi. Pošalji nešto! Preuzimanje Da Ne @@ -24,4 +25,5 @@ Trying to login… Promjeni ime Makni + diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml index 71c0a5ee..ad18e4b1 100644 --- a/res/values-hu-rHU/strings.xml +++ b/res/values-hu-rHU/strings.xml @@ -43,7 +43,8 @@ Nem jött tartalom. Nincs mit feltölteni. %1$s nem jogosult a megosztott tartalom elérésére Feltöltés - Ebben a mappában nincsenek állományok. A \"Feltöltés\" menüpont segítségével tölthet föl fájlokat. + Itt nincs semmi. Töltsön fel valamit! + Betöltés... Érintsen meg egy fájlt a további információkért. Méret: Tipus: @@ -220,4 +221,5 @@ Küldjük el Link másolása Bemásolva a vágólapra + diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 35864beb..eeb78fe8 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -1,4 +1,5 @@ Բեռնել + diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml index 11f92284..4d38fd5e 100644 --- a/res/values-ia/strings.xml +++ b/res/values-ia/strings.xml @@ -13,6 +13,7 @@ Files Connecte Incargar + Nihil hic. Incarga alcun cosa! Discargar Compartir ligamine Si @@ -24,4 +25,5 @@ Cambiar contrasigno Nomine de dossier Invia + diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml index 35511acc..87160fd5 100644 --- a/res/values-id/strings.xml +++ b/res/values-id/strings.xml @@ -43,7 +43,7 @@ Tidak ada konten yang diterima. Tidak ada yang diunggah %1$s tidak diizinkan mengakses konten berbagi Mengunggah - Tidak ada berkas dalam folder ini.\nBerkas baru dapat ditambahkan dengan opsi menu \"Unggah\". + Tidak ada apa-apa di sini. Unggah sesuatu! Sentuh pada berkas untuk menampilkan informasi tambahan Ukuran: Tipe: @@ -207,4 +207,5 @@ Jangan mengunggah Pratilik gambar Kirim + diff --git a/res/values-io/strings.xml b/res/values-io/strings.xml new file mode 100644 index 00000000..56e55a1d --- /dev/null +++ b/res/values-io/strings.xml @@ -0,0 +1,4 @@ + + + + diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 76d61d20..afb0fa5b 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -10,6 +10,7 @@ Lykilorð Skrár Senda inn + Ekkert hér. Settu eitthvað inn! Niðurhal Já Nei @@ -22,4 +23,5 @@ Endurskýra Fjarlægja Senda + diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 32d11087..24506cd5 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -49,7 +49,9 @@ Non è stato ricevuto alcun contenuto. Niente da caricare. %1$s non è abilitato ad accedere al contenuto condiviso Caricamento in corso - Non ci sono file in questa cartella.\nNuovi file possono essere aggiunti con l\'opzione di menu \"Carica\". + Non c\'è niente qui. Carica qualcosa! + Caricamento in corso... + Non ci sono file in questa cartella. Tocca un file per visualizzare informazioni aggiuntive. Dimensione: Tipo: @@ -248,6 +250,7 @@ Si è verificato un errore in attesa della risposta del server, l\'operazione non è stata completata Si è verificato un errore in attesa della risposta del server, l\'operazione non è stata completata L\'operazione non è stata completata, il server non è disponibile + Non hai i permessi %s per rinominare questo file per eliminare questo file diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml index c6a390e5..59cc9259 100644 --- a/res/values-ja-rJP/strings.xml +++ b/res/values-ja-rJP/strings.xml @@ -49,7 +49,9 @@ コンテンツを受信しませんでした。アップロードするものはありません。 %1$sで共有コンテンツへのアクセスが許可されていません。 アップロード中 - このフォルダーにはファイルがありません。\n\"アップロード\" メニューで新しいファイルを追加することができます。 + ここには何もありません。何かアップロードしてください。 + 読込中 ... + このフォルダにはファイルはありません。 ファイルをタップすると追加情報が表示されます。 サイズ: タイプ: @@ -248,4 +250,13 @@ サーバーからの応答を待っている間にエラーが発生しました。操作を完了することができません。 サーバーからの応答を待っている間にエラーが発生しました。操作を完了することができません。 操作を完了することができません。サーバーが利用できません。 + + 権限 %s がありません + ファイル名の変更 + ファイルを削除 + ファイルを共有 + ファイルの共有を解除 + ファイルを作成 + フォルダをアップロード + ファイルはサーバー上で利用できません diff --git a/res/values-jv/strings.xml b/res/values-jv/strings.xml index 4ab64314..084a4e3e 100644 --- a/res/values-jv/strings.xml +++ b/res/values-jv/strings.xml @@ -1,4 +1,5 @@ Njipuk + diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 02c4b9d4..9cc07091 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -28,7 +28,7 @@ კონტენტი არ იქნა მიღებული. არაფერია ასატვირთად. %1$s–ი არ დაიშვება გაზიარებული კონტენტის სანახავად მიმდინარეობს ატვირთვა - ამ ფოლდერში ფაილები არ არის.⏎\nახალი ფაილები შეიძლება დაემატოს \"ატვირთვა\" მენიუს ოფციით. + აქ არაფერი არ არის. ატვირთე რამე! დააჭირეთ ფაილს დამატებითი ინფორმაციის გამოსაჩენად. ზომა: ტიპი: @@ -146,4 +146,5 @@ არ ატვირთო გაგზავნა კოპირებულია კლიპბორდში + diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 83033dbf..3c56c1f1 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -21,6 +21,7 @@ ដំឡើង ចាក់ចេញ កំពុង​ផ្ទុក​ឡើង + គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ផ្ទុក​ឡើង​អ្វី​មួយ! ចុចមួយ​លើឯកសារ ដើម្បី​បង្ហាញ​ព័ត៌មាន​បន្ថែម។ ទំហំ៖ ប្រភេទ៖ @@ -78,4 +79,5 @@ រហូតដល់ៈ ហត្ថលេខា: ផ្ញើ + diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index b3db0a52..1deb5729 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -43,7 +43,7 @@ 받은 콘텐츠가 없습니다. 업로드할 항목이 없습니다. %1$s에서 공유된 콘텐츠에 접근할 수 없습니다 업로드 중 - 이 폴더에 파일이 없습니다.\n메뉴 옵션의 \"업로드\" 항목을 사용하여 새 파일을 업로드할 수 있습니다. + 내용이 없습니다. 업로드할 수 있습니다! 파일을 누르면 추가 정보가 표시됩니다. 크기: 종류: @@ -212,4 +212,5 @@ 보내기 링크 복사 클립보드로 복사됨 + diff --git a/res/values-ku-rIQ/strings.xml b/res/values-ku-rIQ/strings.xml index 957ee5b3..39537b40 100644 --- a/res/values-ku-rIQ/strings.xml +++ b/res/values-ku-rIQ/strings.xml @@ -27,4 +27,5 @@ پاشکەوتکردن & دەرچوون هه‌ڵه ناوی بوخچه + diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml index e8374cf3..5ce3b391 100644 --- a/res/values-lb/strings.xml +++ b/res/values-lb/strings.xml @@ -22,6 +22,7 @@ Setup Erausgoen Eroplueden + Hei ass näischt. Lued eppes rop! Gréisst: Typ: Erstallt: @@ -81,4 +82,5 @@ Iwwerschreiwen Net eroplueden Schécken + diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml index db74b593..5a5919c0 100644 --- a/res/values-lt-rLT/strings.xml +++ b/res/values-lt-rLT/strings.xml @@ -48,7 +48,7 @@ nebuvo gauta turinio. Nėra įkeltino turinio %1$s neleidžiama prieiti prie turinio, kuriuo dalijamasi Išsiunčiama - Šiame aplanke failų nėra.\nNauji failai gali būti pridėti naudojant \"Įkelti\" funkciją meniu. + Čia tuščia. Įkelkite ką nors! Palieskite failą, kad parodyti papildomą informaciją. Dydis: Tipas: @@ -226,4 +226,5 @@ Siųsti Kopijuoti nuorodą Nukopijuota į talpyklę + diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 7b867e27..3d1db10d 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -26,7 +26,7 @@ Nav saņemts nekāds saturs. Nav ko augšupielādēt. %1$s nedrīkst piekļūt koplietotajam saturam Augšupielādē - Šajā mapē nav datņu.\nJaunas datnes var pievienot ar izvēlnes opciju “Augšupielādēt” + Te vēl nekas nav. Rīkojies, sāc augšupielādēt! Uzsitiet uz datnes, lai redzētu papildinformāciju. Izmērs: Tips: @@ -140,4 +140,5 @@ Pārrakstīt Neaugšupielādēt Sūtīt + diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 4aa137cb..a918e116 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -26,6 +26,7 @@ Не е пронајдена сметка Нагодување Прекини + Тука нема ништо. Снимете нешто! Големина: Тип: Создадено: @@ -116,4 +117,5 @@ Задржи ги и двете Препиши Прати + diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 9bb8089a..75c6f22f 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -2,4 +2,5 @@ ഫയലുകൾ ഫയലുകൾ + diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 56da371e..29cf818b 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -17,6 +17,7 @@ Device anda tidak mempunyai sebarang akaun %1$s. Mohon bina akaun dahulu. Berhenti Memuatnaik + Tiada apa-apa di sini. Muat naik sesuatu! Saiz Jenis Telah dibina: @@ -43,4 +44,5 @@ Namakan Buang Lokal sahaja + diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index fe388c26..c5a061f9 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -10,4 +10,5 @@ မဟုတ်ဘူး အိုကေ ပယ်ဖျက်မည် + diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml index 496a122a..691383f5 100644 --- a/res/values-nb-rNO/strings.xml +++ b/res/values-nb-rNO/strings.xml @@ -49,7 +49,8 @@ Intet innhold ble mottatt. Intet å laste opp. %1$s har ikke tilgang til det delte innholdet Laster opp - Det finnes ikke filer i mappen.\nNye filer kan legges til med \"last opp\" i menyen. + Ingenting her. Last opp noe! + Laster... Trykk på en fil for å vise ekstra informasjon. Størrelse: Type: @@ -248,6 +249,7 @@ En feil oppstod ved venting på svar fra serveren. Operasjonen kunne ikke utføres En feil oppstod ved venting på svar fra serveren. Operasjonen kunne ikke utføres Operasjonen kunne ikke fullføres. Server utilgjengelig + Du har ikke tillatelse til %s å omdøpe denne filen å slette denne filen diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 0b031395..9604d2b3 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -49,7 +49,9 @@ Er werd geen inhoud ontvangen. Niets om te uploaden. %1$s is niet toegestaan om toegang te hebben tot de publieke inhoud Uploaden - Er zitten geen bestanden in deze map.\nNieuwe bestanden kunnen worden toegevoegd via de \"Upload\" menukeuze. + Er bevindt zich hier niets. Upload een bestand! + Laden ... + Er staan geen bestanden in deze map. Druk op een bestand om extra informatie weer te geven Grootte: Type: @@ -248,6 +250,7 @@ Er trad een fout op bij het wachten op de server, de verwerking kon niet plaatsvinden Er trad een fout op bij het wachten op de server, de verwerking kon niet plaatsvinden De verwerking kon niet plaatsvinden, de server is niet beschikbaar + U mist autorisatie %s om dit bestand te hernoemen om dit bestand te verwijderen diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml index 0dffdcf2..7d5d93aa 100644 --- a/res/values-nn-rNO/strings.xml +++ b/res/values-nn-rNO/strings.xml @@ -28,6 +28,7 @@ Inga innhald å lasta opp Mottok ikkje noko innhald. Ingenting å lasta opp. Lastar opp + Ingenting her. Last noko opp! Trykk på ei fil for å visa meir informasjon. Storleik: Type: @@ -105,4 +106,5 @@ Klarte ikkje å lagra sertifikatet Berre last opp bilete over WiFi Send + diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml index ed189936..97d740cc 100644 --- a/res/values-oc/strings.xml +++ b/res/values-oc/strings.xml @@ -17,6 +17,7 @@ Configuracion Quita Al amontcargar + Pas res dedins. Amontcarga qualquaren Talha : Tipe : Creat : @@ -38,4 +39,5 @@ Causís lo compte Dintras ton PIN d\'App, se te plai Torna nomenar + diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-or-rIN/strings.xml +++ b/res/values-or-rIN/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index c0dae14f..e2704840 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -117,4 +117,5 @@ ਅੱਪਲੋਡ ਨਾ ਕਰੋ ਚਿੱਤਰ ਝਲਕ ਭੇਜੋ + diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 9c909f5f..f0285b40 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -49,7 +49,8 @@ Nie otrzymano danych. Nie ma nic do wysłania. %1$s nie ma dostępu do udostępnionych treści Wysyłanie - Nie ma plików w tym katalogu.⏎ Nowe pliki można dodać wybierając w menu Wyślij. + Pusto. Wyślij coś! + Ładowanie... Dotknij plik aby wyświetlić dodatkowe informacje Rozmiar: Typ: @@ -248,6 +249,7 @@ Pojawił się błąd podczas oczekiwania na serwer, operacja nie mogła zostać wykonana Pojawił się błąd podczas oczekiwania na serwer, operacja nie mogła zostać wykonana Nie można dokończyć operacji, serwer jest niedostępny + Nie masz uprawnień %s do zmiany nazwy tego pliku do usuwania tego pliku diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index f35ca29d..06865580 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -49,7 +49,9 @@ Nenhum conteúdo foi recebido. Nada para enviar. %1$s não é permitido acessar o conteúdo compartilhado Enviando - Não existe arquivos nesta pasta\nNovos arquivos podem ser adicionados com a opção \"Enviar\" do menu + Nada aqui. Envie alguma coisa! + Carregando... + Não existe nenhum arquivo nesta pasta. Toque em um arquivo para mostrar informações adicionais. Tamanho: Tipo: @@ -248,6 +250,7 @@ Ocorreu um erro enquanto se espera pelo servidor, a operação não poderia ter sido executada Ocorreu um erro enquanto se espera pelo servidor, a operação não poderia ter sido executada A operação não pôde ser concluída, o servidor está indisponível + Você não tem premissão %s para renomear este arquivo para excluir este arquivo diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 991702da..8fdfe0d0 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -49,7 +49,9 @@ Não foi recebido nenhum conteúdo. Nada para enviar. O %1$s não está autorizado a aceder aos ficheiro partilhados. A enviar - Não existem ficheiros nesta pasta.\nPode adicionar ficheiros com a opção \"Enviar\" no menu. + Vazio. Envie alguma coisa! + A carregar... + Não existem ficheiros nesta pasta. Clique no ficheiro para visualizar informação adicional. Tamanho: Tipo: @@ -248,6 +250,7 @@ Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação. Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação. A operação não foi concluída, o servidor está inacessível. + Você não tem permissão %s para renomear este ficheiro para eliminar este ficheiro diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 3d4ffd74..0ee674d1 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -21,13 +21,17 @@ Încărca instantaneu imagini luate de camera Încărcare instantă de videoclipuri. Încarcă videoclipuri instant, filmate cu camera. + Permite logarea Acesta este folosit pentru a înregistra problemele + Istoria logarilor Asta arata înregistrările salvate Ştergeţi istoric Ajutor Recomandati unui prieten Feedback + Imprint Încearcă %1$s pe smartphone-ul tău! + Vreau sa te invit sa folosesti %1$s pe smartphone-ul tau!\nDownloadeaza aici: %2$s\" Verificaţi Serverul Adresa serverului https://... Nume utilizator @@ -45,7 +49,9 @@ Nu a fost primit nici un conţinut .Nu exista nimic de încărcat . %1$s nu este permis sa acceseze conținutul shared Încărcare - Nu există fișiere în acest dosar. \nNoile fișiere pot fi adăugate cu opțiunea de meniu \"Upload\" + Nimic aici. Încarcă ceva! + Se incarca + In acest folder nu sunt fisiere. Selectati un fisier pentru a afisa informatia aditionala Mărime: Tip: @@ -93,6 +99,9 @@ Sincronizarea %1$s nu a putut fi completata Parolă greșită pentru %1$s S-au gasit conflicte + %1$d file pastrate-in-sync files nu au putut fi sincronizate + Pastrarea fisierelor in sync nu a reușit + Conținutul a%1$d fișiere nu a putut fi sincronizat (conflicte %2$d) Unele fisiere locale au fost uitate %1$d fisiere din dosarul %2$s nu a putut fi copiat in Începând cu versiunea 1.3.16, fișierele încărcate de acest aparat sunt copiate în dosarul local %1$s pentru a preveni pierderea de date atunci când un singur fișier este sincronizat cu conturi multiple. \nDatorita acestei schimbari, toate fișierele încărcate în versiunile anterioare ale acestei aplicații au fost copiate în dosarul %2$s. Cu toate acestea, o eroare a împiedicat finalizarea acestei operațiuni în timpul sincronizarii contului. Poti fie sa lasi fișierul(le), așa cum sunt și sa elimini link-ul spre \n%3$s, sau muți fișierul(le) în dosarul %1$s și păstrezi link-ul la %4$s. Mai jos sunt listate fișierul(le) locale și fișierul(le) la distanță în %5$s unde au fost link-ate. @@ -131,6 +140,7 @@ Butonul rewind Buton de play sau pauză Butonul pentru repede înainte + Obținerea autorizației... În curs de autentificare... Nu exista conexiune Conexiune securizată indisponibilă @@ -152,12 +162,14 @@ Utilizator sau parola greşită Autorizare nereușită Acces refuzat de serverul de autorizare + Situație neașteptată, vă rugăm, introduceți din nou URL-ul serverului Autorizarea dvs. a expirat. Vă rugăm să autorizați din nou. Va rugam introduceţi parola curenta Sesiunea a expirat .Va rugam conectati-va din nou Se conectează la serverul de autentificare... Serverul nu soporta aceasta metoda de autentificare %1$s nu suporta conturi multiple + Server-ul dvs. nu întoarce un ID de utilizator corect, vă rugăm să contactați un administrator Nu se poate autentifica cu acest server Păstrează fișierul actualizat Redenumește @@ -238,4 +250,13 @@ A apărut o eroare în timp ce se aștepta pentru server, operațiunea nu s-a executat A apărut o eroare în timp ce se aștepta pentru server, operațiunea nu s-a executat Operațiunea nu a putut fi finalizată, serverul este indisponibil + + Nu aveți permisiune %s + pentru a redenumi acest fișier + pentru a șterge acest fișier + de a share acest fișier + de a nu permite accesul la acest fisier + pentru a crea fisierul + pentru a încărca în acest folder + Fișierul nu mai este disponibil pe server diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index cef29be2..5e1e6576 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -49,7 +49,9 @@ Содержимое не получено. Нечего загружать. %1$s не имеет доступа к опубликованным данным Загрузка - В этом каталоге нет файлов.\nНовые файлы могут быть добавлены с помощью пункта меню \"Загрузить\". + Здесь ничего нет. Загрузите что-нибудь! + Загрузка... + В данной папке нет файлов. Нажмите на файл для отображения дополнительной информации. Размер: Тип: @@ -248,12 +250,13 @@ Во время ожидания сервера возникла ошибка, операция не может быть завершена Во время ожидания сервера возникла ошибка, операция не может быть завершена Операция не может быть завершена, сервер недоступен + У вас нет доступа %s - к переименованию этого файла - к удалению этого файла - к публикации этого файла - к отмене публикации этого файла - к созданию этого файла - к загрузке этой папки + переименовать этот файл + удалить этот файл + опубликовать этот файл + отменить публикацию этого файла + создать файл + загрузить в эту папку Этот файл больше недоступен на сервере diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 4bf2eec8..50bc87b4 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -19,6 +19,7 @@ ස්ථාපනය නික්මෙන්න උඩුගතවේ + මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න වැඩි විස්තර සඳහා ගොනුවක් ස්පර්ෂ කරන්න විශාලත්වය: ගණය: @@ -70,4 +71,5 @@ නොසිතු ප්‍රශ්ණයක්; කරුණාකර වෙනත් යෙදුමක් භාවිතා කර ගොනුව තෝරන්න ගොනුවක් තෝරා නැත සඟවන්න + diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml index 9aada609..bcf7ac5b 100644 --- a/res/values-sk-rSK/strings.xml +++ b/res/values-sk-rSK/strings.xml @@ -49,7 +49,7 @@ Nedodaný žiaden obsah. Nič na odoslanie. %1$s nemá práva pre prístup k zdieľanému obsahu Nahrávanie - Priečinok neobsahuje súbory.\nNové súbory môžete pridať cez \"Nahrať\" v menu. + Žiadny súbor. Nahrajte niečo! Viac informácií získate kliknutím na súbor. Veľkosť: Typ: @@ -246,4 +246,5 @@ Pri čakaní na odpoveď servera nastala chyba, operácia nemohla byť dokončená Pri čakaní na odpoveď servera nastala chyba, operácia nemohla byť dokončená Operácia nemohla byť dokončená, server je nedostupný + diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 1eb12a48..63fbabf5 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -4,4 +4,5 @@ Všeobecné Stiahnuť Zrušiť + diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index b79c7334..bc2db411 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -49,7 +49,8 @@ Ni prejete vsebine. Ni datotek za pošiljanje. Oblak %1$s nima nastavljenih dovoljenj za dostop do vsebine v souporabi Pošiljanje - V tej mapi ni datotek.\nNove datoteke je mogoče dodati preko možnosti menija \"Pošlji\". + Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak! + Poteka nalaganje ... Pritisnite na datoteko za prikaz dodatnih podrobnosti. Velikost: Vrsta: @@ -248,6 +249,7 @@ Med čakanjem na vzpostavitev povezave s strežnikom je prišlo do napake. Zahtevanega dejanja ni mogoče izvesti. Med čakanjem na vzpostavitev povezave s strežnikom je prišlo do napake. Zahtevanega dejanja ni bilo mogoče končati. Zahtevanega dejanja ni bilo mogoče končati. Strežnik ni dosegljiv. + Ni ustreznega dovoljenja %s za preimenovanje datoteke. za izbris datoteke. diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index c1607120..723af46d 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -22,6 +22,7 @@ Ndërto Dil Ngarko + Këtu nuk ka asgje. Ngarko dicka Trokitje e lehtë në një dokument për të shfaqur informacion shtesë. Dimensioni: Tipi: @@ -67,4 +68,5 @@ Riemërto Hiq Dërgo + diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml index 72d3f1a1..59563839 100644 --- a/res/values-sr-rSP/strings.xml +++ b/res/values-sr-rSP/strings.xml @@ -15,6 +15,7 @@ Pošalji Nalog nije nađen Šalje se + Ovde nema ničeg. Pošaljite nešto! Veličina: Tip: Preuzmi @@ -51,4 +52,5 @@ Potpis: Zadrži oboje Pošalji + diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 6437eef2..0c3eb1e6 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -20,7 +20,7 @@ Нема садржаја за отпремање Садржај није примљен. Нема ништа да се отпреми. Отпремање - Нема датотека у овој фасцикли.\nНове датотеке можете да додате путем опције „Отпреми“. + Овде нема ничег. Отпремите нешто! Додирните датотеку ради приказа додатних информација. Величина: Врста: @@ -106,4 +106,5 @@ Отпремај слике само путем бежичне мреже Ажурирај сукоб Пошаљи + diff --git a/res/values-su/strings.xml b/res/values-su/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-su/strings.xml +++ b/res/values-su/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index fb311e0e..4b9c6615 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -49,7 +49,8 @@ Inget innehåll mottaget. Inget att ladda upp. %1$s har inte rättighet till det delade innehållet Laddar upp - Det finns inga filer i denna mapp.\nNya filer kan läggas till med \"Ladda upp\" i menyn. + Ingenting här. Ladda upp något! + Laddar... Peka på en fil för att visa mer information. Storlek: Typ: @@ -247,4 +248,5 @@ Ett fel uppstod i väntan på servern, operationen kunde inte ha gjorts Ett fel uppstod i väntan på servern, operationen kunde inte ha gjorts Åtgärden kunte inte slutföras, servern är ej tillgänglig + diff --git a/res/values-sw-rKE/strings.xml b/res/values-sw-rKE/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-sw-rKE/strings.xml +++ b/res/values-sw-rKE/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index bf87f597..ff574274 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -29,4 +29,5 @@ பதிவேற்று விவரங்கள் அனுப்பவும் + diff --git a/res/values-ta-rLK/strings.xml b/res/values-ta-rLK/strings.xml index 9d605a27..7b44d0e6 100644 --- a/res/values-ta-rLK/strings.xml +++ b/res/values-ta-rLK/strings.xml @@ -25,7 +25,7 @@ ஒரு உள்ளடக்கமும் பெறப்படவில்லை. பதிவேற்றுவதற்கு ஒன்றும் இல்லை பகிரப்பட்ட உள்ளடக்ககங்களை அணுகுவதற்கு %1$s அனுமதிக்கமாட்டாது பதிவேற்றல் - இந்த கோப்புறையில் எந்த கோப்பும் இல்லை. \"பதிவேற்றல்\" பட்டி தெரிவு மூலம் புதிய கோப்புகளை பதிவேற்றமுடியும். + இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக! மேலதிக தகவல்களை காட்சிப்படுத்துவதற்கு கோப்பின் மேல் தட்டுக. அளவு: வகை: @@ -134,4 +134,5 @@ இரண்டையும் வைக்க மேலெழுதல் பதிவேற்ற வேண்டாம் + diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index e0ded877..ac049826 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -14,4 +14,5 @@ పొరపాటు సంచయం పేరు పంపించు + diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml index 7b64376c..67a97827 100644 --- a/res/values-th-rTH/strings.xml +++ b/res/values-th-rTH/strings.xml @@ -27,7 +27,7 @@ ยังไม่ได้รับเนื้อหา ไม่มีอะไรให้ต้องอัพโหลด %1$s ไม่อนุญาตให้เข้าถึงเนื้อหาที่ถูกแชร์ไว้ กำลังอัพโหลด - ยังไม่มีไฟล์อยู่ในโฟลเดอร์นี้.\nสามารถเพิ่มไฟล์ใหม่ได้จากตัวเลือกในเมนู \"อัพโหลด\". + ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์! แตะที่ไฟล์ เพื่อแสดงข้อมูลเพิ่มเติม ขนาด: ชนิด: @@ -147,4 +147,5 @@ เขียนทับ ไม่ต้องอัพโหลด ส่ง + diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index e4023c81..00a802bb 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -49,7 +49,9 @@ Hiç içerik alınmadı. Yüklenecek hiçbir şey yok. %1$s için paylaşılan içeriğe erişim izni yok Yükleniyor - Bu klasörde dosya yok.\nYeni dosyalar \"Yükle\" menü seçeneği ile eklenebilir. + Burada hiçbir şey yok. Bir şeyler yükleyin! + Yükleniyor... + Bu klasörde dosya yok. Ek bilgileri görmek için dosyaya dokunun. Boyut: Tür: @@ -248,4 +250,13 @@ Sunucu beklenirken bir hata oluştu, işlem yapılamadı Sunucu beklenirken bir hata oluştu, işlem yapılamadı İşlem tamamlanamadı, sunucu kullanılamıyor + + %s izniniz yok + Bu dosyayı adlandırma + Bu dosyayı silme + Bu dosyayı paylaşma + Bu dosya paylaşımını kaldırma + Dosya oluşturma + Bu klasöre yükleme + Bu dosya artık sunucuda mevcut değil diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml index 3e7ae77d..64460e3f 100644 --- a/res/values-ug/strings.xml +++ b/res/values-ug/strings.xml @@ -19,6 +19,7 @@ تەڭشەك چېكىن يۈكلەۋاتىدۇ + بۇ جايدا ھېچنېمە يوق. Upload something! چوڭلۇقى: تىپى: قۇرۇلغان ۋاقتى: @@ -38,4 +39,5 @@ ئات ئۆزگەرت چىقىرىۋەت يوللا + diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index f1e6381c..4a78942d 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -29,7 +29,7 @@ Не отримано даних. Нічого завантажувати. %1$s не може отримати доступ до спільного контенту Завантаження - В цьому каталозі відсутні файли.\nНові файли можна додати через опцію меню \"Завантаження\". + Тут нічого немає. Відвантажте що-небудь! Натисніть на файлі для відображення додаткової інформації Розмір: Тип: @@ -151,4 +151,5 @@ Не завантажувати Надіслати Скопійовано в буфер обміну + diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index 1452d651..1edab5f3 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -16,4 +16,5 @@ ایرر غیر معروف خرابی بھجیں + diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index c757504a..56e55a1d 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -1,2 +1,4 @@ - + + + diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 8d85b994..7d668867 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -43,7 +43,7 @@ Không có nội dung được nhận. Không có gì để tải lên. %1$s không cho phép truy cập vào các nội dung chia sẻ Đang tải lên - Không có tập tin trong thư mục này. tập tin mới có thể được thêm vào với tùy chọn \"Tải lên\". + Không có gì ở đây .Hãy tải lên một cái gì đó ! Tap vào một tập tin để hiển thị thêm thông tin Kích thước: Loại: @@ -216,4 +216,5 @@ Không thể gỡ chia sẻ file hoặc thư mục. Nó không tồn tại. Một lỗi đã xảy ra khi thử gỡ chia sẻ file hoặc thư mục này Gởi + diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 205f7a19..f1064c2f 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -49,7 +49,8 @@ 没有接收到内容，无可上传。 %1$s未被允许访问共享内容。 上传 - 文件夹为空\n可以使用上传按钮来增加文件 + 这里还什么都没有。上传些东西吧！ + 载入中.... 点击一个文件来显示额外的信息。 大小： 类型： @@ -248,4 +249,5 @@ 等待服务器响应时发生了一个错误，此操作无法完成 等待服务器响应时发生了一个错误，此操作无法完成 服务器不可用，此操作无法完成 + diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 9f97ae98..00e66d35 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -65,4 +65,5 @@ 12:23:45 傳送 複製連結 + diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index c4f1b261..9741c6fb 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -49,7 +49,7 @@ 沒接到任何內容。沒有什麼可上載。 %1$s 並沒有被允許存取分享的內容 上傳中 - 這個目錄目前是空的 + 這裡還沒有東西，上傳一些吧！ 在檔案上輕觸來顯示更多資訊。 容量: 類型: @@ -246,4 +246,5 @@ 在等待伺服器回應時發生了錯誤, 這個操作將無法被完成 在等待伺服器回應時發生了錯誤, 這個操作將無法被完成 這個操作無法完成, 無法使用伺服器 + diff --git a/res/values/strings.xml b/res/values/strings.xml index c9927ec4..a8179bb8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -53,7 +53,9 @@ No content was received. Nothing to upload. %1$s is not allowed to access the shared content Uploading - There are no files in this folder.\nNew files can be added with the \"Upload\" menu option. + Nothing in here. Upload something! + Loading... + There are no files in this folder. Tap on a file to display additional information. Size: Type: @@ -269,6 +271,7 @@ An error occurred while waiting for the server, the operation couldn\'t have been done An error occurred while waiting for the server, the operation couldn\'t have been done The operation couldn\'t be completed, server is unavailable + You do not have permission %s to rename this file @@ -281,5 +284,6 @@ Accounts Add account + Secure connection is redirected through a non secure route. diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index bc0ab54e..07c4d792 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -62,23 +62,19 @@ import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; -import com.owncloud.android.lib.common.OwnCloudAccount; -import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; -import com.owncloud.android.lib.common.OwnCloudCredentialsFactory; import com.owncloud.android.lib.common.accounts.AccountTypeUtils; import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; -import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod; -import com.owncloud.android.operations.GetServerInfoOperation; -import com.owncloud.android.operations.OAuth2GetAccessToken; - import com.owncloud.android.lib.common.network.CertificateCombinedException; import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation; - +import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod; +import com.owncloud.android.operations.GetServerInfoOperation; +import com.owncloud.android.operations.OAuth2GetAccessToken; import com.owncloud.android.services.OperationsService; import com.owncloud.android.services.OperationsService.OperationsServiceBinder; import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; @@ -86,7 +82,6 @@ import com.owncloud.android.ui.dialog.SamlWebViewDialog; import com.owncloud.android.ui.dialog.SslUntrustedCertDialog; import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener; import com.owncloud.android.utils.Log_OC; -import com.owncloud.android.lib.resources.status.OwnCloudVersion; /** * This Activity is used to add an ownCloud account to the App @@ -1167,6 +1162,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener { case UNKNOWN_ERROR: mServerStatusText = R.string.auth_unknown_error_title; break; + case OK_REDIRECT_TO_NON_SECURE_CONNECTION: + mServerStatusIcon = android.R.drawable.ic_partial_secure; + mServerStatusText = R.string.auth_redirect_non_secure_connection_title; + break; default: mServerStatusText = 0; mServerStatusIcon = 0; diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index e263b953..a7a25382 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -196,6 +196,8 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/); // always AFTER setContentView(...) ; to work around bug in its implementation + setBackgroundText(); + Log_OC.d(TAG, "onCreate() end"); } @@ -960,6 +962,8 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener removeStickyBroadcast(intent); Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress); setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/); + + setBackgroundText(); } @@ -976,6 +980,23 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener } } + /** + * Show a text message on screen view for notifying user if content is + * loading or folder is empty + */ + private void setBackgroundText() { + OCFileListFragment ocFileListFragment = getListOfFilesFragment(); + if (ocFileListFragment != null) { + int message = R.string.file_list_loading; + if (!mSyncInProgress) { + // In case file list is empty + message = R.string.file_list_empty; + } + ocFileListFragment.setMessageForEmptyList(getString(message)); + } else { + Log.e(TAG, "OCFileListFragment is null"); + } + } /** * Once the file upload has finished -> update view @@ -1529,6 +1550,8 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener synchFolderOp.execute(getAccount(), this, null, null); setSupportProgressBarIndeterminateVisibility(true); + + setBackgroundText(); } /** @@ -1630,5 +1653,5 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener } onTransferStateChanged(file, false, false); } - + } diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java index 5915ab42..6c52c6e0 100644 --- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -18,21 +18,21 @@ package com.owncloud.android.ui.fragment; -import com.actionbarsherlock.app.SherlockFragment; -import com.owncloud.android.R; -import com.owncloud.android.ui.ExtendedListView; -import com.owncloud.android.utils.Log_OC; - - import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; -import android.widget.ListAdapter; import android.widget.AdapterView.OnItemClickListener; +import android.widget.ListAdapter; import android.widget.ListView; +import android.widget.TextView; + +import com.actionbarsherlock.app.SherlockFragment; +import com.owncloud.android.R; +import com.owncloud.android.ui.ExtendedListView; +import com.owncloud.android.utils.Log_OC; /** * TODO extending SherlockListFragment instead of SherlockFragment @@ -46,6 +46,8 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic protected ExtendedListView mList; private SwipeRefreshLayout mRefreshLayout; + private SwipeRefreshLayout mRefreshEmptyLayout; + private TextView mEmptyListMessage; public void setListAdapter(ListAdapter listAdapter) { mList.setAdapter(listAdapter); @@ -63,9 +65,10 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic //mList = new ExtendedListView(getActivity()); View v = inflater.inflate(R.layout.list_fragment, null); + mEmptyListMessage = (TextView) v.findViewById(R.id.empty_list_view); mList = (ExtendedListView)(v.findViewById(R.id.list_root)); mList.setOnItemClickListener(this); - //mList.setEmptyView(v.findViewById(R.id.empty_list_view)); // looks like it's not a cool idea + mList.setDivider(getResources().getDrawable(R.drawable.uploader_list_separator)); mList.setDividerHeight(1); @@ -76,12 +79,13 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic // Pull down refresh mRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files); - // Colors in animations: background - mRefreshLayout.setColorScheme(R.color.background_color, R.color.background_color, - R.color.background_color, R.color.background_color); + mRefreshEmptyLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files_emptyView); - mRefreshLayout.setOnRefreshListener(this); + onCreateSwipeToRefresh(mRefreshLayout); + onCreateSwipeToRefresh(mRefreshEmptyLayout); + mList.setEmptyView(mRefreshEmptyLayout); + return v; } @@ -129,8 +133,9 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic @Override public void onRefresh() { - // to be @overriden + // to be @overriden mRefreshLayout.setRefreshing(false); + mRefreshEmptyLayout.setRefreshing(false); } /** @@ -161,6 +166,31 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic public void hideSwipeProgress() { mRefreshLayout.setRefreshing(false); } - - + + /** + * Set message for empty list view + */ + public void setMessageForEmptyList(String message) { + if (mEmptyListMessage != null) { + mEmptyListMessage.setText(message); + } + } + + /** + * Get the text of EmptyListMessage TextView + * + * @return String + */ + public String getEmptyViewText() { + return (mEmptyListMessage != null) ? mEmptyListMessage.getText().toString() : ""; + } + + private void onCreateSwipeToRefresh(SwipeRefreshLayout refreshLayout) { + // Colors in animations: background + refreshLayout.setColorScheme(R.color.background_color, R.color.background_color, R.color.background_color, + R.color.background_color); + + refreshLayout.setOnRefreshListener(this); + } + } diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java index bc466016..3d547cbb 100644 --- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java @@ -19,11 +19,6 @@ package com.owncloud.android.ui.fragment; import java.io.File; -import com.owncloud.android.R; -import com.owncloud.android.ui.adapter.LocalFileListAdapter; -import com.owncloud.android.utils.Log_OC; - - import android.app.Activity; import android.os.Bundle; import android.os.Environment; @@ -35,6 +30,10 @@ import android.widget.AdapterView; import android.widget.ImageView; import android.widget.ListView; +import com.owncloud.android.R; +import com.owncloud.android.ui.adapter.LocalFileListAdapter; +import com.owncloud.android.utils.Log_OC; + /** * A Fragment that lists all files and folders in a given LOCAL path. @@ -78,6 +77,7 @@ public class LocalFileListFragment extends ExtendedListFragment { View v = super.onCreateView(inflater, container, savedInstanceState); getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); disableSwipe(); // Disable pull refresh + setMessageForEmptyList(getString(R.string.local_file_list_empty)); Log_OC.i(TAG, "onCreateView() end"); return v; } diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index c53b3781..52598074 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -20,12 +20,21 @@ package com.owncloud.android.ui.fragment; import java.io.File; import java.util.ArrayList; +import android.app.Activity; +import android.os.Bundle; +import android.view.ContextMenu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.AdapterView.AdapterContextMenuInfo; + import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.FileMenuFilter; -import com.owncloud.android.ui.adapter.FileListListAdapter; import com.owncloud.android.ui.activity.FileDisplayActivity; +import com.owncloud.android.ui.adapter.FileListListAdapter; import com.owncloud.android.ui.dialog.ConfirmationDialogFragment; import com.owncloud.android.ui.dialog.RemoveFileDialogFragment; import com.owncloud.android.ui.dialog.RenameFileDialogFragment; @@ -33,15 +42,6 @@ import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.utils.Log_OC; -import android.app.Activity; -import android.os.Bundle; -import android.view.ContextMenu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.widget.AdapterView; -import android.widget.AdapterView.AdapterContextMenuInfo; - /** * A Fragment that lists all files and folders in a given path. * @@ -62,6 +62,7 @@ public class OCFileListFragment extends ExtendedListFragment { private static final String KEY_FIRST_POSITIONS= "FIRST_POSITIONS"; private static final String KEY_TOPS = "TOPS"; private static final String KEY_HEIGHT_CELL = "HEIGHT_CELL"; + private static final String KEY_EMPTY_LIST_MESSAGE = "EMPTY_LIST_MESSAGE"; private FileFragment.ContainerActivity mContainerActivity; @@ -115,6 +116,7 @@ public class OCFileListFragment extends ExtendedListFragment { mFirstPositions = savedInstanceState.getIntegerArrayList(KEY_FIRST_POSITIONS); mTops = savedInstanceState.getIntegerArrayList(KEY_TOPS); mHeightCell = savedInstanceState.getInt(KEY_HEIGHT_CELL); + setMessageForEmptyList(savedInstanceState.getString(KEY_EMPTY_LIST_MESSAGE)); } else { mIndexes = new ArrayList(); @@ -129,8 +131,7 @@ public class OCFileListFragment extends ExtendedListFragment { setListAdapter(mAdapter); registerForContextMenu(getListView()); - getListView().setOnCreateContextMenuListener(this); - + getListView().setOnCreateContextMenuListener(this); } /** @@ -144,6 +145,7 @@ public class OCFileListFragment extends ExtendedListFragment { outState.putIntegerArrayList(KEY_FIRST_POSITIONS, mFirstPositions); outState.putIntegerArrayList(KEY_TOPS, mTops); outState.putInt(KEY_HEIGHT_CELL, mHeightCell); + outState.putString(KEY_EMPTY_LIST_MESSAGE, getEmptyViewText()); } /** diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 954f4a7d..3c9d9cf3 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -27,20 +27,18 @@ import android.os.Bundle; import android.os.IBinder; import android.preference.PreferenceManager; import android.support.v4.view.ViewPager; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnTouchListener; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.Window; +import com.ortiz.touch.ExtendedViewPager; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; -import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; +import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; import com.owncloud.android.lib.common.operations.RemoteOperation; @@ -63,7 +61,7 @@ import com.owncloud.android.utils.Log_OC; * @author David A. Velasco */ public class PreviewImageActivity extends FileActivity implements -FileFragment.ContainerActivity, OnTouchListener, + FileFragment.ContainerActivity, ViewPager.OnPageChangeListener, OnRemoteOperationListener { public static final int DIALOG_SHORT_WAIT = 0; @@ -73,7 +71,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { public static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; private static final String KEY_WAITING_FOR_BINDER = "WAITING_FOR_BINDER"; - private ViewPager mViewPager; + private ExtendedViewPager mViewPager; private PreviewImagePagerAdapter mPreviewImagePagerAdapter; private boolean mRequestWaitingForBinder; @@ -118,7 +116,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { parentFolder = getStorageManager().getFileByPath(OCFile.ROOT_PATH); } mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), parentFolder, getAccount(), getStorageManager()); - mViewPager = (ViewPager) findViewById(R.id.fragmentPager); + mViewPager = (ExtendedViewPager) findViewById(R.id.fragmentPager); int position = mPreviewImagePagerAdapter.getFilePosition(getFile()); position = (position >= 0) ? position : 0; mViewPager.setAdapter(mPreviewImagePagerAdapter); @@ -322,7 +320,11 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { requestForDownload(currentFile); } } + + // Call to reset image zoom to initial state + ((PreviewImagePagerAdapter) mViewPager.getAdapter()).resetZoom(); } + } /** @@ -388,17 +390,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { } - - @Override - public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_UP) { - toggleFullScreen(); - } - return true; - } - - - private void toggleFullScreen() { + public void toggleFullScreen() { ActionBar actionBar = getSupportActionBar(); if (mFullScreen) { actionBar.show(); diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 5e211e58..25eaf38a 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -18,7 +18,6 @@ package com.owncloud.android.ui.preview; import java.lang.ref.WeakReference; - import android.accounts.Account; import android.annotation.SuppressLint; import android.app.Activity; @@ -32,7 +31,7 @@ import android.support.v4.app.FragmentStatePagerAdapter; import android.view.Display; import android.view.LayoutInflater; import android.view.View; -import android.view.View.OnTouchListener; +import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.ProgressBar; @@ -41,6 +40,7 @@ import android.widget.TextView; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; +import com.ortiz.touch.TouchImageView; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.FileMenuFilter; @@ -65,7 +65,7 @@ public class PreviewImageFragment extends FileFragment { private View mView; private Account mAccount; - private ImageView mImageView; + private TouchImageView mImageView; private TextView mMessageView; private ProgressBar mProgressWheel; @@ -124,34 +124,26 @@ public class PreviewImageFragment extends FileFragment { Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); mView = inflater.inflate(R.layout.preview_image_fragment, container, false); - mImageView = (ImageView)mView.findViewById(R.id.image); + mImageView = (TouchImageView) mView.findViewById(R.id.image); mImageView.setVisibility(View.GONE); - mView.setOnTouchListener((OnTouchListener)getActivity()); + mImageView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ((PreviewImageActivity) getActivity()).toggleFullScreen(); + } + + }); mMessageView = (TextView)mView.findViewById(R.id.message); mMessageView.setVisibility(View.GONE); mProgressWheel = (ProgressBar)mView.findViewById(R.id.progressWheel); mProgressWheel.setVisibility(View.VISIBLE); return mView; } - /** * {@inheritDoc} */ @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (!(activity instanceof OnTouchListener)) { - throw new ClassCastException(activity.toString() + - " must implement " + OnTouchListener.class.getSimpleName()); - } - } - - - /** - * {@inheritDoc} - */ - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { @@ -303,7 +295,6 @@ public class PreviewImageFragment extends FileFragment { super.onPause(); } - @Override public void onDestroy() { if (mBitmap != null) { @@ -513,5 +504,8 @@ public class PreviewImageFragment extends FileFragment { container.finish(); } + public TouchImageView getImageView() { + return mImageView; + } } diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java index de90b4bd..2b9fffa4 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java +++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java @@ -18,13 +18,11 @@ package com.owncloud.android.ui.preview; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.Vector; -import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.ui.fragment.FileFragment; - import android.accounts.Account; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -32,6 +30,8 @@ import android.support.v4.app.FragmentStatePagerAdapter; import android.view.ViewGroup; import com.owncloud.android.datamodel.FileDataStorageManager; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.ui.fragment.FileFragment; /** * Adapter class that provides Fragment instances @@ -179,6 +179,19 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter { return mDownloadErrors.contains(Integer.valueOf(position)); } + /** + * Reset the image zoom to default value for each CachedFragments + */ + public void resetZoom() { + Iterator entries = mCachedFragments.values().iterator(); + while (entries.hasNext()) { + FileFragment fileFragment = (FileFragment) entries.next(); + if (fileFragment instanceof PreviewImageFragment) { + ((PreviewImageFragment) fileFragment).getImageView().resetZoom(); + } + } + } + /* -* * Called when a change in the shown pages is going to start being made. * diff --git a/third_party/touch-image-view/LICENSE b/third_party/touch-image-view/LICENSE new file mode 100644 index 00000000..f60f2124 --- /dev/null +++ b/third_party/touch-image-view/LICENSE @@ -0,0 +1,7 @@ +opyright (c) 2012 Michael Ortiz + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE