From: Andy Scherzinger Date: Wed, 9 Sep 2015 09:42:11 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~32 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0234ca22ea2422f49cb453e8f3030a699cdd94bd?hp=ed86a0560aeadbbd4289420f9de5654053c09f55 Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- diff --git a/res/drawable-hdpi/file.png b/res/drawable-hdpi/file.png index b8ee7207..409d2023 100644 Binary files a/res/drawable-hdpi/file.png and b/res/drawable-hdpi/file.png differ diff --git a/res/drawable-hdpi/file_doc.png b/res/drawable-hdpi/file_doc.png index 119fc65f..298ebbdf 100644 Binary files a/res/drawable-hdpi/file_doc.png and b/res/drawable-hdpi/file_doc.png differ diff --git a/res/drawable-hdpi/file_image.png b/res/drawable-hdpi/file_image.png index 610a5be1..61eb88f1 100644 Binary files a/res/drawable-hdpi/file_image.png and b/res/drawable-hdpi/file_image.png differ diff --git a/res/drawable-hdpi/file_movie.png b/res/drawable-hdpi/file_movie.png index a621ffa4..09520e44 100644 Binary files a/res/drawable-hdpi/file_movie.png and b/res/drawable-hdpi/file_movie.png differ diff --git a/res/drawable-hdpi/file_pdf.png b/res/drawable-hdpi/file_pdf.png index bd457209..6af2ec27 100644 Binary files a/res/drawable-hdpi/file_pdf.png and b/res/drawable-hdpi/file_pdf.png differ diff --git a/res/drawable-hdpi/file_ppt.png b/res/drawable-hdpi/file_ppt.png index 116f2ed8..2927f964 100644 Binary files a/res/drawable-hdpi/file_ppt.png and b/res/drawable-hdpi/file_ppt.png differ diff --git a/res/drawable-hdpi/file_sound.png b/res/drawable-hdpi/file_sound.png index 74865dae..2d495b67 100644 Binary files a/res/drawable-hdpi/file_sound.png and b/res/drawable-hdpi/file_sound.png differ diff --git a/res/drawable-hdpi/file_xls.png b/res/drawable-hdpi/file_xls.png index 02070a24..f2aaf846 100644 Binary files a/res/drawable-hdpi/file_xls.png and b/res/drawable-hdpi/file_xls.png differ diff --git a/res/drawable-hdpi/file_zip.png b/res/drawable-hdpi/file_zip.png index faebd60d..de292fb5 100644 Binary files a/res/drawable-hdpi/file_zip.png and b/res/drawable-hdpi/file_zip.png differ diff --git a/res/drawable-hdpi/folder_public.png b/res/drawable-hdpi/folder_public.png index eed64170..55dbdf9d 100644 Binary files a/res/drawable-hdpi/folder_public.png and b/res/drawable-hdpi/folder_public.png differ diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png index 2b842033..e2359dbd 100644 Binary files a/res/drawable-hdpi/ic_menu_archive.png and b/res/drawable-hdpi/ic_menu_archive.png differ diff --git a/res/drawable-hdpi/shared_with_me_folder.png b/res/drawable-hdpi/shared_with_me_folder.png index b26e9788..d312561b 100644 Binary files a/res/drawable-hdpi/shared_with_me_folder.png and b/res/drawable-hdpi/shared_with_me_folder.png differ diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png index b669fdf4..74add13f 100644 Binary files a/res/drawable-ldpi/file.png and b/res/drawable-ldpi/file.png differ diff --git a/res/drawable-ldpi/file_doc.png b/res/drawable-ldpi/file_doc.png index 0ea07e3b..3bc2f08d 100644 Binary files a/res/drawable-ldpi/file_doc.png and b/res/drawable-ldpi/file_doc.png differ diff --git a/res/drawable-ldpi/file_image.png b/res/drawable-ldpi/file_image.png index 1bf20155..8ff5e6c1 100644 Binary files a/res/drawable-ldpi/file_image.png and b/res/drawable-ldpi/file_image.png differ diff --git a/res/drawable-ldpi/file_movie.png b/res/drawable-ldpi/file_movie.png index e50c1681..7cc1ecdc 100644 Binary files a/res/drawable-ldpi/file_movie.png and b/res/drawable-ldpi/file_movie.png differ diff --git a/res/drawable-ldpi/file_pdf.png b/res/drawable-ldpi/file_pdf.png index a05afdd5..55be82f0 100644 Binary files a/res/drawable-ldpi/file_pdf.png and b/res/drawable-ldpi/file_pdf.png differ diff --git a/res/drawable-ldpi/file_ppt.png b/res/drawable-ldpi/file_ppt.png index 11a9cc96..644fb852 100644 Binary files a/res/drawable-ldpi/file_ppt.png and b/res/drawable-ldpi/file_ppt.png differ diff --git a/res/drawable-mdpi/file.png b/res/drawable-mdpi/file.png index f988e577..dd3ebad3 100644 Binary files a/res/drawable-mdpi/file.png and b/res/drawable-mdpi/file.png differ diff --git a/res/drawable-mdpi/file_doc.png b/res/drawable-mdpi/file_doc.png index b48f73f4..6c51d2dd 100644 Binary files a/res/drawable-mdpi/file_doc.png and b/res/drawable-mdpi/file_doc.png differ diff --git a/res/drawable-mdpi/file_image.png b/res/drawable-mdpi/file_image.png index f70eb95b..1d767a5f 100644 Binary files a/res/drawable-mdpi/file_image.png and b/res/drawable-mdpi/file_image.png differ diff --git a/res/drawable-mdpi/file_movie.png b/res/drawable-mdpi/file_movie.png index 48090eb1..638f8edf 100644 Binary files a/res/drawable-mdpi/file_movie.png and b/res/drawable-mdpi/file_movie.png differ diff --git a/res/drawable-mdpi/file_pdf.png b/res/drawable-mdpi/file_pdf.png index a10127ae..6292ff45 100644 Binary files a/res/drawable-mdpi/file_pdf.png and b/res/drawable-mdpi/file_pdf.png differ diff --git a/res/drawable-mdpi/file_ppt.png b/res/drawable-mdpi/file_ppt.png index 9f3b34d7..3a273b1a 100644 Binary files a/res/drawable-mdpi/file_ppt.png and b/res/drawable-mdpi/file_ppt.png differ diff --git a/res/drawable-mdpi/file_sound.png b/res/drawable-mdpi/file_sound.png index 6328e2e1..d157087d 100644 Binary files a/res/drawable-mdpi/file_sound.png and b/res/drawable-mdpi/file_sound.png differ diff --git a/res/drawable-mdpi/file_xls.png b/res/drawable-mdpi/file_xls.png index 430db590..e4c66164 100644 Binary files a/res/drawable-mdpi/file_xls.png and b/res/drawable-mdpi/file_xls.png differ diff --git a/res/drawable-mdpi/file_zip.png b/res/drawable-mdpi/file_zip.png index e587ecdd..f64412d4 100644 Binary files a/res/drawable-mdpi/file_zip.png and b/res/drawable-mdpi/file_zip.png differ diff --git a/res/drawable-mdpi/folder_public.png b/res/drawable-mdpi/folder_public.png index a63effe8..09945b62 100644 Binary files a/res/drawable-mdpi/folder_public.png and b/res/drawable-mdpi/folder_public.png differ diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png index f21a11f4..99529da4 100644 Binary files a/res/drawable-mdpi/ic_menu_archive.png and b/res/drawable-mdpi/ic_menu_archive.png differ diff --git a/res/drawable-mdpi/shared_with_me_folder.png b/res/drawable-mdpi/shared_with_me_folder.png index 0c83a320..ed8f860b 100644 Binary files a/res/drawable-mdpi/shared_with_me_folder.png and b/res/drawable-mdpi/shared_with_me_folder.png differ diff --git a/res/drawable-xhdpi/file.png b/res/drawable-xhdpi/file.png index d575f47c..77641700 100644 Binary files a/res/drawable-xhdpi/file.png and b/res/drawable-xhdpi/file.png differ diff --git a/res/drawable-xhdpi/file_doc.png b/res/drawable-xhdpi/file_doc.png index e0e2ba9b..16cc0f41 100644 Binary files a/res/drawable-xhdpi/file_doc.png and b/res/drawable-xhdpi/file_doc.png differ diff --git a/res/drawable-xhdpi/file_image.png b/res/drawable-xhdpi/file_image.png index 72a7a507..078ed8ae 100644 Binary files a/res/drawable-xhdpi/file_image.png and b/res/drawable-xhdpi/file_image.png differ diff --git a/res/drawable-xhdpi/file_movie.png b/res/drawable-xhdpi/file_movie.png index d0216d85..9bb6ddfb 100644 Binary files a/res/drawable-xhdpi/file_movie.png and b/res/drawable-xhdpi/file_movie.png differ diff --git a/res/drawable-xhdpi/file_pdf.png b/res/drawable-xhdpi/file_pdf.png index 0d44a50a..f8cf9e49 100644 Binary files a/res/drawable-xhdpi/file_pdf.png and b/res/drawable-xhdpi/file_pdf.png differ diff --git a/res/drawable-xhdpi/file_ppt.png b/res/drawable-xhdpi/file_ppt.png index c485c14d..e712d08e 100644 Binary files a/res/drawable-xhdpi/file_ppt.png and b/res/drawable-xhdpi/file_ppt.png differ diff --git a/res/drawable-xhdpi/file_sound.png b/res/drawable-xhdpi/file_sound.png index e2736a68..f9814c90 100644 Binary files a/res/drawable-xhdpi/file_sound.png and b/res/drawable-xhdpi/file_sound.png differ diff --git a/res/drawable-xhdpi/file_xls.png b/res/drawable-xhdpi/file_xls.png index c1a25b98..b5c6ee18 100644 Binary files a/res/drawable-xhdpi/file_xls.png and b/res/drawable-xhdpi/file_xls.png differ diff --git a/res/drawable-xhdpi/file_zip.png b/res/drawable-xhdpi/file_zip.png index 08ccee07..a5ee055e 100644 Binary files a/res/drawable-xhdpi/file_zip.png and b/res/drawable-xhdpi/file_zip.png differ diff --git a/res/drawable-xhdpi/folder_public.png b/res/drawable-xhdpi/folder_public.png index 49e849d5..4e35b7a1 100644 Binary files a/res/drawable-xhdpi/folder_public.png and b/res/drawable-xhdpi/folder_public.png differ diff --git a/res/drawable-xhdpi/ic_menu_archive.png b/res/drawable-xhdpi/ic_menu_archive.png index bf86cb33..a54161c9 100644 Binary files a/res/drawable-xhdpi/ic_menu_archive.png and b/res/drawable-xhdpi/ic_menu_archive.png differ diff --git a/res/drawable-xhdpi/shared_with_me_folder.png b/res/drawable-xhdpi/shared_with_me_folder.png index c5af0d7b..1e6fb301 100644 Binary files a/res/drawable-xhdpi/shared_with_me_folder.png and b/res/drawable-xhdpi/shared_with_me_folder.png differ diff --git a/res/drawable-xxhdpi/file.png b/res/drawable-xxhdpi/file.png index ddc9d6b9..be54c422 100644 Binary files a/res/drawable-xxhdpi/file.png and b/res/drawable-xxhdpi/file.png differ diff --git a/res/drawable-xxhdpi/file_doc.png b/res/drawable-xxhdpi/file_doc.png index 0c7caeb4..6007b378 100644 Binary files a/res/drawable-xxhdpi/file_doc.png and b/res/drawable-xxhdpi/file_doc.png differ diff --git a/res/drawable-xxhdpi/file_image.png b/res/drawable-xxhdpi/file_image.png index 239d4a79..671b6bf1 100644 Binary files a/res/drawable-xxhdpi/file_image.png and b/res/drawable-xxhdpi/file_image.png differ diff --git a/res/drawable-xxhdpi/file_movie.png b/res/drawable-xxhdpi/file_movie.png index f60eb714..28acf0e5 100644 Binary files a/res/drawable-xxhdpi/file_movie.png and b/res/drawable-xxhdpi/file_movie.png differ diff --git a/res/drawable-xxhdpi/file_pdf.png b/res/drawable-xxhdpi/file_pdf.png index d267059a..b3d9274f 100644 Binary files a/res/drawable-xxhdpi/file_pdf.png and b/res/drawable-xxhdpi/file_pdf.png differ diff --git a/res/drawable-xxhdpi/file_ppt.png b/res/drawable-xxhdpi/file_ppt.png index 29235684..569feeca 100644 Binary files a/res/drawable-xxhdpi/file_ppt.png and b/res/drawable-xxhdpi/file_ppt.png differ diff --git a/res/drawable-xxhdpi/file_sound.png b/res/drawable-xxhdpi/file_sound.png index b364c3bb..63b0d492 100644 Binary files a/res/drawable-xxhdpi/file_sound.png and b/res/drawable-xxhdpi/file_sound.png differ diff --git a/res/drawable-xxhdpi/file_xls.png b/res/drawable-xxhdpi/file_xls.png index c800ae4a..9e297ee3 100644 Binary files a/res/drawable-xxhdpi/file_xls.png and b/res/drawable-xxhdpi/file_xls.png differ diff --git a/res/drawable-xxhdpi/file_zip.png b/res/drawable-xxhdpi/file_zip.png index 2ce35ba6..2535d7cb 100644 Binary files a/res/drawable-xxhdpi/file_zip.png and b/res/drawable-xxhdpi/file_zip.png differ diff --git a/res/drawable-xxhdpi/folder_public.png b/res/drawable-xxhdpi/folder_public.png index ea72b4db..b6755f3e 100644 Binary files a/res/drawable-xxhdpi/folder_public.png and b/res/drawable-xxhdpi/folder_public.png differ diff --git a/res/drawable-xxhdpi/ic_menu_archive.png b/res/drawable-xxhdpi/ic_menu_archive.png index 93ee2adf..81e9f7f8 100644 Binary files a/res/drawable-xxhdpi/ic_menu_archive.png and b/res/drawable-xxhdpi/ic_menu_archive.png differ diff --git a/res/drawable-xxhdpi/shared_with_me_folder.png b/res/drawable-xxhdpi/shared_with_me_folder.png index 23e23d8f..d0d6ce80 100644 Binary files a/res/drawable-xxhdpi/shared_with_me_folder.png and b/res/drawable-xxhdpi/shared_with_me_folder.png differ diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml index f5a51773..e7e46fec 100644 --- a/res/values-cy-rGB/strings.xml +++ b/res/values-cy-rGB/strings.xml @@ -128,6 +128,7 @@ Llwytho lluniau i fyny drwy WiFi\'n unig /LlwythoSyth Cadw\'r ddau + Anfon Cyfrifon Dewisiwch diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index edf331a5..51aa4a40 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -272,6 +272,10 @@ Descárgueo de aquí: %2$s Produciuse un erro ao tentar deixar de compartir este ficheiro ou cartafol Escriba un contrasinal Ten que escribir un contrasinal + Enviar + Copiar a ligazón + Copiado no portapapeis. + Produciuse un erro crítico: non é posíbel realizar as operacións Produciuse un erro mentres conectaba co servidor. 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 diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 74cc8cbd..1a62cc2d 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -231,6 +231,10 @@ ⇥⇥מנהל. שגיאה אירעה בזמן ניסיון לשתף קובץ זה או תיקייה זו שגיאה אירעה בזמן ניסיון לבטל שיתוף לקובץ זה או לתיקייה זו + שליחה + העתקת קישור + הועתק ללוח הגזירים - clipboard + שגיאה קריטית: לא ניתן לבצע את הפעולות שגיאה אירעה בזמן חיבור לשרת. שגיאה אירעה בזמן המתנה לשרת, הפעולה לא הייתה ניתנת להשלמה שגיאה אירעה בזמן המתנה לשרת, הפעולה לא הייתה ניתנת להשלמה diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml index c716901f..b8bae64c 100644 --- a/res/values-hu-rHU/strings.xml +++ b/res/values-hu-rHU/strings.xml @@ -226,6 +226,9 @@ %1$s nem lehet másolni a %2$s helyi könyvtárba Hiba lépett fel a mappa megosztásakor Hiba lépett fel a mappa megosztásának visszavonásakor + Küldjük el + Link másolása + Bemásolva a vágólapra Fiókok Fiók hozzáadása diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 89cbb7eb..68b39212 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -98,6 +98,7 @@ ចាប់ពីៈ រហូតដល់ៈ ហត្ថលេខា: + ផ្ញើ គណនី ខុស​ពាក្យ​សម្ងាត់ diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 8add0e40..ef5e51c7 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -33,6 +33,7 @@ ಅಚ್ಚುಮೆಚ್ಚಿನ ಮರುಹೆಸರಿಸು ತೆಗೆದುಹಾಕಿ + ಕಳುಹಿಸಿ ದೃಢೀಕರಣ ಅಗತ್ಯವಿದೆ ದುರ್ಬಲ ಗುಪ್ತಪದ diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 6324922c..1d91a6b2 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -270,6 +270,10 @@ Ocorreu um erro enquanto retirava a partilha deste ficheiro ou pasta Introduza uma palavra-passe Você deve introduzir uma palavra-passe + Enviar + Copiar hiperligação + Copiado para a área de transferência + Erro crítico: não é possível executar as operações Ocorreu um erro durante a ligação ao servidos. 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. diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 5bfb25f9..30b37f0a 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -33,6 +33,7 @@ பதிவேற்று புதிய கோப்புறை விவரங்கள் + அனுப்பவும் கணக்குகள் diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml index ef33def5..836a2af2 100644 --- a/res/values-th-rTH/strings.xml +++ b/res/values-th-rTH/strings.xml @@ -270,6 +270,10 @@ เกิดข้อผิดพลาดในขณะที่จะยกเลิกการอชร์ไฟล์หรือโฟลเดอร์นี้ ป้อนรหัสผ่าน คุณจะต้องใส่รหัสผ่าน + ส่ง + คัดลอกลิงค์ + คัดลอกไปยังคลิปบอร์ด + ข้อผิดพลาด: ไม่สามารถดำเนินการได้ เกิดข้อผิดพลาดขณะกำลังเชื่อมต่อกับเซิร์ฟเวอร์ เกิดข้อผิดพลาดขณะที่รอการดำเนินการจากเซิร์ฟเวอร์ เกิดข้อผิดพลาดขณะที่รอการดำเนินการจากเซิร์ฟเวอร์ diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml index 92419b06..4573d713 100644 --- a/res/values-ug/strings.xml +++ b/res/values-ug/strings.xml @@ -47,6 +47,7 @@ يىغقۇچ ئات ئۆزگەرت چىقىرىۋەت + يوللا ھېساباتلار بىخەتەرلىك