From 24356ea2501fc55edf7ab2df2da2b12f8acb210a Mon Sep 17 00:00:00 2001 From: Philippe MARASSE Date: Wed, 5 Feb 2014 00:04:42 +0100 Subject: [PATCH 01/10] Modified actionbar to allow display of icon+text on tablets --- res/menu/main_menu.xml | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 538dde76c1..7c7ed11d38 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -17,12 +17,33 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - - - - - - - - + + + + + + + + + + \ No newline at end of file From 28ef4217e56e2db9805af6153ebd074a7a85488b Mon Sep 17 00:00:00 2001 From: Philippe MARASSE Date: Mon, 17 Mar 2014 22:14:07 +0100 Subject: [PATCH 02/10] updated menu from github comments --- res/drawable-hdpi-v9/ic_action_settings.png | Bin 0 -> 1299 bytes res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 1231 bytes res/drawable-ldpi-v9/ic_action_settings.png | Bin 0 -> 871 bytes res/drawable-ldpi/ic_action_settings.png | Bin 0 -> 594 bytes res/drawable-mdpi-v9/ic_action_settings.png | Bin 0 -> 1372 bytes res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 953 bytes res/menu/main_menu.xml | 18 +++++++++--------- 7 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 res/drawable-hdpi-v9/ic_action_settings.png create mode 100644 res/drawable-hdpi/ic_action_settings.png create mode 100644 res/drawable-ldpi-v9/ic_action_settings.png create mode 100644 res/drawable-ldpi/ic_action_settings.png create mode 100644 res/drawable-mdpi-v9/ic_action_settings.png create mode 100644 res/drawable-mdpi/ic_action_settings.png diff --git a/res/drawable-hdpi-v9/ic_action_settings.png b/res/drawable-hdpi-v9/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..86b54f4c71184c7f1f277b6c8e155e381c3855ba GIT binary patch literal 1299 zcmV+u1?>8XP)b@E5Rt9EBtTUU0AF+wJ0l`js#?>& ziVfht0GX*O7gRL?A<7+9)jRr*08{E{p!i5XTEJ+8>_lHVK~)_9J_N=hZaX9*?OkmF zsyd{qGv?jBimU1jupX&Az`D&nkVkCZ^`2UQ?dk7;{WjDA=7A01H{fod;apG9viq*5 z#_t7=1H-BD4)C&wtk^S0fct@CMrsFmxTv+1Az%hL9dS#;O>$Iq2uQsBc53{o$hlWV zw$dR5qK~p9~`KN(vwpHdMl*eSxtLj_8w>DQd4BOgzYXPeIrN>dFaTZtv zE*J3rX*7XnfQJGsA=(P|MJhiKpnOwAE}0V>>!R4I{WWvs#(-H7SuxpeR&b!#7BFrm zorS}|UBG8K(coe_Y#F(a0kb(<>SxO-a;-%~wtMCSL}V>zPcB+GdpE5jdC54FXzW)4-p=H+ek>BdKQu40TyRQVyRmv&`F{ zEhk49=~8AlL}X4?KL}`%9ga!7Zi~#$wp6v*#RA4ub;cGvnDa)519}Tdq0=xzyD1-? zbrx}gZwAPmR@KKvWG<(C4MD@YL8F1*{?(p4L347e0iy3DmSFq074eu>(mSvMXg=hg z*!^FqBV@iHrY+v&W?OvIJp2>Dqn@IvV{v{-MAppTyg_(deA3G3-VJdx{qcB2pNFe^sU;SR zuL5MQSGl07zZ4w+j^O`Z@DEe|TA4n7jT$v-)TmLTMvWR__y=jf$O5|?49x%l002ov JPDHLkV1iuBQB42< literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..999d0f0d8c1571d3f90be129c8e4c95e895ee7b9 GIT binary patch literal 1231 zcmV;=1Tg!FP)hghH17Mrn&ZDP&C4ukZN0TjEU&^6R3zQYP-+@eq8oMeYFz?O9Lg#v&({fS28uqHIV zBZTqbhuah8N1lBfaT@o1NvAnU}e*7 z6Mu~c1GYh9DTcoSaJFgO(b})HZc5)@8tk=tb92)x+yZcl4FlFTPIAw}3G#_{5JHXi zB+&Xrhrt~Ko*tAxv`{|E2M!^to71yp2LNFwDL#+r6uLP1AdU}rewa}Fu#A0<0^p6K z3jEW(UV$b+I!F`Sg=DE7bEO!7&k3NOknBlePLLeUm>g56@#F(ODVqPFi2wXhr!;>_ zGNuZ-QyM>L?GUo(6!pP3INu--`A z8UU$r5qa`|a{nwnJ~+vdCK8Et#Qc4h!z;q~siuStE#yx%+2W&Zi9I;71>i4J)Rd$v z7V_tFwy4|zs7M)`>H*6rakF%h z@{3ZLJVvszAuUQETcbrpCXJa|44`SPQ@&=h+WP3qX+Y08u&I#7oe)R(L2_ zN>Z84sdSrU9vQUAnrRZRR6c<2*&VmH653%4#IuNY)?$pclm*4h2_^0+$=X%;7S%O5 zD>@2X81V3mjU7HUO;KY?y!Hh3g~^MR^TMM5S-~xx#+pG&T7@OF5gk?&PFlVm9qt|A z={)M99!4(~cvP)Kkc;{%mH!%A@PLg{Gg+>9% zA;vkmP+=jQ#Pr0zK-9kzU#lSu)=KG`sSI$d@Gz(diN{cMgig)RNEsoXt6F1YMaEb~ zhNt51V2=QNH349r|CqHWVEb~EA7ZN893Zikyh(BYWhdBG$;aLd#L(tHMNa-CrFfB= zM66KD=B@98>IdKi(}csm3*}umLzyOgz tRnh7415chjdGh4RlP6D}3ZUNt3;-0k%aSxwCl>$!002ovPDHLkV1nmLGUWgO literal 0 HcmV?d00001 diff --git a/res/drawable-ldpi-v9/ic_action_settings.png b/res/drawable-ldpi-v9/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c2d517f576e0e68e8c4d7c20eec213b23b565f GIT binary patch literal 871 zcmV-t1DO1YP)R94O*ZD#+j-CXKIfe0`9J^Xe-8Av|Gh=26C@E4 zNa_#t^XGg-wEYtY5=U+T*{0<{ZA82&b)8%{H(vx)17rP+1~ztQtz1`d|EUL70v{98 zc3`Tc)TT!esFXAr80c|@q{YB|Ku$rM-=_o1fC@VslBy&PDwzY0B7jrCLZB6R1q=tK z0>^>#$&@^>2G|BP0*`>fz<8hu*Z_1yMDZk)R0CWD`ubBJ;4yFrs00oGHIDuzumku4 z>;@*;DFNSr6%lc-CGIDS7OmS$@gi@
}n@&TG)0B&d`pl-gN|??3o{*|b@QRiBTo*i8<&CRMx(;Bz zMdmkqV4iK7j8=b1)g_;H?x&bQEs~BEkZ`G_Tmc6b`CqG~<&yS!ZiA$uf8#-CW%vU4 zYB&c0>w#UsNayzsaNXu}ff@_ocM1V|9Ll-d+3WshD;eapFQ xg2|`d!hd}&F9XW#Kzl@VbOv>A>urB)KL8e}!>JkCceell002ovPDHLkV1k|6c1ZvL literal 0 HcmV?d00001 diff --git a/res/drawable-ldpi/ic_action_settings.png b/res/drawable-ldpi/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..c290e5902fd96e62a0a15c6a88d90c5d261b64b2 GIT binary patch literal 594 zcmV-Y0N@uc4+U<6{Uax;_Qov!pg~0@dGS8KwLAcfmQXM0 z^@7F>#_J%}i$PzJ{wX5ChCe~XT;n!$3yhIT>#jNlmY1A*%BanB`sRE z=TfQtu@7)wm&k2{a^0ewFAO9M1qm5UgUge-WU7GNDnJE{3~lyOcqY4HPcS}fR@Yhz z$3(`&rVJn8xjf_z2m1wFi4X~?laTRyTMkULxewzr7||ty=b-`MWZTO~iAK~!X|cg? zLDDP@3DT4OGbr-@ahvPd)2>&W>o`F8-LB&TU?V}g&231Ap8xBQC@$%Odk3)4T5RG9 gppr@sF24c{01P0jsq^4BjQ{`u07*qoM6N<$f<^ZV0{{R3 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi-v9/ic_action_settings.png b/res/drawable-mdpi-v9/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..47ef3f442902f84f4ce9a44f829441692c5840ae GIT binary patch literal 1372 zcmV-i1*7_jP)(`|JnSMMVEuYk-Xy2Ye3<C-B5IXHZGtfB1xW8mQQ&T1E$|Jn8TcJ|5O@H%*52O- zYy=K@i6+lo;5|Emr4iBL^;>|efE$6Hi0H`nEDePuO$C+$^>B2cED(vX`5I3BW|44|o~4!`^-a z*a7@tNZkp1=(&4*Z!d5WaB<>*K^rkkQbUn2DjGsp0-xC1c?WEF?2iLp0;U1|Lm*Mb z25bUe0J?!Cxq_F;XyDF>*mzn7B(eX6(IsD;dV$%%y~g;aT=lIa5URxJe&9V|F|g8J z&l|fnB4!Mi3w6U`yQB(mNuod|4Zt#>-pV&x`3i6tSZ@z6@%MwC8}u`?fXjfl{A|8v zv`RX!NFo=3&&iU$lGH7!%b(v$s+Y7XxxPcvA}4%)tx1wzm9#TiW3{A4e{S>jt)81# zDn*bqMbeMnWS69wl5X<%E-SD|QgaRf(zQlOT9_!iThi^4ZjrRd*S1KSFDXi6uZa=u z_TVl_Es|c7^s6`Sl+;>atybULC26~)cO{KYJioZAJYUj2Nh|$*Pjc*^j$p0jex^&( z0Ym0eNqZ$VjKuSWxsVe&s{?z|P;qj04!3bK_e+9MeXh`ly!QAUIXq)zu8w~}MnvW! z;(+n}Lg1L|K)Aq7AI@{hTx(KO1oR|4si$-UvW=Z!M}X_iELXZ708Eh7R*+L&Zp9mb z)vg0=E^xC;%Yh_uL(+VATUn)@;cA*0Fcx@H(%651(PrQo8=n=!4&Vk?@jl==Nz;GH-4^)6FJTi)n4Ni}Vxl$aDGpk&`o z-$|#_`F!rq-hiL<35!N;xSu1DtsT=t+36NWyh zR;%H1xm@R7h2Z2aF0Y_x&^a^|RfYF=46j^Ta({w%zbId>!LJv|`(6WJb@`AmOq9s) z3@(B`mgN%~(7_IWmpEo+2=F6<2z{5)Uc&PU^e40n9Vkwg6lXje z3}E%es=c%f8FD3s<4plp6M&(0=ria!^eY3oZyF1nM8L_yR~6b#aK6b^t2o#aW8Ofw z`894cr+WabE*mkA<*wR^0q}%s%I6Mqe-dLma4EUv6aapwt*}U$0|L9EIX(giFAWPZ z&;ToJ92#s3nZm}<3kHyj*T~6V`1wM)eFA+1-O`*t#Ke)o#u_$GIewG3MgHHgO4ZXk zpK2%OimFEE25K<2u}wZ3X}1NCr>b37=TlP&7@jJ>LoFRHU1~QMLQStgOSeg8Tu22K zb6S-!g{d=xU72HB(Qe7nudn(>}YJyET`(&62EQC*nOR z+nLa5Od@vL=h_}}u9eXyO63$K^TyII43sijBKdowl+lJOjYz|V`i9*$V2|5T_>6FH z3l3btfye;Vw}y@En0Pw%WW^|GOFk%{_m>K)I7dI{%361-zyXQbW^ zw&;)xlN|dz;PrYk$FgV3-O%^xbQWi$b6WuanvJ@MZS%SCJz1`QaJZhf6;encg%pyT b{1#vU%aSg@hL7wY00000NkvXXu0mjfhD literal 0 HcmV?d00001 diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 7c7ed11d38..f30382e14a 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -20,11 +20,11 @@ + android:title="@string/actionbar_upload"/> + android:showAsAction="ifRoom" + android:title="@string/actionbar_sync"/> From 5f4b46015f7fd904792e97e2cc6d40d1d90d60da Mon Sep 17 00:00:00 2001 From: masensio Date: Mon, 31 Mar 2014 10:32:49 +0200 Subject: [PATCH 03/10] Update string: 'New folder' instead of 'Create directory' --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a73f9061eb..1bb5f12b3e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8,7 +8,7 @@ Content from other apps Files Open with - Create directory + New folder Settings Details Send From f7bc72f21dacfe7061b739b793a190a913d09454 Mon Sep 17 00:00:00 2001 From: masensio Date: Mon, 31 Mar 2014 10:36:56 +0200 Subject: [PATCH 04/10] Replace 'directory' by 'folder' in strings.xml --- res/values/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 1bb5f12b3e..0f71d6e3e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -41,7 +41,7 @@ Files Connect Upload - Choose upload directory: + Choose upload folder: No account found There are no %1$s accounts on your device. Please setup an account first. Setup @@ -76,7 +76,7 @@ Delete account Create account Upload from … - Directory name + Folder name Uploading … %1$d%% Uploading %2$s Upload succeeded @@ -99,8 +99,8 @@ Kept-in-sync files failed Contents of %1$d files could not be sync\'ed (%2$d conflicts) Some local files were forgotten - %1$d files out of the %2$s directory could not be copied into - As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to. + %1$d files out of the %2$s folder could not be copied into + As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s folder and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to. Folder %1$s does not exist anymore "Move all" "All files were moved" @@ -185,7 +185,7 @@ "Rename could not be completed" Remote file could not be checked File contents already synchronized - Directory could not be created + Folder could not be created Forbidden characters: / \\ < > : " | ? * Wait a moment "Unexpected problem ; please select the file from a different app" @@ -238,7 +238,7 @@ Image preview This image can not be shown - %1$s could not be copied to %2$s local directory + %1$s could not be copied to %2$s local folder Failed InstantUpload Failed instant uploads Summary of all failed instant uploads From 1037fd1b08f03827a931e7d0559abc2cfd5d3357 Mon Sep 17 00:00:00 2001 From: "Mr. Jenkins" Date: Wed, 2 Apr 2014 01:15:13 -0400 Subject: [PATCH 05/10] [tx-robot] updated from transifex --- res/values-et-rEE/strings.xml | 7 +++++++ res/values-tr/strings.xml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 1387877520..e4369d6db3 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -97,6 +97,7 @@ Faili %1$d sisu ei suudeta sünkroniseerida (konflikt %2$d) Osad kohalikud faili ununesid %1$d faili %2$s kataloogist ei suudeta kopeerida + Alates versioonist 1.3.16 failid, mis on üles laaditud kopeeritakse kohalikku kataloogi %1$s vältimaks andmete kadu vältimaks andmete kadu juhul, kui ühte faili sünkroniseeritakse mitmelt kontolt.\n\nSelle muudatusega seoses kõik failid, mis on üles laetud rakenduse vanemate versioonidega, kopeeriti kataloogi %2$s. Selle tegevuse peatas viga, mis tekkis konto sünkroniseerimise käigus. Sa saad jätta faili(d) nagu nad on ning eemaldata viite %3$s või tõsta faili(d) %1$s kataloogi ja säilitada viite %4$s. \n\nAllpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, millele nad viitavad. Kausta %1$s pole enam olemas Tõsta kõik ümber Kõik failid tõsteti ümber @@ -160,6 +161,8 @@ Autentimisserveriga ühendumine ... See server ei toeta seda autentimise viisi %1$s ei toeta mitme konto kasutamist + Server ei tagasta korrektset kasutaja ID-d. Palun kontakteeru administraatoriga. + Ei suuda autoriseerida selle serveriga. Hoia faili ajakohasena Nimeta ümber Eemalda @@ -206,6 +209,8 @@ Saaja: Allkiri: Algoritm: + Ei suuda kuvada sertifikaati. + - Vea kohta puudub info See on kohahoidja placeholder.txt PNG pilt @@ -233,10 +238,12 @@ ära tee midagi, sa pole võrku ühendatud koheseks üleslaadimiseks Veateade: Palun kontrolli oma serveri seadeid, võib-olla on mahulimiit ületatud. + Vabandust, server ei toeta jagamist. Palun kontakteeru administraatoriga. Antud faili või kausta ei saa jagada. Tee kindlaks, et see on olemas Faili või kausta jagamisel esines viga Antud faili või kausta jagamist pole võimalik tühistada Faili või kausta jagamise tühistamisel esines viga Saada + Kopeeri link Kopeeritud lõikepuhvrisse diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 9db43d1d42..531bd7fc5a 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -199,8 +199,8 @@ Verilen: Veren: Ortak ad: - Organizasyon: - Organizasyon birimi: + Kurum: + Kuruluş birimi: Ülke: Eyalet: Konum: From 6dde4ddd3a1dd5f8e239f5056d863274ae2196da Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 2 Apr 2014 11:15:05 +0200 Subject: [PATCH 06/10] Add different action bar configuration for landscape and portrait --- res/menu/main_menu.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index f30382e14a..2823da5265 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) 2012-2014 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, @@ -23,13 +23,13 @@ android:id="@+id/action_upload" android:icon="@drawable/ic_action_upload" android:orderInCategory="2" - android:showAsAction="ifRoom|withText" + android:showAsAction="ifRoom" android:title="@string/actionbar_upload"/> - - \ No newline at end of file From c3da11d2447434ed4d5b0de1b71e87ced9e77d0d Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 2 Apr 2014 11:19:08 +0200 Subject: [PATCH 07/10] Revert "Add different action bar configuration for landscape and portrait" This reverts commit 6dde4ddd3a1dd5f8e239f5056d863274ae2196da. --- res/menu/main_menu.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 2823da5265..f30382e14a 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-2014 ownCloud Inc. + Copyright (C) 2012-2013 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, @@ -23,13 +23,13 @@ android:id="@+id/action_upload" android:icon="@drawable/ic_action_upload" android:orderInCategory="2" - android:showAsAction="ifRoom" + android:showAsAction="ifRoom|withText" android:title="@string/actionbar_upload"/> + + \ No newline at end of file From 6fead9dd7ffcd207324a9cb1e38a1c5cdd90d17a Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 2 Apr 2014 11:19:42 +0200 Subject: [PATCH 08/10] Add different action bar configuration for landscape and portrait --- res/menu-land/main_menu.xml | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 res/menu-land/main_menu.xml diff --git a/res/menu-land/main_menu.xml b/res/menu-land/main_menu.xml new file mode 100644 index 0000000000..6b84826386 --- /dev/null +++ b/res/menu-land/main_menu.xml @@ -0,0 +1,46 @@ + + + + + + + + + + \ No newline at end of file From 9587c90abf225ee7a89cbf79ec5f839705cd64bb Mon Sep 17 00:00:00 2001 From: "Mr. Jenkins" Date: Thu, 3 Apr 2014 01:15:14 -0400 Subject: [PATCH 09/10] [tx-robot] updated from transifex --- res/values-hu-rHU/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml index 169731225f..370fa5d254 100644 --- a/res/values-hu-rHU/strings.xml +++ b/res/values-hu-rHU/strings.xml @@ -97,6 +97,7 @@ %1$d fájl szinkronizálása nem sikerült (%2$d ütközés) Néhány helyi fájlt figyelmen kívül hagytunk %1$d fájlt nem sikerült a %2$s mappából bemásolni + Az 1.3.16 verzió használatakor azok az állományok, amiket erről az eszközről töltenek fel, a helyi %1$s mappába másolódnak be, hogy elkerülhető legyen az adatvesztés, amikor ugyanazt az állományt több résztvevő is szinkronizál.\n\nEmiatt a változás miatt, az e program korábbi változataival feltöltött állományok a %2$s mappába másolódtak. Sajnos azonban egy a szinkronizáció közben fellépő hiba miatt ez a feladat csak részben valósult meg. Két lehetősége van: vagy úgy dönt, hogy maradjanak a fájl(ok) ahol vannak és akkor törölje a %3$s-re mutató linket, vagy pedig helyezze át az állomány(oka)t a %1$s mappába, és tartsa meg a %4$s-re mutató linket.\n\nAz alábbiakban látható a helyi fájl(ok) listája és a távoli fájl(ok) a %5$s mappában, amihez linkelve voltak. A %1$s mappa már nem létezik Helyezzük át mindet Az összes fájlt áthelyeztük @@ -160,6 +161,8 @@ Kapcsolódás a felhasználóazonosítást végző kiszolgálóhoz... A kiszolgáló nem támogatja ezt a felhasználóazonosítási módszert %1$s nem támogat több bejelenkezési jogosultságot + A szerver nem megfelelő felhasználói id-t ad vissza, vegye fel a kapcsolatot egy rendszergazdával + Nem hiteleíthető a szerverrel szemben Automatikusan frissítse a fájlokat Átnevezés Eltávolítás @@ -206,6 +209,8 @@ Eddig a dátumig: Aláírás: Algoritmus: + A tanúsítvány nem megjeleníthető. + - Nincs információ a hibáról Ez egy helyőrző helyörző.txt PNG kép @@ -239,5 +244,6 @@ Nem lehet a megosztást megszüntetni. A mappa vagy fájl nem létezik. Hiba lépett fel a mappa megosztásának visszavonásakor Küldjük el + Link másolása Bemásolva a vágólapra From d164646e289306ae85a2b2b9b3f952c2ddac0fe5 Mon Sep 17 00:00:00 2001 From: masensio Date: Thu, 3 Apr 2014 10:08:57 +0200 Subject: [PATCH 10/10] On any device, any orientation, show the icons for Upload and New folder directly in the bar. --- res/menu-land/main_menu.xml | 46 ------------------------------------- res/menu/main_menu.xml | 8 +++---- 2 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 res/menu-land/main_menu.xml diff --git a/res/menu-land/main_menu.xml b/res/menu-land/main_menu.xml deleted file mode 100644 index 6b84826386..0000000000 --- a/res/menu-land/main_menu.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index f30382e14a..979d7309ed 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -23,25 +23,25 @@ android:id="@+id/action_upload" android:icon="@drawable/ic_action_upload" android:orderInCategory="2" - android:showAsAction="ifRoom|withText" + android:showAsAction="always" android:title="@string/actionbar_upload"/>