From fd43be1e59727697d270db676b5a4254f193f728 Mon Sep 17 00:00:00 2001 From: kniddl <10777535+kniddl@users.noreply.github.com> Date: Wed, 28 Feb 2018 12:01:08 +0100 Subject: [PATCH 1/3] Updated German FAQ section --- app/src/main/res/values-de/strings.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 010b7a476..4a3a29090 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -189,13 +189,13 @@ Keine App zum Setzen des Klingeltons gefunden Kein Klingelton gewählt Terminbeginn kann nicht vor Terminende liegen - CalDAV Sync + CalDAV Synchronisierung Terminlisten Vergangene Termine anzeigen - Always use same snooze interval + Immer dasselbe Snooze-Intervall nutzen Erinnerung mit Snooze verschieben um Widgets - Replace event description with location + Ersetze Terminbeschreibung mit Ort Alle Termine löschen Bist du sicher, dass du alle Termine löschen willst? Deine Termintypen und Einstellungen bleiben erhalten. @@ -273,12 +273,13 @@ Kaffeepause - How can I remove the holidays imported via the \"Add holidays\" button? - Holidays created that way are inserted in a new event type called \"Holidays\". You can go in Settings -> Manage Event Types, - long press the given event type and delete it by selecting the trashbin. - Can I sync my events via Google Calendar, or other service supporting CalDAV? - Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. - In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + Wie kann ich Feiertage löschen, die über \"Feiertage hinzufügen\" importiert wurden? + Die über diesen Weg erstellten Feiertage sind als Termin-Typ \"Feiertage\" deklariert. + Du kannst in den Einstellungen -> Verwalte Termin-Typen auf den Termin-Typ gedrückt halten und über das Papierkorbsymbol löschen. + Kann ich meine Termine über Google Kalender oder andere CalDAV unterstützende Dienste synchronisieren? + Ja, aktiviere \"CalDAV Synchronisierung\" in den Einstellungen und wähle die Kalender aus, die du synchronisieren willst. + Jedoch benötigst du eine separate App, die die Synchronisierung zwischen Gerät und Servern handhabt. Falls du einen Google Kalender synchronisieren willst, kann die offizielle Kalender-App dies übernehmen. + Für andere Kalender benötigst du einen Synchronisierungsadapter, wie z. B. DAVdroid. From 0f9ff7c2e9c230bd9923082801c6f4c81497832b Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 28 Feb 2018 18:05:34 +0100 Subject: [PATCH 2/3] move some resources to Commons --- app/build.gradle | 2 +- app/src/main/res/drawable-hdpi/ic_clock.png | Bin 805 -> 0 bytes app/src/main/res/drawable-hdpi/ic_snooze.png | Bin 631 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_clock.png | Bin 1032 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_snooze.png | Bin 824 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_clock.png | Bin 2022 -> 0 bytes .../main/res/drawable-xxhdpi/ic_snooze.png | Bin 1215 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_clock.png | Bin 1345 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_snooze.png | Bin 1663 -> 0 bytes app/src/main/res/values-br/strings.xml | 23 ----------- app/src/main/res/values-cs/strings.xml | 23 ----------- app/src/main/res/values-da/strings.xml | 23 ----------- app/src/main/res/values-de/strings.xml | 23 ----------- app/src/main/res/values-es/strings.xml | 23 ----------- app/src/main/res/values-fr/strings.xml | 23 ----------- app/src/main/res/values-gl/strings.xml | 36 +----------------- app/src/main/res/values-hi-rIN/strings.xml | 23 ----------- app/src/main/res/values-hu/strings.xml | 23 ----------- app/src/main/res/values-it/strings.xml | 23 ----------- app/src/main/res/values-iw/strings.xml | 23 ----------- app/src/main/res/values-ja/strings.xml | 23 ----------- app/src/main/res/values-ko/strings.xml | 23 ----------- app/src/main/res/values-nb/strings.xml | 23 ----------- app/src/main/res/values-nl/strings.xml | 23 ----------- app/src/main/res/values-no/strings.xml | 23 ----------- app/src/main/res/values-pl/strings.xml | 23 ----------- app/src/main/res/values-pt-rBR/strings.xml | 23 ----------- app/src/main/res/values-pt/strings.xml | 23 ----------- app/src/main/res/values-ru/strings.xml | 23 ----------- app/src/main/res/values-sk/strings.xml | 23 ----------- app/src/main/res/values-sv/strings.xml | 23 ----------- app/src/main/res/values-tr/strings.xml | 23 ----------- app/src/main/res/values/donottranslate.xml | 15 -------- app/src/main/res/values/strings.xml | 23 ----------- 34 files changed, 3 insertions(+), 579 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_clock.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_snooze.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_clock.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_snooze.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_clock.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_snooze.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_clock.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_snooze.png diff --git a/app/build.gradle b/app/build.gradle index 29a3aa3c3..ce6de48d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.12.16' + implementation 'com.simplemobiletools:commons:3.14.0' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.2' diff --git a/app/src/main/res/drawable-hdpi/ic_clock.png b/app/src/main/res/drawable-hdpi/ic_clock.png deleted file mode 100644 index 4651478fc36c28c69bc02f790c4face5ded21f8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 805 zcmV+=1KRwFP)_>Cg_Cxugw%W=UO=dL(s9>X6jri?<|wlQb`BR?>Ut+*WN+_kyH>5#T$JrMzW< z4PY2(uQkjdkO_b&X6wMsT7WbFj|+@^0k{WT0@{Fj|Fi+!zHG5TBp(3{)xf*}a$YP4 ztN^`0V?g^xpbuCz8d>03MNmF67G?rysX(U%n2bR^Oe!*H!ki;om~}~Ej9wjZ$3PLh zrigY^#=uOJf&sdKAz&~7YRW*Z6SDh&yJi$C<)+EQ0K5y(Zt-g>Z^PvpG!va2`MK^5 z=p-1(*Y7t`+5l3v{79^Rm!!1!mnFRk=_H}O_S*7&T`UFEZQe~g=l;~1#%oTS{(DLR zbsB%B)-c9qB~hTyJwT_8zpVYUCF6J4f;do<@qg|cj`YL$&9)#8RE>22=c^To1KHfA zHBe(o(x#+SlHLMiKwFtMCyc*Yv=;Em99rFhKmyJHuh_ZWGr%pNzDWHZa~93nvUr3( z8$TGxIk)1RyDaINqKKW8G%jflxB$d6Q@hpYiwXl*%_tWLNHYp(9QPOLFR%00Mw=)t zS@dPwz?D*Bso2%gmlVioodsS3AAzIh{dF^48K9|@j{NBIwn_y#P)zTb@mql}M*nt* zKs^1Jq>5a~=+*&GOmx-)cH{rX17;LCAGK-|v=MeEXg89IjIld~ovLK|{509fWP#D7 zI{763c?@cmD4z*U^85Xou`o~VBCiB$oZXfq+P3$J4!Cx9K7-Q!-2-1I7i&9OF-#0> zfWjY&xe|}HwZv;C04hzixHky0_VNVwDkL|&Y8o*dC%{6&V-8)%|b49X)BV;I&B)u z6_u>(s3z+58_o=6YKFnS?mW?`2poGRM-+h*!|9^S%m8-XEeP&2ZN;9lvOQm#a<3q` z->-lPb(NxKp8{6335IM)%bKSIH~9|mv8MB)&jFukcAX`8S=8!Ei-4u`qFxcE)Vb3( z;J~{c)2^VP-GKKT0)BD3dUJ?8P5OgzfB3Iz z9#jVNiH6LrTCfEkt*MU&!H?+;IR(D1sk6TY6X~Kh5qPocU3&$bxISGJ%zz`^LJmES zK}pCGHQE3N`ZF~TI|Qq)$QA`Ri(g2Ww4_{?cbtJ8H&*+ny~7sZ(EA?Op`byBCw$;< zz)!k_YNDXkqP#4)R!A2mdD5D+tQr*32(r1yq%Z7M z675OeV&={Fob!Ee?#y@YNQ+p+{~Im_3D7HPtE8QhHcNU<(i%xGrbGUebW>7G(uAZ- zk}f;v9>vhF3}8L*EpUr)Oar69;PWv4GH@JtSi!i(1K>Mg)w43c7nq4)+~N+fyPL+B z04JVcU?>9Q)#qpa4-4VW?uypl@mzghmD6Rpr=gWb`v;5z$O(j zfhPGKd#fGi%jiAR9(T^&t74)KoOAP%&YA9=cAPJP&8GcREK?P5$+WFEZvwBI_OH?G zgu`lEZ{7sfnD&iWZYtoqX|J^daz{#FK~is~tIs+2PpESC;dRbcI=Ye^RTnZ{3(mQY z0`KX|QUn0+c8lAWz+a}lJc7<;lF}r!rdeUy)|)qhY13X8DB8v@N!KzuBa&Lc$LZ84 zgY~98We4~Ym^AH;CB-`6oEw)kBk`7Cn0Ctq1dHX5e@&Gcwi0)8`^w<~J` zACkvJH+vFZx8CcT5OO!uy)P^ zoUg-eg_ad00m%|O3^W7ynrV#hbz<9mX}+?e4gAxojalF{Fao>-^z-=jdVktCLQ)>s z9X5+2(SG@YMD~zhonqiN@Ilv%nszpB_%cw7~!T1yezh?<_3cpQTJNekGsn1PC+4xg6KaeNKGx%g0Lbm ztP5KXv(d&D>UeB#blJxw->f^Ae1 z^$YcD_l~#ykC7W}B zEye-N+S3>)c^3euwFx0~d);Ry&6qcD#)MP$=@LR%?+k#<+i76EF92lT62cnK8c1M`3uQKuHefD@ult$?}J0-pfRTf16d2B`ZIzXOL6HZ9kJN|)zv3?60r)@^0oEA@P}L)(d)PGqqgsmrp~E!*i;n3Qb?SE9B7iBI zL;;{ii~%5X!9o2hTD7VeaL9-Z06*I#6bFQLjwrhKwTd*5Zb(($E*li-LgSh}>nHV> z8L?ZFC=R6BW}j2W-7x2tX=6@$$ySkH_@BE20000WAI?m6nf~r?=g)6uc9Z!g^RRd4chC2p-?`_Wd+xadee}^sAAR&OQ;~H`kU9%k z0xSlu20jK{2P^}w0Tuv*)vuoi-UdzrBfu-bOTa1M4DeQ#Wp;yi#}%Z`1J(k!02_c+ zghB?I>}m{n9r!1(8`ujR$g*s-JhokgI!FDa`mFkzdS1O?IT%%6Rd=elsm&_8cTg`? zKd0_f$4gR35ysR#>SlFeug9N+I-uUHKCZso1;y0kzv|D_b?WS1>*FG*Ur~>!l^!Uk zhKhPf-BQ-L+H%rr1`Gq=0`6;|zj0y}It?5I4gg1h2m&wjVs*Ho5zUfrRt>crR^ zA$*15h{vWNdQ|B86g50^)zV26#Tf8z>3Z6?`F<>m^DFSb+52}}RjKtI&FHs+=a>?U)LET~};v^#o zJW^me52}kw7u-D0MTYN7y~soAx=sjv-1O4Ay_c3#4|RdD#OI-6MBL?VON_l$-u7YK zaL8>rzv|nb{P}hXoQKut&0pQ#Q8%|Mqb6vMx;ODQP8h3IyAgT)bSOhXnfhrX1jw6i zdu$*JFslJsw-WiBJp2;a)w58(098(Z0)CbF%6cL{)jEto>^BMPIciBkU?(hSQs488 z+)*BOPBn(9ENBgp0j$Ru@aRm)=4DxS4)`gtQLe`-Vk4YHQb9%z`4%8=V|f_(W8*Y? zjz18b>v0uubCC}%vY;iz9If9jj04XSDTwhL;KM^%y3mS}uwdv<{e)(|$0^ zvNxOK)_Y`Gb`m%Q)Q2QXxT0%ulqZ#+rtDDzO6|ZjWQGth{{9d+I;bud6A4 z*sPr830Wso&lJ6#)I%%UqnV4lfjz)ECIY!x#8zh;@RE9`dRd!tu1&PRo_e52K_iLw zm5s7#6j_!%3ET^81>Ttauj=Q+z!ShD>TPX^x<1i9l6s&>L9Zm*3-c$fBFnPZfJcBY z06T&I)qQ0l@Oj`D>NnI&TM)A*(ViM>8tP}wKgHOuCO3CwK%HHczu)}Bf(ynG)Rso4 zopG>uAjbz))H_-sd87HM%2VpbraNo_>W9?tm@ZNnRi7}*@CK*oYm@qBP9I0r8(JZE zrIE9($Cz<2*YR`rDvu#`jru$Dk8s9})0OWR^f71@Ipoz7>`+@un7u`;EcG$MY+xgu zSIUYo#DV8ke1>RK&OqcD!1 zKcoIDp`aI1R@aKKdyG2ddW;*DU7fGoY7$2A!tYHNFWgn8uti2?Szh3H!Kmz-Zsjk} zBrK<*K4wW9;K@SQtA}$0)|B*+(;$aqT!nZzp&X42L8=&|Ex`loeF>o&Wp7(ce>2T- zTu@cce+m?IubsTAU{q)26>-*zpLQ7YzuQHe!%j@A)VAcu-5@ipK5cOs@bgCTQsMrn zBtC=c9fm_LDg)lGCQmQQB$TPEO)vc#E60ct@pdejG=jiw#!_BXNWNRW-fo5?>XNFG zQkGOR_2cT-j7s-1t|AOp`+C5M?M9L1>{c%?W6Z6PU2V+!sV=jOsed;vqHMASQ#bNC zn+zv>u;9hiFluZ?Qdz`?P{wtrrNB3VFE`NNI8lOfnkXcwU57eG9O~81t>zQgp{^y; zq-%&Wl`DYDY3#o1Pkej5uk%5pm~j zOFE5rj0kzH)A34X4aTRRj4hvnRT4df z%%uw&H0U9SUV@>!Lb%n`t%pKv%4}9k1=IBEE&cU!IedSvexC1q-&_9vkLP@cpXdDV z`JZ!CtE}=rg;FA@0Fh6LSx>X!j*;f$Ktip|P#cbrLo)!-V6Bq`V39Myg&yDvWci1^ zRyr^8FJ!q)EQrv^!c!=V zs9*%iG>82PonaA4icQF5uOLYqDTbLKLxu^4xyA)fvlB=3-NFqd3%q466yq`==^*M- z*~cZu@nVb)_PVszas`mIv&KYdGd)Nac-tj=iXlw7LjzH{edNx%w@^8EkxWyiTTd{G zU+(dW{{A@WmGV;R9A+BH2s^WFMRa3J7u&O=Jj)+QCaGLr=u0Hm*^+IkW11jLaV$I1 zW86ma)$&5?=taX9tj(@|3rjIaCugamm^e|Q#3`nlb96DsQk>5wc>!Oe;T8p6IrJ!_ z04(yZuG62B%MaAE0kup##7S!Ojvoz3fLBL?!*X zN_s1JjSRCqW3mrbySlX?nIS$#4bE*qf}a0#@eH=5P3Q^HFSPK2LK+Liv0Pnm!6pL4<-Y zS(~WfkH}X0C9_THcR({mxo8V9sjq>i+GFUWEV^FT4v4l;fA$wZb8gvzpCb)m{{Cpc zF`hO!{XW4MXx=y0ktg*;c*S+Vvf9VVfM$p3@nak`Cqq4cG>QUjbwIlrs!$(jF4`Vp zD?<}Hgqz*Ahx~pbp$O%RA~T3%e+^28BGiPN`XCp@S;|lWqk=imjIbuyReFGUAe}-6 zadRBySID6oH$AKm@YrwzH&?@Xj_Dz8IXhBkl5M&z;DgnGMJ`n^h@>{i|I1pCq)8Gn zmdU4yIVA6)tb{xsJ^MLmq;rVdfTSH|FXZ(s+)IPU6IPr?`pBh&NN^#A!-p)zJSm!~ zp@c$W#3-bM8k*@QgFq}+Fd-c;Ger<4Whw_3QWTNGmaA+-g(#%sRYvj4h}e}w7E;7$ z#OR@(d3?bWT*R)7lYb&|Ie;fwh8qiclzoWEKLbP9 zgE#5Ht1ezSYh{0ejPn)nTa(4V~zE*-?DL&ejODF+KT_?JIPH>>)m4A7bb} zlH_m{R;P*2I2)^jl4~>7=$;VQ_?wi=#&W{q6_=x%M>s73qAWmnfp|k6EvN?7wq-bg zf=!5_Y9vRz;CyuVi1->n!Gq||689Lwa#W2Jq&2{3T2L(^TijwdbQg;F9zelmXgu^E zUPskTH0=R$X+`y-`vTgH>ShtY16Xkzst&^92K%FmQy55q65^=#6gPMr)wd#P3!va9 zR1b+8EJ1Z%D}Qi=;Jxf@)MdixVzJ^-7=tUiUl`@f4~{ z0u68ls>j3$U!mGN&;a|P`dpkaAJy7{23Qx>9C1Pes)>OHn1ZTKoY0FZ9B6pwmXZl z`hr!(1NKMtnKUdohGPS&G#kY%I3;8Px;g2K%ClQzV8E=308u#d%09C`Grs+xFds>J~AGB0fNO zg;;Pqs&+!+4zHqWAxDg2FXb}LXSis{qYc&b;ugE0yI2fUF4HzHS{UpgZjsG0RLzVM z<0$4s`<-Pht*920mCBzO+%LXhFUE-lkDxn4ydak*R53P^G+}e%sOpJ|H(ZLYjEJNG zxhz6=o_Ix+N_5Xi8t@{zrG&&g4#(Mc$zmq$=z7^% ze8R5up=)8PB#)!8>SZ6FcE1m+gCsRPg;k8ReYpEEtR9q95#m?uJV#UvA%_>S^Buz_ zb&O{zb{4RSp|-UMI|~>sW>7*6c49o3+9HhM5#rdXV1}5(s?=bwnajwPB#_4yv|_J< zQZb7XmXSy+w^1SQCfG#&V*g@eU^6!JNKc%P|~E*wrJCM{)uNiU*Y zLK7y`aV{YV0=b;aa#FE~(}_rs$YvK_p$o6td7kaal79xG?8750#Ep48!0v?PpNR47 z!i7A}7tE!OE(RH(i&|#$DUWa-J2FNxGBPqUGK~2PbJs|XNa!0X00000NkvXXu0mjf DiPU72 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_snooze.png b/app/src/main/res/drawable-xxxhdpi/ic_snooze.png deleted file mode 100644 index c3cdb9288c81425c5695c9bdb9b92062107b1acd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1663 zcmV-_27vjAP)$`3Y@WVi!F6apd~V7LU2DQra8NxGd10k4qmj}$39RB;fydCCzB zv3r*ag@dV_#%6%!3IUIjz~)1~qujBOPHft_TOnZ)SF!0}o^r!F;@JF`+hjqMAF!Gi zc#D5?fnE|M=;1sk*vocSa3@8wU>awz8Dy1$Vl;oi?r)5f2a{OOKj>p5J^Yn*RLg@Z z4q>;Q8|9Ai{2jX&7_DI_WjTj&ljH!upjg8Y zD}@=H#ipO78W~%$+fPhG7|Tn9Z3iV9!Yv%Z?spmq8?bqqh=wqYR`TH_w`&L``~{nh z8X2!(O0Zrj+(#Fg#Ce}*sAo1cR1hIT1vSiO8Cy9_oJ=~IuOW=$DZF+n8${U8m#%TY zQfMH7pMIKHOt~_koCkQFe*6rwL@E4~UcPjYh_XYBQ+)0trYnU<@Nq`xOk|#_I|B!jXKj1yhoV3W8r@>Zd}!a3o*E z7{K(1g5VuYP09dA%79&%_Q@R)dND0l2DsU)40sSzH>2f>S(pYXQy^6GA*N%LDFeol zz;vfvu@ck!3WO*JF@4Of8UaT!HOLh^Fg>FH7{#A4UE{kN5!*05FIVitRIdPd8dID_ z$^s3T_Q(|{G0m1U>hW5otS|@Dak=6GrW!e79)p;+DofO1YLhE^F;&P3Q@Mhvi5rw9 zVwk$+iUg*J9PkZ3!gPdEWsNANxLlFI6j9bFaQ}HOdmtVj5ts98rgdg6rF`K?zKAh^ zX{~~w7OzJ6!jXLOB&H;{Di{u7y2Kdyz>$1V#$`k?(k4Ugm1#|-5GchHB| zqskRgPT_TqT7`@{+VEy2HLo?~l zF;gMn4%$d}oMMHC$y_B}AFGuk*3wV94kjsFEFzB0ZfX<|wd}!WfVm1E^(3+BrjfC7 zL>Zgu!6w1O$`96%#IBt!#FQms{F-*`5-eB#P){5`1MK2K#wi2F@esQiz|Q~=E5BI8 zRWgb50o!O`4t2zc5+z0*b7){2M@f)L2XmEwOs1K9IL0JhAC&SU;Y#ux#k!ujhf{>5 znIG!lgBsTHHa(2w8gH_O zZ|dubBEHWGw(}%da eurioù - Morse - - Genver - C\'hwevrer - Meurzh - Ebrel - Mae - Mezheven - Gouere - Eost - Gwengolo - Here - Du - Kerzu - L Meu Mer @@ -244,14 +229,6 @@ Sa Su - Lun - Meurzh - Merc\'her - Yaou - Gwener - Sadorn - Sul - Lun diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 27323eb3d..89fdd136a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -230,21 +230,6 @@ %d hodin - Nikdy - - leden - únor - březen - duben - květen - červen - červenec - srpen - září - říjen - listopad - prosinec - P Ú S @@ -253,14 +238,6 @@ S N - Pondělí - Úterý - Středa - Čtvrtek - Pátek - Sobota - Neděle - Pondělí diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0a5c399a4..c4247878f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -221,21 +221,6 @@ %d timer - Aldrig - - Januar - Februar - Marts - April - Maj - Juni - Juli - August - September - Oktober - November - December - M T O @@ -244,14 +229,6 @@ L S - Mandag - Tirsdag - Onsdag - Torsdag - Fredag - Lørdag - Søndag - Mandag diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4a3a29090..6a0044d76 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -221,21 +221,6 @@ %d Stunden - Nie - - Januar - Februar - März - April - Mai - Juni - Juli - August - September - Oktober - November - Dezember - M D M @@ -244,14 +229,6 @@ S S - Montag - Dienstag - Mittwoch - Donnerstag - Freitag - Samstag - Sonntag - Montag diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3b68d684a..419e392a2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -221,21 +221,6 @@ %d horas - Nunca - - Enero - Febrero - Marzo - Abril - Mayo - Junio - Julio - Agosto - Septiembre - Octubre - Noviembre - Diciembre - L M M @@ -244,14 +229,6 @@ S D - Lunes - Martes - Miércoles - Jueves - Viernes - Sábado - Domingo - Lunes diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c4242218c..dcf2d3a5d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -221,21 +221,6 @@ %d heures - Jamais - - Janvier - Février - Mars - Avril - Mai - Juin - Juillet - Août - Septembre - Octobre - Novembre - Décembre - L M M @@ -244,14 +229,6 @@ S D - Lundi - Mardi - Mercredi - Jeudi - Vendredi - Samedi - Dimanche - Lundi diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index e08729346..376bd2171 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -3,6 +3,7 @@ Simple Calendar Calendario Cambiar vista + Daily view Vista semanal Vista mensual Vista anual @@ -26,6 +27,7 @@ Evento engadido con éxito O evento foi actualizado correctamente Filtrar eventos por tipo + Please fill in a location to be shown on a map Repetición @@ -135,24 +137,14 @@ - Importando… - Exportando… Importar eventos Exportar eventos Importar eventos desde un ficheiro .ics Exportar eventos desde un ficheiro .ics - Eventos importados correctamente - Eventos exportados correctamente - Fallo ao importar eventos - Fallo ao exportar eventos - Fallo ao importar algúns eventos - Fallo ao exportar algúns eventos Tipo de evento predeterminado - Non se atoparon eventos para exportar Exportar tamén eventos pasados Incluír tipos de eventos Nome de ficheiro (sin .ics) - Sin título Título @@ -194,7 +186,6 @@ Mostrar os números da semana Vibrar coa notificación de recordatorio Son de recordatorio - Recordatorio predeterminado de un evento Non se atopou ningunha aplicación capaz de establecer o ton de aviso Ningún O día non puede rematar antes de que comece @@ -230,21 +221,6 @@ %d horas - Nunca - - Xaneiro - Febreiro - Marzo - Abril - Maio - Xuño - Xullo - Agosto - Setembro - Outubro - Novembro - Nadal - S T C @@ -253,14 +229,6 @@ Sa D - Segunda - Terceira - Cuarta - Quinta - Sexta - Sábado - Domingo - Segunda diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 37215f6ff..84c7d6436 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -222,21 +222,6 @@ %d hours - Never - - जनवरी - फरवरी - मार्च - अप्रैल - मई - जून - जुलाई - अगस्त - सितंबर - अक्टूबर - नवंबर - दिसंबर - सो मं बू @@ -245,14 +230,6 @@ श र - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - Monday diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 46f5e27a8..4f45e1428 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -221,21 +221,6 @@ %d hours - Never - - Január - Február - Március - Április - Május - Június - Július - Augusztus - Szeptember - Október - November - December - H K SZE @@ -244,14 +229,6 @@ SZO V - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - Monday diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b3386d4bc..617fc9e70 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -221,21 +221,6 @@ %d hours - Never - - Gennaio - Febbraio - Marzo - Aprile - Maggio - Giugno - Luglio - Agosto - Settembre - Ottobre - Novembre - Dicembre - L M M @@ -244,14 +229,6 @@ S D - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - Monday diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index bb1b1654d..785d8074b 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -222,21 +222,6 @@ %d hours - Never - - ינואר - פברואר - מרץ - אפריל - מאי - יוני - יולי - אוגוסט - ספטמבר - אוקטובר - נובמבר - דצמבר - ב\' ג\' ד\' @@ -245,14 +230,6 @@ ש\' א\' - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - Monday diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index eabce4c81..fb0bdee9f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -221,21 +221,6 @@ %d hours - Never - - 1月 - 2月 - 3月 - 4月 - 5月 - 6月 - 7月 - 8月 - 9月 - 10月 - 11月 - 12月 - 月 火 水 @@ -244,14 +229,6 @@ 土 日 - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - Monday diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d7d546c48..3edf82c1b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -221,21 +221,6 @@ %d 시 - 사용 안함 - - 1월 - 2월 - 3월 - 4월 - 5월 - 6월 - 7월 - 8월 - 9월 - 10월 - 11월 - 12월 - 월 화 수 @@ -244,14 +229,6 @@ 토 일 - 월요일 - 화요일 - 수요일 - 목요일 - 금요일 - 토요일 - 일요일 - Monday diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index e445ef384..b652a697d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -221,21 +221,6 @@ %d timer - Aldri - - Januar - Februar - Mars - April - Mai - Juni - Juli - August - September - Oktober - November - Desember - M T O @@ -244,14 +229,6 @@ L S - Mandag - Tirsdag - Onsdag - Torsdag - Fredag - Lørdag - Søndag - Mandag diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 91f64151a..608794715 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -221,21 +221,6 @@ %d uren - Nooit - - Januari - Februari - Maart - April - Mei - Juni - Juli - Augustus - September - Oktober - November - December - M D W @@ -244,14 +229,6 @@ Z Z - Maandag - Dinsdag - Woensdag - Donderdag - Vrijdag - Zaterdag - Zondag - maandag diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index dccbd48f9..1ef8f8265 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -221,21 +221,6 @@ %d timer - Aldri - - Januar - Februar - Mars - April - Mai - Juni - Juli - August - September - Oktober - November - Desember - M T O @@ -244,14 +229,6 @@ L S - Mandag - Tirsdag - Onsdag - Torsdag - Fredag - Lørdag - Søndag - Mandag diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c562f90ab..024bac60c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -228,21 +228,6 @@ %d godzin - Nigdy - - Styczeń - Luty - Marzec - Kwiecień - Maj - Czerwiec - Lipiec - Sierpień - Wrzesień - Październik - Listopad - Grudzień - Pn Wt Śr @@ -251,14 +236,6 @@ Sb Nd - Poniedziałek - Wtorek - Środa - Czwartek - Piątek - Sobota - Niedziela - Poniedziałek diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 79b14700d..490ad0138 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -221,21 +221,6 @@ %d hours - Never - - janeiro - fevereiro - março - abril - maio - junho - julho - agosto - setembro - outubro - novembro - dezembro - S T Q @@ -244,14 +229,6 @@ S D - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - Monday diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3c8be8586..5ec792bdc 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -221,21 +221,6 @@ %d horas - Nunca - - janeiro - fevereiro - março - abril - maio - junho - julho - agosto - setembro - outubro - novembro - dezembro - S T Q @@ -244,14 +229,6 @@ S D - segunda - terça - quarta - quinta - sexta - sábado - domingo - segunda diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0b332e695..4d2e838d8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -237,21 +237,6 @@ %d часов - Никогда - - Январь - Февраль - Март - Апрель - Май - Июнь - Июль - Август - Сентябрь - Октябрь - Ноябрь - Декабрь - ПН ВТ СР @@ -260,14 +245,6 @@ СБ ВС - Понедельник - Вторник - Среда - Четверг - Пятница - Суббота - Воскресенье - Понедельник diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index f3c0a9cdd..5e41f004c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -230,21 +230,6 @@ %d hodín - Nikdy - - Január - Február - Marec - Apríl - Máj - Jún - Júl - August - September - Október - November - December - P U S @@ -253,14 +238,6 @@ S N - Pondelok - Utorok - Streda - Štvrtok - Piatok - Sobota - Nedeľa - pondelok diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 741f35aff..41e97ac90 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -221,21 +221,6 @@ %d timmar - Aldrig - - Januari - Februari - Mars - April - Maj - Juni - Juli - Augusti - September - Oktober - November - December - M T O @@ -244,14 +229,6 @@ L S - Måndag - Tisdag - Onsdag - Torsdag - Fredag - Lördag - Söndag - Måndag diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cd1545b27..9b6de1e3d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -221,21 +221,6 @@ %d hours - Never - - Ocak - Şubat - Mart - Nisan - Mayıs - Haziran - Temmuz - Ağustos - Eylül - Ekim - Kasım - Aralık - M T W @@ -244,14 +229,6 @@ S S - Pazartesi - Salı - Çarşamba - Perşembe - Cuma - Cumartesi - Pazar - Pazartesi diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index a150d71b5..c9213f010 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -45,19 +45,4 @@ Allow changing the reminder notification sound Added a new view, a list of upcoming events Added the option to vibrate at notifications - - - @string/january - @string/february - @string/march - @string/april - @string/may - @string/june - @string/july - @string/august - @string/september - @string/october - @string/november - @string/december - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d2785bad2..4abd0812e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -221,21 +221,6 @@ %d hours - Never - - January - February - March - April - May - June - July - August - September - October - November - December - M T W @@ -244,14 +229,6 @@ S S - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday - Monday From 84bc20d7321cda8c2066d536dc169750de679dee Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 28 Feb 2018 18:44:21 +0100 Subject: [PATCH 3/3] update commons to 3.14.1 --- app/build.gradle | 2 +- .../calendar/dialogs/RepeatRuleWeeklyDialog.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ce6de48d3..06398e4ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.14.0' + implementation 'com.simplemobiletools:commons:3.14.1' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt index 18e694065..1348dc50e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt @@ -7,20 +7,21 @@ import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.views.MyAppCompatCheckbox import kotlinx.android.synthetic.main.dialog_vertical_linear_layout.view.* +import java.util.* class RepeatRuleWeeklyDialog(val activity: Activity, val curRepeatRule: Int, val callback: (repeatRule: Int) -> Unit) { val dialog: AlertDialog val view = activity.layoutInflater.inflate(R.layout.dialog_vertical_linear_layout, null) init { - val days = arrayOf(R.string.monday, R.string.tuesday, R.string.wednesday, R.string.thursday, R.string.friday, R.string.saturday, R.string.sunday) + val days = activity.resources.getStringArray(R.array.week_days) val res = activity.resources val checkboxes = ArrayList(7) for (i in 0..6) { val pow = Math.pow(2.0, i.toDouble()).toInt() (activity.layoutInflater.inflate(R.layout.my_checkbox, null) as MyAppCompatCheckbox).apply { isChecked = curRepeatRule and pow != 0 - text = res.getString(days[i]) + text = days[i] id = pow checkboxes.add(this) }