From: masensio Date: Tue, 10 Mar 2015 13:58:21 +0000 (+0100) Subject: Merge branch 'develop' into accessibility X-Git-Tag: oc-android-1.7.1_signed^2~17^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c963eb0fad38ec71f511de231bd81deadecc70fb?hp=21c775585804213116e490395df6b76561546d4e Merge branch 'develop' into accessibility Conflicts: src/com/owncloud/android/ui/adapter/FileListListAdapter.java --- diff --git a/.gitmodules b/.gitmodules index fa52fcd6..38f0f582 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,3 +3,7 @@ path = owncloud-android-library url = git://github.com/owncloud/android-library.git branch = develop +[submodule "ocdoc"] + path = user_manual/ocdoc + url = https://github.com/owncloud/documentation + branch = master diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fd92d3d6..f0d1e9dc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2014 ownCloud Inc. + Copyright (C) 2012-2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, @@ -18,8 +18,8 @@ along with this program. If not, see . --> + android:versionCode="10700000" + android:versionName="1.7.0" xmlns:android="http://schemas.android.com/apk/res/android">

@@ -86,9 +86,6 @@ android:name=".ui.activity.Preferences" android:theme="@style/Theme.ownCloud" > - - - diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..51d52429 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,20 @@ +## 1.7.0 (19 February 2015) + +- Download full folders +- Grid view for images +- Remote thumbnails (OC Server 8.0+) +- Added number of files and folders at the end of the list +- "Open with" in contextual menu +- Downloads added to Media Provider +- Uploads: + + Local thumbnails in section "Files" + + Multiple selection in "Content from other apps" (Android 4.3+) +- Gallery: + + proper handling of EXIF + + obey sorting in the list of files +- Settings view updated +- Improved subjects in e-mails +- Bugs fixed +... + + diff --git a/build.gradle b/build.gradle index 46308aca..57ec86e5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.14.0' + classpath 'com.android.tools.build:gradle:1.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8d63f892..5a1c4383 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 15 10:45:44 CEST 2014 +#Sun Jan 18 17:01:43 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml index 478e3c42..18ffb4c0 100644 --- a/oc_jb_workaround/AndroidManifest.xml +++ b/oc_jb_workaround/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="0100021" + android:versionName="1.0.21" > + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/grid_item.xml b/res/layout/grid_item.xml new file mode 100644 index 00000000..d0f3d0f1 --- /dev/null +++ b/res/layout/grid_item.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml index 160edc1d..81b52100 100644 --- a/res/layout/list_fragment.xml +++ b/res/layout/list_fragment.xml @@ -1,9 +1,9 @@ - +--> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" > + android:footerDividersEnabled="false" + android:visibility="visible" > - + android:layout_height="match_parent" + android:visibility="visible" /> + - - - - - - - + android:layout_height="match_parent" + android:columnWidth="100dp" + android:gravity="center" + android:horizontalSpacing="2dp" + android:stretchMode="columnWidth" + android:verticalSpacing="2dp" + android:visibility="visible" /> + + + + + + + - + + \ No newline at end of file diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml index c6c7b92f..c66ff730 100644 --- a/res/layout/list_item.xml +++ b/res/layout/list_item.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, @@ -19,129 +19,141 @@ --> - - - - - - - - - - - + android:orientation="horizontal"> + + + + + + + + + + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="vertical" > + android:textColor="#303030" + android:textSize="16dip" /> - + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:weightSum="1"> + + + + + + - + - - - - - + + + + + + - + diff --git a/res/layout/loading_dialog.xml b/res/layout/loading_dialog.xml index 629d8e27..0dbb9ef3 100644 --- a/res/layout/loading_dialog.xml +++ b/res/layout/loading_dialog.xml @@ -1,4 +1,21 @@ + + + diff --git a/res/menu/account_picker_long_click.xml b/res/menu/account_picker_long_click.xml index b7e2dd37..df83e378 100644 --- a/res/menu/account_picker_long_click.xml +++ b/res/menu/account_picker_long_click.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml index b60d542c..545f8ea6 100644 --- a/res/menu/file_actions_menu.xml +++ b/res/menu/file_actions_menu.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 07056010..d35eba01 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, diff --git a/res/raw-de/changelog.html b/res/raw-de/changelog.html index a54a6643..d6511201 100644 --- a/res/raw-de/changelog.html +++ b/res/raw-de/changelog.html @@ -2,7 +2,7 @@

- Dieses Gerät läuft mit Android 4.1.x. + Dieses Gerï¿½t lï¿½uft mit Android 4.1.x.

- In dieser Version von Android existiert ein Bug, der nach jedem Neustart eine erneute Eingabe der ownCloud Login-Informationen nötig macht. Um das zu umgehen installieren Sie bitte diese kostenlose Hilfs-App: + In dieser Version von Android existiert ein Bug, der nach jedem Neustart eine erneute Eingabe der ownCloud Login-Informationen nï¿½tig macht. Um das zu umgehen installieren Sie bitte diese kostenlose Hilfs-App:

ownCloud Jelly Bean Workaround diff --git a/res/raw-es/changelog.html b/res/raw-es/changelog.html index 9321d520..e8f0e77f 100644 --- a/res/raw-es/changelog.html +++ b/res/raw-es/changelog.html @@ -2,7 +2,7 @@ Ãmumi @@ -32,6 +38,8 @@ Dostuna mÉslÉhÉt gÃ¶r GeriyÉ cavab Ä°ÅarÉlÉmÉk + PaylaÅma Ã¼nvanÄ±nÄ± yadda saxla + Son paylaÅÄ±lmÄ±Å yÃ¼klÉnmÉ Ã¼nvanÄ±nÄ± yadda saxla %1$s-i aÄÄ±llÄ± telefonunuzda yoxlayÄ±n! MÉn sizi Ã¶z smartfonunuzda %1$s istifadÉ etmÉk Ã¼Ã§Ã¼n dÉvÉt etmÉk istÉyirÉm! Burdan endirin: %2$s Serveri yoxla @@ -51,9 +59,14 @@ HeÃ§ bir kontent gÉlmÉdi. YuklÉmÉk Ã¼Ã§Ã¼n heÃ§nÉ yoxdur. %1$s yayÄ±mlanmÄ±Å kontent Ã¼Ã§Ã¼n yetkili deyil YÃ¼klÉnmÉ gedir + saniyÉlÉr Ã¶ncÉ Burda heÃ§nÉ yoxdur. Nese yÃ¼klÉyin! YÃ¼klÉnir... Bu qovluqda heÃ§ bir fayl movcud deyil. + qovluq + qovluqlar + fayl + fayllar FaylÄ±n Ã¼stÃ¼nÉ sÄ±xÄ±n ki, ÉlavÉ mÉlumat ekrana Ã§Ä±xsÄ±n. HÉcm: Tip: @@ -177,6 +190,7 @@ AÅaÄÄ±da gÃ¶stÉrilÉn %5$s-dÉ olan daxili vÉ xarici fayl(lar) link edilmiÅ %1$s Ã§oxlu hesab dÉstÉklÉmir Sizin server dÃ¼zgÃ¼n istifadÉÃ§i id-si qaytarmÄ±r, xahiÅ olunur inzibatÃ§Ä± ilÉ ÉlaqÉ saxlayasÄ±nÄ±z Bu serverdÉ yenidÉn qeydiyyatdan keÃ§mÉk olmur + Hesab gÃ¶stÉrilÉn avadanlÄ±qda mÃ¶vcud deyil FaylÄ± gÃ¼ndÉmdÉ saxla AdÄ± dÉyiÅ Sil @@ -206,18 +220,88 @@ AÅaÄÄ±da gÃ¶stÉrilÉn %5$s-dÉ olan daxili vÉ xarici fayl(lar) link edilmiÅ Server sertifikati inamlÄ± deyil - Server sertifikatÄ±nÄ±n vaxtÄ± bitmiÅdir - Server sertifikatÄ±nÄ±n dÃ¼zgÃ¼n tarixi gÉlÉcÉkdÉdir + URL sertifikatda olan host adÄ±na uyÄun deyil + Ä°stÉnilÉn halda bu sertifikata inanmaq istÉyirsinizmi? + Sertifikat saxlanÄ±la bilmÉz Detallar + GizlÉ + Verilir: + TÉrÉfindÉn verilib: + Ãmumi ad: + TÉÅkilat: + Alt tÉÅkilatOrganizational unit: + ÃlkÉ: + DÃ¶vlÉt: + Ærazi: + EtibarlÄ±lÄ±q: + KimdÉn: + KimÉ: + Ä°mza: + AlqÄ±ritm: + Sertifikat gÃ¶rÃ¼nÉ bilmÉz. + - SÉhv haqqÄ±nda mÉlumat yoxdur + Bu bir yer doldurucusudur + yerdoldurucusu.txt + PNG ÅÉkil + 389 KB + 2012/05/18 12:23 + 12:23:45 + ÅÉkillÉri yalnÄ±z WiFi Ã¼zÉrindÉn yÃ¼klÉ + VideolarÄ± yalnÄ±z WiFi Ã¼zÉrindÉn yÃ¼klÉ + /CÉldYÃ¼klÉmÉ + YÃ¼klÉnmÉ konflikti + Uzaq fayl %s local faylla sinxronizasiya edilmÉdi. FaylÄ±n kontentinin serverdÉ dÉyiÅdirilmÉsinÉ davam edirik. + BirlikdÉ saxla + Sil yenidÉn yaz + YÃ¼klÉmÉ + ÅÉkili gÃ¶stÉr + Bu ÅÉkil gÃ¶stÉrilÉ bilmÉz + %1$s nÃ¼sxÉlÉnÉ bilmÉz %2$s local qovluÄa + YÃ¼klÉnmÉ Ã¼nvanÄ± + Ãzr istÉyirik, sizin yerverdÉ paylaÅÄ±ma izin verilmir. XahiÅ olunur +inzibatÃ§Ä±nÄ±zla ÉlaqÉ saxlayasÄ±nÄ±z. + PaylaÅa bilinmir. + Bu faylÄ±n yada qovluÄun paylaÅÄ±mÄ± zamanÄ± sÉhv baÅ verdi + PaylaÅÄ±mÄ± dayandÄ±rmaq olmur. XahiÅ olunur fayl mÃ¶vcudluÄunu yoxlayasÄ±nÄ±z Bu fayl vÉ ya qovluÄun yayÄ±mlanmasÄ±nÄ±n dayandÄ±rÄ±lmasÄ±nda sÉhv baÅ verdi GÃ¶ndÉr linki nÃ¼sxÉlÉ MÃ¼badilÉ buferinÉ nÃ¼sxÉlÉndi + Kritik sÉhv: ÉmÉliyyat yerinÉ yetirilÉ bilinmir + ServerlÉ ÉlaqÉyÉ girdikdÉ sÉhv baÅ verdi. + Serveri gÃ¶zlÉdiyimiz mÃ¼ddÉtdÉ sÉhv baÅ verdi, ÉmÉliyyat bitÉ bilmÉz + Serveri gÃ¶zlÉdiyimiz mÃ¼ddÉtdÉ sÉhv baÅ verdi, ÉmÉliyyat bitÉ bilmÉz + ÆmÉliyyat bitÉ bilmÉz, serverÉ Ã§atmaq mÃ¼mkÃ¼n deyil Sizin yetkiniz yoxdur %s + faylÄ±n adÄ±nÄ± dÉyiÅmÉk bu faylÄ± silmÉk Ã¼Ã§Ã¼n bu faylÄ± yayÄ±mlamaq Ã¼Ã§Ã¼n + fayl paylaÅÄ±mÄ±nÄ± dayandÄ±rmaq fayl yaratmaq Ã¼Ã§Ã¼n bu qovluÄa yÃ¼klÉmÉk Ã¼Ã§Ã¼n + Bu fayla serverdÉ artÄ±q uzun mÃ¼ddÉtdir ki, Ã§atmaq mÃ¼mkÃ¼n deyil Hesablar Hesab ÉlavÉ et + TÉhlÃ¼kÉsiz qoÅulma, tÉhlÃ¼kÉsiz olmayan istiqamÉtÉ yÃ¶nlÉdirilmiÅdir + Jurnallar + TarixÃ§Éni gÃ¶ndÉr + JurnallarÄ±n Ã¶tÃ¼rÃ¼lmÉsi Ã¼Ã§Ã¼n proqram tÉminatÄ± tapÄ±lmadÄ±! + %1$s Android proqram jurnallarÄ± + Data yÃ¼klÉnir... + Qeydiyyat tÉlÉb edilir YalnÄ±Å ÅifrÉ + KÃ¶Ã§Ã¼rmÉk + Burda heÃ§nÉ yoxdur. Siz qovluq ÉlavÉ edÉ bilÉrsiniz! + SeÃ§ + KÃ¶Ã§Ã¼rmÉ mÃ¼mkÃ¼n olmur. XahiÅ olunur faylÄ±n mÃ¶vcudluÄunu yoxlayasÄ±nÄ±z. + QovluÄu bu nÉsilÉ kÃ¶Ã§Ã¼rmÉk mÃ¼mkÃ¼n deyil + Fayl artÄ±q mÉnsÉb qovluÄunda mÃ¶vcuddur + Fayl vÉ ya qovluÄun kÃ¶Ã§Ã¼rÃ¼lmÉsi mÃ¼ddÉtindÉ sÉhv baÅ verdi + bu faylÄ± kÃ¶Ã§Ã¼rtmÉk + AnÄ±nda yÃ¼klÉmÉlÉr + TÉhlÃ¼kÉsizlik + Video Ã¼nvanÄ±nÄ± yÃ¼klÉ + QovluÄun endirilmÉsinin %1$s hissÉsi tamamlana bilmÉz + %1$s paylaÅdÄ± \"%2$s\" sizinlÉ diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml index 27178f21..2cd1c818 100644 --- a/res/values-bg-rBG/strings.xml +++ b/res/values-bg-rBG/strings.xml @@ -282,6 +282,9 @@ Ð¡Ð¸Ð³ÑÑÐ½Ð° Ð²ÑÑÐ·ÐºÐ° Ðµ Ð¿ÑÐµÐ½Ð°ÑÐ¾ÑÐµÐ½Ð° Ð¿Ð¾ Ð½ÐµÑÐ¸Ð³ÑÑÐµÐ½ Ð¿ÑÑ. ÐÐ¾ÐºÐ»Ð°Ð´Ð¸ ÐÐ·Ð¿ÑÐ°ÑÐ¸ ÐÑÑÐ¾ÑÐ¸Ñ + ÐÐµ ÑÐ° Ð½Ð°Ð¼ÐµÑÐµÐ½Ð¸ Ð¶ÑÑÐ½Ð°Ð»Ð¸ Ð·Ð° Ð¸Ð·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð¾Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾. ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð¹ÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð·Ð° ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð¿Ð¾ÑÐ°! + %1$s Android Ð¶ÑÑÐ½Ð°Ð»Ð¸ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÑÐ° + ÐÐ°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸... ÐÑÐ¶Ð½Ð° Ðµ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ ÐÑÐµÑÐ½Ð° Ð¿Ð°ÑÐ¾Ð»Ð° ÐÑÐµÐ¼ÐµÑÑÐ¸ @@ -294,4 +297,6 @@ Ð·Ð° Ð´Ð° Ð¿ÑÐµÐ¼ÐµÑÑÐ¸Ñ ÑÐ¾Ð·Ð¸ ÑÐ°Ð¹Ð» ÐÐµÐ·Ð°Ð±Ð°Ð²Ð½Ð¾ ÐºÐ°ÑÐ²Ð°Ð½Ðµ Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ + ÐÐ°ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð²Ð¸Ð´ÐµÐ¾ Ð¿ÑÑ + Ð¡Ð²Ð°Ð»ÑÐ½ÐµÑÐ¾ Ð½Ð° Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸ÑÑÐ° %1$s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð·Ð°Ð²ÑÑÑÐµÐ½Ð¾ diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 4c2f8692..9ab386ca 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -1,7 +1,34 @@ + UÄitaj + Datoteke Nova fascikla + Postavke + PoÅ¡alji + ViÅ¡e + PomoÄ + KorisniÄko ime + Lozinka + Datoteke + UÄitaj + Preuzmite + Podijelite vezu + Da + Ne + Ok + Prekini uÄitavanje + Odustani + GreÅ¡ka + Nepoznata greÅ¡ka + Promijeni lozinku + Kreiraj raÄun + Preimenuj + PoÅ¡alji + Potrebna autentifikacija + PogreÅ¡na lozinka + Izaberite + Sigurnost diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 9980cf2c..d0cd67a4 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -11,6 +11,12 @@ ConfiguraciÃ³ Detalls Envia + Ordena + Ordena per + + A-Z + MÃ©s nou - MÃ©s antic + General diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml index 56b77025..897be007 100644 --- a/res/values-cs-rCZ/strings.xml +++ b/res/values-cs-rCZ/strings.xml @@ -40,7 +40,7 @@ Imprint Zapamatovat umÃstÄnÃ sdÃlenÃ Zapamatovat poslednÃ umÃstÄnÃ pro nahrÃ¡nÃ sdÃlenÃ½ch souborÅ¯ - Zkuste %1$s na vaÅ¡em smartphonu! + Zkuste %1$s na svÃ©m chytrÃ©m telefonu! ChtÄl bych vÃ¡s pozvat k pouÅ¾ÃvÃ¡nÃ %1$s na vaÅ¡em chytrÃ©m telefonu!\nKe staÅ¾enÃ zde: %2$s Zkontrolovat server Adresa serveru https://... @@ -178,14 +178,15 @@ NeÃºspÄÅ¡nÃ© pÅihlÃ¡Å¡enÃ PÅÃstup zamÃtnut autorizaÄnÃm serverem NeoÄekÃ¡vanÃ½ stav; prosÃm vloÅ¾te znovu URL adresu serveru - VaÅ¡e pÅihlÃ¡Å¡enÃ vyprÅ¡elo. PÅihlaÅ¡te se, prosÃm, znovu + VaÅ¡e pÅihlÃ¡Å¡enÃ vyprÅ¡elo. PÅihlaste se prosÃm znovu Zadejte prosÃm aktuÃ¡lnÃ heslo - VaÅ¡e pÅihlÃ¡Å¡enÃ vyprÅ¡elo. PÅihlaÅ¡te se, prosÃm, znovu + VaÅ¡e pÅihlÃ¡Å¡enÃ vyprÅ¡elo. PÅihlaste se prosÃm znovu PÅipojuji se k pÅihlaÅ¡ovacÃmu serveru... Server nepodporuje tuto pÅihlaÅ¡ovacÃ metodu %1$s nepodporuje vÃce ÃºÄtÅ¯ VÃ¡Å¡ server nevracÃ sprÃ¡vnÃ© pÅihlaÅ¡ovacÃ ID, kontaktujte prosÃm svÃ©ho sprÃ¡vce systÃ©mu NenÃ moÅ¾nÃ© provÃ©st ovÄÅenÃ + V zaÅÃzenÃ nenÃ zatÃm nastaven ÃºÄet UdrÅ¾ovat soubor aktuÃ¡lnÃ PÅejmenovat Odstranit @@ -281,7 +282,7 @@ sprÃ¡vce systÃ©mu. BezpeÄnÃ© spojenÃ je pÅesmÄrovÃ¡no na nezabezpeÄenou trasu. Logy Odeslat historii - Nebyla nalezena Å¾Ã¡dnÃ¡ aplikace pro zasÃlÃ¡nÃ logÅ¯. Nainstalujte poÅ¡tovnÃ aplikaci! + Nebyla nalezena Å¾Ã¡dnÃ¡ aplikace pro odesÃlÃ¡nÃ logÅ¯. Nainstalujte poÅ¡tovnÃ aplikaci! %1$s logy aplikace pro Android NaÄÃtÃ¡nÃ datâ¦ VyÅ¾adovÃ¡no pÅihlÃ¡Å¡enÃ @@ -297,4 +298,6 @@ sprÃ¡vce systÃ©mu. OkamÅ¾itÃ¡ odesÃlÃ¡nÃ ZabezpeÄenÃ Cesta pro nahrÃ¡vÃ¡nÃ videÃ + StaÅ¾enÃ adresÃ¡Åe %1$s nemohlo bÃ½t dokonÄeno + %1$s sdÃlÃ \"%2$s\" s vÃ¡mi diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 149862b0..337ea373 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -186,6 +186,7 @@ %1$s understÃ¸tter ikke multiple konti Din server retunere ikke et korrekt bruger-id. Kontakt venligst din administrator Kan ikke autentificere mod denne server + Kontoen findes endnu ikke pÃ¥ enheden Hold filen opdateret OmdÃ¸b Fjern @@ -296,4 +297,6 @@ Ãjeblikkelige uploads Sikkerhed Sti til videoupload + Download af %1$s mappe kunne ikke fuldfÃ¸res + %1$s delt \"%2$s\" med dig diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml index b1a9e68a..99125374 100644 --- a/res/values-de-rDE/strings.xml +++ b/res/values-de-rDE/strings.xml @@ -160,7 +160,7 @@ Keine Netzwerkverbindung Sichere Verbindung nicht verfÃ¼gbar. Verbindung hergestellt - Verbindungstest â¦ + Verbindungstestâ¦ Fehlerhafte Server Konfiguration Ein Benutzerkonto fÃ¼r den gleichen Benutzer und Server existiert auf diesem GerÃ¤t bereits Der eingegebene Benutzer passt nicht zu dem Benutzer dieses Benutzerkontos @@ -187,6 +187,7 @@ Ihr Server gibt keine richtige Benutzerkennung zurÃ¼ck, bitte kontaktieren Sie einen Administrator â¥ Die Legitimierung gegenÃ¼ber dem Server konnte nicht durchgefÃ¼hrt werden + Das Benutzerkonto ist bis jetzt noch nicht auf dem GerÃ¤t vorhanden Datei aktuell halten Umbenennen LÃ¶schen @@ -298,4 +299,6 @@ Sofortiges Hochladen Sicherheit Verzeichnis zum Hochladen der Videos + Herunterladen des %1$s - Ordners konnte nicht abgeschlossen werden + %1$s hat â%2$sâ mit Ihnen geteilt diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 23cdb642..aa0fdb96 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -43,7 +43,7 @@ Probiere %1$s auf Deinem Smartphone! Ich mÃ¶chte Dich zum Benutzen von %1$s auf Deinem Smartphone einladen!\nLade es hier herunter: %2$s ÃberprÃ¼fe den Server - Server-Adresse https://â¦ + Serveradresse https://â¦ Benutzername Passwort Ist %1$s neu fÃ¼r dich? @@ -61,7 +61,7 @@ Lade hoch Gerade eben Alles leer. Lade etwas hoch! - Ladevorgang â¦ + Ladenâ¦ Es befinden sich keine Dateien in diesem Ordner. Ordner Ordner @@ -75,7 +75,7 @@ Herunterladen Datei aktualisieren Datei wurde wÃ¤rend des Uploads zu %1$s umbenannt - Link Teilen + Link teilen Link nicht mehr freigeben Ja Nein @@ -85,22 +85,22 @@ Abbrechen Speichern & schlieÃen Fehler - LÃ¤dt ... + Ladeâ¦ Unbekannter Fehler Ãber Passwort Ã¤ndern Account lÃ¶schen Account erstellen - Dateien hochladen von... + Dateien hochladen vonâ¦ Ordnername - Hochladen... + Hochladenâ¦ %1$d%% Hochladen %2$s Hochladen erfolgreich %1$s wurde(n) erfolgreich hochgeladen Hochladen fehlgeschlagen Hochladen von %1$s konnte nicht abgeschlossen werden Hochladen fehlgeschlagen, Du musst dich nochmals anmelden - Herunterladen... + Herunterladenâ¦ %1$d%% Herunterladen %2$s Herunterladen erfolgreich %1$s wurde erfolgreich heruntergeladen @@ -155,12 +155,12 @@ ZurÃ¼ckspielen Knopf Play-/Pause Knopf Vorspulen Knopf - Autorisierung empfangen... - Anmeldungsversuch... + Autorisierung empfangenâ¦ + Anmeldeversuchâ¦ Keine Netzwerkverbindung Sichere Verbindung nicht verfÃ¼gbar. Verbindung hergestellt - Verbindung testen... + Verbindung testenâ¦ Fehlerhafte Server Konfiguration Ein Benutzerkonto fÃ¼r den gleichen Benutzer und Server existiert auf diesem GerÃ¤t bereits Der eingegebene Benutzer passt nicht zu dem Benutzer dieses Benutzerkontos @@ -187,6 +187,7 @@ Dein Server gibt keine korrekte Benutzer-ID zurÃ¼ck, bitte kontaktiere einen Administrator Die Authentifizierung gegenÃ¼ber dem Server konnte nicht durchgefÃ¼hrt werden + Das Benutzerkonto ist bis jetzt noch nicht auf dem GerÃ¤t vorhanden Datei aktuell halten Umbenennen LÃ¶schen @@ -209,7 +210,7 @@ Bitte warte einen Moment. Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu Ã¶ffnen Es wurde keine Datei ausgewÃ¤hlt. - Link senden an ... + Link senden anâ¦ Anmelden mit oAuth2 Verbinde mit dem oAuth2-Server. Die IdentitÃ¤t der Website konnte nicht Ã¼berprÃ¼ft werden @@ -298,4 +299,6 @@ Sofortiges Hochladen Sicherheit Verzeichnis zum Hochladen der Videos + Herunterladen des %1$s - Ordners konnte nicht abgeschlossen werden + %1$s hat â%2$sâ mit Dir geteilt diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index b037f019..29f78e96 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -11,8 +11,10 @@ Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎÎµÏÏÎ¿Î¼ÎÏÎµÎ¹ÎµÏ ÎÏÎ¿ÏÏÎ¿Î»Î® + Î¤Î±Î¾Î¹Î½ÏÎ¼Î·ÏÎ· + Î¤Î±Î¾Î¹Î½ÏÎ¼Î·ÏÎ· ÎºÎ±ÏÎ¬ - A-Z + A-Î© ÎÎµÏÏÎµÏÎ¿ - Î Î±Î»Î±Î¹ÏÏÎµÏÎ¿ General @@ -32,7 +38,10 @@ Recomendar a un amigo Sugerencias Imprint + Recordar compartir ubicaciÃ³n + Recordar la ultima ubicaciÃ³n compartida de subida Â¡Intento %1$s en tu telÃ©fono inteligente! + Quiero invitarte a usar %1$s en tu telÃ©fono inteligente!\nDescÃ¡rgalo aquÃ: %2$s Verificar Servidor DirecciÃ³n del servidor https://... Nombre de usuario @@ -241,12 +250,50 @@ No subir PrevisualizaciÃ³n de imagen Esta imagen no puede ser mostrada + %1$s no pudo ser copiado a la carpeta local %2$s + DirecciÃ³n de subida + Lo sentimos, compartir no esta activado en su servidor. Por favor contacte a su +â¥â¥administrator. + Imposible compartir. Por favor revise si el archivo existe + Un error ocurriÃ³ cuando se intentaba compartir el archivo o carpeta + Imposible dejar de compartir. Por favor revise si los archivos existen + Un error ocurriÃ³ cuando se intentaba dejar de compartir el archivo o carpeta Mandar + Copiar direcciÃ³n url Copiado al portapapeles + Error critico: no se puede realizar operaciones + Un error ocurriÃ³ mientras se conectaba con el Servidor. + Un error ocurriÃ³ mientras se conectaba con el Servidor. La operaciÃ³n no se realizÃ³ + Un error ocurriÃ³ esperando al Servidor, la operaciÃ³n no se realizÃ³ + OperaciÃ³n no completada, Servidor no disponible. + Tu no tienes permiso %s + para renombrar este archivo + para borrar este archivo + para compartir este archivo + para dejar de compartir este archivo + para crear el archivo + para subir en esta carpeta + El archivo no esta mas disponible en este Servidor Cuentas + AÃ±adir cuenta + ConexiÃ³n segura redireccionada a una ruta insegura. + Registro + Enviar Historial + AplicaciÃ³n para enviar registros no encontrada. Instale una aplicaciÃ³n de correo! + %1$s Registros de la aplicaciÃ³n Android + Cargando datos... AutentificaciÃ³n requerida Clave incorrecta + Mover + Nada aquÃ. Puedes agregar una carpeta! Elegir + Imposible mover. Por favor revisa si el archivo existe + El archivo ya existe en la carpeta destino + Un error ocurriÃ³ intentando mover el archivo o carpeta + para mover este archivo + Subida InstantÃ¡nea Seguridad + DirecciÃ³n de subida del video + La descarga de la carpeta %1$s no pudo ser completada diff --git a/res/values-es-rCR/strings.xml b/res/values-es-rCR/strings.xml index 69623e19..26dde5f1 100644 --- a/res/values-es-rCR/strings.xml +++ b/res/values-es-rCR/strings.xml @@ -1,6 +1,8 @@ + Archivos + Archivos diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 793c094b..e5faa345 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -7,7 +7,7 @@ Contenido de otras aplicaciones Archivos Abrir con - Nueva Carpeta + Nueva carpeta ConfiguraciÃ³n Detalles Enviar @@ -40,19 +40,19 @@ pie de imprenta Recordar la ubicaciÃ³n de los archivos compartidos Recordar la ubicaciÃ³n de los Ãºltimos archivos compartidos subidos - Prueba %1$s en tu smarthphone! + Â¡Prueba %1$s en su smarthphone! Â¡Quiero invitarle a usar %1$s en su smartphone!\nDescÃ¡rguelo aquÃ: %2$s Compruebe el servidor. DirecciÃ³n del servidor https://â¦ Nombre de usuario ContraseÃ±a - Nuevo para %1$s? + Â¿Nuevo en %1$s? Archivos Conectar Subir Escoger carpeta de carga: No se encontrÃ³ la cuenta - No hay cuentas de %1$s en tu dispositivo. Por favor configura una cuenta primero. + No hay cuentas de %1$s en su dispositivo. Por favor, configure una cuenta primero. ConfiguraciÃ³n Salir No hay contenido para subir @@ -85,7 +85,7 @@ Cancelar Guardar & Salir Error - Cargando ... + Cargando... Error desconocido Acerca de Cambiar contraseÃ±a @@ -100,7 +100,7 @@ Error en la subida La subida de %1$s no se pudo completar La carga fallÃ³, necesita volver a iniciar sesiÃ³n - Descargando ... + Descargando... %1$d%% Descargado de %2$s Descarga completa %1$s se ha descargado con Ã©xito @@ -108,7 +108,7 @@ La descarga de %1$s no se pudo completar No descargado Descarga fallida, necesita reinicar la sesiÃ³n - Elige una cuenta + Elija una cuenta FallÃ³ la sincronizaciÃ³n La sincronizaciÃ³n fallÃ³, debe reiniciar la sesiÃ³n La sincronizaciÃ³n de %1$s s no se pudo completar @@ -127,7 +127,7 @@ Local: %1$s Remoto: %1$s No hay suficiente espacio para copiar los archivos seleccionados a la carpeta %1$s. Â¿Desea moverlos en vez de copiarlos? - Por favor, inserta tu PIN de aplicaciÃ³n + Por favor, inserte su PIN de aplicaciÃ³n Introduzca un PIN para la aplicaciÃ³n Se solicitarÃ¡ el PIN cada vez que se inicie la aplicaciÃ³n Repita el PIN para la aplicaciÃ³n, por favor @@ -142,8 +142,8 @@ %1$s reproducciÃ³n finalizada No se encontrÃ³ el archivo multimedia No se ha proporcionado cuenta - El archivo no esta en una cuenta valida - Codec No Soportado + El archivo no estÃ¡ en una cuenta vÃ¡lida + Codec no soportado El archivo de medios no pudo ser leÃdo Archivo no codificado correctamente Tiempo de espera agotado en el intento de reproducciÃ³n @@ -151,8 +151,8 @@ El archivo de medios no se puede reproducir con el reproductor de medios por defecto Error de seguridad al intentar reproducir %1$s Error de entrada al intentar reproducir %1$s - Error inesperado intentando reproducir %1$s - BotÃ³n Rebobinado + Error inesperado al intentar reproducir %1$s + BotÃ³n de rebobinado BotÃ³n de reproducciÃ³n o pausa BotÃ³n avance rÃ¡pido Consiguiendo autorizaciÃ³n... @@ -174,7 +174,7 @@ No se reconoce la versiÃ³n del servidor No se ha podido establecer la conexiÃ³n ConexiÃ³n segura establecida - Nombre de usuario o contraseÃ±a incorrecta + Nombre de usuario o contraseÃ±a incorrectos AutorizaciÃ³n no satisfactoria Acceso denegado por servidor de autorizaciÃ³n Estado inesperado; por favor, introduzca la URL del servidor de nuevo @@ -187,6 +187,7 @@ Su servidor no estÃ¡ retornando una identificaciÃ³n de usuario correcta; contacte a un administrador No puede autenticarse en este servidor. + AÃºn no existe la cuenta en el dispositivo Mantener el archivo actualizado Renombrar Borrar @@ -207,7 +208,7 @@ CarÃ¡cteres ilegales: / \\ < > : \" | ? * El nombre de archivo no puede estar vacÃo Espere un momento - Problema inesperado; por favor, prueba otra app para seleccionar el archivo + Problema inesperado; por favor, pruebe otra app para seleccionar el archivo No hay ficheros seleccionados. Enviar enlace a... Ingresar con oAuth2 @@ -215,9 +216,9 @@ La identidad del sitio no puede ser verificada - El certificado del servidor no es de confianza - El certificado del servidor expirÃ³ - - El certificado del servidor es de una fecha que aÃºn no llega + - El certificado del servidor es de una fecha que aÃºn no ha llegado - La URL no coincide con el nombre de dominio del certificado - Â¿ConfÃas de todas formas en este certificado? + Â¿ConfÃa de todas formas en este certificado? El certificado no pudo ser guardado Detalles Ocultar @@ -280,7 +281,7 @@ Cuentas Agregar cuenta La conexiÃ³n segura estÃ¡ siendo desviada por una ruta insegura. - Logs + Registros Enviar historial No se ha encontrado una app para enviar logs. Instale la app mail! Se han encontrado %1$s logs de la app Android @@ -289,7 +290,7 @@ ContraseÃ±a incorrecta Mover AquÃ no hay nada. Â¡Puede agregar una carpeta! - Seleccionar + Elegir No se puede mover. Revise si el archivo existe No se puede mover una carpeta dentro de una de SUS subcarpetas. El archivo ya existe en la carpeta de destino @@ -297,5 +298,7 @@ para mover este archivo Subidas instantÃ¡neas Seguridad - Ruta de vÃdeo de subida + Guardar videos subidos en la carpeta: + La descarga de la carpeta %1$s no ha podido ser completada + %1$s compartiÃ³ \"%2$s\" contigo diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index d8dd2639..0bca4628 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -12,6 +12,7 @@ Xehetasunak Bidali Ordenatu + Ordenatu honen arabera A-Z Berrienak - Zaharrenak @@ -38,6 +39,7 @@ Oharrak Imprint Probatu %1$s zure telefono adimentsuan! + Nik %1$s zure telefono adimentsuan erabitzera gonbidatu nahi zaitut!\nDeskargatu hemen: %2$s Egiaztatu zerbitzaria Zerbitzariaren helbidea https:// Erabiltzaile izena @@ -115,6 +117,7 @@ %1$d fitxategien edukiak ezin dira sinkronizatu (%2$d gatazka) Bertako fitxategi batzuk ahaztu dira %2$s karpetako %1$d fitxategi ezin dira dira kopiatu + 1.3.16 bertsioan, gailu honetatik igotzen diren fitxategiak bertako %1$s karpetara mugitzen dira datu galera ekiditeko fitxategi bat kontu ezberdinekin sinkronizatzen denean.\n\n Aldaketa hau dela eta, programa honen aurreko bertsioetan igotako fitxategi guztiak %2$s karpetara kopiatu dira. Hala ere, errore batek hau burutzea ekidin du kontuaren sinkronizazioa egiten ari zen bitartean. Orain fitxategiak dauden bezala utz ditzakezu eta %3$s rako lotura ezabatu, edo fitxategiak %1$s karpetara mugi ditzakezu eta %4$srako lotura mantendu.\n\nBehean bertako fitxategien zerrenda eta %5$s era lotuta zeuden urruneko fitxategiena. %1$s karpeta dagoeneko ez da existitzen Mugitu denak Fitxategi guztiak mugitu dira @@ -250,7 +253,9 @@ Mesedez, baimendu berriz %1$s ezin da %2$s karpeta lokalera kopiatu Igotzetarako Bidea Sentitzen dut, partekatzea ez dago zure zerbitzarian gaituta. Mesedez jarri harremanetan zure administratzailearekin. + Ezin izan da partekatu. Mesedez egiaztatu fitxategia existitzen dela Errore bat egon da fitxategaia edo karpeta partekatzerakoan + Ezin izan da partekatzea desegin. Mesedez egiaztatu fitxategia existitzen dela Errore bat egon da fitxategaia edo karpeta partekatzeari uzterakoan Bidali Lotura kopiatu @@ -271,10 +276,23 @@ Mesedez, baimendu berriz Fitxategia jadanik ez dago eskuragarri zerbitzarian Kontuak Gehitu kontua + Konexio segurua birbideratu da segurua ez den bide batera. + Egunkariak + Bidali Historia + Egunkariak bidaltzeko aplikaziorik ez da aurkitu. Instalatu posta aplikazioa! + %1$s Android aplikazioaren egunerokoak + Datuak kargatzen... Autentikazioa beharrezkoa Pasahitz okerra Mugitu + Hemen ez dago ezer. Karpeta bat gehi dezakezu! Aukeratu + Ezin izan da mugitu. Mesedez egiaztatu fitxategia existitzen dela + Fitxategia dagoeneko existitzen da helburuko karpetan + Errore bat gertatu da fitxategi edo karpeta hau mugitzen saiatzerakoan + fitxategi hau mugitzeko Berehalako Igoerak Segurtasuna + Bideo Igoera Bidea + %1$s karpetaren deskarga ezin izan da burutu diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml index 4ba0fcf0..e69853b7 100644 --- a/res/values-fi-rFI/strings.xml +++ b/res/values-fi-rFI/strings.xml @@ -75,6 +75,7 @@ PÃ¤ivitÃ¤ tiedosto Tiedoston nimeksi muutettiin %1$s siirron yhteydessÃ¤ Jaa linkki + Poista linkin jako KyllÃ¤ Ei OK @@ -130,12 +131,15 @@ VÃ¤Ã¤rÃ¤ sovelluksen PIN Sovelluksen PIN poistettu Sovelluksen PIN-koodi tallennettu + %1$s-musiikkisoitin %1$s (toistetaan) %1$s (ladataan) Mediatiedostoa ei lÃ¶ytynyt TiliÃ¤ ei mÃ¤Ã¤ritetty Tiedosto ei ole kelvollisella tilillÃ¤ + Mediakoodekki ei ole tuettu Mediatiedoston luku ei onnistunut + Mediatiedostoa ei ole koodattu kelvollisesti Aikakatkaisu toistoa yrittÃ¤essÃ¤ Mediatiedostoa ei voi suoratoistaa Turvallisuusvirhe yrittÃ¤essÃ¤ toistaa kohdetta %1$s @@ -151,6 +155,7 @@ Testataan yhteyttÃ¤... VÃ¤Ã¤rin tehdyt palvelin-asetukset Laitteella on jo tili samalle kÃ¤yttÃ¤jÃ¤lle ja palvelimelle + SyÃ¶tetty kÃ¤yttÃ¤jÃ¤ ei tÃ¤smÃ¤Ã¤ tÃ¤mÃ¤n tilin kÃ¤yttÃ¤jÃ¤n kanssa Tuntematon virhe IsÃ¤ntÃ¤Ã¤ ei lÃ¶ydy Palvelin-instanssia ei lÃ¶ydetty @@ -172,6 +177,7 @@ Palvelin ei tue tÃ¤tÃ¤ tunnistautumistapaa %1$s ei tue useita tilejÃ¤ Tunnistautuminen palvelinta vastaan ei onnistu + TiliÃ¤ ei ole olemassa vielÃ¤ laitteella PidÃ¤ tiedosto ajan tasalla NimeÃ¤ uudelleen Poista @@ -271,4 +277,5 @@ TÃ¤mÃ¤n tiedoston tai kansion siirtoa yrittÃ¤essÃ¤ tapahtui virhe VÃ¤littÃ¶mÃ¤t lÃ¤hetykset Tietoturva + %1$s jakoi kohteen \"%2$s\" kanssasi diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index a49a4091..f52eec64 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -12,23 +12,23 @@ DÃ©tails Envoyer Trier - Trier par + Trier - A-Z - Plus rÃ©cent - Plus ancien + par ordre alphabÃ©tique + du plus rÃ©cent au plus ancien GÃ©nÃ©ral Plus Comptes - Gestion des comptes utilisateur - Utilisation d\'un code de sÃ©curitÃ© - ProtÃ©ger l\'accÃ¨s aux donnÃ©es manipulÃ©es par le client - TÃ©lÃ©chargements instantanÃ©s d\'images - TÃ©lÃ©versement instantanÃ© des photos prises par la camÃ©ra - TÃ©lÃ©chargements instantanÃ©s de vidÃ©os - TÃ©lÃ©versement instantanÃ© des vidÃ©os prises par la camÃ©ra + Gestion des comptes + Code de sÃ©curitÃ© + ProtÃ©ger l\'accÃ¨s Ã l\'application + TÃ©lÃ©versement immÃ©diat des photos + TÃ©lÃ©verser immÃ©diatement les photos prises par la camÃ©ra + TÃ©lÃ©versement immÃ©diat des vidÃ©os + TÃ©lÃ©verser immÃ©diatement les vidÃ©os prises par la camÃ©ra Activer les logs UtilisÃ© pour enregistrer les problÃ¨mes dans les logs Historique des logs @@ -39,27 +39,27 @@ Commentaires Empreinte MÃ©moriser l\'emplacement de partage - MÃ©moriser le dernier emplacement d\'upload - Essayez %1$s sur votre smartphone ! + MÃ©moriser le dernier emplacement de tÃ©lÃ©versement + Essayez %1$s sur votre smartphone ! J\'aimerais vous inviter Ã utiliser %1$s sur votre smartphone ! TÃ©lÃ©chargez-le ici : %2$s VÃ©rifier le serveur Adresse du serveur https://â¦ Nom d\'utilisateur Mot de passe - Nouveau dans %1$s ? + Nouveau dans %1$s ? Fichiers Connecter TÃ©lÃ©verser SÃ©lectionner le dossier d\'envoi : Aucun compte n\'a Ã©tÃ© trouvÃ© Aucun compte %1$s n\'a Ã©tÃ© trouvÃ©. Veuillez commencer par en configurer un. - ParamÃ¨tres + Configuration Quitter Rien Ã envoyer Aucun contenu reÃ§u. Rien Ã envoyer. %1$s n\'est pas autorisÃ© Ã accÃ©der au contenu partagÃ© - TÃ©lÃ©versement + TÃ©lÃ©versement... il y a quelques secondes Il n\'y a rien ici ! Envoyez donc quelque chose :) Chargementâ¦ @@ -68,7 +68,7 @@ TÃ©lÃ©chargez-le ici : %2$s dossiers fichier fichiers - Effleurez un fichier pour afficher les informations complÃ©mentaires + Effleurez un fichier pour afficher les informations complÃ©mentaires. Taille : Type : CrÃ©Ã© le : @@ -82,7 +82,7 @@ TÃ©lÃ©chargez-le ici : %2$s Non OK Annuler le tÃ©lÃ©chargement - Annuler l\'envoi + Annuler le tÃ©lÃ©versement Annuler Sauvegarder & Quitter Erreur @@ -90,14 +90,14 @@ TÃ©lÃ©chargez-le ici : %2$s Erreur inconnue Ã propos de Changer de mot de passe - Effacer ce compte + Supprimer ce compte CrÃ©er un compte TÃ©lÃ©verser un fichier depuisâ¦ Nom du dossier TÃ©lÃ©versementâ¦ Envoi du fichier %2$s : %1$d%% effectuÃ©s TÃ©lÃ©versement rÃ©ussi - Le fichier %1$s a Ã©tÃ© envoyÃ© avec succÃ¨s + Le fichier %1$s a Ã©tÃ© tÃ©lÃ©versÃ© avec succÃ¨s Ãchec de l\'envoi L\'envoi de %1$s a Ã©chouÃ© Le tÃ©lÃ©versement a Ã©chouÃ©, vous devez vous connecter Ã nouveau @@ -111,31 +111,31 @@ TÃ©lÃ©chargez-le ici : %2$s Le tÃ©lÃ©chargement a Ã©chouÃ©, vous devez vous connecter Ã nouveau Choisissez un compte La synchronisation a Ã©chouÃ© - Ãchec de la synchronisation, vous devez vous reconnecter Ã nouveau - La synchronisation de %1$s ne peut pas Ãªtre complÃ©tÃ©e - Mot de passe invalide pour %1$s + Ãchec de la synchronisation, vous devez vous reconnecter + La synchronisation de %1$s n\'a pu Ãªtre terminÃ©e + Mot de passe non valide pour %1$s Des conflits ont Ã©tÃ© trouvÃ©s - %1$d fichiers Ã garder synchronisÃ©s n\'ont put Ãªtre synchronisÃ© + %1$d fichiers Ã garder synchronisÃ©s n\'ont pu Ãªtre synchronisÃ©s La synchronisation des fichiers a Ã©chouÃ© Le contenu de %1$d fichiers n\'a pu Ãªtre synchronisÃ© (%2$d conflits) Certains fichiers locaux ont Ã©tÃ© oubliÃ©s %1$d fichiers du dossier %2$s n\'ont pas pu Ãªtre copiÃ©s dans - Depuis la version 1.3.16, les fichiers envoyÃ© depuis ce pÃ©riphÃ©rique sont copiÃ©s dans le dossier local %1$s pour Ã©viter une perte de donnÃ©es lorsqu\'un mÃªme fichier est synchronisÃ© avec plusieurs comptes. + Depuis la version 1.3.16, les fichiers envoyÃ©s depuis ce pÃ©riphÃ©rique sont copiÃ©s dans le dossier local %1$s pour Ã©viter une perte de donnÃ©es lorsqu\'un mÃªme fichier est synchronisÃ© avec plusieurs comptes. -En raison de cette modification, tous les fichiers envoyÃ©s avec des versions antÃ©rieures de cette application ont Ã©tÃ© copiÃ©s dans le dossier %2$s. Cependant une erreur a empÃªchÃ© l\'achÃ¨vement de cette opÃ©ration pendant la synchronisation du compte. Vous pouvez soit laisser les fichiers tels quels et supprimer le lien vers %3$s, soit dÃ©placer les fichiers dans le dossier %1$s et garder le lien vers %4$s. +En raison de cette modification, tous les fichiers envoyÃ©s avec des versions antÃ©rieures de cette application ont Ã©tÃ© copiÃ©s dans le dossier %2$s. Cependant, une erreur a empÃªchÃ© l\'achÃ¨vement de cette opÃ©ration pendant la synchronisation du compte. Vous pouvez soit laisser les fichiers tels quels et supprimer le lien vers %3$s, soit dÃ©placer les fichiers dans le dossier %1$s et garder le lien vers %4$s. Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxquels ils Ã©taient liÃ©s. Le dossier %1$s n\'existe plus Tout dÃ©placer Tous les fichiers ont Ã©tÃ© dÃ©placÃ©s Certains fichiers n\'ont pu Ãªtre dÃ©placÃ©s - Local : %1$s + Local : %1$s Distant : %1$s - Il n\'y a pas assez de place disponible pour copier les fichiers sÃ©lectionnÃ©s dans le dossier %1$s. Voulez-vous quand mÃªme les dÃ©placer ? + Il n\'y a pas assez de place disponible pour copier les fichiers sÃ©lectionnÃ©s dans le dossier %1$s. Voulez-vous les dÃ©placer Ã la place ? Veuillez saisir votre code de sÃ©curitÃ© Veuillez saisir votre code de sÃ©curitÃ© - Le code PIN vous sera demandÃ© Ã chaque lancement de l\'application - Veuillez saisir Ã nouveau votre code de sÃ©curitÃ© + Le code de sÃ©curitÃ© vous sera demandÃ© Ã chaque lancement de l\'application + Veuillez saisir de nouveau votre code de sÃ©curitÃ© Retirer le code de sÃ©curitÃ© Les deux codes saisis ne concordent pas Code de sÃ©curitÃ© incorrect @@ -151,7 +151,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Le codec de ce mÃ©dia n\'est pas pris en charge Le fichier mÃ©dia ne peut pas Ãªtre lu Le fichier mÃ©dia n\'est pas correctement encodÃ© - DÃ©lai dÃ©passÃ© pour la lecture du morceau. + DÃ©lai dÃ©passÃ© pour la lecture du morceau Le fichier mÃ©dia ne peut pas Ãªtre diffusÃ© Le fichier mÃ©dia ne peut Ãªtre jouÃ© avec le lecteur standard Erreur de sÃ©curitÃ© Ã la lecture de %1$s @@ -167,13 +167,13 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Connexion Ã©tablie Test de la connexionâ¦ Configuration du serveur erronÃ©e - Un compte pour le mÃªme utilisateur et serveur existe dÃ©jÃ sur ce pÃ©riphÃ©rique + Un compte pour le mÃªme utilisateur et serveur existe dÃ©jÃ sur cet appareil L\'utilisateur entrÃ© ne correspond pas Ã l\'utilisateur de ce compte - Une erreur inconnue s\'est produite + Une erreur inconnue s\'est produite. Impossible de trouver l\'hÃ´te Aucune instance du serveur n\'a Ã©tÃ© trouvÃ©e - Le serveur met trop longtemps Ã rÃ©pondre - Adresse invalide + Le serveur a pris trop de temps Ã rÃ©pondre + Adresse non valide Ãchec de l\'initialisation SSL Impossible de vÃ©rifier l\'identitÃ© du serveur SSL La version du serveur n\'est pas reconnue @@ -192,29 +192,30 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Votre serveur a retournÃ© un identifiant d\'utilisateur incorrect. Veuillez prendre contact avec votre administrateur Impossible de s\'authentifier sur ce serveur + Le compte n\'existe pas encore sur ce pÃ©riphÃ©rique Maintenir le fichier Ã jour Renommer Supprimer - Voulez-vous vraiment supprimer %1$s ? - Voulez-vous vraiment supprimer %1$s et son contenu ? + Voulez-vous vraiment supprimer %1$s ? + Voulez-vous vraiment supprimer %1$s et son contenu ? Local seulement - Le contenu local uniquement + Contenu local uniquement Effacer du serveur - Les deux distant et local + Distant et local Suppression effectuÃ©e avec succÃ¨s Suppression impossible Entrez un nouveau nom La version locale ne peut Ãªtre renommÃ©e, veuillez rÃ©essayer avec un nom diffÃ©rent Renommage impossible Le fichier distant n\'a pu Ãªtre vÃ©rifiÃ© - Le contenu des fichiers est dÃ©jÃ synchronisÃ© + Le contenu du fichier est dÃ©jÃ synchronisÃ© Le dossier n\'a pas pu Ãªtre crÃ©Ã© - CaractÃ¨res interdits : / \\ < > : " | ? * + CaractÃ¨res interdits : / \\ < > : \" | ? * Le nom du fichier ne peut pas Ãªtre vide Veuillez patienter ProblÃ¨me inattendu. Veuillez essayer une autre application pour la sÃ©lection du fichier Aucun fichier sÃ©lectionnÃ© - Envoyer un lien Ã â¦ + Envoyer le lien versâ¦ Connexion avec oAuth2 Connexion au serveur oAuth2â¦ L\'identitÃ© du site ne peut Ãªtre vÃ©rifiÃ©e @@ -222,23 +223,23 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq - Le certificat du serveur a expirÃ© - Le certificat du serveur n\'est pas encore valide - L\'URL ne correspond pas au nom d\'hÃ´te du certificat - Voulez-vous tout de mÃªme faire confiance Ã ce certificat ? + Voulez-vous tout de mÃªme faire confiance Ã ce certificat ? Impossible de sauvegarder le certificat DÃ©tails Masquer - DÃ©livrÃ© Ã  : - DÃ©livrÃ© par : + DÃ©livrÃ© Ã : + DÃ©livrÃ© par : Nom d\'usage : - Organisation : - UnitÃ© organisationnelle : - Pays : - RÃ©gion : - Localisation : - ValiditÃ© : - De : - Ã : - Signature : - Algorithme : + Organisation : + UnitÃ© organisationnelle : + Pays : + RÃ©gion : + Localisation : + ValiditÃ© : + Du : + Au : + Signature : + Algorithme : Impossible d\'afficher le certificat. - Aucune information sur l\'erreur Ceci est un espace rÃ©servÃ© @@ -249,16 +250,16 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq 12:23:45 TÃ©lÃ©verser les images via une connexion WiFi uniquement TÃ©lÃ©verser les vidÃ©os via une connexion WiFi uniquement - /TÃ©lÃ©versementInstantanÃ© + /InstantUpload Conflit de mise Ã jour - Le fichier distant %s n\'est pas synchronisÃ© avec le fichier local. En choisissant de continuer, vous remplacerez le contenu de fichier sur le serveur. + Le fichier distant %s n\'est pas synchronisÃ© avec le fichier local. En choisissant de continuer, vous remplacerez le contenu du fichier sur le serveur. Garder les deux versions Ãcraser Ne pas tÃ©lÃ©verser PrÃ©visualisation de l\'image Cette image ne peut pas Ãªtre affichÃ©e %1$s n\'a pas pu Ãªtre copiÃ© dans le dossier local %2$s - Chemin d\'accÃ¨s pour le tÃ©lÃ©versement + RÃ©pertoire de tÃ©lÃ©versement DÃ©solÃ©, le partage n\'est pas disponible sur votre serveur. Veuillez contacter votre administrateur. Impossible de partager. VÃ©rifiez que le fichier est bien prÃ©sent Une erreur est survenue lors de la tentative de partage de ce fichier ou rÃ©pertoire @@ -267,11 +268,11 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Envoyer Copier le lien CopiÃ© dans le presse-papiers - Erreur critique : impossible de rÃ©aliser des opÃ©rations - Une erreur s\'est produite pendant la connection au serveur - 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. + Erreur critique : impossible de rÃ©aliser des opÃ©rations + Une erreur est survenue pendant la connexion au serveur. + 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 @@ -283,10 +284,12 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Ce fichier nâest plus disponible sur le serveur Comptes Ajouter un compte - La connexion sÃ©curisÃ©e est redirigÃ©e via une route non-sÃ©curisÃ©e. + Le connexion sÃ©curisÃ©e est redirigÃ©e vers une route non-sÃ©curisÃ©e. Journaux Envoyer l\'historique - Chargement des donnÃ©es... + Aucune application trouvÃ©e pour l\'envoi de journaux. Installer une application de courriel ! + Journaux de l\'application Android %1$s + Chargement des donnÃ©esâ¦ Authentification requise Mot de passe incorrect DÃ©placer @@ -297,7 +300,9 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Le fichier existe dÃ©jÃ dans le dossier de destination Une erreur est survenue lors de la tentative de dÃ©placement de ce fichier ou dossier de dÃ©placer ce fichier - TÃ©lÃ©chargements instantanÃ©s + Envois immÃ©diats SÃ©curitÃ© - Chemin d\'accÃ¨s pour le tÃ©lÃ©versement + RÃ©pertoire de tÃ©lÃ©versement des vidÃ©os + Le tÃ©lÃ©chargement du dossier %1$s n\'a pas pu Ãªtre achevÃ© + %1$s a partagÃ© \"%2$s\" avec vous diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 68d5d8c3..882f17ca 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -8,7 +8,7 @@ Ficheiros Abrir con Novo cartafol - Preferencias + Axustes Detalles Enviar Ordenar @@ -188,6 +188,7 @@ DescÃ¡rgueo de aquÃ: %2$s O seu servidor non devolveu un ID de usuario correcto, contacte cun administrador Non pode autenticarse neste servidor + AÃnda non existe a conta no dispositivo Manter actualizado o ficheiro Renomear Retirar @@ -283,6 +284,9 @@ DescÃ¡rgueo de aquÃ: %2$s A conexiÃ³n segura estÃ¡ a ser redirixida a unha ruta non segura. Rexistros Enviar o historial + Non se atopou unha aplicaciÃ³n para enviar os rexistros. Instale unha aplicaciÃ³n de correo! + Rexistros da aplicaciÃ³n %1$s Android + Cargando os datos... RequÃrese autenticaciÃ³n Contrasinal incorrecto Mover @@ -296,4 +300,6 @@ DescÃ¡rgueo de aquÃ: %2$s EnvÃo instantÃ¡neo Seguranza Enviar a ruta do vÃdeo + Non foi posÃbel completar a descarga do cartafol %1$s + %1$s compartiu Â«%2$sÂ» con vostede diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 173239c4..eb8bf880 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -1,15 +1,34 @@ + %1$s Android aplikacija + verzija %1$s + OsvjeÅ¾i raÄun UÄitaj + SadrÅ¾aj iz drugih aplikacija Datoteke + Otvori sa Nova mapa Postavke + Detalji PoÅ¡aljite + Sortiraj + Sortiraj po + + A-Z + Najnoviji- Stariji + OpÄenito viÅ¡e KorisniÄki raÄuni + Upravljaj raÄunima + PIN aplikacije + ZaÅ¡tit svog klijenta + Trenutni upload slika + Trenutni upload slika snimljenih kamerom + Trenutni upload videa + Trenutni upload videa snimljen kamerom PomoÄ KorisniÄko ime Lozinka @@ -37,6 +56,7 @@ Trying to loginâ¦ Promjeni ime Makni + Detalji PoÅ¡aljite KorisniÄki raÄuni diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 94fc138e..c4f396f3 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -187,6 +187,7 @@ Il tuo server non ha restituito un id utente corretto, contatta un amministratore Impossibile eseguire l\'autenticazione su questo server + L\'account non esiste ancora sul dispositivo Tieni aggiornato il file Rinomina Rimuovi @@ -298,4 +299,6 @@ Caricamenti istantanei Protezione Percorso di caricamento video + Lo scaricamento della cartella %1$s non puÃ² essere completato + %1$s ha condiviso \"%2$s\" con te diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml index cbc84bb5..e1e1e343 100644 --- a/res/values-ja-rJP/strings.xml +++ b/res/values-ja-rJP/strings.xml @@ -64,8 +64,8 @@ ããã«ã¯ä½ãããã¾ãããä½ãã¢ãããã¼ããã¦ãã ããã èªè¾¼ä¸ ... ãã®ãã©ã«ãã¼ã«ã¯ãã¡ã¤ã«ãããã¾ããã - ãã©ã«ã - ãã©ã«ã + ãã©ã«ãã¼ + ãã©ã«ãã¼ ãã¡ã¤ã« ãã¡ã¤ã« ãã¡ã¤ã«ãã¿ããããã¨è¿½å æå ±ãè¡¨ç¤ºããã¾ãã @@ -185,9 +185,10 @@ èªè¨¼ãµã¼ãã¼ã«æ¥ç¶ä¸ ... ãµã¼ãã¼ã¯ãã®èªè¨¼æ¹å¼ããµãã¼ããã¦ãã¾ãã %1$s ã¯è¤æ°ã¢ã«ã¦ã³ãããµãã¼ããã¦ãã¾ãã - ãµã¼ãã¼ãæ£ããã¦ã¼ã¶ã¼IDãè¿ãã¾ããã§ãããç®¡çèã«ãé£çµ¡ãã ããã + ãµã¼ãã¼ãæ£ããã¦ã¼ã¶ã¼IDãè¿ãã¾ããã§ãããç®¡çèã«é£çµ¡ãã¦ãã ããã ãã®ãµã¼ãã¼ã«å¯¾ãã¦èªè¨¼ã§ãã¾ãã + ããã¤ã¹ä¸ã«ã¾ã ã¢ã«ã¦ã³ããåå¨ãã¾ãã ãã¡ã¤ã«ãææ°ã«ä¿ã¤ ååãå¤æ´ åé¤ @@ -243,7 +244,7 @@ 389 KB 2012/05/18 12:23 PM 12:23:45 - WiFiçµç±ã§ã®ã¿åçãã¢ãããã¼ã + WiFiçµç±ã§ã®ã¿ç»åãã¢ãããã¼ã WiFiçµç±ã§ã®ã¿åç»ãã¢ãããã¼ã /InstantUpload æ´æ°ãç«¶å @@ -255,8 +256,8 @@ ãã®ç»åã¯è¡¨ç¤ºã§ãã¾ãã %1$s ã¯ããã¼ã«ã«ãã©ã«ãã¼ %2$s ã«ã³ãã¼ã§ãã¾ããã§ããã ã¢ãããã¼ããã¹ - ç³ãè¨³ãããã¾ãããå±æããµã¼ãã¼ä¸ã§æå¹ã«ãªã£ã¦ãã¾ããã ç®¡çèã« - ãé£çµ¡ãã ããã + ãã¿ã¾ãããããµã¼ãã¼ã§å±æãæå¹ã«ãªã£ã¦ãã¾ããã + ç®¡çèã«é£çµ¡ãã¦ãã ããã å±æã§ãã¾ããããã¡ã¤ã«ããããç¢ºèªãã¦ãã ããã ãã®ãã¡ã¤ã«ã¾ãã¯ãã©ã«ãã¼ãå±æããéã«ã¨ã©ã¼ãçºçãã¾ãã å±æãè§£é¤ã§ãã¾ããããã¡ã¤ã«ããããç¢ºèªãã¦ãã ããã @@ -283,17 +284,22 @@ æå·åæ¥ç¶ã¯éæå·åæ¥ç¶ã«ãªãã¤ã¬ã¯ãããã¾ããã ãã° ãã°ãéä¿¡ + ãã°ãéä¿¡ããã¢ããªãè¦ã¤ããã¾ããã§ãããã¡ã¼ã«ã¢ããªãã¤ã³ã¹ãã¼ã«ãã¦ãã ããã + %1$s ã¢ã³ããã¤ãã¢ããªãã° + èªè¾¼ä¸ ... èªè¨¼ãå¿è¦ã¨ãã ç¡å¹ãªãã¹ã¯ã¼ã ç§»å - ãã¡ã¤ã«ãæãã¾ããããã©ã«ããè¿½å ãã¦ãã ããã + ä½ãããã¾ããããã©ã«ãã¼ãè¿½å ãã¦ãã ããã é¸æ ç§»åã§ãã¾ããããã¡ã¤ã«ããããç¢ºèªãã¦ãã ããã - ãã©ã«ããåãã©ã«ãã¸ç§»åãããã¨ã¯ã§ãã¾ããã - ãã®ãã¡ã¤ã«ã¯ãå®åãã©ã«ãã«æ¢ã«åå¨ãã¦ãã¾ãã + ãã©ã«ãã¼ãåãã©ã«ãã¼ã¸ç§»åãããã¨ã¯ã§ãã¾ããã + ãã®ãã¡ã¤ã«ã¯å®åãã©ã«ãã¼ã«ãã§ã«åå¨ãã¾ãã ãã®ãã¡ã¤ã«ã¾ãã¯ãã©ã«ãã¼ãç§»åããéã«ã¨ã©ã¼ãçºçãã¾ãã ãã®ãã¡ã¤ã«ãç§»å èªåã¢ãããã¼ã ã»ãã¥ãªãã£ åç»ã®ã¢ãããã¼ããã¹ + %1$s ã®ãã©ã«ãã®ãã¦ã³ãã¼ããå®äºãã¾ããã§ããã + %1$sãããªãã¨\"%2$s\"ãå±æãã¾ãã diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 36bbbcf9..cc48be13 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -1,18 +1,37 @@ + %1$s áááááá·áá¸á¢á¶ááááá + áááá¶áá %1$s + áááá¸á±áááááá¸á¡á¾ááá·á áááá»áâá¡á¾á + áá¶áá·áá¶áâáá¸áááááá·áá¸áááááááá á¯ááá¶á + áá¾ááá¶áá½á ááâáááá¸ áá¶áááááá áááááá¶áâáááá¢á·á áááá¾ + áááááá + ááááááááá + + A-Z + áááá¸áááá»á-áá¶áááááá»á + áá¼áá áááá¾áâááá áááá¸ áááááááááâáááá¸ + áá¸áâáá¼á áááááá·áá¸ + áááá¾ááá¶ááá¶ááá¼ááááá¶áá + ááááá¶áááá á¶âááááá¶ááâá¢áááâáááâáá¶áâáá¼ááááá¶áá + áááááááá·áááá¶ááá¼ááááá¶áá + áááá¸áááâááºáááá á¶ááá¶áááááá¶áâáá¼ááááá¶áá + áá»áâáááááááá· áááá½á + áááááá¢áá»áá¶ááááááá¶áááá·áááááááá· + ááá·áááá¡áá áááááâá¢ááááááá¾ áá¶áááááááá¶áá á¯ááá¶á @@ -41,6 +60,7 @@ ááá á»á áááá»ááááá¾ááá¶á áá·áâáááá¶ááâááá á»á + á¢ááá¸ áááá¼áâáá¶áááááááá¶áá ááááááá¸ ááááá¾ááááá¸ @@ -69,6 +89,9 @@ ááááá¶á¯ááá¶ááá á¼áááááá¶áááá·ááááá áááá¼áâááááá ááááá + áá¸áááááááááá½á + ááááááá¸âááºááº + ááááá¶á áá·ááá¸áá¶áá áá¶áááááááááá¶ááááááá áá¶áááááááááá¶áááá¶ááá ááááá¼áááááááááá¸ diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 69623e19..f55428eb 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -1,6 +1,35 @@ + à²ªà³à²°à²¿à²¸à³ + ï»¿à²à²¡à²¤à²à²³à³ + ï»¿à²¹à³à²¸ à²à²¡à²¤à²à³à²¶ + à²à²¯à³à²à³ + ï»¿à²à²³à³à²¹à²¿à²¸à²¿ + ï»¿à²à²¨à³à²¨à²·à³à²à³ + ï»¿à²¸à²¹à²¾à²¯ + à²®à³à²¦à³à²°à³ + ï»¿à²¬à²³à²à³à²¯ à²¹à³à²¸à²°à³ + à²à³à²ªà³à²¤ à²ªà²¦ + ï»¿à²à²¡à²¤à²à²³à³ + à²ªà³à²°à²¿à²¸à³ + à²ªà³à²°à²¤à²¿à²¯à²¨à³à²¨à³ à²¸à³à²¥à²³à³à²¯à²µà²¾à²à²¿ à²à²³à²¿à²¸à²¿à²à³à²³à³à²³à²¿ + à²¸à²à²ªà²°à³à² à²à³à²à²¡à²¿à²¯à²¨à³à²¨à³ ï»¿à²¹à²à²à²¿à²à³à²³à³à²³à²¬à²¹à³à²¦à³ + ï»¿à²¹à³à²¦à³ + ï»¿à²à²²à³à²² + à²¸à²°à²¿ + ï»¿à²µà²°à³à²à²¾à²µà²£à³ à²°à²¦à³à²¦à³ à²®à²¾à²¡à²¿ + ï»¿à²°à²¦à³à²¦à³ + ï»¿à²¤à²ªà³à²ªà²¾à²à²¿à²¦à³ + à²à³à²¤à³à²¤à²¿à²²à³à²²à²¦ à²¦à³à²· + à²à³à²ªà³à²¤ à²ªà²¦à²µà²¨à³à²¨à³ à²¬à²¦à²²à²¾à²¯à²¿à²¸à²¿ + ï»¿à²®à²°à³à²¹à³à²¸à²°à²¿à²¸à³ + à²¤à³à²à³à²¦à³à²¹à²¾à²à²¿ + ï»¿à²à²³à³à²¹à²¿à²¸à²¿ + ï»¿à²¦à³à²¢à²¿à³à²à²°à²£ à²à²à²¤à³à²¯à²µà²¿à²¦à³ + à²¦à³à²°à³à²¬à²² à²à³à²ªà³à²¤à²ªà²¦ + ï»¿à²à²¯à³à²à³ + ï»¿à²à²¦à³à²°à²¤à³ diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 3bb9a60c..b58f7983 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -6,29 +6,42 @@ ìë¡ë ë¤ë¥¸ ì±ì ì½íì¸ íì¼ - ë¡ ì´ê¸° + ë¤ìì¼ë¡ ì´ê¸° ì í´ë ì¤ì - ì¸ë¶ë´ì© + ìì¸í ì ë³´ ë³´ë´ê¸° + ì ë ¬ + ì ë ¬ ìì + + ê°ëë¤ + ìµì - ì´ì + ì¼ë° - ë ì¤ìí¨ + ë ë³´ê¸° ê³ì ê³ì ê´ë¦¬ ì± ìí¸ ë´ í´ë¼ì´ì¸í¸ ë³´í¸ - ë¡ê¹ íì© - ì´ê±´ ë¡ê·¸ ë¬¸ì ì ì¬ì©ë©ëë¤ + ì¬ì§ ì¦ì ìë¡ë + ì¹´ë©ë¼ë¡ ì°ì ì¬ì§ ì¦ì ìë¡ë + ëìì ì¦ì ìë¡ë + ì¹´ë©ë¼ë¡ ì°ì ëìì ì¦ì ìë¡ë + ë¡ê·¸ ê¸°ë¡ ì¬ì© + ë¬¸ì ì ì ê¸°ë¡íë ë° ì¬ì©ë©ëë¤ ë¡ê·¸ ê¸°ë¡ ì¬ê¸°ì ê¸°ë¡ë ë¡ê·¸ë¥¼ ë³´ì¬ì¤ëë¤ - ìì¬ ìì íê¸° + ê³¼ê±° ê¸°ë¡ ìì ëìë§ - ì¹êµ¬ë¤ìê² ê¶íê¸° + ì¹êµ¬ìê² ì¶ì²íê¸° í¼ëë°± - ìíë¦°í¸ - %1$s ì ì¤ë§í¸í°ìì ì¬ì©í´ë³´ì¸ì! + ë²ì ê³ ì§ + ê³µì ìì¹ ê¸°ìµíê¸° + ë§ì§ë§ ê³µì ìë¡ë ìì¹ ê¸°ìµíê¸° + %1$sì(ë¥¼) ì¤ë§í¸í°ìì ì¬ì©í´ ë³´ì¸ì! + %1$sì(ë¥¼) ì¤ë§í¸í°ìì ì¬ì©í´ ë³´ë ê²ì ì¶ì²í©ëë¤!\në¤ì´ë¡ë ë§í¬: %2$s ìë² íì¸ ìë² ì£¼ì https://â¦ ì¬ì©ì ì´ë¦ @@ -37,6 +50,7 @@ íì¼ ì ì ìë¡ë + ìë¡ë í´ë ì í: ê³ì ìì ì´ ì¥ì¹ì %1$s ê³ì ì´ ììµëë¤. ë¨¼ì ê³ì ì ì¤ì íììì¤. ì¤ì @@ -45,8 +59,10 @@ ë°ì ì½íì¸ ê° ììµëë¤. ìë¡ëí íëª©ì´ ììµëë¤. %1$sìì ê³µì ë ì½íì¸ ì ì ê·¼í ì ììµëë¤ ìë¡ë ì¤ - ì´ ì + ì´ ì§ë¨ ë´ì©ì´ ììµëë¤. ìë¡ëí ì ììµëë¤! + ë¶ë¬ì¤ë ì¤... + ì´ í´ëì íì¼ì´ ììµëë¤. í´ë í´ë íì¼ @@ -57,9 +73,10 @@ ë§ë ë ì§: ìì í ë ì§: ë¤ì´ë¡ë - íì¼ ìë¡ê³ ì¹¨ + íì¼ ìë¡ ê³ ì¹¨ ìë¡ë ì¤ íì¼ ì´ë¦ì %1$s(ì¼)ë¡ ë³ê²½íììµëë¤ ë§í¬ ê³µì + ë§í¬ ê³µì í´ì ì ìëì íì¸ @@ -69,7 +86,7 @@ ì ì¥íê³ ëë´ê¸° ì¤ë¥ ë¶ë¬ì¤ë ì¤... - ìììë ì¤ë¥ + ì ì ìë ì¤ë¥ ì ë³´ ìí¸ ë³ê²½ ê³ì ìì @@ -81,29 +98,35 @@ ìë¡ë ì±ê³µ %1$sì(ë¥¼) ìë¡ëíììµëë¤ ìë¡ë ì¤í¨ - %1$sì(ë¥¼) ìë¡ëí ì ìììµëë¤ + %1$sì(ë¥¼) ìë¡ëí ì ììµëë¤ + ìë¡ëê° ì¤í¨íììµëë¤. ë¤ì ë¡ê·¸ì¸íììì¤ ë¤ì´ë¡ë ì¤... %1$d%% %2$s ë¤ì´ë¡ë ì¤ ë¤ì´ë¡ë ì±ê³µ %1$sì(ë¥¼) ë¤ì´ë¡ëíììµëë¤ ë¤ì´ë¡ë ì¤í¨ - %1$sì(ë¥¼) ë¤ì´ë¡ëí ì ìììµëë¤ + %1$sì(ë¥¼) ë¤ì´ë¡ëí ì ììµëë¤ ìì§ ë¤ì´ë¡ë ëì§ ìììµëë¤ + ë¤ì´ë¡ëê° ì¤í¨íììµëë¤. ë¤ì ë¡ê·¸ì¸íììì¤ ê³ì ì í ëê¸°í ì¤í¨ + ëê¸°íê° ì¤í¨íììµëë¤. ë¤ì ë¡ê·¸ì¸íììì¤ %1$sì(ê³¼) ëê¸°íí ì ìììµëë¤ - %1$sì ëí ë¹ë°ë²í¸ê° íë¦½ëë¤ + %1$sì ìí¸ê° ì¬ë°ë¥´ì§ ììµëë¤ ì¶©ëíë íëª© ë°ê²¬ë¨ - ëê¸°íë íì¼ ì¤ %1$dê°ë¥¼ ëê¸°íí ì ìììµëë¤ + ëê¸°íë íì¼ ì¤ %1$dê°ë¥¼ ëê¸°íí ì ììµëë¤ íì¼ì ëê¸°íí ì ìììµëë¤ - íì¼ %1$dê°ì ë´ì©ì ëê¸°íí ì ìììµëë¤ (ì¶©ë %2$dê°) - ëªëª ë¡ì»¬ íì¼ì´ ì¬ë¼ì¡ìµëë¤. - %1$s í´ëê° ì¡´ì¬íì§ ììµëë¤. - ëª¨ë ì®ê¹ - ëª¨ë íì¼ ì®ê¹ - ëªëª íì¼ì ì®ê¸°ì§ ëª»íìµëë¤. + íì¼ %1$dê°ì ë´ì©ì ëê¸°íí ì ììµëë¤ (ì¶©ë %2$dê°) + ì¼ë¶ ë¡ì»¬ íì¼ì´ ì¬ë¼ì¡ìµëë¤. + í´ë %2$sì íì¼ ì¤ %1$dê°ë¥¼ ë³µì¬í ì ììµëë¤ + ë²ì 1.3.16ë¶í°ë íëì íì¼ì´ ì¬ë¬ ê³ì ê³¼ ëê¸°íë ë ë°ì´í° ìì¤ì ë§ê¸° ìí´ì ì´ ì¥ì¹ìì ìë¡ëë íì¼ì ë¡ì»¬ í´ë %1$s(ì¼)ë¡ ë³µì¬ë©ëë¤.\n\nì´ ë³ê²½ ì¬í ëë¬¸ì ì´ ì±ì ì´ì ë²ì ìì ìë¡ëë ëª¨ë íì¼ì í´ë %2$s(ì¼)ë¡ ë³µì¬ëììµëë¤. ê³ì ëê¸°í ì¤ ì¤ë¥ê° ë°ìíì¬ ì´ ììì´ ì¤ë¨ëììµëë¤. íì¼ì ê·¸ëë¡ ë ë¤ì %3$s(ì¼)ë¡ í¥í ë§í¬ë¥¼ ìì íê±°ë, íì¼ì ì§ì í´ë %1$s(ì¼)ë¡ ì´ëí ë¤ì %4$s(ì¼)ë¡ í¥í ë§í¬ë¥¼ ê·¸ëë¡ ëììì¤.\n\nìë ëª©ë¡ì ë¡ì»¬ íì¼ê³¼ ë§í¬ê° ê±¸ë ¤ ìë %5$sì ìë ìê²© íì¼ìëë¤. + í´ë %1$sì´(ê°) ë ì´ì ì¡´ì¬íì§ ììµëë¤. + ëª¨ë ì´ë + ëª¨ë íì¼ ì´ëë¨ + ëªëª íì¼ì ì´ëí ì ìì ë¡ì»¬: %1$s ìê²©: %1$s + ì íí íì¼ì í´ë %1$s(ì¼)ë¡ ë³µì¬í ê³µê°ì´ ë¶ì¡±í©ëë¤. íì¼ì ì´ëíìê² ìµëê¹? ì± ìí¸ë¥¼ ìë ¥íììì¤ ì± ìí¸ë¥¼ ìë ¥íììì¤ ì±ì ììí ëë§ë¤ ìí¸ë¥¼ ë¬¼ì´ë´ëë¤ @@ -114,79 +137,89 @@ ì± ìí¸ê° ìì ëììµëë¤ ì± ìí¸ê° ì ì¥ëììµëë¤ %1$s ìì ì¬ìê¸° - %1$s (ì¬ìì¤) + %1$s (ì¬ì ì¤) %1$s (ë¶ë¬ì¤ë ì¤) %1$s ì¬ì ìë£ë¨ - ë¯¸ëì´ íì¼ì ì°¾ìì ììµëë¤ + ë¯¸ëì´ íì¼ì ì°¾ì ì ì ì¤ë¹ë ê³ì ì´ ììµëë¤ ì í¨í ê³ì ì íì¼ì´ ìëëë¤ ì§ìíì§ ìë ë¯¸ëì´ ì½ë± - ë¯¸ëì´ íì¼ì ì½ìì + ë¯¸ëì´ íì¼ì ì½ì ì ìì ë¯¸ëì´ íì¼ì´ ì ëë¡ ì¸ì½ë ëì§ ìììµëë¤ ì¬ì ìë ì¤ ìê°ì´ ì´ê³¼ë¨ - ë¯¸ëì´ íì¼ì ì¤í¸ë¦¬ë° í ì ììµëë¤ - ë´ì¥ë ë¯¸ëì´ íë ì´ì´ììë ì´ ë¯¸ëì´ íì¼ì ì¬ìí ì ììµëë¤ - %1$s ë¥¼ ì¬ìíë ì¤ì ë³´ìì¤ë¥ê° ë°ìí¨ - %1$s ë¥¼ ì¬ìíë ì¤ì ìë ¥ ìë¬ê° ë°ìí¨ - %1$s ë¥¼ ì¬ìíë ì¤ì ìì ìë ì¤ë¥ê° ë°ìí¨ - ëê°ê¸° ë²í¼ - ì¬ì í¹ì ì¼ìì ì§ ë²í¼ - ë¹¨ë¦¬ê°ê¸° ë²í¼ - ë¡ê·¸ì¸ ì¤... + ë¯¸ëì´ íì¼ì ì¤í¸ë¦¬ë° í ì ììµëë¤ + ë´ì¥ë ë¯¸ëì´ íë ì´ì´ìì ì´ ë¯¸ëì´ íì¼ì ì¬ìí ì ììµëë¤ + %1$sì(ë¥¼) ì¬ìíë ì¤ ë³´ì ì¤ë¥ê° ë°ìí¨ + %1$sì(ë¥¼) ì¬ìíë ì¤ ìë ¥ ì¤ë¥ê° ë°ìí¨ + %1$sì(ë¥¼) ì¬ìíë ì¤ ì ì ìë ì¤ë¥ê° ë°ìí¨ + ëê°ê¸° ë¨ì¶ + ì¬ì í¹ì ì¼ì ì ì§ ë¨ì¶ + ë¹¨ë¦¬ê°ê¸° ë¨ì¶ + ì¸ì¦ ì ë³´ ê°ì ¸ì¤ë ì¤... + ë¡ê·¸ì¸ ìë ì¤... ë¤í¸ìí¬ì ì°ê²°í ì ììµëë¤ ìí¸íë ì°ê²°ì ì¬ì©í ì ììµëë¤. ì°ê²°ë¨ ì°ê²° íì¤í¸ ì¤... ìë² ì¤ì ì´ ìëª»ë¨ ê°ì ì¬ì©ìì ìë²ì ëí ê³ì ì´ ì´ë¯¸ ì¡´ì¬í©ëë¤ - ìë ¥ë ì¬ì©ìê° ì´ ê³ì ì ì¬ì©ìì ì¼ì¹íì§ ìì + ìë ¥ë ì¬ì©ìê° ì´ ê³ì ì ì¬ì©ìì ì¼ì¹íì§ ììµëë¤ ì ì ìë ì¤ë¥ê° ë°ìíììµëë¤! í¸ì¤í¸ë¥¼ ì°¾ì ì ìì ìë² ì¸ì¤í´ì¤ë¥¼ ì°¾ì ì ìì - ìë² ìëµ ìê°ì´ ì´ê³¼ëììµëë¤ + ìë² ìëµ ìê°ì´ ì´ê³¼ë¨ ìëª»ë URL SSL ì´ê¸°í ì¤ë¥ SSL ìë²ì ì ìì íì¸í ì ììµëë¤ íì¸í ì ìë ìë² ë²ì ì°ê²°ì ìë¦½í ì ìì ìí¸íë ì°ê²° ì¬ì© ì¤ - ìëª»ë ë¡ê·¸ì¸/ìí¸ - ê¶íë¶ì¬ê° ì±ê³µì ì¼ë¡ ì´ë¤ì§ì§ ìììµëë¤ - ê¶í ìë²ë¡ ë¶í° ì ê·¼ì´ ê±°ë¶ëììµëë¤ - ë»ë°ì ìí; ë¤ì ìë² ì£¼ìë¥¼ ìë ¥í´ì£¼ììì¤ - ì¸ì¦ì´ ë§ë£ëììµëë¤. ë¤ì ì¸ì¦í´ì£¼ì¸ì - íì¬ ìí¸ë¥¼ - ì¸ìì´ ë§ë£ëììµëë¤. ë¤ì ì ìí´ì£¼ì¸ì - ì¸ì¦ ìë²ì ì ìíë ì¤... + ìëª»ë ì¬ì©ì ì´ë¦ ë° ìí¸ + ì¸ì¦ ì¤í¨ + ì¸ì¦ ìë² ì ê·¼ ê±°ë¶ë¨ + ììíì§ ëª»í ìíìëë¤. ìë² URLì ë¤ì ìë ¥í´ ì£¼ììì¤ + ì¸ì¦ì´ ë§ë£ëììµëë¤. ë¤ì ì¸ì¦í´ ì£¼ììì¤ + íì¬ ìí¸ë¥¼ ìë ¥í´ ì£¼ììì¤ + ì¸ìì´ ë§ë£ëììµëë¤. ë¤ì ì ìí´ ì£¼ììì¤ + ì¸ì¦ ìë²ì ì°ê²°íë ì¤... ìë²ìì ì´ ì¸ì¦ ë°©ë²ì ì§ìíì§ ììµëë¤. - %1$s ììë ë¤ì¤ ê³ì ì ì§ìíì§ ììµëë¤ + %1$sìì ë¤ì¤ ê³ì ì ì§ìíì§ ììµëë¤ + ìë²ìì ì¬ë°ë¥¸ ì¬ì©ì IDë¥¼ ë°ííì§ ìììµëë¤. ê´ë¦¬ììê² ì°ë½íììì¤ + + ì´ ìë²ì ì¸ì¦í ì ìì + ì¥ì¹ì ìì§ ê³ì ì´ ì¡´ì¬íì§ ììµëë¤. íì¼ì ìµì ì ë³´ë¡ ì ì§ ì´ë¦ ë°ê¾¸ê¸° ìì + %1$sì(ë¥¼) ìì íìê² ìµëê¹? + %1$s ë° í¬í¨ë ë´ì©ì ìì íìê² ìµëê¹? ë¡ì»¬ë§ ë¡ì»¬ ì½íì¸ ë§ ìë²ìì ìì ìë²ì ë¡ì»¬ ëª¨ë - ì±ê³µì ì¼ë¡ ìì íììµëë¤ - ìì í ì ìììµëë¤ + ì±ê³µì ì¼ë¡ ìì í¨ + ìì í ì ìì ì ì´ë¦ ìë ¥ ë¡ì»¬ íì¼ì ì´ë¦ì ë³ê²½í ì ììµëë¤. ë¤ë¥¸ ì´ë¦ì ìë ¥íììì¤ - ì´ë¦ì ë³ê²½í ì ìììµëë¤ - ìê²© íì¼ì íì¸í ì ìììµëë¤ - íì¼ ë´ì©ì´ ì´ë¯¸ ëê¸°íëììµëë¤ - ì¬ì©í ì ìë ë¬¸ìë¤: / \\ < > : \" | ? * + ì´ë¦ì ë³ê²½í ì ìì + ìê²© íì¼ì íì¸í ì ìì + íì¼ ë´ì©ì´ ì´ë¯¸ ëê¸°íë¨ + í´ëë¥¼ ë§ë¤ ì ìì + ì¬ì©í ì ìë ë¬¸ì: / \\ < > : \" | ? * + íì¼ ì´ë¦ì´ ë¹ì´ ìì ì ìì ì ì ê¸°ë¤ë ¤ ì£¼ììì¤ ììíì§ ëª»í ì¤ë¥ìëë¤. ë¤ë¥¸ ì±ìì íì¼ì ì ííììì¤ ì íí íì¼ ìì + ë¤ìì¼ë¡ ë§í¬ ë³´ë´ê¸°... oAuth2ë¡ ë¡ê·¸ì¸íê¸° - oAuth2 ìë²ì ì°ê²°ì¤... - ì¬ì´í¸ ì¸ì¦ìë¥¼ íì¸í ì ìììµëë¤ + oAuth2 ìë²ì ì°ê²° ì¤... + ì¬ì´í¸ ì¸ì¦ìë¥¼ íì¸í ì ììµëë¤ - ìë² ì¸ì¦ìë¥¼ ì ë¢°í ì ììµëë¤ - ìë² ì¸ì¦ìê° ë§ë£ëììµëë¤ - ìë² ì¸ì¦ìì ì í¨ ê¸°ê°ì´ ììëì§ ìììµëë¤ - ì¸ì¦ìì URLê³¼ ìë ¥í URLì´ ì¼ì¹íì§ ììµëë¤ ì´ ì¸ì¦ìë¥¼ ì ë¢°íìê² ìµëê¹? - ì¸ì¦ìë¥¼ ì ì¥í ì ìììµëë¤ + ì¸ì¦ìë¥¼ ì ì¥í ì ììµëë¤ ìì¸í ì¨ê¸°ê¸° ë°ê¸ ëì: @@ -202,27 +235,69 @@ ë: ìëª: ìê³ ë¦¬ì¦: - ì´ê²ì íë ì´ì¤íëìëë¤ + ì¸ì¦ìë¥¼ íìí ì ììµëë¤. + - ì¤ë¥ì ëí ì ë³´ê° ììµëë¤ + ì´ê²ì ìë¦¬ ë¹ìììëë¤ placeholder.txt PNG ê·¸ë¦¼ 389 KB 2012/05/18 12:23 PM 12:23:45 - WiFi ì¬ì© ì¤ì¼ëë§ ì¬ì§ ìë¡ë + Wi-Fi ì¬ì© ì¤ì¼ëë§ ì¬ì§ ìë¡ë + Wi-Fi ì¬ì© ì¤ì¼ëë§ ëìì ìë¡ë /InstantUpload ìë°ì´í¸ ì¶©ë ìê²© íì¼ %sì´(ê°) ë¡ì»¬ íì¼ê³¼ ëê¸°íëì§ ìììµëë¤. ê³ì ì§ííë©´ ìë²ì ìë íì¼ì ë®ì´ìëë¤. ëª¨ë ì ì¥ ë®ì´ì°ê¸° ìë¡ëíì§ ìì - ê·¸ë¦¼ ë¯¸ë¦¬ë³´ê¸° + ì¬ì§ ë¯¸ë¦¬ ë³´ê¸° + ì´ ì¬ì§ì ë¯¸ë¦¬ ë³¼ ì ììµëë¤ + %1$sì(ë¥¼) ë¡ì»¬ í´ë %2$s(ì¼)ë¡ ë³µì¬í ì ììµëë¤ + ìë¡ë ê²½ë¡ + ìë²ìì ê³µì ê° ë¹íì±íëì´ ììµëë¤. ê´ë¦¬ììê² ì°ë½íììì¤. + ê³µì í ì ììµëë¤. íì¼ì´ ìëì§ íì¸íììì¤ + ì´ íì¼ì´ë í´ëë¥¼ ê³µì íë ì¤ ì¤ë¥ ë°ì + ê³µì ë¥¼ í´ì í ì ììµëë¤. íì¼ì´ ìëì§ íì¸íììì¤ + ì´ íì¼ì´ë í´ëì ê³µì ë¥¼ í´ì íë ì¤ ì¤ë¥ ë°ì ë³´ë´ê¸° - ë§í¬ ë³µì¬ + ë§í¬ ì£¼ì ë³µì¬ í´ë¦½ë³´ëë¡ ë³µì¬ë¨ + ì¹ëªì ì¤ë¥: ììì ì§íí ì ìì + ìë²ì ì°ê²°íë ì¤ ì¤ë¥ê° ë°ìíììµëë¤. + ìë²ë¥¼ ê¸°ë¤ë¦¬ë ì¤ ì¤ë¥ê° ë°ìíììµëë¤. ììì´ ì§íëì§ ììì ìë ììµëë¤ + ìë²ë¥¼ ê¸°ë¤ë¦¬ë ì¤ ì¤ë¥ê° ë°ìíììµëë¤. ììì´ ì§íëì§ ììì ìë ììµëë¤ + ìë²ë¥¼ ì¬ì©í ì ìì´ì ììì ì§íí ì ììµëë¤ + %s ê¶íì´ ììµëë¤ + ì´ íì¼ì ì´ë¦ì ë°ê¿ + ì´ íì¼ì ìì í + ì´ íì¼ì ê³µì í + ì´ íì¼ì ê³µì ë¥¼ í´ì í + íì¼ì ìì±í + ì´ í´ëì ìë¡ëí + ì´ íì¼ì ìë²ìì ë ì´ì ì¬ì©í ì ììµëë¤ ê³ì + ê³ì ì¶ê° + ë³´ì ì°ê²°ì´ ìì íì§ ìì ê²½ë¡ë¡ ëì´ê°ëë¤. + ë¡ê·¸ + ê³¼ê±° ê¸°ë¡ ë³´ë´ê¸° + ë¡ê·¸ë¥¼ ë³´ë¼ ì±ì´ ììµëë¤. ë©ì¼ ì±ì ì¤ì¹íììì¤! + %1$s Android ì± ë¡ê·¸ + ë°ì´í° ë¶ë¬ì¤ë ì¤... ì¸ì¦ íìí¨ ìëª»ë ìí¸ + ì´ë + íëª©ì´ ììµëë¤. í´ëë¥¼ ì¶ê°í ì ììµëë¤! ì í + ì´ëí ì ììµëë¤. íì¼ì´ ì¡´ì¬íë ì§ íì¸íììì¤ + í´ëë¥¼ íì í´ë ìëë¡ ì´ëí ì ììµëë¤ + íì¼ì´ ì´ë¯¸ ëì í´ëì ì¡´ì¬í©ëë¤ + ì´ íì¼ì´ë í´ëë¥¼ ì´ëíë ì¤ ì¤ë¥ê° ë°ìíììµëë¤ + ì´ íì¼ì ì´ëí + ì¦ì ìë¡ë ë³´ì + ëìì ìë¡ë ê²½ë¡ + %1$s í´ëë¥¼ ë¤ì´ë¡ëí ì ììµëë¤ + %1$sìì \"%2$s\"ë¥¼ ë¹ì ê³¼ ê³µì íììµëë¤. diff --git a/res/values-large-land/bools.xml b/res/values-large-land/bools.xml index 9feccd8a..09b11cc0 100644 --- a/res/values-large-land/bools.xml +++ b/res/values-large-land/bools.xml @@ -2,7 +2,7 @@ + + diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml index 30cca384..76e0e523 100644 --- a/res/values-lt-rLT/strings.xml +++ b/res/values-lt-rLT/strings.xml @@ -11,6 +11,12 @@ Nustatymai Informacija SiÅ³sti + Rikiuoti + Rikiuoti pagal + + A-Z + Naujausi - Seniausi + Bendras @@ -32,6 +38,8 @@ Rekomenduoti draugui Atsiliepimai Imprint + Prisiminti bendrinimo vietÄ + Prisiminti paskutinio bendrinimo Ä¯kÄlimo vietÄ IÅ¡bandykite %1$s savo iÅ¡maniajame telefone! Patikrinti ServerÄ¯ Serverio adresas diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index c185f73f..0895ca91 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -149,6 +149,7 @@ SÅ«tÄ«t Konti + Nepareiza parole IzvÄlieties DroÅ¡Ä«ba diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 69623e19..b4185fd3 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -1,6 +1,17 @@ + ÐÐ°Ð¹ÑÑÑÑÐ»Ð°Ñ + Ð¤Ð°Ð¹Ð»ÑÑÐ´ + Ð¢Ð¾ÑÐ¸ÑÐ³Ð¾Ð¾ + ÐÑÓ©Ð½ÑÐ¸Ð¹ + Ð¥ÑÑÑÐ³Ð»ÑÐ³ÑÐ¸Ð¹Ð½ Ð½ÑÑ + ÐÑÑÑ Ò¯Ð³ + Ð¤Ð°Ð¹Ð»ÑÑÐ´ + ÐÐ°Ð¹ÑÑÑÑÐ»Ð°Ñ + ÐÐºÐºÐ°ÑÐ½Ñ Ò¯Ò¯ÑÐ³ÑÑ + Ð£ÑÑÐ³Ð°Ñ + ÐÑÑÐ»Ð³Ò¯Ð¹ Ð±Ð°Ð¹Ð´Ð°Ð» diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml new file mode 100644 index 00000000..69623e19 --- /dev/null +++ b/res/values-mr/strings.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml index 98f4ff6b..3336ec12 100644 --- a/res/values-nb-rNO/strings.xml +++ b/res/values-nb-rNO/strings.xml @@ -11,6 +11,12 @@ Innstillinger Detaljer Send + Sorter + Sorter etter + + A-Z + Nyeste - Eldste + Generelt @@ -32,6 +38,8 @@ Anbefal til en venn Tilbakemelding Avtrykk + Husk delt plassering + Husk sist delt plassering for opplasting PrÃ¸v %1$s pÃ¥ smarttelefonen din! Jeg Ã¸nsker Ã¥ invitere deg til Ã¥ bruke %1$s pÃ¥ smarttelefonen din!\nLast ned her: %2$s Sjekk server @@ -245,6 +253,7 @@ BildeforhÃ¥ndsvisning Dette bildet kan ikke vises %1$s kunne ikke kopieres til lokal mappe %2$s + Sti til opplasting Beklager, deling er ikke skrudd pÃ¥ for din tjener. Ta kontakt med administratoren. Kan ikke dele. Sjekk om filen eksisterer. @@ -270,8 +279,12 @@ Filen finnes ikke pÃ¥ serveren lenger Kontoer Legg til en konto + Sikker forbindelse er omdirigert til en usikker rute. Logger Send historikk + Ingen app for sending av logger funnet. Installer epost-app! + %1$s Android app logger + Laster data... Autentisering kreves Feil passord Flytt @@ -282,5 +295,8 @@ Filen finnes allerede i mÃ¥lmappen En feil oppstod ved flytting av denne filen eller mappen Ã¥ flytte denne filen + Umiddelbare opplastinger Sikkerhet + Sti til video-opplasting + Nedlasting av %1$s mappen kunne ikke fullfÃ¸res diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index a6fc894b..f675c09b 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -190,6 +190,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar Uw server geeft geen goede userid terug, neem contact op met uw beheerder Kan niet authenticeren tegen deze server + Het account bestaat nog niet in dit apparaat Houd bestand actueel Hernoemen Verwijderen @@ -301,4 +302,6 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar Directe uploads Beveiliging Upload Video Pad + Download van %1$s map kon niet worden voltooid + %1$s deelde \"%2$s\" met u diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5a0b30da..3623617f 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -38,6 +38,8 @@ PoleÄ znajomemu Wsparcie Stopka + ZapamiÄtaj poÅoÅ¼enie udostÄpnienia + ZapamiÄtaj ostatniÄ lokalizacjÄ wgrywania WyprÃ³buj %1$s na swoim smartphonie! ChciaÅbym zaprosiÄ CiÄ do uÅ¼ywania %1$s na swoim smartfonie!\nÅciÄgnij tutaj: %2$s SprawdÅº serwer @@ -280,6 +282,9 @@ Bezpieczne poÅÄczenie jest przekierowywane przez niezabezpieczone trasy. Logi WyÅlij historiÄ + Brak aplikacji do wysyÅania logÃ³w. Zainstaluj klienta poczty! + %1$s Logi aplikacji Android + ÅadujÄ dane... Wymagana autoryzacja ZÅe hasÅo PrzenieÅ @@ -292,4 +297,6 @@ aby przenieÅÄ ten plik Automatyczne wysyÅanie BezpieczeÅstwo + Katalog wysyÅania dla wideo + Pobieranie %1$s katalogu nie moÅ¼e zostaÄ ukoÅczone diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 45909b45..baf155f9 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -187,6 +187,7 @@ Seu servidor nÃ£o estÃ¡ retornando um ID de usuÃ¡rio correto, por favor, entre em contato com um administrador â¥ NÃ£o foi possÃvel autenticar neste servidor + Conta ainda nÃ£o existe no dispositivo Manter arquivo atualizado Renomear Remover @@ -298,4 +299,6 @@ Envios InstantÃ¢neos SeguranÃ§a Enviar o Caminho do VÃdeo + Baixar %1$s da pasta nÃ£o pode ser completado + %1$s compartilhou \"%2$s\" com vocÃª diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 60d9377b..6a686c25 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -41,7 +41,7 @@ Lembrar localizaÃ§Ã£o de partilha Lembrar da Ãºltima localizaÃ§Ã£o de envio de partilha Test %1$s no seu smartphone! - Quero convidar-te a usares %1$s no teu smartphone!\nFaz download aqui: %2$s + Eu quero convidar-te para usares %1$s no teu smartphone!\nTransfere aqui: %2$s Verificar Servidor EndereÃ§o do servidor https://.. Nome de Utilizador @@ -52,7 +52,7 @@ Enviar Escolha a pasta de envio: A conta nÃ£o foi encontrada - NÃ£o tem nenhuma conta %1$s no seu dispositivo. Por favor, configure primeiro uma conta. + NÃ£o existe nenhuma conta %1$s no seu dispositivo. Por favor, configure primeiro uma conta. Configurar Sair Sem conteÃºdo para enviar @@ -76,7 +76,7 @@ Atualizar ficheiro O ficheiro foi renomeado para %1$s durante o envio. Partilhar a hiperligaÃ§Ã£o - Deixar de partilhar a ligaÃ§Ã£o + Deixar de partilhar a hiperligaÃ§Ã£o Sim NÃ£o ACEITAR @@ -98,14 +98,14 @@ Envio bem sucedido %1$s foi enviado com sucesso NÃ£o foi possÃvel enviar - O envio do ficheiro %1$s nÃ£o foi concluÃdo. + NÃ£o foi possÃvel concluir o envio de %1$s. Falha no carregamento, Ã© necessÃ¡rio fazer novo login - A transferir ... + A transferir... %1$d%% A transferir %2$s TransferÃªncia bem sucedida - %1$s foi descarregado com sucesso - Descarga falhou - O descarregamento %1$s nÃ£o foi possÃvel descarregar + %1$s foi transferido com sucesso + TransferÃªncia falhada + NÃ£o foi possÃvel concluir a transferÃªncia de %1$s Ainda nÃ£o foi transferido NÃ£o foi possÃvel transferir, tem de iniciar a sessÃ£o novamente Escolha a conta @@ -132,10 +132,10 @@ O PIN serÃ¡ pedido sempre que a app seja iniciada. Por favor, reinsira o PIN da App Remover o seu PIN da App - Os cÃ³digos PIN introduzidos nÃ£o sÃ£o iguais. - CÃ³digo PIN Incorrecto. - PIN da aplicaÃ§Ã£o removido - PIN da aplicaÃ§Ã£o guardado + Os CÃDIGOS da APP nÃ£o sÃ£o iguais + CÃDIGO da App Incorreto + CÃDIGOS da App removido + CÃDIGO da App guardado %1$s leitor de mÃºsica %1$s (a reproduzir) %1$s (a carregar) @@ -143,8 +143,8 @@ NÃ£o foi encontrado nenhum ficheiro de mÃ©dia NÃ£o foi fornecida conta O ficheiro nÃ£o estÃ¡ numa conta vÃ¡lida - Codec de mÃ©dia nÃ£o suportado - NÃ£o foi possÃvel reproduzir o ficheiro + Codec de multimÃ©dia nÃ£o suportado + NÃ£o foi possÃvel ler o ficheiro de multimÃ©dia Ficheiro erradamente codificado (codec) O tempo de espera para jogar expirou O ficheiro nÃ£o pode ser reproduzido (streaming) @@ -152,25 +152,25 @@ Erro de seguranÃ§a a tentar reproduzir o ficheiro %1$s Erro de input a tentar reproduzir %1$s Erro inesperado a tentar reproduzir %1$s - BotÃ£o de rebobinar - BotÃ£o Tocar/Pausa + BotÃ£o de Retroceder + BotÃ£o de Reproduzir/Pausar BotÃ£o de avanÃ§o rÃ¡pido A obter autorizaÃ§Ã£o... - A tentar entrar... + A tentar iniciar a sessÃ£o... Sem ligaÃ§Ã£o Ã rede - LigaÃ§Ã£o segura indisponÃvel + LigaÃ§Ã£o segura indisponÃvel. LigaÃ§Ã£o estabelecida A testar a ligaÃ§Ã£o... ConfiguraÃ§Ã£o do servidor incorrecta. Uma conta para este utilizador e servidor jÃ¡ existe no dispositivo O utilizador que escreveu nÃ£o coincide com o nome de utilizador desta conta Ocorreu um erro desconhecido! - NÃ£o Ã© possÃvel encontrar o servidor - InstÃ¢ncia servidor nÃ£o encontrada - O servidor levou demasiado tempo a responder + NÃ£o foi possÃvel encontrar o anfitriÃ£o + InstÃ¢ncia do servidor nÃ£o encontrada + O servidor demorou muito tempo a responder URL errado InicializaÃ§Ã£o de SSL falhou - NÃ£o foi possÃvel verificar a identidade SSL do servidor + NÃ£o foi possÃvel verificar a identidade do servidor SSL VersÃ£o do servidor nÃ£o reconhecida NÃ£o consegue estabelecer ligaÃ§Ã£o LigaÃ§Ã£o segura estabelecida @@ -179,13 +179,14 @@ Acesso negado pelo servidor Estado inesperado, por favor, digite a URL do servidor novamente O prazo da sua autorizaÃ§Ã£o expirou. Por favor renove-a - Por favor, introduza a password actual + Por favor, insira a palavra-passe atual A sua sessÃ£o expirou. Por favor autentique-se de novo A verificar a sua autenticaÃ§Ã£o no servidor... O servidor nÃ£o suporta este mÃ©todo de autenticaÃ§Ã£o %1$s nÃ£o suporta contas mÃºltiplas O seu servidor nÃ£o transmite o ID correcto. Por favor contacte o administrador. NÃ£o foi possÃvel autenticar no servidor + Conta ainda nÃ£o existe no dispositivo manter ficheiro actualizado Renomear Remover @@ -296,4 +297,6 @@ Envios InstantÃ¢neos SeguranÃ§a Envio do Caminho do VÃdeo + NÃ£o foi possÃvel completar o download da pasta %1$s + %1$s partilhou \"%2$s\" consigo diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index bb03b024..d87cea3d 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -21,10 +21,10 @@ Administrare conturi PIN-ul aplicaÅ£iei ProtejaÅ£i-vÄ clientul - ÃncÄrcare instanta de imagine - ÃncÄrca instantaneu imagini luate de camera + ÃncÄrcare instantÄ de imagini + ÃncarcÄ instantant imagini luate cu camera ÃncÄrcare instantÄ de videoclipuri. - ÃncarcÄ videoclipuri instant, filmate cu camera. + ÃncarcÄ instant videoclipuri Ã®nregistrate cu camera Permite logarea Acesta este folosit pentru a Ã®nregistra problemele Istoria logarilor @@ -34,7 +34,10 @@ Recomandati unui prieten Feedback Imprint + ReÈine contribuie locaÈia + ReÈine locaÈia fiÈierului Ã®ncÄrcat precedent ÃncearcÄ %1$s pe smartphone-ul tÄu! + Te invit sa foloseÈti %1$s pe smartfonul tÄu!\nDescarcÄ aici: %2$s VerificaÅ£i Serverul Adresa serverului https://... Nume utilizator @@ -112,6 +115,7 @@ 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 + Conform ediÈiei 1.3.16, fiÈierele Ã®ncÄrcate de pe aceastÄ platformÄ sunt copiate Ã®n dosarul local %1$s pentru a preveni pierderi de date atunci cÃ®nd un singur fiÈier este sincronizat cu mai multe conturi.\n\nDin cauza acestei schimbÄri, toate fiÈierele Ã®ncÄrcate Ã®n ediÈiile precedente ale acestui app au fost Ã®ncÄrcate in dosarul %2$s. ÃnsÄ acest proces nu fost completat in timpul sincronizÄrii contului din cauza unei erori. Ai opÈiunea de a lÄsa fiÈierul intact (fiÈierele intacte) Èi de a transfera sursa Ã®n dosarul %3$s sau de a schimba locaÈia fiÈierului(-elor) Ã®n dosarul %1$s Èi de a pÄstra sursa Ã®n %4$s.\n\nMai jos gÄseÈti enumerate fiÈierul local(fiÈierele locale) Èi fiÈierul separat(fiÈierele separate) Ã®n %5$s cu sursa respectivÄ. Folderul %1$s nu mai existÄ Muta tot/toate Toate fiÅierele au fost mutate @@ -236,7 +240,7 @@ 12:23:45 Incarca poze doar via WiFi ÃncarcÄ videoclipuri doar via WiFi - /ÃncÄrcare instanta + /ÃncÄrcare instantÄ ActualizaÈi conflictul FiÈierul de la distanÈÄ %s nu este sincronizat cu fiÈierul local. Continuand, se va Ã®nlocui conÈinutul fiÈierului de pe server. Pastreaza amandoua @@ -245,6 +249,7 @@ Previzualizare imagine Aceasta imagine nu poate fi arÄtatÄ %1$s nu a putut fi copiat in dosarul local %2$s + Calea de Ã®ncÄrcare Ne pare rÄu, partajarea nu este activatÄ pe server. VÄ rugÄm sÄ contactaÈi administratorul dvs. A apÄrut o eroare Ã®n timp ce Ã®ncerca sÄ partajeze acest fiÈier sau folder A apÄrut o eroare Ã®n timp ce Ã®ncerca sÄ departajeze sau unshare acest fiÈier sau folder @@ -267,11 +272,23 @@ FiÈierul nu mai este disponibil pe server Conturi AdaugÄ cont + Conexiunea securizatÄ este redirecÈionatÄ cÄtre un traseu neasigurat. + ÃnregistrÄri + Trimite Istoria + App-ul de trimitere a inregistrÄrilor nu a fost gÄsit. InstaleazÄ mail app-ul! + %1$s Ã®nregistrÄrile app-ului Android + Datele se Ã®ncarcÄ... Autentificare necesarÄ ParolÄ greÈitÄ Mutare Nu este nimic aici. PoÈi adÄuga un director! Alege + Incapabil de trasfer. VerificÄ existenÈa fiÈierului + FiÈierul existÄ deja Ã®n dosarul de destinaÈie + O eroare apare la transferarea acestui fiÈier sau dosar pentru a muta acest fiÈier + ÃncÄrcÄri instante Securitate + Calea de Ã®ncÄrcare Video + DescÄrcarea fiÈierului %1$s nu s-a finisat diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 20415883..cc739418 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1,13 +1,13 @@ - %1$s ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÐÐ½Ð´ÑÐ¾Ð¸Ð´Ð° - ÐÐµÑÑÐ¸Ñ %1$s + %1$s Ð´Ð»Ñ Android + Ð²ÐµÑÑÐ¸Ñ %1$s ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð¸Ð· Ð´ÑÑÐ³Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð¤Ð°Ð¹Ð»Ñ ÐÑÐºÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ - ÐÐ¾Ð²Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° + ÐÐ¾Ð²ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ @@ -15,7 +15,7 @@ Ð£Ð¿Ð¾ÑÑÐ´Ð¾ÑÐ¸ÑÑ Ð¿Ð¾ Ð-Ð¯ - ÐÐ¾Ð²ÑÐµ - Ð¡ÑÐ°ÑÑÐµ + ÐÐ¾Ð²Ð¾Ðµ - Ð¡ÑÐ°ÑÐ¾Ðµ @@ -23,12 +23,12 @@ ÐÐ¾Ð»ÑÑÐµ Ð£ÑÑÑÐ½ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÑÑÑÐ½ÑÐ¼Ð¸ Ð·Ð°Ð¿Ð¸ÑÑÐ¼Ð¸ - App PIN + PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÐÐ°ÑÐ¸ÑÐ¸ÑÑ Ð²Ð°Ñ ÐºÐ»Ð¸ÐµÐ½Ñ - ÐÑÑÑÑÐ°Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ° ÑÐ¾ÑÐ¾Ð³ÑÐ°ÑÐ¸Ð¹ + ÐÐ³Ð½Ð¾Ð²ÐµÐ½Ð½Ð°Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ° ÑÐ¾ÑÐ¾Ð³ÑÐ°ÑÐ¸Ð¹ ÐÐµÐ¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ ÑÐ¾ÑÐ¾Ð³ÑÐ°ÑÐ¸Ð¸ ÑÐ´ÐµÐ»Ð°Ð½Ð½ÑÐµ ÐºÐ°Ð¼ÐµÑÐ¾Ð¹ - ÐÑÑÑÑÐ°Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ° Ð²Ð¸Ð´ÐµÐ¾ - ÐÑÑÑÑÐ°Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ° Ð²Ð¸Ð´ÐµÐ¾ Ñ ÐºÐ°Ð¼ÐµÑÑ + ÐÐ³Ð½Ð¾Ð²ÐµÐ½Ð½Ð°Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ° Ð²Ð¸Ð´ÐµÐ¾ + ÐÐµÐ¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ Ð²Ð¸Ð´ÐµÐ¾, ÑÐ´ÐµÐ»Ð°Ð½Ð½ÑÐµ ÐºÐ°Ð¼ÐµÑÐ¾Ð¹ ÐÐºÐ»ÑÑÐ¸ÑÑ Ð¶ÑÑÐ½Ð°Ð»Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸ Ð¾ÑÐ¸Ð±Ð¾Ðº ÐÑÑÐ½Ð°Ð» @@ -38,7 +38,7 @@ Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°ÑÑ Ð´ÑÑÐ³Ñ ÐÐ±ÑÐ°ÑÐ½Ð°Ñ ÑÐ²ÑÐ·Ñ Ð¨ÑÐ°Ð¼Ð¿ - ÐÐ°Ð¿Ð¾Ð¼Ð½Ð¸ÑÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸Ð¸ + ÐÐ°Ð¿Ð¾Ð¼Ð½Ð¸ÑÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¾Ð±ÑÐµÐ³Ð¾ ÑÐµÑÑÑÑÐ° ÐÐ°Ð¿Ð¾Ð¼Ð½Ð¸ÑÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸Ð¸ ÐÐ¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ %1$s Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÐ¼Ð°ÑÑÑÐ¾Ð½Ðµ! Ð¥Ð¾ÑÑ Ð¿ÑÐµÐ´Ð»Ð¾Ð¶Ð¸ÑÑ Ð²Ð°Ð¼ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ %1$s Ð½Ð° ÑÐ¼Ð°ÑÑÑÐ¾Ð½Ðµ!\nÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð´ÐµÑÑ: %2$s @@ -51,21 +51,21 @@ Ð¤Ð°Ð¹Ð»Ñ ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ - ÐÑÐ±ÐµÑÐµÑÐµ Ð¿Ð°Ð¿ÐºÑ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ + ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð£ÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð° - ÐÐ° Ð²Ð°ÑÐµÐ¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ Ð½ÐµÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ %1$s. Ð¡Ð½Ð°ÑÐ°Ð»Ð° Ð½ÑÐ¶Ð½Ð¾ Ð½Ð°ÑÑÑÐ¾Ð¸ÑÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ. - Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° + ÐÐ° Ð²Ð°ÑÐµÐ¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ Ð½ÐµÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ %1$s. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð½Ð°ÑÑÑÐ¾Ð¹ÑÐµ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ. + ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÐÑÑÐ¾Ð´ ÐÐµÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð½Ðµ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¾. ÐÐµÑÐµÐ³Ð¾ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ. - %1$s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð½ÑÐ¼ Ð´Ð°Ð½Ð½ÑÐ¼ + ÐÐ¾ÑÑÑÐ¿ Ðº Ð¾Ð±ÑÐµÐ¼Ñ ÑÐµÑÑÑÑÑ Ð´Ð»Ñ %1$s Ð·Ð°Ð¿ÑÐµÑÐµÐ½ ÐÐ°Ð³ÑÑÐ·ÐºÐ° - ÑÐ¾Ð»ÑÐºÐ¾ ÑÑÐ¾ + Ð¿Ð°ÑÑ ÑÐµÐºÑÐ½Ð´ Ð½Ð°Ð·Ð°Ð´ ÐÐ´ÐµÑÑ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½ÐµÑ. ÐÐ°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ! ÐÐ°Ð³ÑÑÐ·ÐºÐ°... - Ð Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ Ð½ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð². - Ð¿Ð°Ð¿ÐºÐ° - Ð¿Ð°Ð¿ÐºÐ¸ + Ð ÑÑÐ¾Ð¼ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ðµ Ð½ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð². + ÐºÐ°ÑÐ°Ð»Ð¾Ð³ + ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ ÑÐ°Ð¹Ð» ÑÐ°Ð¹Ð»Ñ ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÑÐ°Ð¹Ð» Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸. @@ -77,7 +77,7 @@ ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ°Ð¹Ð» Ð¤Ð°Ð¹Ð» Ð±ÑÐ» Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½ Ð² %1$s Ð²Ð¾ Ð²ÑÐµÐ¼Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÐÐ¾Ð´ÐµÐ»Ð¸ÑÑÑÑ ÑÑÑÐ»ÐºÐ¾Ð¹ - Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÑÐ»ÐºÑ + Ð£Ð±ÑÐ°ÑÑ ÑÑÑÐ»ÐºÑ ÐÐ° ÐÐµÑ ÐÐ @@ -86,68 +86,68 @@ ÐÑÐ¼ÐµÐ½Ð° Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸ Ð²ÑÐ¹ÑÐ¸ ÐÑÐ¸Ð±ÐºÐ° - ÐÐ´ÑÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ°... + ÐÐ°Ð³ÑÑÐ·ÐºÐ° ... ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¡Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ - ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸Ð·... - ÐÐ¼Ñ Ð¿Ð°Ð¿ÐºÐ¸ - ÐÐ°Ð³ÑÑÐ·ÐºÐ°... - %1$d%% Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ %2$s + ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸Ð· ... + ÐÐ¼Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð° + ÐÐ°Ð³ÑÑÐ·ÐºÐ° ... + %1$d%% ÐÐ°Ð³ÑÑÐ¶Ð°ÐµÑÑÑ %2$s ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° %1$s Ð±ÑÐ» ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½ ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÐÐ°Ð³ÑÑÐ·ÐºÐ° %1$s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° - ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð½Ðµ ÑÐ´Ð°Ð»Ð°ÑÑ, ÐÐ°Ð¼ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑÐµÐ¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ - Ð¡ÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ... - %1$d%% ÑÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ñ %2$s + ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð½Ðµ ÑÐ´Ð°Ð»Ð°ÑÑ, Ð½ÑÐ¶Ð½Ð¾ Ð·Ð°Ð½Ð¾Ð²Ð¾ Ð²Ð¾Ð¹ÑÐ¸ Ð² ÑÐ²Ð¾Ñ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ + Ð¡ÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ ... + %1$d%% Ð¡ÐºÐ°ÑÐ¸Ð²Ð°ÐµÑÑÑ %2$s Ð¡ÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾ %1$s ÑÑÐ¿ÐµÑÐ½Ð¾ ÑÐºÐ°ÑÐ°Ð½ Ð¡ÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¡ÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ %1$s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾ ÐÑÑ Ð½Ðµ ÑÐºÐ°ÑÐ°Ð½Ð¾ - Ð¡ÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ, ÐÐ°Ð¼ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑÐµÐ¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ + Ð¡ÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ, Ð½ÑÐ¶Ð½Ð¾ Ð·Ð°Ð½Ð¾Ð²Ð¾ Ð²Ð¾Ð¹ÑÐ¸ Ð² ÑÐ²Ð¾Ñ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ñ Ð¿ÑÐ¾ÑÐ»Ð° Ð½ÐµÑÐ´Ð°ÑÐ½Ð¾ - Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ñ Ð½Ðµ ÑÐ´Ð°Ð»Ð°ÑÑ, ÐÐ°Ð¼ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑÐµÐ¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ + Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ñ Ð½Ðµ ÑÐ´Ð°Ð»Ð°ÑÑ, Ð½ÑÐ¶Ð½Ð¾ Ð·Ð°Ð½Ð¾Ð²Ð¾ Ð²Ð¾Ð¹ÑÐ¸ Ð² ÑÐ²Ð¾Ñ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ñ %1$s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ %1$s ÐÐ±Ð½Ð°ÑÑÐ¶ÐµÐ½Ñ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑ - %1$d ÑÐ°Ð¹Ð»Ñ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ñ + %1$d ÑÐ°Ð¹Ð»Ð¾Ð² Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ°Ð¹Ð»Ñ Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ %1$d ÑÐ°Ð¹Ð»Ð¾Ð² Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ (ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ¾Ð²: %2$d) - ÐÐµÑÐºÐ¾Ð»ÑÐºÐ¾ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² Ð±ÑÐ»Ð¸ Ð·Ð°Ð±ÑÑÑ - ÐÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ %1$d ÑÐ°Ð¹Ð»Ñ Ð¸Ð· %2$s Ð¿Ð°Ð¿ÐºÐ¸ - ÐÐ°ÑÐ¸Ð½Ð°Ñ Ñ Ð²ÐµÑÑÐ¸Ð¸ 1.3.16, ÑÐ°Ð¹Ð»Ñ, Ð·Ð°Ð³ÑÑÐ¶Ð°ÐµÐ¼ÑÐµ Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, ÐºÐ¾Ð¿Ð¸ÑÑÑÑÑÑ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ %1$s, ÑÑÐ¾Ð±Ñ Ð¿ÑÐµÐ´Ð¾ÑÐ²ÑÐ°ÑÐ¸ÑÑ Ð¿Ð¾ÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð¿ÑÐ¸ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ð¸ ÑÐ°Ð¹Ð»Ð° Ñ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ð¼Ð¸ ÑÑÑÑÐ½ÑÐ¼Ð¸ Ð·Ð°Ð¿Ð¸ÑÑÐ¼Ð¸.\n\nÐÐ¾ÑÑÐ¾Ð¼Ñ Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð½ÑÐµ Ð¿ÑÐµÐ´ÑÐ´ÑÑÐ¸Ð¼Ð¸ Ð²ÐµÑÑÐ¸ÑÐ¼Ð¸ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ, Ð±ÑÐ»Ð¸ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ñ Ð² Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ %2$s. ÐÐ´Ð½Ð°ÐºÐ¾, Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ð¸ ÑÑÐ¾-ÑÐ¾ Ð¿Ð¾Ð¼ÐµÑÐ°Ð»Ð¾ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ ÑÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ. Ð¢ÐµÐ¿ÐµÑÑ Ð¼Ð¾Ð¶Ð½Ð¾ Ð»Ð¸Ð±Ð¾ Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÑÐ°Ð¹Ð»Ñ ÐºÐ°Ðº ÐµÑÑÑ Ð¸ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÑÐ»ÐºÑ Ð½Ð° %3$s, Ð»Ð¸Ð±Ð¾ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð¸Ñ Ð² %1$s Ð¸ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÑÐ»ÐºÑ Ð½Ð° %4$s.\n\nÐÐ¸Ð¶Ðµ Ð¿ÐµÑÐµÑÐ¸ÑÐ»ÐµÐ½Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð¸ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²ÑÑÑÐ¸Ðµ Ð¸Ð¼ ÑÐ´Ð°Ð»ÑÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð² %5$s, Ðº ÐºÐ¾ÑÐ¾ÑÑÐ¼ Ð¾Ð½Ð¸ Ð¿ÑÐ¸Ð²ÑÐ·Ð°Ð½Ñ. + ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð½Ðµ Ð±ÑÐ»Ð¸ Ð¿ÐµÑÐµÐ½ÐµÑÐµÐ½Ñ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÑ Ð¿Ð°Ð¿ÐºÑ + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ %1$d ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸Ð· Ð¿Ð°Ð¿ÐºÐ¸ %2$s + ÐÐ°ÑÐ¸Ð½Ð°Ñ Ñ Ð²ÐµÑÑÐ¸Ð¸ 1.3.16, ÑÐ°Ð¹Ð»Ñ, Ð·Ð°Ð³ÑÑÐ¶Ð°ÐµÐ¼ÑÐµ Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, ÐºÐ¾Ð¿Ð¸ÑÑÑÑÑÑ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ %1$s, ÑÑÐ¾Ð±Ñ Ð¿ÑÐµÐ´Ð¾ÑÐ²ÑÐ°ÑÐ¸ÑÑ Ð¿Ð¾ÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð¿ÑÐ¸ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ð¸ ÑÐ°Ð¹Ð»Ð° Ñ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ð¼Ð¸ ÑÑÑÑÐ½ÑÐ¼Ð¸ Ð·Ð°Ð¿Ð¸ÑÑÐ¼Ð¸.\n\nÐÐ¾ÑÑÐ¾Ð¼Ñ Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð½ÑÐµ Ð¿ÑÐµÐ´ÑÐ´ÑÑÐ¸Ð¼Ð¸ Ð²ÐµÑÑÐ¸ÑÐ¼Ð¸ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ, Ð±ÑÐ»Ð¸ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ñ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ %2$s. ÐÐ´Ð½Ð°ÐºÐ¾, Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ð¸ ÑÑÐ¾-ÑÐ¾ Ð¿Ð¾Ð¼ÐµÑÐ°Ð»Ð¾ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ ÑÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ. ÐÐ¾Ð¶ÐµÑÐµ Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÑÐ°Ð¹Ð»Ñ ÐºÐ°Ðº ÐµÑÑÑ Ð¸ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÑÐ»ÐºÑ Ð½Ð° %3$s, Ð»Ð¸Ð±Ð¾ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð¸Ñ Ð² %1$s Ð¸ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÑÐ»ÐºÑ Ð½Ð° %4$s.\n\nÐÐ¸Ð¶Ðµ Ð¿ÐµÑÐµÑÐ¸ÑÐ»ÐµÐ½Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð¸ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²ÑÑÑÐ¸Ðµ Ð¸Ð¼ ÑÐ´Ð°Ð»ÑÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð² %5$s, Ðº ÐºÐ¾ÑÐ¾ÑÑÐ¼ Ð¾Ð½Ð¸ Ð¿ÑÐ¸Ð²ÑÐ·Ð°Ð½Ñ. ÐÐ°ÑÐ°Ð»Ð¾Ð³ %1$s Ð±Ð¾Ð»ÑÑÐµ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð²ÑÑ ÐÑÐµ ÑÐ°Ð¹Ð»Ñ Ð±ÑÐ»Ð¸ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ñ ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ°Ð¹Ð»Ñ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ñ - ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¾: %1$s - Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð¾: %1$s - ÐÐ»Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² Ð² Ð¿Ð°Ð¿ÐºÑ %1$s Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ°. Ð¡ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² Ð´ÑÑÐ³Ð¾Ðµ Ð¼ÐµÑÑÐ¾? - ÐÑÑÐ°Ð²ÑÑÐµ App PIN - ÐÐ²ÐµÐ´Ð¸ÑÐµ App PIN - PIN-ÐºÐ¾Ð´ Ð±ÑÐ´ÐµÑ Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÑÑÑÑ Ð¿ÑÐ¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ Ð·Ð°Ð¿ÑÑÐºÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ. - ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð²Ð²Ð¾Ð´ App PIN - Ð£Ð´Ð°Ð»Ð¸ÑÑ App PIN - ÐÐ²ÐµÐ´ÑÐ½Ð½ÑÐµ App PIN Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ - ÐÐµÐ²ÐµÑÐ½ÑÐ¹ App PIN - App PIN ÑÐ´Ð°Ð»ÑÐ½ - App PIN ÑÐ¾ÑÑÐ°Ð½ÑÐ½ + ÐÐ¾ÐºÐ°Ð»ÑÐ½ÑÐµ: %1$s + Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐµ: %1$s + ÐÐ»Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ %1$s Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ°. Ð¡ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² Ð´ÑÑÐ³Ð¾Ðµ Ð¼ÐµÑÑÐ¾? + Ð£ÐºÐ°Ð¶Ð¸ÑÐµ PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ + ÐÐ²ÐµÐ´Ð¸ÑÐµ PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ + PIN Ð±ÑÐ´ÐµÑ Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÑÑÑÑ Ð¿ÑÐ¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ Ð·Ð°Ð¿ÑÑÐºÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ. + ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð²Ð²Ð¾Ð´ PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ + Ð£Ð´Ð°Ð»Ð¸ÑÑ PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ + ÐÐ²ÐµÐ´ÑÐ½Ð½ÑÐµ PIN Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ + ÐÐµÐ²ÐµÑÐ½ÑÐ¹ PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ + PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÑÐ´Ð°Ð»ÑÐ½ + PIN Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÑÐ¾ÑÑÐ°Ð½ÑÐ½ %1$s Ð°ÑÐ´Ð¸Ð¾Ð¿Ð»ÐµÐµÑ %1$s (Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÐµÑÑÑ) %1$s (Ð·Ð°Ð³ÑÑÐ¶Ð°ÐµÑÑÑ) %1$s Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾ - ÐÐµÐ´Ð¸Ð°ÑÐ°Ð¹Ð»Ð¾Ð² Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ - Ð£ÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð° + ÐÐµÐ´Ð¸Ð°ÑÐ°Ð¹Ð»Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ + Ð£ÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð° Ð¤Ð°Ð¹Ð» Ð² Ð½ÐµÐ²ÐµÑÐ½Ð¾Ð¹ ÑÑÑÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÐºÐ¾Ð´ÐµÐº ÐÐµÐ´Ð¸Ð°ÑÐ°Ð¹Ð» Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½ ÐÐµÐ´Ð¸Ð°ÑÐ°Ð¹Ð» Ð½ÐµÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾ Ð·Ð°ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²Ð°Ð½ - ÐÑÐµÐ¼Ñ Ð¿Ð¾Ð¿ÑÑÐ¾Ðº Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð²ÑÑÐ»Ð¾ + ÐÑÑÐµÐºÐ»Ð¾ Ð²ÑÐµÐ¼Ñ Ð¿Ð¾Ð¿ÑÑÐºÐ¸ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ³Ð°Ð½Ð¸Ð·Ð¾Ð²Ð°ÑÑ Ð¿Ð¾ÑÐ¾ÐºÐ¾Ð²ÑÑ Ð¿ÐµÑÐµÐ´Ð°ÑÑ Ð¼ÐµÐ´Ð¸Ð°ÑÐ°Ð¹Ð»Ð° ÐÐµÐ´Ð¸Ð°ÑÐ°Ð¹Ð» Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÐ¾Ð¸Ð³ÑÐ°Ð½ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¼ Ð¿Ð»ÐµÐµÑÐ¾Ð¼ ÐÑÐ¸Ð±ÐºÐ° Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ð¸ %1$s @@ -156,7 +156,7 @@ ÐÐµÑÐµÐ¼Ð¾ÑÐºÐ° Ð½Ð°Ð·Ð°Ð´ ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ Ð¿Ð°ÑÐ·Ð° ÐÐµÑÐµÐ¼Ð¾ÑÐºÐ° Ð²Ð¿ÐµÑÐµÐ´ - ÐÑÐ¾Ð¸ÑÑÐ¾Ð´Ð¸Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ..... + ÐÑÐ¿Ð¾Ð»Ð½ÑÐµÑÑÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ... ÐÐ¾Ð¿ÑÑÐºÐ° Ð²ÑÐ¾Ð´Ð°... ÐÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ðº ÑÐµÑÐ¸ ÐÐ°ÑÐ¸ÑÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾. @@ -171,23 +171,24 @@ Ð¡ÐµÑÐ²ÐµÑ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð¾Ð»Ð³Ð¾ Ð½Ðµ Ð¾ÑÐ²ÐµÑÐ°ÐµÑ ÐÐµÐ²ÐµÑÐ½ÑÐ¹ URL ÐÑÐ¸Ð±ÐºÐ° Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ SSL - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐ¸ÑÑ SSL-ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÑÐµÑÐ²ÐµÑÐ° + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐ¸ÑÑ SSL Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑÑ ÑÐµÑÐ²ÐµÑÐ° ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ ÑÐµÑÐ²ÐµÑÐ° - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ + ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ ÐÐ°ÑÐ¸ÑÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸Ð»Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ ÐÑÐ¸Ð±ÐºÐ° Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ Ð¡ÐµÑÐ²ÐµÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ Ð¾ÑÐºÐ°Ð·Ð°Ð» Ð² Ð´Ð¾ÑÑÑÐ¿Ðµ ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½ÑÐ¹ Ð¾ÑÐ²ÐµÑ; Ð²Ð²ÐµÐ´Ð¸ÑÐµ Ð°Ð´ÑÐµÑ ÑÐµÑÐ²ÐµÑÐ° ÐµÑÑ ÑÐ°Ð· ÐÑÐµÐ¼Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ Ð¸ÑÑÐµÐºÐ»Ð¾. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð°Ð²ÑÐ¾ÑÐ¸Ð·ÑÐ¹ÑÐµÑÑ ÑÐ½Ð¾Ð²Ð° - ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð²Ð²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ + ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐºÐ°Ð¶Ð¸ÑÐµ ÑÐµÐºÑÑÐ¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ ÐÑÐµÐ¼Ñ ÑÐµÑÑÐ¸Ð¸ Ð¸ÑÑÐµÐºÐ»Ð¾. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÐµÑÑ ÑÐ½Ð¾Ð²Ð° ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐµÑÐ²ÐµÑÑ Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸... Ð¡ÐµÑÐ²ÐµÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ Ð¼ÐµÑÐ¾Ð´ Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸ - %1$s Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ ÑÑÐ°Ð·Ñ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ - ÐÐ°Ñ ÑÐµÑÐ²ÐµÑ Ð½Ðµ Ð²Ð¾Ð·Ð²ÑÐ°ÑÐ°ÐµÑ ÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ð¹ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° ÑÐ²ÑÐ¶Ð¸ÑÐµÑÑ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼ + %1$s Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ + Ð¡ÐµÑÐ²ÐµÑ Ð²ÐµÑÐ½ÑÐ» Ð½ÐµÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ð¹ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ²ÑÐ¶Ð¸ÑÐµÑÑ Ñ Ð²Ð°ÑÐ¸Ð¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼ â¥ - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼ ÑÐµÑÐ²ÐµÑÐµ + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð¾Ð²Ð°ÑÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼ ÑÐµÑÐ²ÐµÑÐµ + ÐÐºÐºÐ°ÑÐ½Ñ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ ÐµÑÑ ÐÐ±Ð½Ð¾Ð²Ð»ÑÑÑ ÑÐ°Ð¹Ð» ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ Ð£Ð´Ð°Ð»Ð¸ÑÑ @@ -204,13 +205,13 @@ ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾ Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð» Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½ Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÑÐ°Ð¹Ð»Ð° ÑÐ¶Ðµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ - ÐÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¿Ð°Ð¿ÐºÑ + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ: / \\ < > : \" | ? * ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑÑÐ¼ ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ Ð½ÐµÐ¼Ð½Ð¾Ð³Ð¾ ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°; Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð» Ð¸Ð· Ð´ÑÑÐ³Ð¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¤Ð°Ð¹Ð»Ñ Ð½Ðµ Ð²ÑÐ±ÑÐ°Ð½Ñ - ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÑÑÐ»ÐºÑ... + ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÑÑÐ»ÐºÑ ... ÐÐ¾Ð¹ÑÐ¸ ÑÐµÑÐµÐ· oAuth2 ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐµÑÐ²ÐµÑÑ oAuth2... ÐÐ¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑÑ ÑÐ°Ð¹ÑÐ° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð° @@ -218,81 +219,87 @@ - Ð¡ÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° ÑÐµÑÐ²ÐµÑÐ° Ð¸ÑÑÑÐº - Ð¡ÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° ÑÐµÑÐ²ÐµÑÐ° ÐµÑÑ Ð½Ðµ Ð½Ð°ÑÐ°Ð»ÑÑ - URL Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÐµÑ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ ÑÐµÑÐ²ÐµÑÐ° Ð² ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐµ - ÐÑ ÑÐ¾ÑÐ¸ÑÐµ Ð´Ð¾Ð²ÐµÑÑÑÑ Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ Ð² Ð»ÑÐ±Ð¾Ð¼ ÑÐ»ÑÑÐ°Ðµ? + ÐÐ¾Ð²ÐµÑÑÑÑ ÑÑÐ¾Ð¼Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ Ð² Ð»ÑÐ±Ð¾Ð¼ ÑÐ»ÑÑÐ°Ðµ? Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¾ÑÑÐ°Ð½ÑÐ½ ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ Ð¡ÐºÑÑÑÑ - ÐÐ¾Ð¼Ñ Ð²ÑÐ´Ð°Ð½Ð¾: - ÐÐµÐ¼ Ð²ÑÐ´Ð°Ð½Ð¾: + ÐÐ¾Ð¼Ñ Ð²ÑÐ´Ð°Ð½: + ÐÐµÐ¼ Ð²ÑÐ´Ð°Ð½: ÐÐ¼Ñ: ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ: - ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ð¾Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ð´ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ: + ÐÐ¾Ð´ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ: Ð¡ÑÑÐ°Ð½Ð°: Ð¨ÑÐ°Ñ: ÐÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ: Ð¡ÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ: - ÐÐ·: - Ð: + Ð¡: + ÐÐ¾: ÐÐ¾Ð´Ð¿Ð¸ÑÑ: ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼: Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½. - - ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐµ Ð½ÐµÑ + - ÐÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐµ ÐÑÐ¾ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ñ placeholder.txt ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ PNG 389 ÐÐ 2012/05/18 12:23 PM 12:23:45 - ÐÐ°Ð³ÑÑÐ¶Ð°ÑÑ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµÑÐµÐ· Wi-Fi + ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµÑÐµÐ· Wi-Fi ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð²Ð¸Ð´ÐµÐ¾ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµÑÐµÐ· WiFi /InstantUpload ÐÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð» %s Ð½Ðµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½ Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¼. ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð·Ð°Ð¼ÐµÐ½Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð½Ð° ÑÐµÑÐ²ÐµÑÐµ. Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¾Ð±Ð° - ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ + ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÐ°ÑÑ ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ ÐÑÐ¾ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¾ - %1$s Ð½Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ñ Ð¿Ð°Ð¿ÐºÑ %2$s + %1$s Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ %2$s ÐÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ - Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÐµÑÐ²ÐµÑÐµ Ð¾ÑÐºÐ»ÑÑÐµÐ½ ÑÐ¾Ð²Ð¼ÐµÑÑÐ½ÑÐ¹ Ð´Ð¾ÑÑÑÐ¿. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ²ÑÐ¶Ð¸ÑÐµÑÑ Ñ Ð²Ð°ÑÐ¸Ð¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼. - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð¾Ð±ÑÐ¸Ð¹ Ð´Ð¾ÑÑÑÐ¿. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ, ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð»Ð¸ ÑÐ°Ð¹Ð» - ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±ÑÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÑÐ¾Ð¼Ñ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ±ÑÐ°ÑÑ Ð¸Ð· Ð¾Ð±ÑÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð°. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ, ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð»Ð¸ ÑÐ°Ð¹Ð» - ÐÑÐ¸Ð±ÐºÐ° ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±ÑÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÑÐ¾Ð¼Ñ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ + ÐÐµÑÐ°Ð½Ð¸Ð·Ð¼ Ð¾Ð±ÑÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð° Ð½Ðµ Ð²ÐºÐ»ÑÑÐµÐ½ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÑÐµÑÐ²ÐµÑÐµ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ²ÑÐ¶Ð¸ÑÐµÑÑ Ñ Ð²Ð°ÑÐ¸Ð¼ +â¥â¥Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼. + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð´ÐµÐ»Ð¸ÑÑÑÑ. Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ ÑÐ°Ð¹Ð» ÑÑÑÐµÑÑÐ²ÑÐµÑ + ÐÑÐ¸ Ð¿Ð¾Ð¿ÑÑÐºÐµ Ð¿Ð¾Ð´ÐµÐ»Ð¸ÑÑÑÑ ÑÑÐ¸Ð¼ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð¼ Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°ÐºÑÑÑÑ Ð´Ð¾ÑÑÑÐ¿. Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ ÑÑÐ¾ ÑÐ°Ð¹Ð» ÑÑÑÐµÑÑÐ²ÑÐµÑ + ÐÑÐ¸ Ð¿Ð¾Ð¿ÑÑÐºÐµ Ð·Ð°ÐºÑÑÑÑ Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÑÐ¾Ð¼Ñ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÑÐ»ÐºÑ Ð¡ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ Ð² Ð±ÑÑÐµÑ Ð¾Ð±Ð¼ÐµÐ½Ð° - ÐÑÐ¸ÑÐ¸ÑÐµÑÐºÐ°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸ + ÐÑÐ¸ÑÐ¸ÑÐµÑÐºÐ°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ ÐÑÐ¸ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¸ Ðº ÑÐµÑÐ²ÐµÑÑ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° - ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ ÑÐµÑÐ²ÐµÑÐ° Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°, Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° - ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ ÑÐµÑÐ²ÐµÑÐ° Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°, Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° - ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°, ÑÐµÑÐ²ÐµÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿ÐµÐ½ + ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ ÑÐµÑÐ²ÐµÑÐ° Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°, Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¾ + ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ ÑÐµÑÐ²ÐµÑÐ° Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°, Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¾ + ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¾, ÑÐµÑÐ²ÐµÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿ÐµÐ½ - Ð£ Ð²Ð°Ñ Ð½ÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° %s - Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð» - ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð» - Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð» - Ð¾ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° - ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ°Ð¹Ð» - Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð² ÑÑÑ Ð¿Ð°Ð¿ÐºÑ + Ð£ Ð²Ð°Ñ Ð½ÐµÑ Ð¿ÑÐ°Ð² %s + Ð´Ð»Ñ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° + Ð´Ð»Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° + Ð´Ð»Ñ Ð¾ÑÐºÑÑÑÐ¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÑÐ¾Ð¼Ñ ÑÐ°Ð¹Ð»Ñ + Ð´Ð»Ñ Ð·Ð°ÐºÑÑÑÐ¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÑÐ¾Ð¼Ñ ÑÐ°Ð¹Ð»Ñ + Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÐ°Ð¹Ð»Ð° + Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð² ÑÑÐ¾Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ ÐÑÐ¾Ñ ÑÐ°Ð¹Ð» Ð±Ð¾Ð»ÑÑÐµ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð½Ð° ÑÐµÑÐ²ÐµÑÐµ Ð£ÑÑÑÐ½ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ - ÐÐ°ÑÐ¸ÑÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾ Ð½ÐµÐ·Ð°ÑÐ¸ÑÑÐ½Ð½Ð¾Ð¼Ñ Ð¼Ð°ÑÑÑÑÑÑ + ÐÐ°ÑÐ¸ÑÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾ Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð¼Ñ Ð¼Ð°ÑÑÑÑÑÑ ÐÑÑÐ½Ð°Ð»Ñ ÐÑÑÐ¾ÑÐ¸Ñ ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ð¹ + ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¶ÑÑÐ½Ð°Ð»Ð° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾. Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ Ð¿Ð¾ÑÑÐ¾Ð²Ð¾Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ! + ÐÑÑÐ½Ð°Ð»Ñ %1$s Ð´Ð»Ñ Android + ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð´Ð°Ð½Ð½ÑÑâ¦ Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ - ÐÐ´ÐµÑÑ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½ÐµÑ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð¿Ð°Ð¿ÐºÑ! + ÐÐ´ÐµÑÑ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½ÐµÑ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³! ÐÑÐ±ÑÐ°ÑÑ - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ, ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð»Ð¸ ÑÐ°Ð¹Ð» - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð¿Ð°Ð¿ÐºÑ Ð² Ð¿Ð°Ð¿ÐºÑ-Ð¿Ð¾ÑÐ¾Ð¼Ð¾Ðº - Ð¤Ð°Ð¹Ð» ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð² Ð¿Ð°Ð¿ÐºÐµ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ - ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð¿ÑÑÐºÐµ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¸ - Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð» + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ. Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ ÑÐ°Ð¹Ð» ÑÑÑÐµÑÑÐ²ÑÐµÑ + ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð² ÐµÐ³Ð¾ Ð¿Ð¾Ð´ÐºÐ°ÑÐ°Ð»Ð¾Ð³ + Ð¤Ð°Ð¹Ð» ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ðµ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ + ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð¿ÑÑÐºÐµ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð¸Ð»Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð° + Ð´Ð»Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° ÐÐ³Ð½Ð¾Ð²ÐµÐ½Ð½ÑÐµ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ ÐÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÐÐ¸Ð´ÐµÐ¾ + ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¿Ð°Ð¿ÐºÐ¸ %1$s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° + %1$s Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð¸Ð» Ð²Ð°Ð¼ Ð´Ð¾ÑÑÑÐ¿ Ðº \"%2$s\" diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml index 1566dede..9a70c227 100644 --- a/res/values-sk-rSK/strings.xml +++ b/res/values-sk-rSK/strings.xml @@ -187,6 +187,7 @@ VÃ¡Å¡ server nevracia sprÃ¡vne pouÅ¾ÃvateÄ¾skÃ© id, kontaktujte prosÃm sprÃ¡vcu systÃ©mu Nie je moÅ¾nÃ© vykonaÅ¥ autentifikÃ¡ciu na server + ÃÄet zatiaÄ¾ v zariadenÃ neexistuje UdrÅ¾iavaÅ¥ sÃºbor aktuÃ¡lny. Premenuj Odober @@ -282,6 +283,9 @@ ZabezpeÄenÃ© pripojenie je presmerovanÃ© na nezabezpeÄenÃº trasu. Logy OdoslaÅ¥ histÃ³riu + Nebola nÃ¡jdenÃ¡ aplikÃ¡cia pre odosielanie log protokolov. NainÅ¡talujte si mailovÃº aplikÃ¡ciu! + %1$s Android app logs + NaÄÃtavam dÃ¡ta... VyÅ¾aduje sa overenie NesprÃ¡vne heslo PresunÃºÅ¥ @@ -294,4 +298,7 @@ pre presun tohoto sÃºboru OkamÅ¾itÃ© nahratie ZabezpeÄenie + Cesta pre nahrÃ¡vanie videÃ + SÅ¥ahovanie %1$s prieÄinka nebolo dokonÄenÃ© + %1$s vÃ¡m zdieÄ¾a â%2$sâ diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 731bd67f..3f99fb3b 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -298,4 +298,6 @@ TakojÅ¡nje poÅ¡iljanje v oblak Varnost Pot videa za poÅ¡iljanje + Imenika %1$s ni mogoÄe prejeti v celoti + Uporabnik %1$s je omogoÄil souporabo \"%2$s\". diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml index b5d14f16..41e12381 100644 --- a/res/values-sr-rSP/strings.xml +++ b/res/values-sr-rSP/strings.xml @@ -2,6 +2,7 @@ PoÅ¡alji Fajlovi + Novi direktorijum PodeÅ¡avanja Detaljnije PoÅ¡alji @@ -22,14 +23,18 @@ VeliÄina: Tip: Preuzmi + Podeli preÄicu Da Ne Ok + OtkaÅ¾i otpremanje OtkaÅ¾i GreÅ¡ka + Nepoznata greÅ¡ka Izmeni lozinku Ukloni nalog Novi nalog + Ime fascikle Otpremanje... UspeÅ¡no otpremljeno Otpremanje nije uspelo diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index b9235ad7..3311ba24 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -1,116 +1,293 @@ + %1$s ÐÐ½Ð´ÑÐ¾Ð¸Ð´ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐ° + Ð²ÐµÑÐ·Ð¸ÑÐ° %1$s + ÐÑÐ²ÐµÐ¶Ð¸ Ð½Ð°Ð»Ð¾Ð³ ÐÑÐ¿ÑÐµÐ¼Ð¸ - Ð¡Ð°Ð´ÑÐ¶Ð°Ñ ÑÐ° Ð´ÑÑÐ³Ð¸Ñ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐ° - ÐÐ°ÑÐ¾ÑÐµÐºÐµ + Ð¡Ð°Ð´ÑÐ¶Ð°Ñ Ð¸Ð· Ð´ÑÑÐ³Ð¸Ñ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐ° + Ð¤Ð°ÑÐ»Ð¾Ð²Ð¸ + ÐÑÐ²Ð¾ÑÐ¸ Ð¿Ð¾Ð¼Ð¾ÑÑ + ÐÐ¾Ð²Ð° ÑÐ°ÑÑÐ¸ÐºÐ»Ð° ÐÐ¾ÑÑÐ°Ð²ÐºÐµ + ÐÐµÑÐ°ÑÐ¸ ÐÐ¾ÑÐ°ÑÐ¸ + Ð Ð°Ð·Ð²ÑÑÑÐ°Ñ + Ð Ð°Ð·Ð²ÑÑÑÐ°Ð²Ð°ÑÐµ + + A-Z + Ð½Ð¾Ð²Ð¸ÑÐ¸ - ÑÑÐ°ÑÐ¸ÑÐ¸ + ÐÐ¿ÑÑÐµ ÐÐ¸ÑÐµ ÐÐ°Ð»Ð¾Ð·Ð¸ + Ð£Ð¿ÑÐ°Ð²ÑÐ°ÑÐµ Ð½Ð°Ð»Ð¾Ð·Ð¸Ð¼Ð° + ÐÐÐ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ + ÐÐ°ÑÑÐ¸ÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ + Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ ÑÐ¾ÑÐ¾Ð³ÑÐ°ÑÐ¸ÑÐ° + Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¾ÑÐ¿ÑÐµÐ¼Ð°Ñ ÑÐ¾ÑÐ¾Ð³ÑÐ°ÑÐ¸ÑÐµ ÑÐ»Ð¸ÐºÐ°Ð½Ðµ ÐºÐ°Ð¼ÐµÑÐ¾Ð¼ + Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ Ð²Ð¸Ð´ÐµÐ° + Ð¢ÑÐµÐ½ÑÑÐ½Ð¾ Ð¾ÑÐ¿ÑÐµÐ¼Ð°Ñ Ð²Ð¸Ð´ÐµÐ¾ ÑÐ½Ð¸Ð¼ÑÐµÐ½ ÐºÐ°Ð¼ÐµÑÐ¾Ð¼ + Ð£ÐºÑÑÑÐ¸ Ð±ÐµÐ»ÐµÐ¶ÐµÑÐµ + ÐÐ²Ð¾ ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐ¸ Ð·Ð° Ð±ÐµÐ»ÐµÐ¶ÐµÑÐµ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð° + ÐÑÑÐ¾ÑÐ¸ÑÐ°Ñ Ð±ÐµÐ»ÐµÐ¶ÐµÑÐ° + ÐÐ²Ð¾ Ð¿ÑÐ¸ÐºÐ°Ð·ÑÑÐµ ÑÐ°ÑÑÐ²Ð°Ð½Ðµ Ð·Ð°Ð¿Ð¸ÑÐ½Ð¸ÐºÐµ + ÐÐ±ÑÐ¸ÑÐ¸ Ð¸ÑÑÐ¾ÑÐ¸ÑÐ°Ñ ÐÐ¾Ð¼Ð¾Ñ + ÐÑÐµÐ¿Ð¾ÑÑÑÐ¸ Ð¿ÑÐ¸ÑÐ°ÑÐµÑÑ + ÐÐ°ÑÐµ Ð¼Ð¸ÑÑÐµÑÐµ + ÐÐ¸Ð³ + Ð£Ð¿Ð°Ð¼ÑÐ¸ Ð»Ð¾ÐºÐ°ÑÐ¸ÑÑ Ð´ÐµÑÐµÑÐ° + ÐÐ°Ð¼ÑÐ¸ Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑ Ð»Ð¾ÐºÐ°ÑÐ¸ÑÑ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ° Ð´ÐµÑÐµÑÐ° + ÐÑÐ¾Ð±Ð°ÑÑÐµ %1$s Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÐµÐ»ÐµÑÐ¾Ð½Ñ! + ÐÑÐµÐ´Ð»Ð°Ð¶ÐµÐ¼ Ð²Ð°Ð¼ Ð´Ð° Ð¿ÑÐ¾Ð±Ð°ÑÐµ %1$s Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÐµÐ»ÐµÑÐ¾Ð½Ñ!\nÐÑÐµÑÐ·Ð¼Ð¸ÑÐµ Ð¾Ð²Ð´Ðµ: %2$s + ÐÑÐ¾Ð²ÐµÑÐ¸ ÑÐµÑÐ²ÐµÑ + ÐÐ´ÑÐµÑÐ° ÑÐµÑÐ²ÐµÑÐ° https://â¦ ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¾ Ð¸Ð¼Ðµ ÐÐ¾Ð·Ð¸Ð½ÐºÐ° + ÐÐ¾Ð² Ð²Ð°Ð¼ ÑÐµ %1$s? Ð¤Ð°ÑÐ»Ð¾Ð²Ð¸ - ÐÐ¾Ð²ÐµÐ¶Ð¸ Ð¼Ðµ + ÐÐ¾Ð²ÐµÐ¶Ð¸ ÑÐµ ÐÑÐ¿ÑÐµÐ¼Ð¸ + ÐÐ·Ð°Ð±ÐµÑÐ¸ÑÐµ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ°: ÐÐµÐ¼Ð° Ð½Ð°Ð»Ð¾Ð³Ð° + ÐÐµÐ¼Ð° %1$s Ð½Ð°Ð»Ð¾Ð³Ð° Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÑÐµÑÐ°ÑÑ. ÐÑÐ²Ð¾ Ð¿Ð¾Ð´ÐµÑÐ¸ÑÐµ Ð½Ð°Ð»Ð¾Ð³. ÐÐ¾Ð´ÐµÑÐ¸ - ÐÐ·Ð°ÑÐ¸ + ÐÐ°Ð¿ÑÑÑÐ¸ ÐÐµÐ¼Ð° ÑÐ°Ð´ÑÐ¶Ð°ÑÐ° Ð·Ð° Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ - Ð¡Ð°Ð´ÑÐ¶Ð°Ñ Ð½Ð¸ÑÐµ Ð¿ÑÐ¸Ð¼ÑÐµÐ½. ÐÐµÐ¼Ð° Ð½Ð¸ÑÑÐ° Ð´Ð° ÑÐµ Ð¾ÑÐ¿ÑÐµÐ¼Ð¸. + Ð¡Ð°Ð´ÑÐ¶Ð°Ñ Ð½Ð¸ÑÐµ Ð¿ÑÐ¸Ð¼ÑÐµÐ½. ÐÐµÐ¼Ð° ÑÑÐ° Ð´Ð° ÑÐµ Ð¾ÑÐ¿ÑÐµÐ¼Ð¸. ÐÑÐ¿ÑÐµÐ¼Ð°ÑÐµ - Ð¿ÑÐµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑÐ½Ð´Ð¸ + Ð¿ÑÐµ Ð¿Ð°Ñ ÑÐµÐºÑÐ½Ð´Ð¸ ÐÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸ÑÐµÐ³. ÐÑÐ¿ÑÐµÐ¼Ð¸ÑÐµ Ð½ÐµÑÑÐ¾! - ÐÐ¾Ð´Ð¸ÑÐ½Ð¸ÑÐµ Ð´Ð°ÑÐ¾ÑÐµÐºÑ ÑÐ°Ð´Ð¸ Ð¿ÑÐ¸ÐºÐ°Ð·Ð° Ð´Ð¾Ð´Ð°ÑÐ½Ð¸Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ°. + Ð£ÑÐ¸ÑÐ°Ð²Ð°Ð¼ + ÐÐµÐ¼Ð° ÑÐ°ÑÐ»Ð¾Ð²Ð° Ñ Ð¾Ð²Ð¾Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸. + Ð¢Ð°Ð¿Ð½Ð¸ÑÐµ Ð½Ð° ÑÐ°ÑÐ» ÑÐ°Ð´Ð¸ Ð¿ÑÐ¸ÐºÐ°Ð·Ð° Ð´Ð¾Ð´Ð°ÑÐ½Ð¸Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ°. ÐÐµÐ»Ð¸ÑÐ¸Ð½Ð°: ÐÑÑÑÐ°: - ÐÐ°Ð¿ÑÐ°Ð²ÑÐµÐ½Ð¾: - ÐÐ·Ð¼ÐµÑÐµÐ½Ð¾: + ÐÐ°Ð¿ÑÐ°Ð²ÑÐµÐ½: + ÐÐ·Ð¼ÐµÑÐµÐ½: ÐÑÐµÑÐ·Ð¼Ð¸ - ÐÑÐ²ÐµÐ¶Ð¸ Ð´Ð°ÑÐ¾ÑÐµÐºÑ + ÐÑÐ²ÐµÐ¶Ð¸ ÑÐ°ÑÐ» + Ð¤Ð°ÑÐ» ÑÐµ Ð¿ÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½ Ñ %1$s ÑÐ¾ÐºÐ¾Ð¼ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ° + ÐÐµÐ·Ð° Ð´ÐµÑÐµÑÐ° + ÐÐµ Ð´ÐµÐ»Ð¸ Ð²ÐµÐ·Ð¾Ð¼ ÐÐ° ÐÐµ Ð£ ÑÐµÐ´Ñ - ÐÐ±ÑÑÑÐ°Ð²Ð¸ Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ - ÐÑÐµÐºÐ¸Ð½Ð¸ ÑÐ»Ð°ÑÐµ + ÐÑÐºÐ°Ð¶Ð¸ Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ + ÐÑÐºÐ°Ð¶Ð¸ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ ÐÑÐºÐ°Ð¶Ð¸ Ð¡Ð°ÑÑÐ²Ð°Ñ Ð¸ Ð¸Ð·Ð°ÑÐ¸ ÐÑÐµÑÐºÐ° + Ð£ÑÐ¸ÑÐ°Ð²Ð°Ð¼... + ÐÐµÐ¿Ð¾Ð·Ð½Ð°ÑÐ° Ð³ÑÐµÑÐºÐ° Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ ÐÐ·Ð¼ÐµÐ½Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ ÐÐ±ÑÐ¸ÑÐ¸ Ð½Ð°Ð»Ð¾Ð³ ÐÑÐ²Ð¾ÑÐ¸ Ð½Ð°Ð»Ð¾Ð³ ÐÑÐ¿ÑÐµÐ¼Ð¸ Ð¸Ð·â¦ + ÐÐ°Ð·Ð¸Ð² ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ ÐÑÐ¿ÑÐµÐ¼Ð°Ð¼â¦ %1$d%% ÐÑÐ¿ÑÐµÐ¼Ð°Ð¼ %2$s ÐÑÐ¿ÑÐµÐ¼Ð°ÑÐµ ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ + %1$s ÑÐµ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð¾ÑÐ¿ÑÐµÐ¼ÑÐµÐ½ ÐÑÐ¿ÑÐµÐ¼Ð°ÑÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ - ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´Ð¾Ð²ÑÑÐ¸Ð¼ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ %1$s + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´Ð¾Ð²ÑÑÐ¸Ð¼ Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ %1$s + ÐÑÐ¿ÑÐµÐ¼Ð°ÑÐµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾. ÐÐ¾Ð½Ð¾Ð²Ð¾ ÑÐµ Ð¿ÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ. ÐÑÐµÑÐ·Ð¸Ð¼Ð°Ð¼â¦ %1$d%% ÐÑÐµÑÐ·Ð¸Ð¼Ð°Ð¼ %2$s ÐÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ ÑÑÐ¿ÐµÑÐ½Ð¾ %1$s ÑÐµ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð¿ÑÐµÑÐ·ÐµÑ ÐÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ - ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´Ð¾Ð²ÑÑÐ¸Ð¼ Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ %1$s + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´Ð¾Ð²ÑÑÐ¸Ð¼ Ð¿ÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ %1$s ÐÐ¾Ñ ÑÐ²ÐµÐº Ð½Ð¸ÑÐµ Ð¿ÑÐµÑÐ·ÐµÑÐ¾ - ÐÐ·Ð°Ð±ÐµÑÐ¸ Ð½Ð°Ð»Ð¾Ð³ + ÐÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾. ÐÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ ÑÐµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ + ÐÐ·Ð°Ð±ÐµÑÐ¸ÑÐµ Ð½Ð°Ð»Ð¾Ð³ Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¾Ð²Ð°ÑÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ - ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´Ð¾Ð²ÑÑÐ¸Ð¼ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸ÑÑ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ %1$s - Ð¡Ð²Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ ÑÑ Ð¿Ð¾Ð¼ÐµÑÐµÐ½Ðµ - ÐÐµÐºÐµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÑ Ð¼Ð¾Ð³Ð»Ðµ Ð±Ð¸ÑÐ¸ Ð¿Ð¾Ð¼ÐµÑÐµÐ½Ðµ - Ð£Ð½ÐµÑÐ¸ÑÐµ PIN Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ - Ð¡Ð° ÑÐ²Ð°ÐºÐ¸Ð¼ Ð¿Ð¾ÐºÑÐµÑÐ°ÑÐµÐ¼ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ Ð¼Ð¾ÑÐ°ÑÐµÑÐµ Ð´Ð° ÑÐ½ÐµÑÐµÑÐµ PIN + Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¾Ð²Ð°ÑÐµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾. ÐÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ ÑÐµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´Ð¾Ð²ÑÑÐ¸Ð¼ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸ÑÑ %1$s + ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð·Ð° %1$s + ÐÐ¾ÑÑÐ¾ÑÐµ ÑÑÐºÐ¾Ð±Ð¸ + ÐÐ´ Ð²ÐµÑÐ·Ð¸ÑÐµ 1.3.16, ÑÐ°ÑÐ»Ð¾Ð²Ð¸ Ð¾ÑÐ¿ÑÐµÐ¼ÑÐµÐ½Ð¸ ÑÐ° ÑÑÐµÑÐ°ÑÐ° ÑÐµ ÐºÐ¾Ð¿Ð¸ÑÐ°ÑÑ Ñ Ð»Ð¾ÐºÐ°Ð»Ð½Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ %1$s Ð´Ð° Ð±Ð¸ ÑÐµ ÑÐ¿ÑÐµÑÐ¸Ð¾ Ð³ÑÐ±Ð¸ÑÐ°Ðº Ð¿Ð¾Ð´Ð°ÑÐ°ÐºÐ° ÐºÐ°Ð´Ð° ÑÐµ Ð¸ÑÑÐ¸ ÑÐ°ÑÐ» ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·ÑÑÐµ ÑÐ° Ð²Ð¸ÑÐµ Ð½Ð°Ð»Ð¾Ð³Ð°.\n\nÐÐ±Ð¾Ð³ Ð¾Ð²Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ, ÑÐ²Ð¸ ÑÐ°ÑÐ»Ð¾Ð²Ð¸ Ð¾ÑÐ¿ÑÐµÐ¼ÑÐµÐ½Ð¸ ÑÐ° Ð¿ÑÐµÑÑÐ¾Ð´Ð½Ð¸Ð¼ Ð²ÐµÑÐ·Ð¸ÑÐ°Ð¼Ð° Ð¾Ð²Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ ÑÐµ ÐºÐ¾Ð¿Ð¸ÑÐ°ÑÑ Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ %2$s. ÐÐµÑÑÑÐ¸Ð¼, Ð³ÑÐµÑÐºÐ° ÑÐµ Ð¾Ð½ÐµÐ¼Ð¾Ð³ÑÑÐ¸Ð»Ð° Ð´Ð¾Ð²ÑÑÐ°Ð²Ð°ÑÐµ Ð¾Ð²Ðµ ÑÐ°Ð´ÑÐµ ÑÐ¾ÐºÐ¾Ð¼ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸ÑÐµ Ð½Ð°Ð»Ð¾Ð³Ð°. ÐÐ¾Ð¶ÐµÑÐµ Ð¸Ð»Ð¸ Ð¾ÑÑÐ°Ð²Ð¸ÑÐ¸ ÑÐ°ÑÐ»Ð¾Ð²Ðµ ÐºÐ°ÐºÐ¾ ÑÐµÑÑ Ð¸ ÑÐºÐ»Ð¾Ð½Ð¸ÑÐ¸ Ð»Ð¸Ð½Ðº Ð´Ð¾ %3$s Ð¸Ð»Ð¸ Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐ¸ ÑÐ°ÑÐ»Ð¾Ð²Ðµ Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ %1$s Ð¸ Ð·Ð°Ð´ÑÐ¶Ð°ÑÐ¸ Ð²ÐµÐ·Ñ Ð´Ð¾ %4$s.\n\nÐÑÐ¿Ð¾Ð´ ÑÑ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸ ÑÐ°ÑÐ»Ð¾Ð²Ð¸ Ð¸ ÑÐ´Ð°ÑÐµÐ½Ð¸ ÑÐ°ÑÐ»Ð¾Ð²Ð¸ Ñ %5$s ÑÐ° ÐºÐ¾ÑÐ¸Ð¼Ð° ÑÑ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¸. + Ð¤Ð°ÑÑÐ¸ÐºÐ»Ð° %1$s Ð²Ð¸ÑÐµ Ð½Ðµ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ + ÐÑÐµÐ¼ÐµÑÑÐ¸ ÑÐ²Ðµ + Ð¡Ð²Ð¸ ÑÐ°ÑÐ»Ð¾Ð²Ð¸ ÑÑ Ð¿ÑÐµÐ¼ÐµÑÑÐµÐ½Ð¸ + ÐÐµÐºÐ¸ ÑÐ°ÑÐ»Ð¾Ð²Ð¸ Ð½Ð¸ÑÑ Ð¼Ð¾Ð³Ð»Ð¸ Ð±Ð¸ÑÐ¸ Ð¿ÑÐµÐ¼ÐµÑÑÐµÐ½Ð¸ + ÐÐ¾ÐºÐ°Ð»Ð½Ð¾: %1$s + Ð£Ð´Ð°ÑÐµÐ½Ð¾: %1$s + ÐÐµÐ¼Ð° Ð´Ð¾Ð²Ð¾ÑÐ½Ð¾ Ð¿ÑÐ¾ÑÑÐ¾ÑÐ° Ð´Ð° Ð±Ð¸ ÑÐµ Ð¸Ð·Ð°Ð±ÑÐ°Ð½Ð¸ ÑÐ°ÑÐ»Ð¾Ð²Ð¸ ÐºÐ¾Ð¿Ð¸ÑÐ°Ð»Ð¸ Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ %1$s. ÐÐµÐ»Ð¸ÑÐµ Ð»Ð¸ Ð´Ð° Ð¸Ñ Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ? + Ð£Ð½ÐµÑÐ¸ÑÐµ ÐÐÐ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ + Ð£Ð½ÐµÑÐ¸ÑÐµ ÐÐÐ Ð·Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÑ + Ð¡Ð° ÑÐ²Ð°ÐºÐ¸Ð¼ Ð¿Ð¾ÐºÑÐµÑÐ°ÑÐµÐ¼ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ Ð¼Ð¾ÑÐ°ÑÐµÑÐµ Ð´Ð° ÑÐ½ÐµÑÐµÑÐµ ÐÐÐ + Ð£Ð½ÐµÑÐ¸ÑÐµ ÐÐÐ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ + Ð£ÐºÐ»Ð¾Ð½Ð¸ÑÐµ ÐÐÐ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ + ÐÑÐ¾ÑÐµÐ²Ð¸ ÑÐµ Ð½Ðµ Ð¿Ð¾ÐºÐ»Ð°Ð¿Ð°ÑÑ + ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ ÐÐÐ + ÐÐÐ ÑÐµ ÑÐºÐ»Ð¾ÑÐµÐ½ + ÐÐÐ ÑÐµ ÑÐ¿Ð°Ð¼ÑÐµÐ½ + %1$s Ð¼ÑÐ·Ð¸ÑÐºÐ¸ Ð¿Ð»ÐµÑÐµÑ + %1$s (Ð¿ÑÑÑÐ°Ð¼) + %1$s (ÑÑÐ¸ÑÐ°Ð²Ð°Ð¼) + %1$s Ð¿ÑÑÑÐ°ÑÐµ Ð·Ð°Ð²ÑÑÐµÐ½Ð¾ + ÐÐµÐ¼Ð° Ð¼ÐµÐ´Ð¸ÑÑÐºÐ¸Ñ ÑÐ°ÑÐ»Ð¾Ð²Ð° + ÐÐ¸ÑÐµ Ð½Ð°Ð²ÐµÐ´ÐµÐ½ Ð½Ð°Ð»Ð¾Ð³ + Ð¤Ð°ÑÐ» Ð½Ð¸ÑÐµ Ñ Ð¸ÑÐ¿ÑÐ°Ð²Ð½Ð¾Ð¼ Ð½Ð°Ð»Ð¾Ð³Ñ + ÐÐµÐ¿Ð¾Ð´ÑÐ¶Ð°Ð½ ÐºÐ¾Ð´ÐµÐº + ÐÐµÐ´Ð¸ÑÑÐºÐ¸ ÑÐ°ÑÐ» ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ ÑÐ¸ÑÐ°ÑÐ¸ + ÐÐµÐ´Ð¸ÑÑÐºÐ¸ ÑÐ°ÑÐ» Ð½Ð¸ÑÐµ Ð¸ÑÐ¿ÑÐ°Ð²Ð½Ð¾ ÐºÐ¾Ð´Ð¸ÑÐ°Ð½ + ÐÑÐµÐ¼Ðµ Ð¸ÑÑÐµÐºÐ»Ð¾ Ñ Ð¿Ð¾ÐºÑÑÐ°Ð²Ð°ÑÑ Ð¿ÑÑÑÐ°ÑÐ° + ÐÐµÐ´Ð¸ÑÑÐºÐ¸ ÑÐ°ÑÐ» ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÑÑÐ¸ÑÐ¸ + ÐÐµÐ´Ð¸ÑÑÐºÐ¸ ÑÐ°ÑÐ» ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÑÑÐ¸ÑÐ¸ ÑÐ° ÑÐ°Ð±ÑÐ¸ÑÐºÐ¸Ð¼ Ð¿Ð»ÐµÑÐµÑÐ¾Ð¼ + ÐÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð° Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾ÐºÑÑÐ°ÑÑ Ð¿ÑÑÑÐ°ÑÐ° %1$s + Ð£Ð»Ð°Ð·Ð½Ð° Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾ÐºÑÑÐ°ÑÑ Ð¿ÑÑÑÐ°ÑÐ° %1$s + ÐÐµÐ¾ÑÐµÐºÐ¸Ð²Ð°Ð½Ð° Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾ÐºÑÑÐ°ÑÑ Ð¿ÑÑÑÐ°ÑÐ° %1$s + Ð£Ð½Ð°Ð·Ð°Ð´ + ÐÑÑÑÐ°ÑÐµ-Ð¿Ð°ÑÐ·Ð° + Ð£Ð½Ð°Ð¿ÑÐµÐ´ + Ð¢ÑÐ°Ð¶Ð¸Ð¼ Ð°ÑÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸ÑÑ... + ÐÐ¾ÐºÑÑÐ°Ð²Ð°Ð¼ Ð¿ÑÐ¸ÑÐ°Ð²ÑÐ¸Ð²Ð°ÑÐµ... ÐÐµÐ¼Ð° Ð¼ÑÐµÐ¶Ð½Ðµ Ð²ÐµÐ·Ðµ ÐÐµÐ·Ð±ÐµÐ´Ð½Ð° Ð²ÐµÐ·Ð° Ð½Ð¸ÑÐµ Ð´Ð¾ÑÑÑÐ¿Ð½Ð°. ÐÐµÐ·Ð° ÑÐµ ÑÑÐ¿Ð¾ÑÑÐ°Ð²ÑÐµÐ½Ð° - ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°ÑÐµ Ð³ÑÐµÑÐºÐµ. + Ð¢ÐµÑÑÐ¸ÑÐ°Ð¼ Ð²ÐµÐ·Ñ... + ÐÐ¾ÑÐµ Ð¿Ð¾Ð´ÐµÑÐ°Ð²Ð°ÑÐµ ÑÐµÑÐ²ÐµÑÐ° + ÐÐ°Ð»Ð¾Ð³ ÑÐ° Ð¸ÑÑÐ¸Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ð¼ Ð¸ ÑÐµÑÐ²ÐµÑÐ¾Ð¼ Ð²ÐµÑ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ Ð½Ð° ÑÑÐµÑÐ°ÑÑ + Ð£Ð½ÐµÑÐµÐ½Ð¸ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº ÑÐµ Ð½Ðµ Ð¿Ð¾ÐºÐ»Ð°Ð¿Ð° ÑÐ° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ð¼ Ð¾Ð²Ð¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð° + ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°ÑÐµ Ð³ÑÐµÑÐºÐµ! ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð¿ÑÐ¾Ð½Ð°ÑÐµÐ¼ Ð´Ð¾Ð¼Ð°ÑÐ¸Ð½Ð° ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð¿ÑÐ¾Ð½Ð°ÑÐµÐ¼ Ð¿ÑÐ¸Ð¼ÐµÑÐ°Ðº ÑÐµÑÐ²ÐµÑÐ° Ð¡ÐµÑÐ²ÐµÑÑ ÑÐµ ÑÑÐµÐ±Ð°Ð»Ð¾ Ð¿ÑÐµÐ´ÑÐ³Ð¾ Ð´Ð° ÑÐµ Ð¾Ð´Ð°Ð·Ð¾Ð²Ðµ ÐÐ¾Ð³ÑÐµÑÐ½Ð¾ ÑÐ¾Ð±Ð»Ð¸ÑÐµÐ½Ð° Ð°Ð´ÑÐµÑÐ° - ÐÐ¾ÐºÑÐµÑÐ°ÑÐµ SSL-Ð° Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ + Ð¡Ð¡Ð Ð¸Ð½Ð¸ÑÐ¸ÑÐ°Ð»Ð¸Ð·Ð°ÑÐ¸ÑÐ° Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð° + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð¿ÑÐ¾Ð²ÐµÑÐ¸Ð¼ Ð¡Ð¡Ð Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑ ÑÐµÑÐ²ÐµÑÐ° + ÐÐµÐ¿Ð¾Ð·Ð½Ð°ÑÐ° Ð²ÐµÑÐ·Ð¸ÑÐ° ÑÐµÑÐ²ÐµÑÐ° ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° ÑÑÐ¿Ð¾ÑÑÐ°Ð²Ð¸Ð¼ Ð²ÐµÐ·Ñ ÐÐµÐ·Ð±ÐµÐ´Ð½Ð° Ð²ÐµÐ·Ð° ÑÐµ ÑÑÐ¿Ð¾ÑÑÐ°Ð²ÑÐµÐ½Ð° - Ð ÐµÐ´Ð¾Ð²Ð½Ð¾ Ð°Ð¶ÑÑÐ¸ÑÐ°Ñ Ð´Ð°ÑÐ¾ÑÐµÐºÑ + ÐÐ¾Ð³ÑÐµÑÐ½Ð¾ Ð¸Ð¼Ðµ Ð¸Ð»Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° + ÐÐµÑÑÐ¿ÐµÑÐ½Ð° Ð°ÑÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸ÑÐ° + Ð¡ÐµÑÐ²ÐµÑ Ð°ÑÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸ÑÐµ ÑÐµ Ð¾Ð´Ð±Ð¸Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¿ + ÐÐµÐ¾ÑÐµÐºÐ¸Ð²Ð°Ð½Ð¾ ÑÑÐ°ÑÐµ. Ð£Ð½ÐµÑÐ¸ÑÐµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð°Ð´ÑÐµÑÑ ÑÐµÑÐ²ÐµÑÐ° + ÐÑÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸ÑÐ° ÑÐµ Ð¸ÑÑÐµÐºÐ»Ð°. Ð£ÑÐ°Ð´Ð¸ÑÐµ ÑÐµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ + Ð£Ð½ÐµÑÐ¸ÑÐµ ÑÑÐµÐ½ÑÑÐ½Ñ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ + Ð¡ÐµÑÐ¸ÑÐ° ÑÐµ Ð¸ÑÑÐµÐºÐ»Ð°. ÐÐ¾Ð²ÐµÐ¶Ð¸ÑÐµ ÑÐµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ + ÐÐ¾Ð²ÐµÐ·ÑÑÐµÐ¼ ÑÐµ Ð½Ð° ÑÐµÑÐ²ÐµÑ Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸ÑÐµ... + Ð¡ÐµÑÐ²ÐµÑ Ð½Ðµ Ð¿Ð¾Ð´ÑÐ¶Ð°Ð²Ð° Ð¾Ð²Ð°Ñ Ð½Ð°ÑÐ¸Ð½ Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸ÑÐµ + %1$s Ð½Ðµ Ð¿Ð¾Ð´ÑÐ¶Ð°Ð²Ð° Ð²Ð¸ÑÐµÑÑÑÑÐºÐµ Ð½Ð°Ð»Ð¾Ð³Ðµ + Ð¡ÐµÑÐ²ÐµÑ Ð½Ðµ Ð²ÑÐ°ÑÐ° Ð¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ ÐÐ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ°. ÐÐ¾Ð½ÑÐ°ÐºÑÐ¸ÑÐ°ÑÑÐµ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ° + + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÑÑÐµÐ¼ ÑÐ° Ð¾Ð²Ð¸Ð¼ ÑÐµÑÐ²ÐµÑÐ¾Ð¼ + ÐÐµ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ Ð½Ð°Ð»Ð¾Ð³ Ð½Ð° ÑÑÐµÑÐ°ÑÑ + Ð ÐµÐ´Ð¾Ð²Ð½Ð¾ Ð°Ð¶ÑÑÐ¸ÑÐ°Ñ ÑÐ°ÑÐ» ÐÑÐµÐ¸Ð¼ÐµÐ½ÑÑ Ð£ÐºÐ»Ð¾Ð½Ð¸ + ÐÐµÐ»Ð¸ÑÐµ Ð´Ð° ÑÐºÐ»Ð¾Ð½Ð¸ÑÐµ %1$s? + ÐÐµÐ»Ð¸ÑÐµ Ð´Ð° ÑÐºÐ»Ð¾Ð½Ð¸ÑÐµ %1$s Ð¸ ÑÐµÐ½ ÑÐ°Ð´ÑÐ¶Ð°Ñ? Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ + Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸ ÑÐ°Ð´ÑÐ¶Ð°Ñ Ð£ÐºÐ»Ð¾Ð½Ð¸ ÑÐ° ÑÐµÑÐ²ÐµÑÐ° Ð£Ð´Ð°ÑÐµÐ½Ð¾ Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ - Ð£Ð½ÐµÑÐ¸ÑÐµ Ð½Ð¾Ð²Ð¾ Ð¸Ð¼Ðµ + Ð£ÐºÐ»Ð°ÑÐ°ÑÐµ ÑÑÐ¿ÐµÑÐ½Ð¾ + Ð£ÐºÐ»Ð°ÑÐ°ÑÐµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾ + Ð£Ð½ÐµÑÐ¸ÑÐµ Ð½Ð¾Ð² Ð½Ð°Ð·Ð¸Ð² + ÐÐ¾ÐºÐ°Ð»Ð½Ð° ÐºÐ¾Ð¿Ð¸ÑÐ° ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÐ¸. ÐÐ¾ÐºÑÑÐ°ÑÑÐµ Ð´ÑÑÐ³Ð¸ Ð½Ð°Ð·Ð¸Ð² ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´Ð¾Ð²ÑÑÐ¸Ð¼ Ð¿ÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÐµ - Ð£Ð´Ð°ÑÐµÐ½Ð° Ð´Ð°ÑÐ¾ÑÐµÐºÐ° ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¾Ð²ÐµÑÐ¸ÑÐ¸ + Ð£Ð´Ð°ÑÐµÐ½Ð¸ ÑÐ°ÑÐ» ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¾Ð²ÐµÑÐ¸ÑÐ¸ + Ð¡Ð°Ð´ÑÐ¶Ð°Ñ ÑÐµ Ð²ÐµÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¾Ð²Ð°Ð½ + Ð¤Ð°ÑÑÐ¸ÐºÐ»Ð° ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÐ¸ + ÐÐ°Ð±ÑÐ°ÑÐµÐ½Ð¸ Ð·Ð½Ð°ÐºÐ¾Ð²Ð¸: / \\ < > : \" | ? * + ÐÐ°Ð·Ð¸Ð² ÑÐ°ÑÐ»Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸ÑÐ¸ Ð¿ÑÐ°Ð·Ð°Ð½ Ð¡Ð°ÑÐµÐºÐ°ÑÑÐµ ÑÑÐµÐ½ÑÑÐ°Ðº - ÐÐ¸ÑÑÐµ Ð¸Ð·Ð°Ð±ÑÐ°Ð»Ð¸ Ð´Ð°ÑÐ¾ÑÐµÐºÑ + ÐÐµÐ¾ÑÐµÐºÐ¸Ð²Ð°Ð½Ð¸ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼. ÐÐ·Ð°Ð±ÐµÑÐ¸ÑÐµ ÑÐ°ÑÐ» Ð´ÑÑÐ³Ð¾Ð¼ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐ¾Ð¼ + ÐÐ¸ÑÑÐµ Ð¸Ð·Ð°Ð±ÑÐ°Ð»Ð¸ ÑÐ°ÑÐ» + ÐÐ¾ÑÐ°ÑÐ¸ Ð²ÐµÐ·Ñ ... + ÐÑÐ¸ÑÐ°Ð²Ð¸ ÑÐµ Ð¿Ð¾Ð¼Ð¾ÑÑ âoAuth2â + ÐÐ¾Ð²ÐµÐ·ÑÑÐµÐ¼ ÑÐµ Ð½Ð° âoAuth2â ÑÐµÑÐ²ÐµÑ... ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð¿ÑÐ¾Ð²ÐµÑÐ¸Ð¼ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑ ÑÐ°ÑÑÐ° - â Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÑÐµÑÐ²ÐµÑÐ° Ð½Ð¸ÑÐµ Ð¿Ð¾Ð²ÐµÑÑÐ¸Ð² + â Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÑÐµÑÐ²ÐµÑÐ° Ð½Ð¸ÑÐµ Ð¾Ð´ Ð¿Ð¾Ð²ÐµÑÐµÑÐ° â Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÑÐµÑÐ²ÐµÑÐ° ÑÐµ Ð¸ÑÑÐµÐºÐ°Ð¾ + - ÐÐ°ÑÑÐ¼Ð¸ Ð²Ð°Ð¶ÐµÑÐ° ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ° ÑÑ Ñ Ð±ÑÐ´ÑÑÐ½Ð¾ÑÑÐ¸ â ÐÐ´ÑÐµÑÐ° ÑÐµ Ð½Ðµ Ð¿Ð¾ÐºÐ»Ð°Ð¿Ð° ÑÐ° Ð¸Ð¼ÐµÐ½Ð¾Ð¼ Ð´Ð¾Ð¼Ð°ÑÐ¸Ð½Ð° Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ - ÐÐµÐ»Ð¸ÑÐµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð¾Ð·Ð½Ð°ÑÐ¸ÑÐµ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÐºÐ°Ð¾ Ð¿Ð¾Ð²ÐµÑÑÐ¸Ð²? + ÐÐµÐ»Ð¸ÑÐµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð²ÐµÑÑÑÐµÑÐµ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ? ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° ÑÐ°ÑÑÐ²Ð°Ð¼ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÐÐ¾Ð´Ð°ÑÐ¸ Ð¡Ð°ÐºÑÐ¸Ñ ÐÐ·Ð´Ð°ÑÐ¾ Ð·Ð°: - ÐÐ·Ð´Ð°Ð¾/Ð»Ð°: + ÐÐ·Ð´Ð°Ð²Ð°Ñ: Ð£Ð¾Ð±Ð¸ÑÐ°ÑÐµÐ½Ð¾ Ð¸Ð¼Ðµ: ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸ÑÐ°: ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ð¾Ð½Ð° ÑÐµÐ´Ð¸Ð½Ð¸ÑÐ°: - ÐÐµÐ¼ÑÐ°: - ÐÑÐ¶Ð°Ð²Ð°: + ÐÑÐ¶Ð°Ð²Ð°: + ÐÐ¾ÐºÑÐ°ÑÐ¸Ð½Ð°: ÐÐ¾ÐºÐ°ÑÐ¸ÑÐ°: ÐÐ°ÑÐ°Ð½Ð¾ÑÑ: ÐÐ´: ÐÐ°: ÐÐ¾ÑÐ¿Ð¸Ñ: ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ°Ð¼: + Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¸ÐºÐ°Ð·Ð°ÑÐ¸. + - ÐÐµÐ¼Ð° Ð¿Ð¾Ð´Ð°ÑÐ°ÐºÐ° Ð¾ Ð³ÑÐµÑÑÐ¸ + ÐÐ²Ð¾ ÑÐµ Ð¼ÐµÑÑÐ¾Ð´ÑÐ¶Ð°Ñ + ÑÑÐ²Ð°Ð¼Ð¼ÐµÑÑÐ¾.txt + ÐÐÐ ÑÐ»Ð¸ÐºÐ° + 389 KB + 2012/05/18 12:23 ÐÐ¾Ð + 12:23:45 ÐÑÐ¿ÑÐµÐ¼Ð°Ñ ÑÐ»Ð¸ÐºÐµ ÑÐ°Ð¼Ð¾ Ð¿ÑÑÐµÐ¼ Ð±ÐµÐ¶Ð¸ÑÐ½Ðµ Ð¼ÑÐµÐ¶Ðµ + ÐÑÐ¿ÑÐµÐ¼Ð°Ñ Ð²Ð¸Ð´ÐµÐ¾ ÑÐ°Ð¼Ð¾ Ð¿ÑÑÐµÐ¼ Ð±ÐµÐ¶Ð¸ÑÐ½Ðµ Ð¼ÑÐµÐ¶Ðµ ÐÐ¶ÑÑÐ¸ÑÐ°Ñ ÑÑÐºÐ¾Ð± + Ð£Ð´Ð°ÑÐµÐ½Ð¸ ÑÐ°ÑÐ» %s Ð½Ð¸ÑÐµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¾Ð²Ð°Ð½ ÑÐ° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ð¼. ÐÐºÐ¾ Ð½Ð°ÑÑÐ°Ð²Ð¸ÑÐµ, Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÐµÑÐµ ÑÐ°ÑÐ» Ð½Ð° ÑÐµÑÐ²ÐµÑÑ. + ÐÐ°Ð´ÑÐ¶Ð¸ Ð¾Ð±Ð° + ÐÑÐµÐ±ÑÐ¸ÑÐ¸ + ÐÐµ Ð¾ÑÐ¿ÑÐµÐ¼Ð°Ñ + ÐÑÐµÐ³Ð»ÐµÐ´ ÑÐ»Ð¸ÐºÐµ + Ð¡Ð»Ð¸ÐºÐ° ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¸ÐºÐ°Ð·Ð°ÑÐ¸ + %1$s ÑÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ ÐºÐ¾Ð¿Ð¸ÑÐ°ÑÐ¸ Ñ Ð»Ð¾ÐºÐ°Ð»Ð½Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ %2$s + ÐÑÑÐ°ÑÐ° Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ° + ÐÐµÑÐµÑÐµ Ð½Ð¸ÑÐµ ÑÐºÑÑÑÐµÐ½Ð¾ Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÐµÑÐ²ÐµÑÑ. ÐÐ¾Ð½ÑÐ°ÐºÑÐ¸ÑÐ°ÑÑÐµ + Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°. + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð´ÐµÐ»Ð¸Ð¼. ÐÑÐ¾Ð²ÐµÑÐ¸ÑÐµ Ð´Ð° Ð»Ð¸ ÑÐ°ÑÐ» Ð¿Ð¾ÑÑÐ¾ÑÐ¸ + ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ð¾ÐºÑÑÐ°ÑÐ° Ð´ÐµÑÐµÑÐ° Ð¾Ð²Ð¾Ð³ ÑÐ°ÑÐ»Ð° Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð¿ÑÐµÐºÐ¸Ð½ÐµÐ¼ Ð´ÐµÑÐµÑÐµ. ÐÑÐ¾Ð²ÐµÑÐ¸ÑÐµ Ð´Ð° Ð»Ð¸ ÑÐ°ÑÐ» Ð¿Ð¾ÑÑÐ¾ÑÐ¸ + ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ð¾ÐºÑÑÐ°ÑÐ° ÑÐºÐ¸Ð´Ð°ÑÐ° Ð´ÐµÑÐµÑÐ° Ð¾Ð²Ð¾Ð³ ÑÐ°ÑÐ»Ð° Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ ÐÐ¾ÑÐ°ÑÐ¸ + ÐÐ¾Ð¿Ð¸ÑÐ°Ñ Ð²ÐµÐ·Ñ + ÐÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¾ Ñ ÐºÐ»Ð¸Ð¿Ð±Ð¾ÑÐ´ + ÐÑÐ¸ÑÐ¸ÑÐ½Ð° Ð³ÑÐµÑÐºÐ°: Ð½Ðµ Ð¼Ð¾Ð³Ñ Ð´Ð° ÑÐ°Ð´Ð¸Ð¼ + ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°ÑÑ ÑÐ° ÑÐµÑÐ²ÐµÑÐ¾Ð¼. + ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸ ÑÐµÐºÐ°ÑÑ Ð½Ð° ÑÐµÑÐ²ÐµÑ. Ð Ð°Ð´ÑÐ° Ð½Ð¸ÑÐµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸ÑÐ¸ ÑÑÐ°ÑÐµÐ½Ð° + ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸ ÑÐµÐºÐ°ÑÑ Ð½Ð° ÑÐµÑÐ²ÐµÑ. Ð Ð°Ð´ÑÐ° Ð½Ð¸ÑÐµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸ÑÐ¸ ÑÑÐ°ÑÐµÐ½Ð° + Ð Ð°Ð´ÑÐ° Ð½Ð¸ÑÐµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸ÑÐ¸ Ð´Ð¾Ð²ÑÑÐµÐ½Ð°. Ð¡ÐµÑÐ²ÐµÑ ÑÐµ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð°Ð½ + ÐÐµÐ¼Ð°ÑÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ñ %s + Ð´Ð° Ð¿ÑÐµÐ¸Ð¼ÐµÐ½ÑÑÐµÑÐµ Ð¾Ð²Ð°Ñ ÑÐ°ÑÐ» + Ð´Ð° Ð¾Ð±ÑÐ¸ÑÐµÑÐµ Ð¾Ð²Ð°Ñ ÑÐ°ÑÐ» + Ð´Ð° Ð´ÐµÐ»Ð¸ÑÐµ Ð¾Ð²Ð°Ñ ÑÐ°ÑÐ» + Ð´Ð° ÑÐºÐ¸Ð½ÐµÑÐµ Ð´ÐµÑÐµÑÐµ Ð¾Ð²Ð¾Ð³ ÑÐ°ÑÐ»Ð° + Ð´Ð° Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÐµ ÑÐ°ÑÐ» + Ð´Ð° Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐµ Ñ Ð¾Ð²Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ + Ð¤Ð°ÑÐ» Ð½Ð¸ÑÐµ Ð²Ð¸ÑÐµ Ð´Ð¾ÑÑÑÐ¿Ð°Ð½ Ð½Ð° ÑÐµÑÐ²ÐµÑÑ ÐÐ°Ð»Ð¾Ð·Ð¸ + ÐÐ¾Ð´Ð°Ñ Ð½Ð°Ð»Ð¾Ð³ + ÐÐµÐ·Ð±ÐµÐ´Ð½Ð° Ð²ÐµÐ·Ð° ÑÐµ Ð¿ÑÐµÑÑÐ¼ÐµÑÐµÐ½Ð° Ð½Ð° Ð½ÐµÐ±ÐµÐ·Ð±ÐµÐ´Ð½Ñ ÑÑÑÑ + ÐÐ°Ð¿Ð¸ÑÐ½Ð¸ÑÐ¸ + ÐÑÑÐ¾ÑÐ¸ÑÐ°Ñ ÑÐ»Ð°ÑÐ° + ÐÐµÐ¼Ð° Ð½Ð°ÑÐ¸Ð½Ð° Ð·Ð° ÑÐ»Ð°ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ½Ð¸ÐºÐ°. ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÑÐµ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÑ Ðµ-Ð¿Ð¾ÑÑÐµ! + ÐÐ°Ð¿Ð¸ÑÐ½Ð¸ÑÐ¸ %1$s ÐÐ½Ð´ÑÐ¾Ð¸Ð´ Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐµ + Ð£ÑÐ¸ÑÐ°Ð²Ð°Ð¼ Ð¿Ð¾Ð´Ð°ÑÐºÐµ... + ÐÐµÐ¾Ð¿ÑÐ¾Ð´Ð½Ð° Ð¿ÑÐ¾Ð²ÐµÑÐ° Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑÐ° + ÐÐ¾Ð³ÑÐµÑÐ½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° + ÐÑÐµÐ¼ÐµÑÑÐ¸ + ÐÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸ÑÐµÐ³Ð°. ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð¾Ð´Ð°ÑÐ¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ! ÐÐ´Ð°Ð±ÐµÑÐ¸ + ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð° Ð¿ÑÐµÐ¼ÐµÑÑÐ¸Ð¼. ÐÑÐ¾Ð²ÐµÑÐ¸ÑÐµ Ð´Ð° Ð»Ð¸ ÑÐ°ÑÐ» Ð¿Ð¾ÑÑÐ¾ÑÐ¸ + ÐÐ¸ÑÐµ Ð¼Ð¾Ð³ÑÑÐµ Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐ¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ Ñ ÑÐµÐ½Ñ Ð¿Ð¾ÑÑÐ°ÑÑÐ¸ÐºÐ»Ñ + Ð¤Ð°ÑÐ» Ð²ÐµÑ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ Ñ Ð¾Ð´ÑÐµÐ´Ð¸ÑÐ½Ð¾Ñ ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸ + ÐÐ¾ÑÐ»Ð¾ ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ð¿ÑÐ¸ Ð¿ÑÐµÐ¼ÐµÑÑÐ°ÑÑ ÑÐ°ÑÐ»Ð° Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ + Ð´Ð° Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ Ð¾Ð²Ð°Ñ ÑÐ°ÑÐ» + Ð¢ÑÐµÐ½ÑÑÐ½Ð° Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ° ÐÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ + ÐÑÑÐ°ÑÐ° Ð¾ÑÐ¿ÑÐµÐ¼Ð°ÑÐ° Ð²Ð¸Ð´ÐµÐ° + ÐÑÐµÑÐ·Ð¸Ð¼Ð°ÑÐµ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ %1$s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸ÑÐ¸ Ð´Ð¾Ð²ÑÑÐµÐ½Ð¾ + %1$s Ð¿Ð¾Ð´ÐµÐ»Ð¸ â%2$sâ ÑÐ° Ð²Ð°Ð¼Ð° diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index f87edff8..f44afacc 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -11,6 +11,12 @@ InstÃ¤llningar Detaljer Skicka + Sortera + Sortera efter + + A-Ã + Nyast - Ãldst + AllmÃ¤nt @@ -32,6 +38,8 @@ Rekommendera till en vÃ¤n Feedback Imprint + Kom ihÃ¥g plats fÃ¶r delat + Kom ihÃ¥g senaste uppladdningsplats vid dela Prova %1$s pÃ¥ din smartphone! Jag skullje vilja bjuda in dig till att prova %1$s pÃ¥ din smartphone!\nLadda ner appen frÃ¥n Google Play hÃ¤r: %2$s Kontrollera Server @@ -111,6 +119,7 @@ InnehÃ¥llet i %1$d filer kunde inte synkas (%2$d konflikter) Vissa lokala filer glÃ¶mdes %1$d filer frÃ¥n %2$s mappar kunde inte kopieras till + FrÃ¥n och med version 1.3.16 kommer filer uppladdade frÃ¥n denna enhet kopieras in till lokal %1$s mapp fÃ¶r att fÃ¶rhindra datafÃ¶rlust nÃ¤r en enskild fil synkroniseras med flera konton.\n\nPÃ¥ grund av denna Ã¤ndring kommer alla filer uppladdade i tidigare versioner av denna applikation kopieras in till %2$s mapp. Dock fÃ¶rhindrade ett fel slutfÃ¶randet av denna operation under konto-synkronisering. Du kan antingen lÃ¤mna filerna som de Ã¤r och ta bort lÃ¤nken till %3$s, eller flytta filerna in till %1$s mapp och behÃ¥lla lÃ¤nken till %4$s.\n\nNedan listas de lokala filerna och de fjrran filerna i %5$s som de lÃ¤nkades till. Mappen %1$s existerar inte lÃ¤ngre Flytta allt Alla filer flyttades @@ -244,9 +253,12 @@ FÃ¶rhandsvisa bild Denna bild kan inte visas %1$s kunde inte kopieras till %2$s lokal mapp + Uppladdnings-sÃ¶kvÃ¤g Ledsen, delning Ã¤r inte aktiverat pÃ¥ din server. VÃ¤nligen kontakta din administratÃ¶r. + Lyckades ej dela. VÃ¤nligen kontrollera om filen eisterar Ett fel uppstod vid fÃ¶rsÃ¶k att dela denna fil eller mapp + Lyckades ej sluta dela. VÃ¤nligen kontrollera om filen existerar Ett fel uppstod vid fÃ¶rsÃ¶k att sluta dela denna fil eller mapp Skicka Kopiera lÃ¤nk @@ -267,12 +279,23 @@ Filen Ã¤r inte lÃ¤ngre tillgÃ¤nglig pÃ¥ servern Konton LÃ¤gg till konto + SÃ¤ker anslutning Ã¤r omdirigerad till en osÃ¤ker vÃ¤g. + Loggar + Skickat historik + Ingen app fÃ¶r att skicka loggar hittades. Installera mail appen! + %1$s Android app logs + Laddar data... Autentisering krÃ¤vs Fel lÃ¶senord Flytta Ingenting hÃ¤r. Du kan skapa en mapp! VÃ¤lj Gick inte att flytta. VÃ¤nligen kontrollera att filen existerar + Det Ã¤r inte mÃ¶jligt att flytta mappen in i underliggande struktur + Filen existerar redan i destinationsmappen + Ett fel uppstod vid fÃ¶rsÃ¶k att flytta denna fil eller mapp att flytta den hÃ¤r filen + Direktuppladning SÃ¤kerhet + Uppladdnings-sÃ¶kvÃ¤g fÃ¶r video diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 680190c8..8805fdce 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -64,9 +64,9 @@ YÃ¼kleniyor... Bu klasÃ¶rde dosya yok. klasÃ¶r - klasÃ¶rler + klasÃ¶r dosya - dosyalar + dosya Ek bilgileri gÃ¶rmek iÃ§in dosyaya dokunun. Boyut: TÃ¼r: @@ -187,6 +187,7 @@ Sunucunuz geÃ§erli bir kullanÄ±cÄ± kimliÄi dÃ¶ndÃ¼rmÃ¼yor, lÃ¼tfen yÃ¶neticinizle iletiÅime geÃ§in Bu sunucuya karÅÄ± kimlik doÄrulama yapÄ±lamaz + Hesap henÃ¼z cihazda mevcut deÄil DosyayÄ± gÃ¼ncel tut Yeniden adlandÄ±r KaldÄ±r @@ -282,9 +283,9 @@ GÃ¼venli baÄlantÄ±, gÃ¼venli olmayan bir rotaya yÃ¶nlendirildi. GÃ¼nlÃ¼kler GeÃ§miÅi GÃ¶nder - LoglarÄ± gÃ¶ndermek iÃ§in uygulama bulunamadÄ±. Eposta uygulamasÄ±nÄ± yÃ¼kleyin! + KayÄ±tlarÄ± gÃ¶ndermek iÃ§in uygulama bulunamadÄ±. E-posta uygulamasÄ±nÄ± yÃ¼kleyin! %1$s Android uygulama kayÄ±tlarÄ± - YÃ¼kleniyor... + Veri yÃ¼kleniyor... Kimlik doÄrulama gerekli HatalÄ± parola TaÅÄ± @@ -298,4 +299,6 @@ AnÄ±nda YÃ¼klemeler GÃ¼venlik Video YÃ¼kleme Yolu + %1$s klasÃ¶rÃ¼n indirilmesi tamamlanamadÄ± + %1$s sizinle \"%2$s\" paylaÅÄ±mÄ±nÄ± yaptÄ± diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 4c07d79b..64c57d30 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -38,6 +38,8 @@ ÐÐ¾ÑÐ°Ð´Ð¸ÑÐ¸ ÑÐ¾Ð²Ð°ÑÐ¸ÑÑ ÐÐ²Ð¾ÑÐ¾ÑÐ½ÑÐ¹ Ð·Ð²\'ÑÐ·Ð¾Ðº ÐÑÐ´Ð±Ð¸ÑÐ¾Ðº + ÐÐ°Ð¿Ð°Ð¼\'ÑÑÐ°ÑÐ¸ Ð¿Ð¾Ð·Ð¸ÑÑÑ + ÐÐ°Ð¿Ð°Ð¼\'ÑÑÐ°ÑÐ¸ Ð¾ÑÑÐ°Ð½Ð½ÑÐ¹ Ð¾Ð¿ÑÐ±Ð»ÑÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹ ÑÐ»ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¡Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ %1$s Ð½Ð° ÑÐ²Ð¾ÑÐ¼Ñ ÑÐ¼Ð°ÑÑÑÐ¾Ð½Ñ! ÐÑÐ¾Ð¿Ð¾Ð½ÑÑ Ð²Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ¸ÑÑ %1$s Ð½Ð° Ð²Ð°ÑÐ¾Ð¼Ñ ÑÐ¼Ð°ÑÑÑÐ¾Ð½Ñ!\nÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð° Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½ÑÐ¼: %2$s ÐÐµÑÐµÐ²ÑÑÐ¸ÑÐ¸ ÑÐµÑÐ²ÐµÑ @@ -98,7 +100,7 @@ ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ %1$s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐ¸ÑÑ ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ, Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ Ð²ÑÑÐ´ - ÐÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ â¦ + Ð¡ÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ â¦ %1$d%% ÐÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ %2$s Ð£ÑÐ¿ÑÑÐ½Ð¾ Ð·ÐºÐ°ÑÐ°Ð½Ð¾ %1$s ÑÑÐ¿ÑÑÐ½Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¾ @@ -279,6 +281,9 @@ ÐÐµÐ·Ð¿ÐµÑÐ½Ðµ Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÑÑÑÑÑÑ ÑÐµÑÐµÐ· Ð½ÐµÐ·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð¸Ð¹ Ð¼Ð°ÑÑÑÑÑ. ÐÑÑÐ½Ð°Ð»Ð¸ ÐÐ°Ð´ÑÑÐ»Ð°ÑÐ¸ ÑÑÑÐ¾ÑÑÑ + ÐÐµÐ¼Ð°Ñ Ð´Ð¾Ð´Ð°ÑÐºÑ Ð´Ð»Ñ Ð²ÑÐ´Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¶ÑÑÐ½Ð°Ð»ÑÐ². ÐÑÑÐ°Ð½Ð¾Ð²ÑÑÑ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº! + %1$s Android Ð»Ð¾Ð³ Ð´Ð¾Ð´Ð°ÑÐºÑ + ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ... ÐÐ¾ÑÑÑÐ±Ð½Ð° Ð°ÑÑÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÑÑ ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ ÐÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ @@ -291,4 +296,6 @@ Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ ÑÐµÐ¹ ÑÐ°Ð¹Ð» ÐÐ¸ÑÑÑÐ²Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÐÐµÐ·Ð¿ÐµÐºÐ° + Ð¨Ð»ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð²ÑÐ´ÐµÐ¾ + Ð¡ÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐµÐºÐ¸ %1$s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾ diff --git a/res/values-yo/strings.xml b/res/values-yo/strings.xml new file mode 100644 index 00000000..69623e19 --- /dev/null +++ b/res/values-yo/strings.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e8852f5e..28123e0a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -4,13 +4,19 @@ çæ¬ï¼%1$s å·æ°å¸æ· ä¸ä¼ - æ¥èªå¶å®appçåå®¹ + æ¥èªå¶å®åºç¨çåå®¹ æä»¶ - æå¼ - å¢å æä»¶å¤¹ + æå¼æ¹å¼ + æ°å»ºæä»¶å¤¹ è®¾ç½® è¯¦ç»ä¿¡æ¯ åé + æåº + æåºæ¹å¼ + + A - Z + æ° - æ§ + å¸¸è§ @@ -18,13 +24,13 @@ è´¦å· ç®¡çè´¦å· App PIN - ä¿æ¤æ¨çAppå®¢æ·ç«¯ + ä¿æ¤å®¢æ·ç«¯ å³æ¶å¾çä¸ä¼ å³æ¶ä¸ä¼ ç¸æºææçå¾ç - ç«å³ä¸ä¼ è§é¢ + å³æ¶ä¸ä¼ è§é¢ å³æ¶ä¸ä¼ ç±ç¸æºææçè§é¢ å¼å¯æ¥å¿ - è¿è¿å»æ¯æ¥å¿é®é¢ + ç¨äºè®°å½é®é¢ æ¥å¿åå² è¿æ¾ç¤ºå·²ç»ä¿åçæ¥å¿ å é¤åå² @@ -32,27 +38,28 @@ æ¨èç»æå åé¦ çæ¬è¯´æ - å¨æ¨çæºè½ææºä¸è¯ç¨ä¸ä¸ %1$sï¼ - âæéè¯·ä½ ä½¿ç¨å¨ä½ çæºè½ææºä¸ä½¿ç¨ %1$sï¼å¨è¿ä¸è½½ï¼%2$sâ - + è®°ä½å±äº«ä½ç½® + è®°ä½ä¸æ¬¡å±äº«ä¸ä¼ çä½ç½® + å¨æ¨çæºè½ææºä¸è¯ç¨ %1$sï¼ + æéè¯·ä½ å¨æºè½ææºä¸ä½¿ç¨ %1$s\nä¸è½½è·¯å¾ï¼%2$s æ£æ¥æå¡å¨ æå¡å¨å°å https://... ç¨æ·å å¯ç - æ°å¢å° %1$s? + åæ¬¡ä½¿ç¨ %1$s? æä»¶ è¿æ¥ ä¸ä¼ éæ©ä¸ä¼ æä»¶å¤¹ï¼ æªæ¾å°è´¦å· - è®¾å¤ä¸æªæ¾å°è´¦å·ï¼è¯·ååå»ºè´¦å·ã + è®¾å¤ä¸æªæ¾å° %1$s è´¦å·ï¼è¯·åè®¾ç½®è´¦å·ã è®¾ç½® éåº - æ²¡æä¸ä¼ çåå®¹ - æ²¡ææ¥æ¶å°åå®¹ï¼æ å¯ä¸ä¼ ã + æ²¡æéè¦ä¸ä¼ çåå®¹ + æ²¡ææ¥æ¶å°åå®¹ï¼æ²¡æéè¦ä¸ä¼ çåå®¹ã %1$sæªè¢«åè®¸è®¿é®å±äº«åå®¹ã ä¸ä¼ - ç§å + å ç§å è¿éè¿ä»ä¹é½æ²¡æãä¸ä¼ äºä¸è¥¿å§ï¼ è½½å¥ä¸.... å¨è¯¥æä»¶å¤¹ä¸ä¸åå¨æä»¶ã @@ -60,19 +67,19 @@ æä»¶å¤¹ æä»¶ æä»¶ - ç¹å»ä¸ä¸ªæä»¶æ¥æ¾ç¤ºé¢å¤çä¿¡æ¯ã + ç¹å»ä¸ä¸ªæä»¶å¯ä»¥æ¾ç¤ºé¢å¤çä¿¡æ¯ã å¤§å°ï¼ ç±»åï¼ åå»ºäºï¼ - å·²ä¿®æ¹ï¼ + ä¿®æ¹äºï¼ ä¸è½½ å·æ°æä»¶ ä¸ä¼ è¿ç¨ä¸æä»¶è¢«æ´åä¸ºäº %1$s åäº«é¾æ¥ - åæ¶å±äº«é¾æ¥ + åæ¶åäº«é¾æ¥ æ¯ å¦ - OK + ç¡®å® åæ¶ä¸è½½ åæ¶ä¸ä¼ åæ¶ @@ -85,35 +92,35 @@ å é¤è´¦å· åå»ºè´¦å· ä¸ä¼ èª... - ç®å½åç§° + æä»¶å¤¹åç§° ä¸ä¼ ... %1$d%% ä¸ä¼ %2$s ä¸ä¼ æå %1$s æåä¸ä¼ ä¸ä¼ å¤±è´¥ - 1$ä¸ä¼ æªè½å®æ + %1$s æªè½æåä¸ä¼ ä¸ä¼ å¤±è´¥ï¼æ¨éè¦éæ°ç»å½ - ä¸è½½ä¸â¦â¦ + ä¸è½½ä¸... %1$d%% ä¸è½½ä¸ %2$s ä¸è½½æå - %1$s æåä¸è½½ + æåä¸è½½ %1$s ä¸è½½å¤±è´¥ - ä¸è½½1$s æªè½å®æ + %1$s ä¸è½½æªè½å®æ æªä¸è½½å®æ¯ ä¸è½½å¤±è´¥ï¼æ¨éè¦éæ°ç»å½ éæ©è´¦æ· åæ¥å¤±è´¥ åæ¥å¤±è´¥ï¼æ¨éè¦éæ°ç»å½ %1$såæ¥æªå®æã - å¯ç éè¯¯%1$s + %1$s çå¯ç éè¯¯ åç°å²çª %1$d æä»¶æ æ³åæ¥ æä»¶åæ¥å¤±è´¥ - æ æ³åæ¥ %1$d æä»¶åå®¹(ä¸ %2$d å²çª) + æ æ³åæ¥ %1$d æä»¶åå®¹(%2$d å²çª) æäºæ¬å°æä»¶å·²è¢«éå¿ %2$s ç®å½ä¸ç %1$d ä¸ªæä»¶ä¸è½è¢«å¤å¶å° ä» 1.3.16 çèµ·ï¼ä»æ¤è®¾å¤ä¸ä¼ çæä»¶å°è¢«å¤å¶å°æ¬å°ç %1$s æä»¶å¤¹ï¼ä»¥é²æ¢æä¸ªåä¸æä»¶å¨å¤ä¸ªè´¦æ·é´åæ¥èé æçæ°æ®æå¤±ã\n\n ç±äºæ¤é¡¹ååï¼æ¤åºç¨ä¹åççæ¬ä¸ä¼ çå¨é¨æä»¶é½å·²è¢«å¤å¶å°äº %2$s æä»¶å¤¹ãç¶èï¼è´¦æ·åæ¥æé´æä¸ä¸ªéè¯¯é»æ¢äºæ¤æä½çå®æãæ¨å¯è½æ³ä¿ææä»¶ä¸å¨ï¼å¹¶ç§»é¤æå %3$s çé¾æ¥ï¼æå°æä»¶ç§»å¨å° %1$s æä»¶å¤¹ä¸å¹¶ä¿æå¶å° %4$s çé¾æ¥ãä¸é¢ååºçæ¯æ¬å°æä»¶ï¼ä»¥åå®ä»¬è¢«é¾æ¥å°ç %5$s ä¸çè¿ç¨æä»¶ã - æä»¶å¤¹%1$s ä¸åå¨ + æä»¶å¤¹%1$s å·²ç»ä¸åå¨ ç§»å¨ææ æææä»¶å·²è¢«ç§»å¨ æäºæä»¶æ æ³è¢«ç§»å¨ @@ -128,7 +135,7 @@ ä¸¤æ¬¡ App PINç ä¸å App PINç ä¸æ£ç¡® App PINç å·²ç§»é¤ - App PINç å·²ä¿åã + App PINç å·²ä¿å %1$s é³ä¹ææ¾å¨ %1$s (ææ¾ä¸) %1$s (è½½å¥ä¸) @@ -149,16 +156,16 @@ ææ¾æåæé® å¿«è¿æé® æ£å¨è®¤è¯... - å°è¯ç»å½ + å°è¯ç»å½... æ²¡æç½ç»è¿æ¥ - å®å¨é¾æ¥æ æã + å®å¨è¿æ¥ä¸å¯ç¨ã è¿æ¥å·²å»ºç«ã æµè¯è¿æ¥â¦â¦ - æå¡å¨éç½®ä¸æ£ç¡®ã + æå¡å¨éç½®ä¸æ£ç¡® æ¤è®¾å¤ä¸å·²ç»åå¨åååæå¡å¨çå¸å· è¾å¥ç¨æ·ä¸æ¤å¸æ·çç¨æ·ä¸ç¬¦ åçæªç¥éè¯¯ï¼ - æ æ³æ¾å°æå¡å¨ + æ æ³æ¾å°ä¸»æº æªåç°æå¡å¨å®ä¾ çèµ·æ¥æå¡å¨ä¸å¤ªç»å ç½åä¸æ£ç¡® @@ -166,13 +173,13 @@ æ æ³éªè¯ SSL æå¡å¨çèº«ä»½ ä¸å¯è¾¨è¯çæå¡å¨æå¡å¨çæ¬ æ æ³å»ºç«è¿æ¥ - å å¯è¿æ¥å·²å»ºç« - ç¨æ·åæå¯ç éè¯¯ï¼ + å®å¨è¿æ¥å·²å»ºç« + ç¨æ·åæå¯ç éè¯¯ è®¤è¯ä¸æå è®¿é®è¢«è®¤è¯æå¡å¨æç» æå¤ç¶æï¼è¯·åæ¬¡è¾å¥æå¡å¨çå°å ä½ çææå·²ç»è¿æãè¯·éæ°ææã - è¯·è¾å¥å½åå¯ç ï¼ + è¯·è¾å¥å½åå¯ç æ¨çä¼è¯è¶æ¶äºï¼è¯·éæ°è¿æ¥ æ£å¨è¿æ¥å°è®¤è¯æå¡å¨.... æå¡å¨ä¸æ¯æè¿ç§éªè¯æ¹å¼ @@ -201,15 +208,15 @@ æä»¶åä¸è½ä¸ºç©º è¯·ç¨å æªç¥é®é¢ï¼è¯·è¯è¯ç¨å¶ä»ç¨åºéæ©æ¤æä»¶ - æªéæ©æä»¶ã + æªéæ©æä»¶ åéé¾æ¥ç» â¦ ä½¿ç¨oAuth2ç»é è¿æ¥oAuth2 æå¡å¨... ç«ç¹èº«ä»½æ æ³éªè¯ - ä¸åä¿¡ä»»çæå¡å¨è¯ä¹¦ - æå¡å¨è¯ä¹¦è¿æ - æå¡å¨è¯ä¹¦è¿æ° - ä¸»æºåä¸è¯ä¹¦ä¸çè®°å½ä¸å¹é + - ä¸åä¿¡ä»»çæå¡å¨è¯ä¹¦ + - æå¡å¨è¯ä¹¦è¿æ + - æå¡å¨è¯ä¹¦æ¶é´æ¯å½åæ¶é´è¿æ + - ä¸»æºåä¸è¯ä¹¦ä¸çè®°å½ä¸å¹é æ¯å¦ä¿¡ä»»æ¤è¯ä¹¦ï¼ è¯ä¹¦æ æ³ä¿å è¯¦ç»ä¿¡æ¯ @@ -235,8 +242,8 @@ 389åè 2012/05/18 ä¸å12:23 12:23:45 - ä»éè¿WIFIä¸ä¼ å¾çã - ä»å¨ WIFI ä¸ä¸ä¼ è§é¢ + ä»éè¿ WIFI ä¸ä¼ å¾çã + ä»éè¿ WIFI ä¸ä¼ è§é¢ /InstantUpload ä¸ä¼ å²çª è¿ç¨æä»¶ %s æªä¸æ¬å°æä»¶åæ¥ãç»§ç»å°æ¿æ¢æå¡å¨ä¸çæä»¶åå®¹ã @@ -244,8 +251,9 @@ è¦ç ä¸ä¸ä¼ å¾çé¢è§ - ä¸è½æ¾ç¤ºå¾ç + æ æ³æ¾ç¤ºå¾ç æ æ³å¤å¶ %1$s å°æ¬å°ç®å½ %2$s + ä¸ä¼ è·¯å¾ æ±æï¼å±äº«åè½æªå¯ç¨ãè¯·èç³»ç®¡çåã æ æ³å±äº«ãè¯·æ£æ¥æä»¶æ¯å¦åå¨ å±äº«æä»¶æç®å½åºé @@ -260,27 +268,34 @@ çå¾æå¡å¨ååºæ¶åçäºä¸ä¸ªéè¯¯ï¼æ¤æä½æ æ³å®æ æå¡å¨ä¸å¯ç¨ï¼æ¤æä½æ æ³å®æ - ä½ æ²¡æè®¸å¯%s + ä½ æ²¡ææé%s éå½åè¯¥æä»¶ å é¤è¯¥æä»¶ - åäº«è¯¥æä»¶ + å±äº«è¯¥æä»¶ åæ¶å±äº«è¯¥æä»¶ åå»ºæä»¶ - ä¸ä¼ æ¤æä»¶å¤¹ + å¨æ¤æä»¶å¤¹ä¸ä¼ è¯¥æä»¶å¨æå¡å¨ä¸ä¸å¯ç¨ è´¦å· æ·»å è´¦å· + å®å¨è¿æ¥è¢«éå®åå°éå®å¨è·¯å¾. æ¥å¿ åéåå² + æªæ¾å°å¯ä»¥åéæ¥å¿çç¨åºãè¯·å®è£ mail! + %1$s Android ç¨åºæ¥å¿ + è½½å¥æ°æ®... éè¦è®¤è¯ éè¯¯å¯ç ç§»å¨ è¿éè¿ä»ä¹é½æ²¡æãä¸ä¼ äºä¸è¥¿å§ï¼ - éæ©(&C)... + éæ© æ æ³ç§»å¨ãè¯·æ£æ¥æä»¶æ¯å¦åå¨ - bä¸è½å¤æä¸ä¸ªç®å½ç§»å¨å°å®çä¸çº§ + æ æ³æä¸ä¸ªç®å½ç§»å¨å°å®çä¸çº§ è¯¥æä»¶å·²ç»åå¨å¨ç®æ æä»¶å¤¹ å°è¯ç§»å¨è¯¥æä»¶ææä»¶å¤¹æ¶åçéè¯¯ ç§»å¨è¯¥æä»¶ + å³æ¶ä¸ä¼ å®å¨ + è§é¢ä¸ä¼ è·¯å¾ + %1$s æä»¶å¤¹çä¸è½½æ æ³å®æ diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index b2731798..892944eb 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -71,4 +71,5 @@ å¸³è å¯ç¢¼é¯èª¤ + å®å¨ diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 45ccd3fd..4659d43a 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -298,4 +298,5 @@ å³æä¸å³ å®å¨æ§ å½±çä¸å³è·¯å¾ + %1$s ç®éçä¸è¼æªå®æ diff --git a/res/values/bools.xml b/res/values/bools.xml index 1c8d68c6..c2ca6732 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -2,7 +2,7 @@ 32dp + 128dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 1fc4d8ee..8f2898cb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -193,6 +193,7 @@ Your server is not returning a correct user id, please contact an administrator Cannot authenticate against this server + Account does not exist in the device yet Keep file up to date Rename @@ -324,6 +325,9 @@ Security Upload Video Path + Download of %1$s folder could not be completed + + %1$s shared \"%2$s\" with you Refresh connection Server address diff --git a/res/values/styles.xml b/res/values/styles.xml index c65cbadd..5996281f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml index eb250052..d0e82440 100644 --- a/res/xml/authenticator.xml +++ b/res/xml/authenticator.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 1673e21b..ac369847 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -3,7 +3,7 @@ ownCloud Android client application Copyright (C) 2012 Bartek Przybylski - Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2015 ownCloud Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, @@ -31,25 +31,23 @@ android:summary="@string/prefs_pincode_summary"/> - - - + - + + - - >>>> x509Certificate " + x509Certificate.toString()); - try { isKnownServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext); } catch (Exception e) { @@ -201,36 +194,4 @@ public class SsoWebViewClient extends WebViewClient { ((AuthenticatorActivity)mContext).createAuthenticationDialog(view, handler); } - @Override - public WebResourceResponse shouldInterceptRequest (WebView view, String url) { - Log_OC.d(TAG, "shouldInterceptRequest : " + url); - return null; - } - - @Override - public void onLoadResource (WebView view, String url) { - Log_OC.d(TAG, "onLoadResource : " + url); - } - - @Override - public void onReceivedLoginRequest (WebView view, String realm, String account, String args) { - Log_OC.d(TAG, "onReceivedLoginRequest : " + realm + ", " + account + ", " + args); - } - - @Override - public void onScaleChanged (WebView view, float oldScale, float newScale) { - Log_OC.d(TAG, "onScaleChanged : " + oldScale + " -> " + newScale); - super.onScaleChanged(view, oldScale, newScale); - } - - @Override - public void onUnhandledKeyEvent (WebView view, KeyEvent event) { - Log_OC.d(TAG, "onUnhandledKeyEvent : " + event); - } - - @Override - public boolean shouldOverrideKeyEvent (WebView view, KeyEvent event) { - Log_OC.d(TAG, "shouldOverrideKeyEvent : " + event); - return false; - } } diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index d8030642..a197e080 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2014 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -46,6 +48,7 @@ import android.content.OperationApplicationException; import android.database.Cursor; import android.net.Uri; import android.os.RemoteException; +import android.provider.MediaStore; public class FileDataStorageManager { @@ -193,6 +196,7 @@ public class FileDataStorageManager { cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions()); cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId()); cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail()); + cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading()); boolean sameRemotePath = fileExists(file.getRemotePath()); if (sameRemotePath || @@ -261,8 +265,8 @@ public class FileDataStorageManager { * HERE ONLY DATA CONSISTENCY SHOULD BE GRANTED * * @param folder - * @param files - * @param removeNotUpdated + * @param updatedFiles + * @param filesToRemove */ public void saveFolder( OCFile folder, Collection updatedFiles, Collection filesToRemove @@ -302,6 +306,7 @@ public class FileDataStorageManager { cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions()); cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId()); cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail()); + cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading()); boolean existsByPath = fileExists(file.getRemotePath()); if (existsByPath || fileExists(file.getFileId())) { @@ -491,7 +496,7 @@ public class FileDataStorageManager { if (removeLocalCopy && file.isDown() && localPath != null && success) { success = new File(localPath).delete(); if (success) { - triggerMediaScan(localPath); + deleteFileInMediaScan(localPath); } if (!removeDBData && success) { // maybe unnecessary, but should be checked TODO remove if unnecessary @@ -539,7 +544,8 @@ public class FileDataStorageManager { private boolean removeLocalFolder(OCFile folder) { boolean success = true; - File localFolder = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, folder)); + String localFolderPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, folder); + File localFolder = new File(localFolderPath); if (localFolder.exists()) { // stage 1: remove the local files already registered in the files database Vector files = getFolderContent(folder.getFileId()); @@ -549,13 +555,13 @@ public class FileDataStorageManager { success &= removeLocalFolder(file); } else { if (file.isDown()) { - String path = file.getStoragePath(); File localFile = new File(file.getStoragePath()); success &= localFile.delete(); if (success) { + // notify MediaScanner about removed file + deleteFileInMediaScan(file.getStoragePath()); file.setStoragePath(null); saveFile(file); - triggerMediaScan(path); // notify MediaScanner about removed file } } } @@ -579,7 +585,6 @@ public class FileDataStorageManager { } else { String path = localFile.getAbsolutePath(); success &= localFile.delete(); - triggerMediaScan(path); // notify MediaScanner about removed file } } } @@ -714,7 +719,7 @@ public class FileDataStorageManager { Iterator it = originalPathsToTriggerMediaScan.iterator(); while (it.hasNext()) { // Notify MediaScanner about removed file - triggerMediaScan(it.next()); + deleteFileInMediaScan(it.next()); } it = newPathsToTriggerMediaScan.iterator(); while (it.hasNext()) { @@ -877,6 +882,8 @@ public class FileDataStorageManager { file.setRemoteId(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID))); file.setNeedsUpdateThumbnail(c.getInt( c.getColumnIndex(ProviderTableMeta.FILE_UPDATE_THUMBNAIL)) == 1 ? true : false); + file.setDownloading(c.getInt( + c.getColumnIndex(ProviderTableMeta.FILE_IS_DOWNLOADING)) == 1 ? true : false); } return file; @@ -1259,6 +1266,10 @@ public class FileDataStorageManager { ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail() ? 1 : 0 ); + cv.put( + ProviderTableMeta.FILE_IS_DOWNLOADING, + file.isDownloading() ? 1 : 0 + ); boolean existsByPath = fileExists(file.getRemotePath()); if (existsByPath || fileExists(file.getFileId())) { @@ -1490,4 +1501,46 @@ public class FileDataStorageManager { MainApp.getAppContext().sendBroadcast(intent); } + public void deleteFileInMediaScan(String path) { + + String mimetypeString = FileStorageUtils.getMimeTypeFromName(path); + ContentResolver contentResolver = getContentResolver(); + + if (contentResolver != null) { + if (mimetypeString.startsWith("image/")) { + // Images + contentResolver.delete(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + MediaStore.Images.Media.DATA + "=?", new String[]{path}); + } else if (mimetypeString.startsWith("audio/")) { + // Audio + contentResolver.delete(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, + MediaStore.Audio.Media.DATA + "=?", new String[]{path}); + } else if (mimetypeString.startsWith("video/")) { + // Video + contentResolver.delete(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, + MediaStore.Video.Media.DATA + "=?", new String[]{path}); + } + } else { + ContentProviderClient contentProviderClient = getContentProviderClient(); + try { + if (mimetypeString.startsWith("image/")) { + // Images + contentProviderClient.delete(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + MediaStore.Images.Media.DATA + "=?", new String[]{path}); + } else if (mimetypeString.startsWith("audio/")) { + // Audio + contentProviderClient.delete(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, + MediaStore.Audio.Media.DATA + "=?", new String[]{path}); + } else if (mimetypeString.startsWith("video/")) { + // Video + contentProviderClient.delete(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, + MediaStore.Video.Media.DATA + "=?", new String[]{path}); + } + } catch (RemoteException e) { + Log_OC.e(TAG, "Exception deleting media file in MediaStore " + e.getMessage()); + } + } + + } + } diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index cf25d278..2c9c53be 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -20,9 +22,9 @@ package com.owncloud.android.datamodel; import android.os.Parcel; import android.os.Parcelable; -import android.webkit.MimeTypeMap; import com.owncloud.android.lib.common.utils.Log_OC; +import com.owncloud.android.utils.FileStorageUtils; import java.io.File; @@ -70,6 +72,8 @@ public class OCFile implements Parcelable, Comparable { private boolean mNeedsUpdateThumbnail; + private boolean mIsDownloading; + /** * Create new {@link OCFile} with given path. @@ -112,6 +116,7 @@ public class OCFile implements Parcelable, Comparable { mPermissions = source.readString(); mRemoteId = source.readString(); mNeedsUpdateThumbnail = source.readInt() == 0; + mIsDownloading = source.readInt() == 0; } @@ -136,6 +141,7 @@ public class OCFile implements Parcelable, Comparable { dest.writeString(mPermissions); dest.writeString(mRemoteId); dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0); + dest.writeInt(mIsDownloading ? 1 : 0); } /** @@ -348,6 +354,7 @@ public class OCFile implements Parcelable, Comparable { mPermissions = null; mRemoteId = null; mNeedsUpdateThumbnail = false; + mIsDownloading = false; } /** @@ -533,17 +540,7 @@ public class OCFile implements Parcelable, Comparable { */ public boolean isImage() { return ((mMimeType != null && mMimeType.startsWith("image/")) || - getMimeTypeFromName().startsWith("image/")); - } - - public String getMimeTypeFromName() { - String extension = ""; - int pos = mRemotePath.lastIndexOf('.'); - if (pos >= 0) { - extension = mRemotePath.substring(pos + 1); - } - String result = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase()); - return (result != null) ? result : ""; + FileStorageUtils.getMimeTypeFromName(mRemotePath).startsWith("image/")); } public String getPermissions() { @@ -562,4 +559,16 @@ public class OCFile implements Parcelable, Comparable { this.mRemoteId = remoteId; } + public boolean isDownloading() { + return mIsDownloading; + } + + public void setDownloading(boolean isDownloading) { + this.mIsDownloading = isDownloading; + } + + public boolean isSynchronizing() { + // TODO real implementation + return false; + } } diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index ce53c444..87fa43ff 100644 --- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -1,5 +1,9 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author Tobias Kaminsky + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -29,10 +33,8 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; import android.graphics.BitmapFactory; -import android.graphics.Matrix; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.media.ExifInterface; import android.media.ThumbnailUtils; import android.net.Uri; import android.os.AsyncTask; @@ -51,10 +53,7 @@ import com.owncloud.android.utils.BitmapUtils; import com.owncloud.android.utils.DisplayUtils; /** - * Manager for concurrent access to thumbnails cache. - * - * @author Tobias Kaminsky - * @author David A. Velasco + * Manager for concurrent access to thumbnails cache. */ public class ThumbnailsCacheManager { @@ -76,7 +75,7 @@ public class ThumbnailsCacheManager { public static Bitmap mDefaultImg = BitmapFactory.decodeResource( MainApp.getAppContext().getResources(), - DisplayUtils.getResourceId("image/png", "default.png") + DisplayUtils.getFileTypeIconId("image/png", "default.png") ); @@ -139,44 +138,15 @@ public class ThumbnailsCacheManager { return null; } - - public static boolean cancelPotentialWork(OCFile file, ImageView imageView) { - final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView); - - if (bitmapWorkerTask != null) { - final OCFile bitmapData = bitmapWorkerTask.mFile; - // If bitmapData is not yet set or it differs from the new data - if (bitmapData == null || bitmapData != file) { - // Cancel previous task - bitmapWorkerTask.cancel(true); - } else { - // The same work is already in progress - return false; - } - } - // No task associated with the ImageView, or an existing task was cancelled - return true; - } - - public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) { - if (imageView != null) { - final Drawable drawable = imageView.getDrawable(); - if (drawable instanceof AsyncDrawable) { - final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable; - return asyncDrawable.getBitmapWorkerTask(); - } - } - return null; - } - - public static class ThumbnailGenerationTask extends AsyncTask { + public static class ThumbnailGenerationTask extends AsyncTask { private final WeakReference mImageViewReference; private static Account mAccount; - private OCFile mFile; + private Object mFile; private FileDataStorageManager mStorageManager; - + + public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager, Account account) { - // Use a WeakReference to ensure the ImageView can be garbage collected + // Use a WeakReference to ensure the ImageView can be garbage collected mImageViewReference = new WeakReference(imageView); if (storageManager == null) throw new IllegalArgumentException("storageManager must not be NULL"); @@ -184,95 +154,46 @@ public class ThumbnailsCacheManager { mAccount = account; } - // Decode image in background. + public ThumbnailGenerationTask(ImageView imageView) { + // Use a WeakReference to ensure the ImageView can be garbage collected + mImageViewReference = new WeakReference(imageView); + } + @Override - protected Bitmap doInBackground(OCFile... params) { + protected Bitmap doInBackground(Object... params) { Bitmap thumbnail = null; - + try { if (mAccount != null) { AccountManager accountMgr = AccountManager.get(MainApp.getAppContext()); - + mServerVersion = accountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION); OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, MainApp.getAppContext()); mClient = OwnCloudClientManagerFactory.getDefaultSingleton(). getClientFor(ocAccount, MainApp.getAppContext()); } - + mFile = params[0]; - final String imageKey = String.valueOf(mFile.getRemoteId()); - - // Check disk cache in background thread - thumbnail = getBitmapFromDiskCache(imageKey); - - // Not found in disk cache - if (thumbnail == null || mFile.needsUpdateThumbnail()) { - // Converts dp to pixel - Resources r = MainApp.getAppContext().getResources(); - - int px = (int) Math.round(r.getDimension(R.dimen.file_icon_size)); - - if (mFile.isDown()){ - Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile( - mFile.getStoragePath(), px, px); - - if (bitmap != null) { - thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); - - // Rotate image, obeying exif tag - thumbnail = BitmapUtils.rotateImage(thumbnail, mFile.getStoragePath()); - - // Add thumbnail to cache - addBitmapToCache(imageKey, thumbnail); + + if (mFile instanceof OCFile) { + thumbnail = doOCFileInBackground(); + } else if (mFile instanceof File) { + thumbnail = doFileInBackground(); + } else { + // do nothing + } - mFile.setNeedsUpdateThumbnail(false); - mStorageManager.saveFile(mFile); - } - - } else { - // Download thumbnail from server - if (mClient != null && mServerVersion != null) { - OwnCloudVersion serverOCVersion = new OwnCloudVersion(mServerVersion); - if (serverOCVersion.compareTo(new OwnCloudVersion(MINOR_SERVER_VERSION_FOR_THUMBS)) >= 0) { - try { - int status = -1; - - String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + - px + "/" + px + Uri.encode(mFile.getRemotePath(), "/"); - Log_OC.d("Thumbnail", "URI: " + uri); - GetMethod get = new GetMethod(uri); - status = mClient.executeMethod(get); - if (status == HttpStatus.SC_OK) { - byte[] bytes = get.getResponseBody(); - Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); - thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); - - // Add thumbnail to cache - if (thumbnail != null) { - addBitmapToCache(imageKey, thumbnail); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } else { - Log_OC.d(TAG, "Server too old"); - } - } + }catch(Throwable t){ + // the app should never break due to a problem with thumbnails + Log_OC.e(TAG, "Generation of thumbnail for " + mFile + " failed", t); + if (t instanceof OutOfMemoryError) { + System.gc(); } } - - } catch (Throwable t) { - // the app should never break due to a problem with thumbnails - Log_OC.e(TAG, "Generation of thumbnail for " + mFile + " failed", t); - if (t instanceof OutOfMemoryError) { - System.gc(); - } - } - + return thumbnail; } - + protected void onPostExecute(Bitmap bitmap){ if (isCancelled()) { bitmap = null; @@ -280,47 +201,183 @@ public class ThumbnailsCacheManager { if (mImageViewReference != null && bitmap != null) { final ImageView imageView = mImageViewReference.get(); - final ThumbnailGenerationTask bitmapWorkerTask = - getBitmapWorkerTask(imageView); + final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView); if (this == bitmapWorkerTask && imageView != null) { - if (imageView.getTag().equals(mFile.getFileId())) { + String tagId = ""; + if (mFile instanceof OCFile){ + tagId = String.valueOf(((OCFile)mFile).getFileId()); + } else if (mFile instanceof File){ + tagId = String.valueOf(((File)mFile).hashCode()); + } + if (String.valueOf(imageView.getTag()).equals(tagId)) { imageView.setImageBitmap(bitmap); } } } } + + /** + * Add thumbnail to cache + * @param imageKey: thumb key + * @param bitmap: image for extracting thumbnail + * @param path: image path + * @param px: thumbnail dp + * @return Bitmap + */ + private Bitmap addThumbnailToCache(String imageKey, Bitmap bitmap, String path, int px){ + + Bitmap thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); + + // Rotate image, obeying exif tag + thumbnail = BitmapUtils.rotateImage(thumbnail,path); + + // Add thumbnail to cache + addBitmapToCache(imageKey, thumbnail); + + return thumbnail; + } + + /** + * Converts size of file icon from dp to pixel + * @return int + */ + private int getThumbnailDimension(){ + // Converts dp to pixel + Resources r = MainApp.getAppContext().getResources(); + return (int) Math.round(r.getDimension(R.dimen.file_icon_size_grid)); + } + + private Bitmap doOCFileInBackground() { + Bitmap thumbnail = null; + OCFile file = (OCFile)mFile; + + final String imageKey = String.valueOf(file.getRemoteId()); + + // Check disk cache in background thread + thumbnail = getBitmapFromDiskCache(imageKey); + + // Not found in disk cache + if (thumbnail == null || file.needsUpdateThumbnail()) { + + int px = getThumbnailDimension(); + + if (file.isDown()) { + Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile( + file.getStoragePath(), px, px); + + if (bitmap != null) { + thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), px); + + file.setNeedsUpdateThumbnail(false); + mStorageManager.saveFile(file); + } + + } else { + // Download thumbnail from server + if (mClient != null && mServerVersion != null) { + OwnCloudVersion serverOCVersion = new OwnCloudVersion(mServerVersion); + if (serverOCVersion.compareTo(new OwnCloudVersion(MINOR_SERVER_VERSION_FOR_THUMBS)) >= 0) { + try { + int status = -1; + + String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + + px + "/" + px + Uri.encode(file.getRemotePath(), "/"); + Log_OC.d("Thumbnail", "URI: " + uri); + GetMethod get = new GetMethod(uri); + status = mClient.executeMethod(get); + if (status == HttpStatus.SC_OK) { + byte[] bytes = get.getResponseBody(); + Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); + thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); + + // Add thumbnail to cache + if (thumbnail != null) { + addBitmapToCache(imageKey, thumbnail); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } else { + Log_OC.d(TAG, "Server too old"); + } + } + } + } + + return thumbnail; + + } + + private Bitmap doFileInBackground() { + Bitmap thumbnail = null; + File file = (File)mFile; + + final String imageKey = String.valueOf(file.hashCode()); + + // Check disk cache in background thread + thumbnail = getBitmapFromDiskCache(imageKey); + + // Not found in disk cache + if (thumbnail == null) { + + int px = getThumbnailDimension(); + + Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile( + file.getAbsolutePath(), px, px); + + if (bitmap != null) { + thumbnail = addThumbnailToCache(imageKey, bitmap, file.getPath(), px); + } + } + return thumbnail; + } + } - - + + public static boolean cancelPotentialWork(Object file, ImageView imageView) { + final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView); + + if (bitmapWorkerTask != null) { + final Object bitmapData = bitmapWorkerTask.mFile; + // If bitmapData is not yet set or it differs from the new data + if (bitmapData == null || bitmapData != file) { + // Cancel previous task + bitmapWorkerTask.cancel(true); + } else { + // The same work is already in progress + return false; + } + } + // No task associated with the ImageView, or an existing task was cancelled + return true; + } + + public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) { + if (imageView != null) { + final Drawable drawable = imageView.getDrawable(); + if (drawable instanceof AsyncDrawable) { + final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable; + return asyncDrawable.getBitmapWorkerTask(); + } + } + return null; + } + public static class AsyncDrawable extends BitmapDrawable { private final WeakReference bitmapWorkerTaskReference; public AsyncDrawable( Resources res, Bitmap bitmap, ThumbnailGenerationTask bitmapWorkerTask - ) { - + ) { + super(res, bitmap); bitmapWorkerTaskReference = - new WeakReference(bitmapWorkerTask); + new WeakReference(bitmapWorkerTask); } public ThumbnailGenerationTask getBitmapWorkerTask() { return bitmapWorkerTaskReference.get(); } } - - - /** - * Remove from cache the remoteId passed - * @param fileRemoteId: remote id of mFile passed - */ - public static void removeFileFromCache(String fileRemoteId){ - synchronized (mThumbnailsDiskCacheLock) { - if (mThumbnailCache != null) { - mThumbnailCache.removeKey(fileRemoteId); - } - mThumbnailsDiskCacheLock.notifyAll(); // Wake any waiting threads - } - } - } diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java index 717066b7..66113066 100644 --- a/src/com/owncloud/android/db/DbHandler.java +++ b/src/com/owncloud/android/db/DbHandler.java @@ -1,6 +1,9 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * + * @author Bartek Przybylski * Copyright (C) 2011-2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -28,9 +31,6 @@ import android.database.sqlite.SQLiteOpenHelper; /** * Custom database helper for ownCloud - * - * @author Bartek Przybylski - * */ public class DbHandler { private SQLiteDatabase mDB; @@ -114,7 +114,14 @@ public class DbHandler { db.execSQL("ALTER TABLE " + TABLE_INSTANT_UPLOAD + " ADD COLUMN attempt INTEGER;"); } db.execSQL("ALTER TABLE " + TABLE_INSTANT_UPLOAD + " ADD COLUMN message TEXT;"); - + } + + @Override + public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { + //downgrading is the exception, so deleting and re-creating is acceptable. + //otherwise exception will be thrown (cannot downgrade) and oc app will crash. + db.execSQL("DROP TABLE IF EXISTS " + TABLE_INSTANT_UPLOAD + ";"); + onCreate(db); } } } diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java index bc59869a..1f789d14 100644 --- a/src/com/owncloud/android/db/ProviderMeta.java +++ b/src/com/owncloud/android/db/ProviderMeta.java @@ -1,6 +1,9 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * + * @author Bartek Przybylski * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -24,14 +27,11 @@ import com.owncloud.android.MainApp; /** * Meta-Class that holds various static field information - * - * @author Bartek Przybylski - * */ public class ProviderMeta { public static final String DB_NAME = "filelist"; - public static final int DB_VERSION = 8; + public static final int DB_VERSION = 9; private ProviderMeta() { } @@ -71,6 +71,7 @@ public class ProviderMeta { public static final String FILE_PERMISSIONS = "permissions"; public static final String FILE_REMOTE_ID = "remote_id"; public static final String FILE_UPDATE_THUMBNAIL = "update_thumbnail"; + public static final String FILE_IS_DOWNLOADING= "is_downloading"; public static final String FILE_DEFAULT_SORT_ORDER = FILE_NAME + " collate nocase asc"; diff --git a/src/com/owncloud/android/files/BootupBroadcastReceiver.java b/src/com/owncloud/android/files/BootupBroadcastReceiver.java index 4e139aeb..2cf4358d 100644 --- a/src/com/owncloud/android/files/BootupBroadcastReceiver.java +++ b/src/com/owncloud/android/files/BootupBroadcastReceiver.java @@ -1,6 +1,9 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * + * @author David A. Velasco * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -29,8 +32,6 @@ import android.content.Intent; /** * App-registered receiver catching the broadcast intent reporting that the system was * just boot up. - * - * @author David A. Velasco */ public class BootupBroadcastReceiver extends BroadcastReceiver { diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java index 6eb746cb..04e9fbc1 100644 --- a/src/com/owncloud/android/files/FileMenuFilter.java +++ b/src/com/owncloud/android/files/FileMenuFilter.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -31,13 +34,13 @@ import com.owncloud.android.files.services.FileDownloader; 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.services.OperationsService; +import com.owncloud.android.services.OperationsService.OperationsServiceBinder; import com.owncloud.android.ui.activity.ComponentsGetter; /** * Filters out the file actions available in a given {@link Menu} for a given {@link OCFile} * according to the current state of the latest. - * - * @author David A. Velasco */ public class FileMenuFilter { @@ -51,8 +54,8 @@ public class FileMenuFilter { * * @param targetFile {@link OCFile} target of the action to filter in the {@link Menu}. * @param account ownCloud {@link Account} holding targetFile. - * @param cg Accessor to app components, needed to get access the - * {@link FileUploader} and {@link FileDownloader} services. + * @param cg Accessor to app components, needed to access the + * {@link FileUploader} and {@link FileDownloader} services * @param context Android {@link Context}, needed to access build setup resources. */ public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg, Context context) { @@ -140,15 +143,17 @@ public class FileMenuFilter { boolean uploading = false; if (mComponentsGetter != null && mFile != null && mAccount != null) { FileDownloaderBinder downloaderBinder = mComponentsGetter.getFileDownloaderBinder(); - downloading = downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile); + downloading = (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)); + OperationsServiceBinder opsBinder = mComponentsGetter.getOperationsServiceBinder(); + downloading |= (opsBinder != null && opsBinder.isSynchronizing(mAccount, mFile.getRemotePath())); FileUploaderBinder uploaderBinder = mComponentsGetter.getFileUploaderBinder(); - uploading = uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile); + uploading = (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile)); } /// decision is taken for each possible action on a file in the menu // DOWNLOAD - if (mFile == null || mFile.isFolder() || mFile.isDown() || downloading || uploading) { + if (mFile == null || mFile.isDown() || downloading || uploading) { toHide.add(R.id.action_download_file); } else { @@ -189,7 +194,7 @@ public class FileMenuFilter { // CANCEL DOWNLOAD - if (mFile == null || !downloading || mFile.isFolder()) { + if (mFile == null || !downloading) { toHide.add(R.id.action_cancel_download); } else { toShow.add(R.id.action_cancel_download); diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index e1ab1953..46588114 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -1,5 +1,9 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author masensio + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -41,9 +45,7 @@ import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.dialog.ShareLinkToDialog; /** - * - * @author masensio - * @author David A. Velasco + * */ public class FileOperationsHelper { @@ -127,7 +129,7 @@ public class FileOperationsHelper { service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); service.putExtra(OperationsService.EXTRA_SEND_INTENT, sendIntent); - mWaitingForOpId = mFileActivity.getOperationsServiceBinder().newOperation(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); } else { Log_OC.wtf(TAG, "Trying to open a NULL OCFile"); @@ -165,7 +167,7 @@ public class FileOperationsHelper { service.setAction(OperationsService.ACTION_UNSHARE); service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); - mWaitingForOpId = mFileActivity.getOperationsServiceBinder().newOperation(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); mFileActivity.showLoadingDialog(); @@ -197,18 +199,25 @@ public class FileOperationsHelper { public void syncFile(OCFile file) { - // Sync file - Intent service = new Intent(mFileActivity, OperationsService.class); - service.setAction(OperationsService.ACTION_SYNC_FILE); - service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); - service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); - service.putExtra(OperationsService.EXTRA_SYNC_FILE_CONTENTS, true); - mWaitingForOpId = mFileActivity.getOperationsServiceBinder().newOperation(service); - mFileActivity.showLoadingDialog(); + if (!file.isFolder()){ + Intent intent = new Intent(mFileActivity, OperationsService.class); + intent.setAction(OperationsService.ACTION_SYNC_FILE); + intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); + intent.putExtra(OperationsService.EXTRA_SYNC_FILE_CONTENTS, true); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(intent); + mFileActivity.showLoadingDialog(); + + } else { + Intent intent = new Intent(mFileActivity, OperationsService.class); + intent.setAction(OperationsService.ACTION_SYNC_FOLDER); + intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); + intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); + mFileActivity.startService(intent); + } } - public void renameFile(OCFile file, String newFilename) { // RenameFile Intent service = new Intent(mFileActivity, OperationsService.class); @@ -216,7 +225,7 @@ public class FileOperationsHelper { service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); service.putExtra(OperationsService.EXTRA_NEWNAME, newFilename); - mWaitingForOpId = mFileActivity.getOperationsServiceBinder().newOperation(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); mFileActivity.showLoadingDialog(); } @@ -229,7 +238,7 @@ public class FileOperationsHelper { service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); service.putExtra(OperationsService.EXTRA_REMOVE_ONLY_LOCAL, onlyLocalCopy); - mWaitingForOpId = mFileActivity.getOperationsServiceBinder().newOperation(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); mFileActivity.showLoadingDialog(); } @@ -242,26 +251,38 @@ public class FileOperationsHelper { service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, remotePath); service.putExtra(OperationsService.EXTRA_CREATE_FULL_PATH, createFullPath); - mWaitingForOpId = mFileActivity.getOperationsServiceBinder().newOperation(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); mFileActivity.showLoadingDialog(); } - + /** + * Cancel the transference in downloads (files/folders) and file uploads + * @param file OCFile + */ public void cancelTransference(OCFile file) { Account account = mFileActivity.getAccount(); + if (file.isFolder()) { + OperationsService.OperationsServiceBinder opsBinder = mFileActivity.getOperationsServiceBinder(); + if (opsBinder != null) { + opsBinder.cancel(account, file); + } + } + + // for both files and folders FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder(); - FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder(); + FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder(); if (downloaderBinder != null && downloaderBinder.isDownloading(account, file)) { + downloaderBinder.cancel(account, file); + + // TODO - review why is this here, and solve in a better way // Remove etag for parent, if file is a keep_in_sync if (file.keepInSync()) { - OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId()); - parent.setEtag(""); - mFileActivity.getStorageManager().saveFile(parent); + OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId()); + parent.setEtag(""); + mFileActivity.getStorageManager().saveFile(parent); } - - downloaderBinder.cancel(account, file); - + } else if (uploaderBinder != null && uploaderBinder.isUploading(account, file)) { uploaderBinder.cancel(account, file); } @@ -279,7 +300,7 @@ public class FileOperationsHelper { service.putExtra(OperationsService.EXTRA_NEW_PARENT_PATH, newfile.getRemotePath()); service.putExtra(OperationsService.EXTRA_REMOTE_PATH, currentFile.getRemotePath()); service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); - mWaitingForOpId = mFileActivity.getOperationsServiceBinder().newOperation(service); + mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service); mFileActivity.showLoadingDialog(); } diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index c1c3e9ca..b52c36d9 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2014 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index c9ad9611..f5be6a76 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2012-2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -25,10 +27,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Vector; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -51,7 +52,9 @@ import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.utils.ErrorMessageAdapter; import android.accounts.Account; +import android.accounts.AccountManager; import android.accounts.AccountsException; +import android.accounts.OnAccountsUpdateListener; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; @@ -64,118 +67,159 @@ import android.os.Looper; import android.os.Message; import android.os.Process; import android.support.v4.app.NotificationCompat; +import android.util.Pair; + +public class FileDownloader extends Service + implements OnDatatransferProgressListener, OnAccountsUpdateListener { -public class FileDownloader extends Service implements OnDatatransferProgressListener { - public static final String EXTRA_ACCOUNT = "ACCOUNT"; public static final String EXTRA_FILE = "FILE"; - + private static final String DOWNLOAD_ADDED_MESSAGE = "DOWNLOAD_ADDED"; private static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH"; - public static final String EXTRA_DOWNLOAD_RESULT = "RESULT"; + public static final String EXTRA_DOWNLOAD_RESULT = "RESULT"; public static final String EXTRA_FILE_PATH = "FILE_PATH"; public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH"; + public static final String EXTRA_LINKED_TO_PATH = "LINKED_TO"; public static final String ACCOUNT_NAME = "ACCOUNT_NAME"; - + private static final String TAG = "FileDownloader"; private Looper mServiceLooper; private ServiceHandler mServiceHandler; private IBinder mBinder; private OwnCloudClient mDownloadClient = null; - private Account mLastAccount = null; + private Account mCurrentAccount = null; private FileDataStorageManager mStorageManager; - - private ConcurrentMap mPendingDownloads = new ConcurrentHashMap(); + + private IndexedForest mPendingDownloads = new IndexedForest(); + private DownloadFileOperation mCurrentDownload = null; - + private NotificationManager mNotificationManager; private NotificationCompat.Builder mNotificationBuilder; private int mLastPercent; - - + + public static String getDownloadAddedMessage() { - return FileDownloader.class.getName().toString() + DOWNLOAD_ADDED_MESSAGE; + return FileDownloader.class.getName() + DOWNLOAD_ADDED_MESSAGE; } - + public static String getDownloadFinishMessage() { - return FileDownloader.class.getName().toString() + DOWNLOAD_FINISH_MESSAGE; - } - - /** - * Builds a key for mPendingDownloads from the account and file to download - * - * @param account Account where the file to download is stored - * @param file File to download - */ - private String buildRemoteName(Account account, OCFile file) { - return account.name + file.getRemotePath(); + return FileDownloader.class.getName() + DOWNLOAD_FINISH_MESSAGE; } - /** * Service initialization */ @Override public void onCreate() { super.onCreate(); + Log_OC.d(TAG, "Creating service"); mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - HandlerThread thread = new HandlerThread("FileDownloaderThread", - Process.THREAD_PRIORITY_BACKGROUND); + HandlerThread thread = new HandlerThread("FileDownloaderThread", Process.THREAD_PRIORITY_BACKGROUND); thread.start(); mServiceLooper = thread.getLooper(); mServiceHandler = new ServiceHandler(mServiceLooper, this); mBinder = new FileDownloaderBinder(); + + // add AccountsUpdatedListener + AccountManager am = AccountManager.get(getApplicationContext()); + am.addOnAccountsUpdatedListener(this, null, false); } + + /** + * Service clean up + */ + @Override + public void onDestroy() { + Log_OC.v(TAG, "Destroying service"); + mBinder = null; + mServiceHandler = null; + mServiceLooper.quit(); + mServiceLooper = null; + mNotificationManager = null; + + // remove AccountsUpdatedListener + AccountManager am = AccountManager.get(getApplicationContext()); + am.removeOnAccountsUpdatedListener(this); + + super.onDestroy(); + } + + /** * Entry point to add one or several files to the queue of downloads. - * - * New downloads are added calling to startService(), resulting in a call to this method. This ensures the service will keep on working - * although the caller activity goes away. + *

+ * New downloads are added calling to startService(), resulting in a call to this method. + * This ensures the service will keep on working although the caller activity goes away. */ @Override public int onStartCommand(Intent intent, int flags, int startId) { - if ( !intent.hasExtra(EXTRA_ACCOUNT) || + Log_OC.d(TAG, "Starting command with id " + startId); + + if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_FILE) - /*!intent.hasExtra(EXTRA_FILE_PATH) || - !intent.hasExtra(EXTRA_REMOTE_PATH)*/ - ) { + ) { Log_OC.e(TAG, "Not enough information provided in intent"); return START_NOT_STICKY; - } - Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); - OCFile file = intent.getParcelableExtra(EXTRA_FILE); - - AbstractList requestedDownloads = new Vector(); // dvelasco: now this always contains just one element, but that can change in a near future (download of multiple selection) - String downloadKey = buildRemoteName(account, file); - try { - DownloadFileOperation newDownload = new DownloadFileOperation(account, file); - mPendingDownloads.putIfAbsent(downloadKey, newDownload); - newDownload.addDatatransferProgressListener(this); - newDownload.addDatatransferProgressListener((FileDownloaderBinder)mBinder); - requestedDownloads.add(downloadKey); - sendBroadcastNewDownload(newDownload); - - } catch (IllegalArgumentException e) { - Log_OC.e(TAG, "Not enough information provided in intent: " + e.getMessage()); - return START_NOT_STICKY; - } - - if (requestedDownloads.size() > 0) { - Message msg = mServiceHandler.obtainMessage(); - msg.arg1 = startId; - msg.obj = requestedDownloads; - mServiceHandler.sendMessage(msg); + } else { + final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); + final OCFile file = intent.getParcelableExtra(EXTRA_FILE); + + /*Log_OC.v( + "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Received request to download file" + );*/ + + AbstractList requestedDownloads = new Vector(); + try { + DownloadFileOperation newDownload = new DownloadFileOperation(account, file); + newDownload.addDatatransferProgressListener(this); + newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder); + Pair putResult = mPendingDownloads.putIfAbsent( + account, file.getRemotePath(), newDownload + ); + String downloadKey = putResult.first; + requestedDownloads.add(downloadKey); + /*Log_OC.v( + "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Download on " + file.getRemotePath() + " added to queue" + );*/ + + // Store file on db with state 'downloading' + /* + TODO - check if helps with UI responsiveness, letting only folders use FileDownloaderBinder to check + FileDataStorageManager storageManager = new FileDataStorageManager(account, getContentResolver()); + file.setDownloading(true); + storageManager.saveFile(file); + */ + + sendBroadcastNewDownload(newDownload, putResult.second); + + } catch (IllegalArgumentException e) { + Log_OC.e(TAG, "Not enough information provided in intent: " + e.getMessage()); + return START_NOT_STICKY; + } + + if (requestedDownloads.size() > 0) { + Message msg = mServiceHandler.obtainMessage(); + msg.arg1 = startId; + msg.obj = requestedDownloads; + mServiceHandler.sendMessage(msg); + } + //} } return START_NOT_STICKY; } - - + + /** - * Provides a binder object that clients can use to perform operations on the queue of downloads, excepting the addition of new files. - * + * Provides a binder object that clients can use to perform operations on the queue of downloads, + * excepting the addition of new files. + *

* Implemented to perform cancellation, pause and resume of existing downloads. */ @Override @@ -189,123 +233,173 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis */ @Override public boolean onUnbind(Intent intent) { - ((FileDownloaderBinder)mBinder).clearListeners(); + ((FileDownloaderBinder) mBinder).clearListeners(); return false; // not accepting rebinding (default behaviour) } - + @Override + public void onAccountsUpdated(Account[] accounts) { + //review the current download and cancel it if its account doesn't exist + if (mCurrentDownload != null && + !AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) { + mCurrentDownload.cancel(); + } + // The rest of downloads are cancelled when they try to start + } + + /** - * Binder to let client components to perform operations on the queue of downloads. - * - * It provides by itself the available operations. + * Binder to let client components to perform operations on the queue of downloads. + *

+ * It provides by itself the available operations. */ public class FileDownloaderBinder extends Binder implements OnDatatransferProgressListener { - - /** - * Map of listeners that will be reported about progress of downloads from a {@link FileDownloaderBinder} instance + + /** + * Map of listeners that will be reported about progress of downloads from a {@link FileDownloaderBinder} + * instance. */ - private Map mBoundListeners = new HashMap(); - - + private Map mBoundListeners = + new HashMap(); + + /** * Cancels a pending or current download of a remote file. - * - * @param account Owncloud account where the remote file is stored. - * @param file A file in the queue of pending downloads + * + * @param account ownCloud account where the remote file is stored. + * @param file A file in the queue of pending downloads */ public void cancel(Account account, OCFile file) { - DownloadFileOperation download = null; - synchronized (mPendingDownloads) { - download = mPendingDownloads.remove(buildRemoteName(account, file)); - } + /*Log_OC.v( + "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Received request to cancel download of " + file.getRemotePath() + ); + Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Removing download of " + file.getRemotePath());*/ + Pair removeResult = + mPendingDownloads.remove(account, file.getRemotePath()); + DownloadFileOperation download = removeResult.first; if (download != null) { + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling returned download of " + file.getRemotePath());*/ download.cancel(); + } else { + if (mCurrentDownload != null && mCurrentAccount != null && + mCurrentDownload.getRemotePath().startsWith(file.getRemotePath()) && + account.name.equals(mCurrentAccount.name)) { + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling current sync as descendant: " + mCurrentDownload.getRemotePath());*/ + mCurrentDownload.cancel(); + } } } - - + + /** + * Cancels a pending or current upload for an account + * + * @param account Owncloud accountName where the remote file will be stored. + */ + public void cancel(Account account) { + Log_OC.d(TAG, "Account= " + account.name); + + if (mCurrentDownload != null) { + Log_OC.d(TAG, "Current Download Account= " + mCurrentDownload.getAccount().name); + if (mCurrentDownload.getAccount().name.equals(account.name)) { + mCurrentDownload.cancel(); + } + } + // Cancel pending downloads + cancelDownloadsForAccount(account); + } + public void clearListeners() { mBoundListeners.clear(); } /** - * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting to download. - * - * If 'file' is a directory, returns 'true' if some of its descendant files is downloading or waiting to download. - * - * @param account Owncloud account where the remote file is stored. - * @param file A file that could be in the queue of downloads. + * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or + * waiting to download. + *

+ * If 'file' is a directory, returns 'true' if any of its descendant files is downloading or + * waiting to download. + * + * @param account ownCloud account where the remote file is stored. + * @param file A file that could be in the queue of downloads. */ public boolean isDownloading(Account account, OCFile file) { if (account == null || file == null) return false; - String targetKey = buildRemoteName(account, file); - synchronized (mPendingDownloads) { - if (file.isFolder()) { - // this can be slow if there are many downloads :( - Iterator it = mPendingDownloads.keySet().iterator(); - boolean found = false; - while (it.hasNext() && !found) { - found = it.next().startsWith(targetKey); - } - return found; - } else { - return (mPendingDownloads.containsKey(targetKey)); - } - } + return (mPendingDownloads.contains(account, file.getRemotePath())); } - + /** * Adds a listener interested in the progress of the download for a concrete file. - * - * @param listener Object to notify about progress of transfer. - * @param account ownCloud account holding the file of interest. - * @param file {@link OCfile} of interest for listener. + * + * @param listener Object to notify about progress of transfer. + * @param account ownCloud account holding the file of interest. + * @param file {@link OCFile} of interest for listener. */ - public void addDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) { + public void addDatatransferProgressListener( + OnDatatransferProgressListener listener, Account account, OCFile file + ) { if (account == null || file == null || listener == null) return; - String targetKey = buildRemoteName(account, file); - mBoundListeners.put(targetKey, listener); + //String targetKey = buildKey(account, file.getRemotePath()); + mBoundListeners.put(file.getFileId(), listener); } - - + + /** * Removes a listener interested in the progress of the download for a concrete file. - * - * @param listener Object to notify about progress of transfer. - * @param account ownCloud account holding the file of interest. - * @param file {@link OCfile} of interest for listener. + * + * @param listener Object to notify about progress of transfer. + * @param account ownCloud account holding the file of interest. + * @param file {@link OCFile} of interest for listener. */ - public void removeDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) { + public void removeDatatransferProgressListener( + OnDatatransferProgressListener listener, Account account, OCFile file + ) { if (account == null || file == null || listener == null) return; - String targetKey = buildRemoteName(account, file); - if (mBoundListeners.get(targetKey) == listener) { - mBoundListeners.remove(targetKey); + //String targetKey = buildKey(account, file.getRemotePath()); + Long fileId = file.getFileId(); + if (mBoundListeners.get(fileId) == listener) { + mBoundListeners.remove(fileId); } } @Override public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, - String fileName) { - String key = buildRemoteName(mCurrentDownload.getAccount(), mCurrentDownload.getFile()); - OnDatatransferProgressListener boundListener = mBoundListeners.get(key); + String fileName) { + //String key = buildKey(mCurrentDownload.getAccount(), mCurrentDownload.getFile().getRemotePath()); + OnDatatransferProgressListener boundListener = mBoundListeners.get(mCurrentDownload.getFile().getFileId()); if (boundListener != null) { boundListener.onTransferProgress(progressRate, totalTransferredSoFar, totalToTransfer, fileName); } } - + + /** + * Review downloads and cancel it if its account doesn't exist + */ + public void checkAccountOfCurrentDownload() { + if (mCurrentDownload != null && + !AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) { + mCurrentDownload.cancel(); + } + // The rest of downloads are cancelled when they try to start + } + } - - - /** - * Download worker. Performs the pending downloads in the order they were requested. - * - * Created with the Looper of a new thread, started in {@link FileUploader#onCreate()}. + + + /** + * Download worker. Performs the pending downloads in the order they were requested. + *

+ * Created with the Looper of a new thread, started in {@link FileUploader#onCreate()}. */ private static class ServiceHandler extends Handler { // don't make it a final class, and don't remove the static ; lint will warn about a possible memory leak FileDownloader mService; + public ServiceHandler(Looper looper, FileDownloader service) { super(looper); if (service == null) @@ -320,65 +414,83 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis if (msg.obj != null) { Iterator it = requestedDownloads.iterator(); while (it.hasNext()) { - mService.downloadFile(it.next()); + String next = it.next(); + mService.downloadFile(next); } } + Log_OC.d(TAG, "Stopping after command with id " + msg.arg1); mService.stopSelf(msg.arg1); } } - + /** * Core download method: requests a file to download and stores it. - * - * @param downloadKey Key to access the download to perform, contained in mPendingDownloads + * + * @param downloadKey Key to access the download to perform, contained in mPendingDownloads */ private void downloadFile(String downloadKey) { - - synchronized(mPendingDownloads) { - mCurrentDownload = mPendingDownloads.get(downloadKey); - } - + + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Getting download of " + downloadKey);*/ + mCurrentDownload = mPendingDownloads.get(downloadKey); + if (mCurrentDownload != null) { - - notifyDownloadStart(mCurrentDownload); + // Detect if the account exists + if (AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) { + Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().name + " exists"); + notifyDownloadStart(mCurrentDownload); - RemoteOperationResult downloadResult = null; - try { - /// prepare client object to send the request to the ownCloud server - if (mDownloadClient == null || !mLastAccount.equals(mCurrentDownload.getAccount())) { - mLastAccount = mCurrentDownload.getAccount(); - mStorageManager = - new FileDataStorageManager(mLastAccount, getContentResolver()); - OwnCloudAccount ocAccount = new OwnCloudAccount(mLastAccount, this); + RemoteOperationResult downloadResult = null; + try { + /// prepare client object to send the request to the ownCloud server + if (mCurrentAccount == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) { + mCurrentAccount = mCurrentDownload.getAccount(); + mStorageManager = new FileDataStorageManager( + mCurrentAccount, + getContentResolver() + ); + } // else, reuse storage manager from previous operation + + // always get client from client manager, to get fresh credentials in case of update + OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this); mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). getClientFor(ocAccount, this); - } - /// perform the download - downloadResult = mCurrentDownload.execute(mDownloadClient); - if (downloadResult.isSuccess()) { - saveDownloadedFile(); - } - - } catch (AccountsException e) { - Log_OC.e(TAG, "Error while trying to get autorization for " + mLastAccount.name, e); - downloadResult = new RemoteOperationResult(e); - } catch (IOException e) { - Log_OC.e(TAG, "Error while trying to get autorization for " + mLastAccount.name, e); - downloadResult = new RemoteOperationResult(e); - - } finally { - synchronized(mPendingDownloads) { - mPendingDownloads.remove(downloadKey); + + /// perform the download + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Executing download of " + mCurrentDownload.getRemotePath());*/ + downloadResult = mCurrentDownload.execute(mDownloadClient); + if (downloadResult.isSuccess()) { + saveDownloadedFile(); + } + + } catch (AccountsException e) { + Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e); + downloadResult = new RemoteOperationResult(e); + } catch (IOException e) { + Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e); + downloadResult = new RemoteOperationResult(e); + + } finally { + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Removing payload " + mCurrentDownload.getRemotePath());*/ + + Pair removeResult = + mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath()); + + /// notify result + notifyDownloadResult(mCurrentDownload, downloadResult); + + sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second); } - } + } else { + // Cancel the transfer + Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " doesn't exist"); + cancelDownloadsForAccount(mCurrentDownload.getAccount()); - - /// notify result - notifyDownloadResult(mCurrentDownload, downloadResult); - - sendBroadcastDownloadFinished(mCurrentDownload, downloadResult); + } } } @@ -403,16 +515,25 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis mStorageManager.triggerMediaScan(file.getStoragePath()); } + /** + * Update the OC File after a unsuccessful download + */ + private void updateUnsuccessfulDownloadedFile() { + OCFile file = mStorageManager.getFileById(mCurrentDownload.getFile().getFileId()); + file.setDownloading(false); + mStorageManager.saveFile(file); + } + /** * Creates a status notification to show the download progress - * - * @param download Download operation starting. + * + * @param download Download operation starting. */ private void notifyDownloadStart(DownloadFileOperation download) { /// create status notification with a progress bar mLastPercent = 0; - mNotificationBuilder = + mNotificationBuilder = NotificationBuilderWithProgressBar.newNotificationBuilderWithProgressBar(this); mNotificationBuilder .setSmallIcon(R.drawable.notification_icon) @@ -424,7 +545,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getSavePath()).getName()) ); - + /// includes a pending intent in the notification showing the details view of the file Intent showDetailsIntent = null; if (PreviewImageFragment.canBePreviewed(download.getFile())) { @@ -435,21 +556,21 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, download.getFile()); showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, download.getAccount()); showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - + mNotificationBuilder.setContentIntent(PendingIntent.getActivity( - this, (int) System.currentTimeMillis(), showDetailsIntent, 0 + this, (int) System.currentTimeMillis(), showDetailsIntent, 0 )); mNotificationManager.notify(R.string.downloader_download_in_progress_ticker, mNotificationBuilder.build()); } - + /** * Callback method to update the progress bar in the status notification. */ @Override public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String filePath) { - int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer)); + int percent = (int) (100.0 * ((double) totalTransferredSoFar) / ((double) totalToTransfer)); if (percent != mLastPercent) { mNotificationBuilder.setProgress(100, percent, totalToTransfer < 0); String fileName = filePath.substring(filePath.lastIndexOf(FileUtils.PATH_SEPARATOR) + 1); @@ -459,100 +580,120 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis } mLastPercent = percent; } - - + + /** * Updates the status notification with the result of a download operation. - * - * @param downloadResult Result of the download operation. - * @param download Finished download operation + * + * @param downloadResult Result of the download operation. + * @param download Finished download operation */ private void notifyDownloadResult(DownloadFileOperation download, RemoteOperationResult downloadResult) { mNotificationManager.cancel(R.string.downloader_download_in_progress_ticker); if (!downloadResult.isCancelled()) { - int tickerId = (downloadResult.isSuccess()) ? R.string.downloader_download_succeeded_ticker : - R.string.downloader_download_failed_ticker; - + int tickerId = (downloadResult.isSuccess()) ? R.string.downloader_download_succeeded_ticker : + R.string.downloader_download_failed_ticker; + boolean needsToUpdateCredentials = ( downloadResult.getCode() == ResultCode.UNAUTHORIZED || - downloadResult.isIdPRedirection() + downloadResult.isIdPRedirection() ); - tickerId = (needsToUpdateCredentials) ? + tickerId = (needsToUpdateCredentials) ? R.string.downloader_download_failed_credentials_error : tickerId; - + mNotificationBuilder - .setTicker(getString(tickerId)) - .setContentTitle(getString(tickerId)) - .setAutoCancel(true) - .setOngoing(false) - .setProgress(0, 0, false); - + .setTicker(getString(tickerId)) + .setContentTitle(getString(tickerId)) + .setAutoCancel(true) + .setOngoing(false) + .setProgress(0, 0, false); + if (needsToUpdateCredentials) { - + // let the user update credentials with one click Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class); updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, download.getAccount()); - updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_EXPIRED_TOKEN); + updateAccountCredentials.putExtra( + AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_EXPIRED_TOKEN + ); updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); updateAccountCredentials.addFlags(Intent.FLAG_FROM_BACKGROUND); mNotificationBuilder - .setContentIntent(PendingIntent.getActivity( - this, (int) System.currentTimeMillis(), updateAccountCredentials, PendingIntent.FLAG_ONE_SHOT)); - - mDownloadClient = null; // grant that future retries on the same account will get the fresh credentials - + .setContentIntent(PendingIntent.getActivity( + this, (int) System.currentTimeMillis(), updateAccountCredentials, PendingIntent.FLAG_ONE_SHOT)); + } else { // TODO put something smart in showDetailsIntent - Intent showDetailsIntent = new Intent(); + Intent showDetailsIntent = new Intent(); mNotificationBuilder - .setContentIntent(PendingIntent.getActivity( - this, (int) System.currentTimeMillis(), showDetailsIntent, 0)); + .setContentIntent(PendingIntent.getActivity( + this, (int) System.currentTimeMillis(), showDetailsIntent, 0)); } - - mNotificationBuilder.setContentText(ErrorMessageAdapter.getErrorCauseMessage(downloadResult, download, getResources())); + + mNotificationBuilder.setContentText( + ErrorMessageAdapter.getErrorCauseMessage(downloadResult, download, getResources()) + ); mNotificationManager.notify(tickerId, mNotificationBuilder.build()); - + // Remove success notification - if (downloadResult.isSuccess()) { + if (downloadResult.isSuccess()) { // Sleep 2 seconds, so show the notification before remove it NotificationDelayer.cancelWithDelay( - mNotificationManager, - R.string.downloader_download_succeeded_ticker, + mNotificationManager, + R.string.downloader_download_succeeded_ticker, 2000); } - + } } - - + + /** * Sends a broadcast when a download finishes in order to the interested activities can update their view - * - * @param download Finished download operation - * @param downloadResult Result of the download operation + * + * @param download Finished download operation + * @param downloadResult Result of the download operation + * @param unlinkedFromRemotePath Path in the downloads tree where the download was unlinked from */ - private void sendBroadcastDownloadFinished(DownloadFileOperation download, RemoteOperationResult downloadResult) { + private void sendBroadcastDownloadFinished( + DownloadFileOperation download, + RemoteOperationResult downloadResult, + String unlinkedFromRemotePath) { Intent end = new Intent(getDownloadFinishMessage()); end.putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult.isSuccess()); end.putExtra(ACCOUNT_NAME, download.getAccount().name); end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath()); end.putExtra(EXTRA_FILE_PATH, download.getSavePath()); + if (unlinkedFromRemotePath != null) { + end.putExtra(EXTRA_LINKED_TO_PATH, unlinkedFromRemotePath); + } sendStickyBroadcast(end); } - - + + /** * Sends a broadcast when a new download is added to the queue. - * - * @param download Added download operation + * + * @param download Added download operation + * @param linkedToRemotePath Path in the downloads tree where the download was linked to */ - private void sendBroadcastNewDownload(DownloadFileOperation download) { + private void sendBroadcastNewDownload(DownloadFileOperation download, String linkedToRemotePath) { Intent added = new Intent(getDownloadAddedMessage()); added.putExtra(ACCOUNT_NAME, download.getAccount().name); added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath()); added.putExtra(EXTRA_FILE_PATH, download.getSavePath()); + added.putExtra(EXTRA_LINKED_TO_PATH, linkedToRemotePath); sendStickyBroadcast(added); } + /** + * Remove downloads of an account + * + * @param account Downloads account to remove + */ + private void cancelDownloadsForAccount(Account account) { + // Cancel pending downloads + mPendingDownloads.remove(account); + } } diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 04804402..851e343f 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2012-2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -31,6 +33,7 @@ import java.util.concurrent.ConcurrentMap; import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AccountsException; +import android.accounts.OnAccountsUpdateListener; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; @@ -76,8 +79,8 @@ import com.owncloud.android.utils.ErrorMessageAdapter; import com.owncloud.android.utils.UriUtils; - -public class FileUploader extends Service implements OnDatatransferProgressListener { +public class FileUploader extends Service + implements OnDatatransferProgressListener, OnAccountsUpdateListener { private static final String UPLOAD_FINISH_MESSAGE = "UPLOAD_FINISH"; public static final String EXTRA_UPLOAD_RESULT = "RESULT"; @@ -124,14 +127,14 @@ public class FileUploader extends Service implements OnDatatransferProgressListe private static final String MIME_TYPE_PDF = "application/pdf"; private static final String FILE_EXTENSION_PDF = ".pdf"; - + public static String getUploadFinishMessage() { return FileUploader.class.getName().toString() + UPLOAD_FINISH_MESSAGE; } - + /** * Builds a key for mPendingUploads from the account and file to upload - * + * * @param account Account where the file to upload is stored * @param file File to upload */ @@ -145,7 +148,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe /** * Checks if an ownCloud server version should support chunked uploads. - * + * * @param version OwnCloud version instance corresponding to an ownCloud * server. * @return 'True' if the ownCloud server with version supports chunked @@ -161,24 +164,50 @@ public class FileUploader extends Service implements OnDatatransferProgressListe @Override public void onCreate() { super.onCreate(); - Log_OC.i(TAG, "mPendingUploads size:" + mPendingUploads.size()); + Log_OC.d(TAG, "Creating service"); mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); HandlerThread thread = new HandlerThread("FileUploaderThread", Process.THREAD_PRIORITY_BACKGROUND); thread.start(); mServiceLooper = thread.getLooper(); mServiceHandler = new ServiceHandler(mServiceLooper, this); mBinder = new FileUploaderBinder(); + + // add AccountsUpdatedListener + AccountManager am = AccountManager.get(getApplicationContext()); + am.addOnAccountsUpdatedListener(this, null, false); } /** + * Service clean up + */ + @Override + public void onDestroy() { + Log_OC.v(TAG, "Destroying service" ); + mBinder = null; + mServiceHandler = null; + mServiceLooper.quit(); + mServiceLooper = null; + mNotificationManager = null; + + // remove AccountsUpdatedListener + AccountManager am = AccountManager.get(getApplicationContext()); + am.removeOnAccountsUpdatedListener(this); + + super.onDestroy(); + } + + + /** * Entry point to add one or several files to the queue of uploads. - * + * * New uploads are added calling to startService(), resulting in a call to * this method. This ensures the service will keep on working although the * caller activity goes away. */ @Override public int onStartCommand(Intent intent, int flags, int startId) { + Log_OC.d(TAG, "Starting command with id " + startId); + if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE) || !(intent.hasExtra(KEY_LOCAL_FILE) || intent.hasExtra(KEY_FILE))) { Log_OC.e(TAG, "Not enough information provided in intent"); @@ -199,7 +228,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe if (uploadType == UPLOAD_SINGLE_FILE) { if (intent.hasExtra(KEY_FILE)) { - files = new OCFile[] { intent.getParcelableExtra(KEY_FILE) }; + files = new OCFile[] { (OCFile) intent.getParcelableExtra(KEY_FILE) }; } else { localPaths = new String[] { intent.getStringExtra(KEY_LOCAL_FILE) }; @@ -229,7 +258,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe boolean forceOverwrite = intent.getBooleanExtra(KEY_FORCE_OVERWRITE, false); boolean isInstant = intent.getBooleanExtra(KEY_INSTANT_UPLOAD, false); int localAction = intent.getIntExtra(KEY_LOCAL_BEHAVIOUR, LOCAL_BEHAVIOUR_COPY); - + if (intent.hasExtra(KEY_FILE) && files == null) { Log_OC.e(TAG, "Incorrect array for OCFiles provided in upload intent"); return Service.START_NOT_STICKY; @@ -262,7 +291,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe AccountManager aMgr = AccountManager.get(this); String version = aMgr.getUserData(account, Constants.KEY_OC_VERSION); OwnCloudVersion ocv = new OwnCloudVersion(version); - + boolean chunked = FileUploader.chunkedUploadIsSupported(ocv); AbstractList requestedUploads = new Vector(); String uploadKey = null; @@ -270,7 +299,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe try { for (int i = 0; i < files.length; i++) { uploadKey = buildRemoteName(account, files[i].getRemotePath()); - newUpload = new UploadFileOperation(account, files[i], chunked, isInstant, forceOverwrite, localAction, + newUpload = new UploadFileOperation(account, files[i], chunked, isInstant, forceOverwrite, localAction, getApplicationContext()); if (isInstant) { newUpload.setRemoteFolderToBeCreated(); @@ -309,7 +338,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe /** * Provides a binder object that clients can use to perform operations on * the queue of uploads, excepting the addition of new files. - * + * * Implemented to perform cancellation, pause and resume of existing * uploads. */ @@ -317,7 +346,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe public IBinder onBind(Intent arg0) { return mBinder; } - + /** * Called when ALL the bound clients were onbound. */ @@ -326,24 +355,33 @@ public class FileUploader extends Service implements OnDatatransferProgressListe ((FileUploaderBinder)mBinder).clearListeners(); return false; // not accepting rebinding (default behaviour) } - + + @Override + public void onAccountsUpdated(Account[] accounts) { + // Review current upload, and cancel it if its account doen't exist + if (mCurrentUpload != null && + !AccountUtils.exists(mCurrentUpload.getAccount(), getApplicationContext())) { + mCurrentUpload.cancel(); + } + // The rest of uploads are cancelled when they try to start + } /** * Binder to let client components to perform operations on the queue of * uploads. - * + * * It provides by itself the available operations. */ public class FileUploaderBinder extends Binder implements OnDatatransferProgressListener { - - /** + + /** * Map of listeners that will be reported about progress of uploads from a {@link FileUploaderBinder} instance */ private Map mBoundListeners = new HashMap(); - + /** * Cancels a pending or current upload of a remote file. - * + * * @param account Owncloud account where the remote file will be stored. * @param file A file in the queue of pending uploads */ @@ -356,24 +394,37 @@ public class FileUploader extends Service implements OnDatatransferProgressListe upload.cancel(); } } - - - + + /** + * Cancels a pending or current upload for an account + * + * @param account Owncloud accountName where the remote file will be stored. + */ + public void cancel(Account account) { + Log_OC.d(TAG, "Account= " + account.name); + + if (mCurrentUpload != null) { + Log_OC.d(TAG, "Current Upload Account= " + mCurrentUpload.getAccount().name); + if (mCurrentUpload.getAccount().name.equals(account.name)) { + mCurrentUpload.cancel(); + } + } + // Cancel pending uploads + cancelUploadForAccount(account.name); + } + public void clearListeners() { mBoundListeners.clear(); } - - - /** * Returns True when the file described by 'file' is being uploaded to * the ownCloud account 'account' or waiting for it - * + * * If 'file' is a directory, returns 'true' if some of its descendant files is uploading or waiting to upload. - * - * @param account Owncloud account where the remote file will be stored. - * @param file A file that could be in the queue of pending uploads + * + * @param account ownCloud account where the remote file will be stored. + * @param file A file that could be in the queue of pending uploads */ public boolean isUploading(Account account, OCFile file) { if (account == null || file == null) @@ -397,25 +448,25 @@ public class FileUploader extends Service implements OnDatatransferProgressListe /** * Adds a listener interested in the progress of the upload for a concrete file. - * + * * @param listener Object to notify about progress of transfer. * @param account ownCloud account holding the file of interest. - * @param file {@link OCfile} of interest for listener. + * @param file {@link OCFile} of interest for listener. */ public void addDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) { if (account == null || file == null || listener == null) return; String targetKey = buildRemoteName(account, file); mBoundListeners.put(targetKey, listener); } - - - + + + /** * Removes a listener interested in the progress of the upload for a concrete file. - * + * * @param listener Object to notify about progress of transfer. * @param account ownCloud account holding the file of interest. - * @param file {@link OCfile} of interest for listener. + * @param file {@link OCFile} of interest for listener. */ public void removeDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) { if (account == null || file == null || listener == null) return; @@ -428,20 +479,30 @@ public class FileUploader extends Service implements OnDatatransferProgressListe @Override public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, - String fileName) { + String fileName) { String key = buildRemoteName(mCurrentUpload.getAccount(), mCurrentUpload.getFile()); OnDatatransferProgressListener boundListener = mBoundListeners.get(key); if (boundListener != null) { boundListener.onTransferProgress(progressRate, totalTransferredSoFar, totalToTransfer, fileName); } } - + + /** + * Review uploads and cancel it if its account doesn't exist + */ + public void checkAccountOfCurrentUpload() { + if (mCurrentUpload != null && + !AccountUtils.exists(mCurrentUpload.getAccount(), getApplicationContext())) { + mCurrentUpload.cancel(); + } + // The rest of uploads are cancelled when they try to start + } } /** * Upload worker. Performs the pending uploads in the order they were * requested. - * + * * Created with the Looper of a new thread, started in * {@link FileUploader#onCreate()}. */ @@ -467,13 +528,14 @@ public class FileUploader extends Service implements OnDatatransferProgressListe mService.uploadFile(it.next()); } } + Log_OC.d(TAG, "Stopping command after id " + msg.arg1); mService.stopSelf(msg.arg1); } } /** * Core upload method: sends the file(s) to upload - * + * * @param uploadKey Key to access the upload to perform, contained in * mPendingUploads */ @@ -485,63 +547,73 @@ public class FileUploader extends Service implements OnDatatransferProgressListe if (mCurrentUpload != null) { - notifyUploadStart(mCurrentUpload); + // Detect if the account exists + if (AccountUtils.exists(mCurrentUpload.getAccount(), getApplicationContext())) { + Log_OC.d(TAG, "Account " + mCurrentUpload.getAccount().name + " exists"); - RemoteOperationResult uploadResult = null, grantResult = null; - - try { - /// prepare client object to send requests to the ownCloud server - if (mUploadClient == null || !mLastAccount.equals(mCurrentUpload.getAccount())) { - mLastAccount = mCurrentUpload.getAccount(); - mStorageManager = - new FileDataStorageManager(mLastAccount, getContentResolver()); - OwnCloudAccount ocAccount = new OwnCloudAccount(mLastAccount, this); - mUploadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, this); - } - - /// check the existence of the parent folder for the file to upload - String remoteParentPath = new File(mCurrentUpload.getRemotePath()).getParent(); - remoteParentPath = remoteParentPath.endsWith(OCFile.PATH_SEPARATOR) ? remoteParentPath : remoteParentPath + OCFile.PATH_SEPARATOR; - grantResult = grantFolderExistence(remoteParentPath); - - /// perform the upload - if (grantResult.isSuccess()) { - OCFile parent = mStorageManager.getFileByPath(remoteParentPath); - mCurrentUpload.getFile().setParentId(parent.getFileId()); - uploadResult = mCurrentUpload.execute(mUploadClient); - if (uploadResult.isSuccess()) { - saveUploadedFile(); + notifyUploadStart(mCurrentUpload); + + RemoteOperationResult uploadResult = null, grantResult = null; + + try { + /// prepare client object to send requests to the ownCloud server + if (mUploadClient == null || !mLastAccount.equals(mCurrentUpload.getAccount())) { + mLastAccount = mCurrentUpload.getAccount(); + mStorageManager = + new FileDataStorageManager(mLastAccount, getContentResolver()); + OwnCloudAccount ocAccount = new OwnCloudAccount(mLastAccount, this); + mUploadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). + getClientFor(ocAccount, this); + } + + /// check the existence of the parent folder for the file to upload + String remoteParentPath = new File(mCurrentUpload.getRemotePath()).getParent(); + remoteParentPath = remoteParentPath.endsWith(OCFile.PATH_SEPARATOR) ? + remoteParentPath : remoteParentPath + OCFile.PATH_SEPARATOR; + grantResult = grantFolderExistence(remoteParentPath); + + /// perform the upload + if (grantResult.isSuccess()) { + OCFile parent = mStorageManager.getFileByPath(remoteParentPath); + mCurrentUpload.getFile().setParentId(parent.getFileId()); + uploadResult = mCurrentUpload.execute(mUploadClient); + if (uploadResult.isSuccess()) { + saveUploadedFile(); + } + } else { + uploadResult = grantResult; + } + + } catch (AccountsException e) { + Log_OC.e(TAG, "Error while trying to get autorization for " + mLastAccount.name, e); + uploadResult = new RemoteOperationResult(e); + + } catch (IOException e) { + Log_OC.e(TAG, "Error while trying to get autorization for " + mLastAccount.name, e); + uploadResult = new RemoteOperationResult(e); + + } finally { + synchronized (mPendingUploads) { + mPendingUploads.remove(uploadKey); + Log_OC.i(TAG, "Remove CurrentUploadItem from pending upload Item Map."); + } + if (uploadResult.isException()) { + // enforce the creation of a new client object for next uploads; this grant that a new socket will + // be created in the future if the current exception is due to an abrupt lose of network connection + mUploadClient = null; } - } else { - uploadResult = grantResult; - } - - } catch (AccountsException e) { - Log_OC.e(TAG, "Error while trying to get autorization for " + mLastAccount.name, e); - uploadResult = new RemoteOperationResult(e); - - } catch (IOException e) { - Log_OC.e(TAG, "Error while trying to get autorization for " + mLastAccount.name, e); - uploadResult = new RemoteOperationResult(e); - - } finally { - synchronized (mPendingUploads) { - mPendingUploads.remove(uploadKey); - Log_OC.i(TAG, "Remove CurrentUploadItem from pending upload Item Map."); - } - if (uploadResult.isException()) { - // enforce the creation of a new client object for next uploads; this grant that a new socket will - // be created in the future if the current exception is due to an abrupt lose of network connection - mUploadClient = null; } - } - - /// notify result - - notifyUploadResult(uploadResult, mCurrentUpload); - sendFinalBroadcast(mCurrentUpload, uploadResult); + /// notify result + notifyUploadResult(uploadResult, mCurrentUpload); + sendFinalBroadcast(mCurrentUpload, uploadResult); + + } else { + // Cancel the transfer + Log_OC.d(TAG, "Account " + mCurrentUpload.getAccount().toString() + " doesn't exist"); + cancelUploadForAccount(mCurrentUpload.getAccount().name); + + } } } @@ -549,17 +621,18 @@ public class FileUploader extends Service implements OnDatatransferProgressListe /** * Checks the existence of the folder where the current file will be uploaded both in the remote server * and in the local database. - * + * * If the upload is set to enforce the creation of the folder, the method tries to create it both remote * and locally. - * + * * @param pathToGrant Full remote path whose existence will be granted. * @return An {@link OCFile} instance corresponding to the folder where the file will be uploaded. */ private RemoteOperationResult grantFolderExistence(String pathToGrant) { RemoteOperation operation = new ExistenceCheckRemoteOperation(pathToGrant, this, false); RemoteOperationResult result = operation.execute(mUploadClient); - if (!result.isSuccess() && result.getCode() == ResultCode.FILE_NOT_FOUND && mCurrentUpload.isRemoteFolderToBeCreated()) { + if (!result.isSuccess() && result.getCode() == ResultCode.FILE_NOT_FOUND && + mCurrentUpload.isRemoteFolderToBeCreated()) { SyncOperation syncOp = new CreateFolderOperation( pathToGrant, true); result = syncOp.execute(mUploadClient, mStorageManager); } @@ -577,10 +650,11 @@ public class FileUploader extends Service implements OnDatatransferProgressListe return result; } - + private OCFile createLocalFolder(String remotePath) { String parentPath = new File(remotePath).getParent(); - parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath + OCFile.PATH_SEPARATOR; + parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? + parentPath : parentPath + OCFile.PATH_SEPARATOR; OCFile parent = mStorageManager.getFileByPath(parentPath); if (parent == null) { parent = createLocalFolder(parentPath); @@ -594,15 +668,15 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } return null; } - + /** * Saves a OC File after a successful upload. - * + * * A PROPFIND is necessary to keep the props in the local database * synchronized with the server, specially the modification time and Etag * (where available) - * + * * TODO refactor this ugly thing */ private void saveUploadedFile() { @@ -621,7 +695,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe updateOCFile(file, (RemoteFile) result.getData().get(0)); file.setLastSyncDateForProperties(syncDate); } - + // / maybe this would be better as part of UploadFileOperation... or // maybe all this method if (mCurrentUpload.wasRenamed()) { @@ -631,8 +705,8 @@ public class FileUploader extends Service implements OnDatatransferProgressListe mStorageManager.saveFile(oldFile); } // else: it was just an automatic renaming due to a name - // coincidence; nothing else is needed, the storagePath is right - // in the instance returned by mCurrentUpload.getFile() + // coincidence; nothing else is needed, the storagePath is right + // in the instance returned by mCurrentUpload.getFile() } file.setNeedsUpdateThumbnail(true); mStorageManager.saveFile(file); @@ -649,7 +723,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType, - FileDataStorageManager storageManager) { + FileDataStorageManager storageManager) { // MIME type if (mimeType == null || mimeType.length() <= 0) { @@ -679,7 +753,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe newFile.setFileLength(localFile.length()); newFile.setLastSyncDateForData(localFile.lastModified()); } // don't worry about not assigning size, the problems with localPath - // are checked when the UploadFileOperation instance is created + // are checked when the UploadFileOperation instance is created newFile.setMimetype(mimeType); @@ -689,13 +763,13 @@ public class FileUploader extends Service implements OnDatatransferProgressListe /** * Creates a status notification to show the upload progress - * + * * @param upload Upload operation starting. */ private void notifyUploadStart(UploadFileOperation upload) { // / create status notification with a progress bar mLastPercent = 0; - mNotificationBuilder = + mNotificationBuilder = NotificationBuilderWithProgressBar.newNotificationBuilderWithProgressBar(this); mNotificationBuilder .setOngoing(true) @@ -712,7 +786,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount()); showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); mNotificationBuilder.setContentIntent(PendingIntent.getActivity( - this, (int) System.currentTimeMillis(), showDetailsIntent, 0 + this, (int) System.currentTimeMillis(), showDetailsIntent, 0 )); mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotificationBuilder.build()); @@ -736,7 +810,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe /** * Updates the status notification with the result of an upload operation. - * + * * @param uploadResult Result of the upload operation. * @param upload Finished upload operation */ @@ -745,33 +819,33 @@ public class FileUploader extends Service implements OnDatatransferProgressListe Log_OC.d(TAG, "NotifyUploadResult with resultCode: " + uploadResult.getCode()); // / cancelled operation or success -> silent removal of progress notification mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker); - + // Show the result: success or fail notification if (!uploadResult.isCancelled()) { - int tickerId = (uploadResult.isSuccess()) ? R.string.uploader_upload_succeeded_ticker : - R.string.uploader_upload_failed_ticker; - + int tickerId = (uploadResult.isSuccess()) ? R.string.uploader_upload_succeeded_ticker : + R.string.uploader_upload_failed_ticker; + String content = null; // check credentials error boolean needsToUpdateCredentials = ( - uploadResult.getCode() == ResultCode.UNAUTHORIZED || - uploadResult.isIdPRedirection() + uploadResult.getCode() == ResultCode.UNAUTHORIZED || + uploadResult.isIdPRedirection() ); - tickerId = (needsToUpdateCredentials) ? + tickerId = (needsToUpdateCredentials) ? R.string.uploader_upload_failed_credentials_error : tickerId; mNotificationBuilder - .setTicker(getString(tickerId)) - .setContentTitle(getString(tickerId)) - .setAutoCancel(true) - .setOngoing(false) - .setProgress(0, 0, false); - + .setTicker(getString(tickerId)) + .setContentTitle(getString(tickerId)) + .setAutoCancel(true) + .setOngoing(false) + .setProgress(0, 0, false); + content = ErrorMessageAdapter.getErrorCauseMessage( uploadResult, upload, getResources() ); - + if (needsToUpdateCredentials) { // let the user update credentials with one click Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class); @@ -779,24 +853,24 @@ public class FileUploader extends Service implements OnDatatransferProgressListe AuthenticatorActivity.EXTRA_ACCOUNT, upload.getAccount() ); updateAccountCredentials.putExtra( - AuthenticatorActivity.EXTRA_ACTION, + AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_EXPIRED_TOKEN ); updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); updateAccountCredentials.addFlags(Intent.FLAG_FROM_BACKGROUND); mNotificationBuilder.setContentIntent(PendingIntent.getActivity( - this, - (int) System.currentTimeMillis(), - updateAccountCredentials, - PendingIntent.FLAG_ONE_SHOT + this, + (int) System.currentTimeMillis(), + updateAccountCredentials, + PendingIntent.FLAG_ONE_SHOT )); - - mUploadClient = null; - // grant that future retries on the same account will get the fresh credentials + + mUploadClient = null; + // grant that future retries on the same account will get the fresh credentials } else { mNotificationBuilder.setContentText(content); - + if (upload.isInstant()) { DbHandler db = null; try { @@ -807,12 +881,12 @@ public class FileUploader extends Service implements OnDatatransferProgressListe if (uploadResult.getCode() == ResultCode.QUOTA_EXCEEDED) { //message = getString(R.string.failed_upload_quota_exceeded_text); if (db.updateFileState( - upload.getOriginalStoragePath(), + upload.getOriginalStoragePath(), DbHandler.UPLOAD_STATUS_UPLOAD_FAILED, message) == 0) { db.putFileForLater( - upload.getOriginalStoragePath(), - upload.getAccount().name, + upload.getOriginalStoragePath(), + upload.getAccount().name, message ); } @@ -824,22 +898,22 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } } } - + mNotificationBuilder.setContentText(content); mNotificationManager.notify(tickerId, mNotificationBuilder.build()); - + if (uploadResult.isSuccess()) { - + DbHandler db = new DbHandler(this.getBaseContext()); db.removeIUPendingFile(mCurrentUpload.getOriginalStoragePath()); db.close(); // remove success notification, with a delay of 2 seconds NotificationDelayer.cancelWithDelay( - mNotificationManager, - R.string.uploader_upload_succeeded_ticker, + mNotificationManager, + R.string.uploader_upload_succeeded_ticker, 2000); - + } } } @@ -847,17 +921,17 @@ public class FileUploader extends Service implements OnDatatransferProgressListe /** * Sends a broadcast in order to the interested activities can update their * view - * + * * @param upload Finished upload operation * @param uploadResult Result of the upload operation */ private void sendFinalBroadcast(UploadFileOperation upload, RemoteOperationResult uploadResult) { Intent end = new Intent(getUploadFinishMessage()); end.putExtra(EXTRA_REMOTE_PATH, upload.getRemotePath()); // real remote - // path, after - // possible - // automatic - // renaming + // path, after + // possible + // automatic + // renaming if (upload.wasRenamed()) { end.putExtra(EXTRA_OLD_REMOTE_PATH, upload.getOldFile().getRemotePath()); } @@ -875,9 +949,27 @@ public class FileUploader extends Service implements OnDatatransferProgressListe * @return true if is needed to add the pdf file extension to the file */ private boolean isPdfFileFromContentProviderWithoutExtension(String localPath, String mimeType) { - return localPath.startsWith(UriUtils.URI_CONTENT_SCHEME) && - mimeType.equals(MIME_TYPE_PDF) && + return localPath.startsWith(UriUtils.URI_CONTENT_SCHEME) && + mimeType.equals(MIME_TYPE_PDF) && !localPath.endsWith(FILE_EXTENSION_PDF); } + /** + * Remove uploads of an account + * @param accountName + */ + private void cancelUploadForAccount(String accountName){ + // this can be slow if there are many uploads :( + Iterator it = mPendingUploads.keySet().iterator(); + Log_OC.d(TAG, "Number of pending updloads= " + mPendingUploads.size()); + while (it.hasNext()) { + String key = it.next(); + Log_OC.d(TAG, "mPendingUploads CANCELLED " + key); + if (key.startsWith(accountName)) { + synchronized (mPendingUploads) { + mPendingUploads.remove(key); + } + } + } + } } diff --git a/src/com/owncloud/android/files/services/IndexedForest.java b/src/com/owncloud/android/files/services/IndexedForest.java new file mode 100644 index 00000000..4c1ac7bd --- /dev/null +++ b/src/com/owncloud/android/files/services/IndexedForest.java @@ -0,0 +1,240 @@ +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.owncloud.android.files.services; + +import android.accounts.Account; +import android.util.Pair; + +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.lib.common.utils.Log_OC; + +import java.io.File; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +/** + * Helper structure to keep the trees of folders containing any file downloading or synchronizing. + * + * A map provides the indexation based in hashing. + * + * A tree is created per account. + */ +public class IndexedForest { + + private ConcurrentMap> mMap = new ConcurrentHashMap>(); + + private class Node { + String mKey = null; + Node mParent = null; + Set> mChildren = new HashSet>(); // TODO be careful with hash() + V mPayload = null; + + // payload is optional + public Node(String key, V payload) { + if (key == null) { + throw new IllegalArgumentException("Argument key MUST NOT be null"); + } + mKey = key; + mPayload = payload; + } + + public Node getParent() { + return mParent; + }; + + public Set> getChildren() { + return mChildren; + } + + public String getKey() { + return mKey; + } + + public V getPayload() { + return mPayload; + } + + public void addChild(Node child) { + mChildren.add(child); + child.setParent(this); + } + + private void setParent(Node parent) { + mParent = parent; + } + + public boolean hasChildren() { + return mChildren.size() > 0; + } + + public void removeChild(Node removed) { + mChildren.remove(removed); + } + + public void clearPayload() { + mPayload = null; + } + } + + + public /* synchronized */ Pair putIfAbsent(Account account, String remotePath, V value) { + String targetKey = buildKey(account, remotePath); + Node valuedNode = new Node(targetKey, value); + mMap.putIfAbsent( + targetKey, + valuedNode + ); + + String currentPath = remotePath, parentPath = null, parentKey = null; + Node currentNode = valuedNode, parentNode = null; + boolean linked = false; + while (!OCFile.ROOT_PATH.equals(currentPath) && !linked) { + parentPath = new File(currentPath).getParent(); + if (!parentPath.endsWith(OCFile.PATH_SEPARATOR)) { + parentPath += OCFile.PATH_SEPARATOR; + } + parentKey = buildKey(account, parentPath); + parentNode = mMap.get(parentKey); + if (parentNode == null) { + parentNode = new Node(parentKey, null); + parentNode.addChild(currentNode); + mMap.put(parentKey, parentNode); + } else { + parentNode.addChild(currentNode); + linked = true; + } + currentPath = parentPath; + currentNode = parentNode; + } + + String linkedTo = OCFile.ROOT_PATH; + if (linked) { + linkedTo = parentNode.getKey().substring(account.name.length()); + } + return new Pair(targetKey, linkedTo); + }; + + + public Pair removePayload(Account account, String remotePath) { + String targetKey = buildKey(account, remotePath); + Node target = mMap.get(targetKey); + if (target != null) { + target.clearPayload(); + if (!target.hasChildren()) { + return remove(account, remotePath); + } + } + return new Pair(null, null); + } + + + public /* synchronized */ Pair remove(Account account, String remotePath) { + String targetKey = buildKey(account, remotePath); + Node firstRemoved = mMap.remove(targetKey); + String unlinkedFrom = null; + + if (firstRemoved != null) { + /// remove children + removeDescendants(firstRemoved); + + /// remove ancestors if only here due to firstRemoved + Node removed = firstRemoved; + Node parent = removed.getParent(); + boolean unlinked = false; + while (parent != null) { + parent.removeChild(removed); + if (!parent.hasChildren()) { + removed = mMap.remove(parent.getKey()); + parent = removed.getParent(); + } else { + break; + } + } + + if (parent != null) { + unlinkedFrom = parent.getKey().substring(account.name.length()); + } + + return new Pair(firstRemoved.getPayload(), unlinkedFrom); + } + + return new Pair(null, null); + } + + private void removeDescendants(Node removed) { + Iterator> childrenIt = removed.getChildren().iterator(); + Node child = null; + while (childrenIt.hasNext()) { + child = childrenIt.next(); + mMap.remove(child.getKey()); + removeDescendants(child); + } + } + + public boolean contains(Account account, String remotePath) { + String targetKey = buildKey(account, remotePath); + return mMap.containsKey(targetKey); + } + + public /* synchronized */ V get(String key) { + Node node = mMap.get(key); + if (node != null) { + return node.getPayload(); + } else { + return null; + } + } + + public V get(Account account, String remotePath) { + String key = buildKey(account, remotePath); + return get(key); + } + + + /** + * Remove the elements that contains account as a part of its key + * @param account + */ + public void remove(Account account){ + Iterator it = mMap.keySet().iterator(); + while (it.hasNext()) { + String key = it.next(); + Log_OC.d("IndexedForest", "Number of pending downloads= " + mMap.size()); + if (key.startsWith(account.name)) { + mMap.remove(key); + } + } + } + + /** + * Builds a key to index files + * + * @param account Account where the file to download is stored + * @param remotePath Path of the file in the server + */ + private String buildKey(Account account, String remotePath) { + return account.name + remotePath; + } + +} diff --git a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java index b6ee1aca..f2ed3bbe 100644 --- a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java +++ b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, diff --git a/src/com/owncloud/android/media/MediaControlView.java b/src/com/owncloud/android/media/MediaControlView.java index b257bd37..653943b9 100644 --- a/src/com/owncloud/android/media/MediaControlView.java +++ b/src/com/owncloud/android/media/MediaControlView.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application - * - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -51,8 +53,6 @@ import com.owncloud.android.R; * * It synchronizes itself with the state of the * {@link MediaPlayer}. - * - * @author David A. Velasco */ public class MediaControlView extends FrameLayout /* implements OnLayoutChangeListener, OnTouchListener */ implements OnClickListener, OnSeekBarChangeListener { diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index 52daa04c..e53c635f 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -49,8 +52,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity; * * Waits for Intents which signal the service to perform specific operations: Play, Pause, * Rewind, etc. - * - * @author David A. Velasco */ public class MediaService extends Service implements OnCompletionListener, OnPreparedListener, OnErrorListener, AudioManager.OnAudioFocusChangeListener { diff --git a/src/com/owncloud/android/media/MediaServiceBinder.java b/src/com/owncloud/android/media/MediaServiceBinder.java index 1b56ec01..95bf5207 100644 --- a/src/com/owncloud/android/media/MediaServiceBinder.java +++ b/src/com/owncloud/android/media/MediaServiceBinder.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -34,8 +37,6 @@ import android.widget.MediaController; * * Provides the operations of {@link MediaController.MediaPlayerControl}, and an extra method to check if * an {@link OCFile} instance is handled by the MediaService. - * - * @author David A. Velasco */ public class MediaServiceBinder extends Binder implements MediaController.MediaPlayerControl { diff --git a/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java b/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java index 63ddf635..c71b35f2 100644 --- a/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java +++ b/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -31,8 +34,6 @@ import android.widget.RemoteViews; * a progress bar is available in every Android version, because * {@link NotificationCompat.Builder#setProgress(int, int, boolean)} has no * real effect for Android < 4.0 - * - * @author David A. Velasco */ public class NotificationBuilderWithProgressBar extends NotificationCompat.Builder { diff --git a/src/com/owncloud/android/notifications/NotificationDelayer.java b/src/com/owncloud/android/notifications/NotificationDelayer.java index aeefe12c..ab1399f1 100644 --- a/src/com/owncloud/android/notifications/NotificationDelayer.java +++ b/src/com/owncloud/android/notifications/NotificationDelayer.java @@ -1,3 +1,22 @@ +/** + * ownCloud Android client application + * + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.owncloud.android.notifications; import java.util.Random; diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java index 4df8b3df..b3c17f1d 100644 --- a/src/com/owncloud/android/operations/CreateFolderOperation.java +++ b/src/com/owncloud/android/operations/CreateFolderOperation.java @@ -1,5 +1,9 @@ -/* ownCloud Android client application - * Copyright (C) 2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * @author masensio + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -31,9 +35,6 @@ import com.owncloud.android.utils.FileStorageUtils; /** * Access to remote operation performing the creation of a new folder in the ownCloud server. * Save the new folder in Database - * - * @author David A. Velasco - * @author masensio */ public class CreateFolderOperation extends SyncOperation implements OnRemoteOperationListener{ diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java index b563790f..01059c9e 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author masensio + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -19,13 +22,12 @@ package com.owncloud.android.operations; /** * Creates a new share from a given file - * - * @author masensio - * */ +import android.content.Context; import android.content.Intent; +import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.lib.common.OwnCloudClient; @@ -46,6 +48,7 @@ public class CreateShareOperation extends SyncOperation { protected FileDataStorageManager mStorageManager; + private Context mContext; private String mPath; private ShareType mShareType; private String mShareWith; @@ -56,6 +59,7 @@ public class CreateShareOperation extends SyncOperation { /** * Constructor + * @param context The context that the share is coming from. * @param path Full path of the file/folder being shared. Mandatory argument * @param shareType 0 = user, 1 = group, 3 = Public link. Mandatory argument * @param shareWith User/group ID with who the file should be shared. This is mandatory for shareType of 0 or 1 @@ -72,9 +76,10 @@ public class CreateShareOperation extends SyncOperation { * To obtain combinations, add the desired values together. * For instance, for Re-Share, delete, read, update, add 16+8+2+1 = 27. */ - public CreateShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, + public CreateShareOperation(Context context, String path, ShareType shareType, String shareWith, boolean publicUpload, String password, int permissions, Intent sendIntent) { + mContext = context; mPath = path; mShareType = shareType; mShareWith = shareWith; @@ -128,6 +133,8 @@ public class CreateShareOperation extends SyncOperation { OCFile file = getStorageManager().getFileByPath(mPath); if (file!=null) { mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink()); + mSendIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(mContext.getString(R.string.subject_token), + getClient().getCredentials().getUsername(), file.getFileName())); file.setPublicLink(share.getShareLink()); file.setShareByLink(true); getStorageManager().saveFile(file); diff --git a/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java b/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java index 5afc4210..9f2827f4 100644 --- a/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java +++ b/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java @@ -1,24 +1,20 @@ -/* ownCloud Android Library is available under MIT license - * Copyright (C) 2014 ownCloud Inc. - * - * 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. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * */ @@ -47,9 +43,7 @@ import android.net.Uri; * When successful, the instance of {@link RemoteOperationResult} passed * through {@link OnRemoteOperationListener#onRemoteOperationFinish(RemoteOperation, * RemoteOperationResult)} returns in {@link RemoteOperationResult#getData()} - * a value of {@link AuthenticationMethod}. - * - * @author David A. Velasco + * a value of {@link AuthenticationMethod}. */ public class DetectAuthenticationMethodOperation extends RemoteOperation { diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index 0a5ff94c..78811f8b 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -1,5 +1,9 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * @author masensio + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -38,9 +42,6 @@ import android.webkit.MimeTypeMap; /** * Remote mDownloadOperation performing the download of a file to an ownCloud server - * - * @author David A. Velasco - * @author masensio */ public class DownloadFileOperation extends RemoteOperation { @@ -177,5 +178,4 @@ public class DownloadFileOperation extends RemoteOperation { mDataTransferListeners.remove(listener); } } - } diff --git a/src/com/owncloud/android/operations/GetServerInfoOperation.java b/src/com/owncloud/android/operations/GetServerInfoOperation.java index 9b7cf872..e081d4eb 100644 --- a/src/com/owncloud/android/operations/GetServerInfoOperation.java +++ b/src/com/owncloud/android/operations/GetServerInfoOperation.java @@ -1,24 +1,21 @@ -/* ownCloud Android Library is available under MIT license - * Copyright (C) 2014 ownCloud Inc. - * - * 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. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * @author masensio + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * */ @@ -43,9 +40,6 @@ import android.content.Context; * * Checks the existence of a configured ownCloud server in the URL, gets its version * and finds out what authentication method is needed to access files in it. - * - * @author David A. Velasco - * @author masensio */ public class GetServerInfoOperation extends RemoteOperation { diff --git a/src/com/owncloud/android/operations/GetSharesForFileOperation.java b/src/com/owncloud/android/operations/GetSharesForFileOperation.java index 649437d2..06e399e8 100644 --- a/src/com/owncloud/android/operations/GetSharesForFileOperation.java +++ b/src/com/owncloud/android/operations/GetSharesForFileOperation.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author masensio + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -28,10 +31,7 @@ import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation import com.owncloud.android.operations.common.SyncOperation; /** - * Provide a list shares for a specific file. - * - * @author masensio - * + * Provide a list shares for a specific file. */ public class GetSharesForFileOperation extends SyncOperation { diff --git a/src/com/owncloud/android/operations/GetSharesOperation.java b/src/com/owncloud/android/operations/GetSharesOperation.java index d096788a..fb838b4d 100644 --- a/src/com/owncloud/android/operations/GetSharesOperation.java +++ b/src/com/owncloud/android/operations/GetSharesOperation.java @@ -1,5 +1,9 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author masensio + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -29,9 +33,6 @@ import com.owncloud.android.operations.common.SyncOperation; /** * Access to remote operation to get the share files/folders * Save the data in Database - * - * @author masensio - * @author David A. Velasco */ public class GetSharesOperation extends SyncOperation { diff --git a/src/com/owncloud/android/operations/MoveFileOperation.java b/src/com/owncloud/android/operations/MoveFileOperation.java index 63856c37..3a1103b1 100644 --- a/src/com/owncloud/android/operations/MoveFileOperation.java +++ b/src/com/owncloud/android/operations/MoveFileOperation.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -29,8 +32,6 @@ import android.accounts.Account; /** * Operation mmoving an {@link OCFile} to a different folder. - * - * @author David A. Velasco */ public class MoveFileOperation extends SyncOperation { diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java index 6f4ff741..918c57bb 100644 --- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java +++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java @@ -1,3 +1,22 @@ +/** + * ownCloud Android client application + * + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.owncloud.android.operations; import java.util.ArrayList; diff --git a/src/com/owncloud/android/operations/RefreshFolderOperation.java b/src/com/owncloud/android/operations/RefreshFolderOperation.java new file mode 100644 index 00000000..8d6cfbb5 --- /dev/null +++ b/src/com/owncloud/android/operations/RefreshFolderOperation.java @@ -0,0 +1,611 @@ +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.owncloud.android.operations; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Vector; + +import org.apache.http.HttpStatus; +import android.accounts.Account; +import android.content.Context; +import android.content.Intent; +import android.util.Log; +//import android.support.v4.content.LocalBroadcastManager; + +import com.owncloud.android.datamodel.FileDataStorageManager; +import com.owncloud.android.datamodel.OCFile; + +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.shares.OCShare; +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.common.utils.Log_OC; +import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation; +import com.owncloud.android.lib.resources.files.FileUtils; +import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation; +import com.owncloud.android.lib.resources.files.RemoteFile; + +import com.owncloud.android.syncadapter.FileSyncAdapter; +import com.owncloud.android.utils.FileStorageUtils; + + + +/** + * Remote operation performing the synchronization of the list of files contained + * in a folder identified with its remote path. + * + * Fetches the list and properties of the files contained in the given folder, including their + * properties, and updates the local database with them. + * + * Does NOT enter in the child folders to synchronize their contents also. + */ +public class RefreshFolderOperation extends RemoteOperation { + + private static final String TAG = RefreshFolderOperation.class.getSimpleName(); + + public static final String EVENT_SINGLE_FOLDER_CONTENTS_SYNCED = + RefreshFolderOperation.class.getName() + ".EVENT_SINGLE_FOLDER_CONTENTS_SYNCED"; + public static final String EVENT_SINGLE_FOLDER_SHARES_SYNCED = + RefreshFolderOperation.class.getName() + ".EVENT_SINGLE_FOLDER_SHARES_SYNCED"; + + /** Time stamp for the synchronization process in progress */ + private long mCurrentSyncTime; + + /** Remote folder to synchronize */ + private OCFile mLocalFolder; + + /** Access to the local database */ + private FileDataStorageManager mStorageManager; + + /** Account where the file to synchronize belongs */ + private Account mAccount; + + /** Android context; necessary to send requests to the download service */ + private Context mContext; + + /** Files and folders contained in the synchronized folder after a successful operation */ + private List mChildren; + + /** Counter of conflicts found between local and remote files */ + private int mConflictsFound; + + /** Counter of failed operations in synchronization of kept-in-sync files */ + private int mFailsInFavouritesFound; + + /** + * Map of remote and local paths to files that where locally stored in a location + * out of the ownCloud folder and couldn't be copied automatically into it + **/ + private Map mForgottenLocalFiles; + + /** 'True' means that this operation is part of a full account synchronization */ + private boolean mSyncFullAccount; + + /** 'True' means that Share resources bound to the files into should be refreshed also */ + private boolean mIsShareSupported; + + /** 'True' means that the remote folder changed and should be fetched */ + private boolean mRemoteFolderChanged; + + /** 'True' means that Etag will be ignored */ + private boolean mIgnoreETag; + + + /** + * Creates a new instance of {@link RefreshFolderOperation}. + * + * @param folder Folder to synchronize. + * @param currentSyncTime Time stamp for the synchronization process in progress. + * @param syncFullAccount 'True' means that this operation is part of a full account + * synchronization. + * @param isShareSupported 'True' means that the server supports the sharing API. + * @param ignoreEtag 'True' means that the content of the remote folder should + * be fetched and updated even though the 'eTag' did not + * change. + * @param dataStorageManager Interface with the local database. + * @param account ownCloud account where the folder is located. + * @param context Application context. + */ + public RefreshFolderOperation(OCFile folder, + long currentSyncTime, + boolean syncFullAccount, + boolean isShareSupported, + boolean ignoreETag, + FileDataStorageManager dataStorageManager, + Account account, + Context context) { + mLocalFolder = folder; + mCurrentSyncTime = currentSyncTime; + mSyncFullAccount = syncFullAccount; + mIsShareSupported = isShareSupported; + mStorageManager = dataStorageManager; + mAccount = account; + mContext = context; + mForgottenLocalFiles = new HashMap(); + mRemoteFolderChanged = false; + mIgnoreETag = ignoreETag; + } + + + public int getConflictsFound() { + return mConflictsFound; + } + + public int getFailsInFavouritesFound() { + return mFailsInFavouritesFound; + } + + public Map getForgottenLocalFiles() { + return mForgottenLocalFiles; + } + + /** + * Returns the list of files and folders contained in the synchronized folder, + * if called after synchronization is complete. + * + * @return List of files and folders contained in the synchronized folder. + */ + public List getChildren() { + return mChildren; + } + + /** + * Performs the synchronization. + * + * {@inheritDoc} + */ + @Override + protected RemoteOperationResult run(OwnCloudClient client) { + RemoteOperationResult result = null; + mFailsInFavouritesFound = 0; + mConflictsFound = 0; + mForgottenLocalFiles.clear(); + + if (FileUtils.PATH_SEPARATOR.equals(mLocalFolder.getRemotePath()) && !mSyncFullAccount) { + updateOCVersion(client); + } + + result = checkForChanges(client); + + if (result.isSuccess()) { + if (mRemoteFolderChanged) { + result = fetchAndSyncRemoteFolder(client); + } else { + mChildren = mStorageManager.getFolderContent(mLocalFolder); + } + } + + if (!mSyncFullAccount) { + sendLocalBroadcast( + EVENT_SINGLE_FOLDER_CONTENTS_SYNCED, mLocalFolder.getRemotePath(), result + ); + } + + if (result.isSuccess() && mIsShareSupported && !mSyncFullAccount) { + refreshSharesForFolder(client); // share result is ignored + } + + if (!mSyncFullAccount) { + sendLocalBroadcast( + EVENT_SINGLE_FOLDER_SHARES_SYNCED, mLocalFolder.getRemotePath(), result + ); + } + + return result; + + } + + + private void updateOCVersion(OwnCloudClient client) { + UpdateOCVersionOperation update = new UpdateOCVersionOperation(mAccount, mContext); + RemoteOperationResult result = update.execute(client); + if (result.isSuccess()) { + mIsShareSupported = update.getOCVersion().isSharedSupported(); + } + } + + + private RemoteOperationResult checkForChanges(OwnCloudClient client) { + mRemoteFolderChanged = true; + RemoteOperationResult result = null; + String remotePath = null; + + remotePath = mLocalFolder.getRemotePath(); + Log_OC.d(TAG, "Checking changes in " + mAccount.name + remotePath); + + // remote request + ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath); + result = operation.execute(client); + if (result.isSuccess()){ + OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0)); + + if (!mIgnoreETag) { + // check if remote and local folder are different + mRemoteFolderChanged = + !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag())); + } + + result = new RemoteOperationResult(ResultCode.OK); + + Log_OC.i(TAG, "Checked " + mAccount.name + remotePath + " : " + + (mRemoteFolderChanged ? "changed" : "not changed")); + + } else { + // check failed + if (result.getCode() == ResultCode.FILE_NOT_FOUND) { + removeLocalFolder(); + } + if (result.isException()) { + Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + + result.getLogMessage(), result.getException()); + } else { + Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + + result.getLogMessage()); + } + } + + return result; + } + + + private RemoteOperationResult fetchAndSyncRemoteFolder(OwnCloudClient client) { + String remotePath = mLocalFolder.getRemotePath(); + ReadRemoteFolderOperation operation = new ReadRemoteFolderOperation(remotePath); + RemoteOperationResult result = operation.execute(client); + Log_OC.d(TAG, "Synchronizing " + mAccount.name + remotePath); + + if (result.isSuccess()) { + synchronizeData(result.getData(), client); + if (mConflictsFound > 0 || mFailsInFavouritesFound > 0) { + result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT); + // should be a different result code, but will do the job + } + } else { + if (result.getCode() == ResultCode.FILE_NOT_FOUND) + removeLocalFolder(); + } + + return result; + } + + + private void removeLocalFolder() { + if (mStorageManager.fileExists(mLocalFolder.getFileId())) { + String currentSavePath = FileStorageUtils.getSavePath(mAccount.name); + mStorageManager.removeFolder( + mLocalFolder, + true, + ( mLocalFolder.isDown() && + mLocalFolder.getStoragePath().startsWith(currentSavePath) + ) + ); + } + } + + + /** + * Synchronizes the data retrieved from the server about the contents of the target folder + * with the current data in the local database. + * + * Grants that mChildren is updated with fresh data after execution. + * + * @param folderAndFiles Remote folder and children files in Folder + * + * @param client Client instance to the remote server where the data were + * retrieved. + * @return 'True' when any change was made in the local data, 'false' otherwise + */ + private void synchronizeData(ArrayList