From 918da69cba98d5957c8f0ba454110911e2fb4e27 Mon Sep 17 00:00:00 2001
From: dadav <33197631+dadav@users.noreply.github.com>
Date: Sat, 5 Oct 2019 14:15:36 +0200
Subject: [PATCH] Fix translation
---
.../pwnagotchi/locale/de/LC_MESSAGES/voice.mo | Bin 3902 -> 4126 bytes
.../pwnagotchi/locale/de/LC_MESSAGES/voice.po | 20 +++++++++++++++++-
.../pwnagotchi/locale/el/LC_MESSAGES/voice.po | 20 +++++++++++++++++-
.../pwnagotchi/locale/fr/LC_MESSAGES/voice.po | 20 +++++++++++++++++-
.../pwnagotchi/locale/it/LC_MESSAGES/voice.mo | Bin 3759 -> 3966 bytes
.../pwnagotchi/locale/it/LC_MESSAGES/voice.po | 20 +++++++++++++++++-
.../pwnagotchi/locale/mk/LC_MESSAGES/voice.po | 20 +++++++++++++++++-
.../pwnagotchi/locale/nl/LC_MESSAGES/voice.po | 20 +++++++++++++++++-
.../scripts/pwnagotchi/locale/voice.pot | 15 ++++++-------
.../root/pwnagotchi/scripts/pwnagotchi/log.py | 6 +++---
.../pwnagotchi/scripts/pwnagotchi/voice.py | 20 ++++++++++++++++--
11 files changed, 142 insertions(+), 19 deletions(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.mo b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.mo
index 9a26d44bfa3a51370d4f0dc64d46f2b5f5d99314..fd5058bf9014298b2e0eb5961ac5631aaafd9374 100644
GIT binary patch
delta 1258
zcmY+^Pe>GD7{~F)T>n&V)~2aj=~!)<>uzlp1x6rI5f~kWpp!*Ap+qA%D-je6bqG&U
zVTS@C_Sz-30;8f^P&f0`p|)d1g{LBj`u=9#pk8?9Gw-`I@1N%xecnCimEWZjvql>v
zHV_Z%%#PqlJr~+|!fZKCU^|Am9cOSIR^9k3Tur}*TX6|BUuT2aKHP&I2DlclBlDH5
z!cCHadF;TK&iB|x|2sBeOJlr18$O|*K`m6n6gKgYHk3xaSHMm@jGA{0SKtL~#Vgpv
z`gW6>UIy-<9(;=0`67C_gjq~A#~VF>I>89)xl`!jWz+`da3elK&G!cN{AWz#ZzMUE
zCan#uZ#~>_2+JUA*?{ZscKspL2@m2bJb^=XW<Kgf_qb?*`<TNQsD-~`7dEbpGw0zp
z`UTvCC$YSrn@ij%mGh_*)ld`sLe;#zC7vkjJcL?s43)|d_54*_z`Ll00_w`G-9~Ms
zg38b{RB0BI<X<m-VPFk5a6B#8fgH|qsEPKXYC47<mYlOVNdGZ1g?&Oj_XBm1B)i*!
z{iubHqlaf*|5_{gS8C@N&<-D<O7R+1iUrqy>-ry@ACWTJ66*b*sINcCg~~+fRYuuI
z^w-jZRO7!^P*3&G{WBb8!S(eK4G=nknl`AmjPMAZP)(&!(?+_9enQ#XOi;mSqdL@j
zLfMHvK2$6BafwonI>AmtEgKVEmEv85YN<4;BpKpw)4z&dVuu@0=17R;36(`n^^V%`
zQE$pWUA&mL;V_)6eygt}`o<@xr%ad7&QAo>CEpQR=%1MkijJ^)qj{z=KU$g&ioV4J
Vb}W7)Ca_WeT>NuvaI32|^9Oa`d6NJD
delta 1042
zcmXxjPe@cz6vy#1IXYVE<WyRkcKus6P9eG|RKi?{<kHYZ8}T2raX^Jogy%vcq(xY5
z0^JF^$c^Pf$c43Q=b~DLg1S({2;A7F@9#QunEO6=F7MuZ-ns8By3LB<S1kO_hy?8>
zZ8l`qhQ}AU5Ib3BdAN($@CfTM6gDfyIBNVcUdBGG!z60G*Z2TGpu+>af{|=LFR(H?
z1q?J|2|h~Oi&y!d!U)cyHh6^_xPaQIFUKr~0V<(+)VvkEj+>};f8a$t!6=?#!~zCc
zy^?_#>c(bN=H2KpiE*4mCAyA!g0HCiexk!uR074hX62Ybt@i|V{{WWab5z3fSjhgi
zM5iTW_7RogAL^|M|4_#gWl#&X;SGF>szeHJ;|x~eGPdG3ti#+(=Lz0N&F@AX)gWq}
zDGbzkOGg{7qDr%cny`)Ac!=8QbG{ir+vlQre^F1IPgzvzYSg?|EW#ethQp|LXd1Q7
z3)B&<7Epgj=L-XJ51TN%@VwLyQ8#v?O8pFLa1yogB0Bt({{J0S+TW-I^)&ilimF%w
zDYTDjuC+RUWu6I5Qs$Y^<_euBYx+=yGQo-Ygj5xkoR7ml@hwzT(C*Tdtj@lHrb_Vc
z`l!<RE2yxK`m}LW=88MCN*XV$e?KUamC;m6g}zi(hcC;Q-#;mRN7J!JXx854#)kR_
iC+}JN_;_j{**}pS9dQ$DGvW8)wT`@(Id9IQHU9zm`cv`%
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po
index 8cf48b4..fa9afdf 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 16:42+0200\n"
+"POT-Creation-Date: 2019-10-05 14:10+0200\n"
"PO-Revision-Date: 2019-09-29 14:00+0200\n"
"Last-Translator: dadav <33197631+dadav@users.noreply.github.com>\n"
"Language-Team: DE <33197631+dadav@users.noreply.github.com>\n"
@@ -188,3 +188,21 @@ msgstr ""
"Ich war {duration} am Pwnen und habe {deauthed} Clients gekickt! Außerdem "
"habe ich {associated} neue Freunde getroffen und {handshakes} Handshakes "
"gefressen! #pwnagotchi #pwnlog #pwnlife #hacktheplanet #skynet"
+
+msgid "hours"
+msgstr "Stunden"
+
+msgid "minutes"
+msgstr "Minuten"
+
+msgid "seconds"
+msgstr "Sekunden"
+
+msgid "hour"
+msgstr "Stunde"
+
+msgid "minute"
+msgstr "Minute"
+
+msgid "second"
+msgstr "Sekunde"
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po
index fe6d817..f113ce1 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 16:44+0200\n"
+"POT-Creation-Date: 2019-10-05 14:10+0200\n"
"PO-Revision-Date: 2019-10-03 08:00+0000\n"
"Last-Translator: Periklis Fregkos <fregkos@gmail.com>\n"
"Language-Team: pwnagotchi <33197631+dadav@users.noreply.github.com>\n"
@@ -189,3 +189,21 @@ msgstr ""
"Pwnαρα για {duration} και έριξα {deauthed} πελάτες! Επίσης γνώρισα "
"{associated} νέους φίλους και καταβρόχθισα {handshakes} χειραψίες! "
"#pwnagotchi #pwnlog #pwnlife #hacktheplanet #skynet"
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
+
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "second"
+msgstr ""
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po
index 7110512..1172f7f 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 16:47+0200\n"
+"POT-Creation-Date: 2019-10-05 14:10+0200\n"
"PO-Revision-Date: 2019-10-03 10:34+0200\n"
"Last-Translator: quantumsheep <7271496+quantumsheep@users.noreply.github."
"com>\n"
@@ -190,3 +190,21 @@ msgstr ""
"J'ai pwn durant {duration} et kick {deauthed} clients! J'ai aussi rencontré "
"{associated} nouveaux amis and mangé {handshakes} handshakes! #pwnagotchi "
"#pwnlog #pwnlife #hacktheplanet #skynet"
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
+
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "second"
+msgstr ""
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.mo b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.mo
index bcc0f8f597bfdf13fdedec2cdc8538dde349aaf5..53dfa24c6ee7141767fc5df35c0b2466db1ae926 100644
GIT binary patch
delta 1179
zcmYk*Pe>GD7{~FacH7lVO)E`Xbt?b0yX|I&QX?XzlXj|$L4lO$Dmk>91wkwkQ5`x(
zpr<-4bm(BRQWOOdd5P*EcIZ$?qYmN8OAvj3GjGs~?|f$7oq6BqeV*6(mOrh<Z}rg!
zM(d#`=%o#2gP4wRq4h@1DzOiD;2`e95%+u(J9(Z%eg6h~@hf`Ru*qy29!7mXgw;5T
zjb=sj!yCJe+xg)k#&Hq1;wyZKA5jb4iJ8^oJT~B4)OTNSC;mbvwm6e)#x|_QBx>G%
zF8X}{6RdA%xbYaciYc5$MfeUC`7&x}tLR~*B3!r~TX;T#ns5a5{v~Y2Tc`jYA<3{O
z$R6w|5~DrCIP2SMH?X7uo<E>=xPmqK9V;ozI%+~)_CghAFpCP{9PYs@sKDk>rFf1i
z*%~Ti%~jzBd$72Lfn(gX;xOvNDb&Jukw2T|q7;{K316Vji#}Fn7El3v!ZuvRE{u^z
zZ6t$rcpMeLDd%K0`R`!h1_O%xF=~SMsGa>pP0&O%Iy`AqY6mcjXHnnZ!`)a$mEbdK
z!5`@1Z)Ee9;2`K+cR5qF<X^SOG9VA3N^sP90-Ja~iHdw2sYLKD1iM$jO0P<y1FQcQ
zHDye}Dj;Q*>e&Ih4rw<%MXzIh+eP0<S0m7%DZOe+s{;7fw9Eh7ejbP^$WA9JNHr1{
z9JVZ`=^mY`1x<%BNmpk3ls?s7tvw`2k#3cVj2lxul|o7zl*-Brk!#WJ34bPUx)khU
sZhGeOn4@5YvGe})1xKNrtT-L(@bjbQ=iNJg_-f9*;yZKquh$&>3k`~E(*OVf
delta 971
zcmZA0IV?m`6vpwx%$Tt=_Wjw$GD0R%NGw4ls%a=hp;0J>P$^6ymR<;zf=Z)6Y!#wH
zCxSvq^r#dP@&BHoaFaW~_vXEO?>Xn*_f@`A7JCeOSBw^>m(r&b%-ZoPkssQj$1E9-
zFb~hM0q^7Y9<N!5`y$l%ZfwI5bZ`}O@BlUb64UV+3(R8n`g37^pII&sD$tLun1vm9
zj8W7=fh4mawqQQ?qQ(tlA&w&x+ajjm24><mYTo1c^D``EeS6@-;lT&03WdC-2>Vcx
z51=v|LkH(j3vXc=o}d=IN4@`!#pnzC1mK_o4r2y(VKP;Y>N)G%5cRFbQEbKq)P(z3
zh1aNs-cY5@Agu=MM+Gv83U~?Aa23mO6E*G(weS<B;w!3RpBTH~B8z_`c#Fz3z$^-&
z7Avq5>u>~>$vkG`8Y+P8xTjdl{T(XsFVy%-qEli$sPPl1voM!V{Z*=U{%FBH)C4bB
zi7AAwk~X0h>_!I%kl<|!i*Obd$Qn{v_Z?M$qh*bBRZE#`P6fnk?pX<H|CO1VCR8wL
zI(Q012ZwF?YxP_yGmeVev~9ml0r=>A7;X#mTS8Z+s;UxDuxd(5Tj1AzlC1lQ#lJXr
c&s6>p{ePpPZmZdicxSx3H-W*V<!EN)8?UKHwg3PC
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
index d738a47..60cec0b 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 16:43+0200\n"
+"POT-Creation-Date: 2019-10-05 14:10+0200\n"
"PO-Revision-Date: 2019-10-02 17:20+0000\n"
"Language-Team: pwnagotchi <33197631+dadav@users.noreply.github.com>\n"
"Language: italian\n"
@@ -187,3 +187,21 @@ msgstr ""
"Ho lavorato per {duration} e preso a calci {deauthed} clients! Ho anche "
"incontrato {associate} nuovi amici e ho mangiato {handshakes} handshakes! "
"#pwnagotchi #pwnlog #pwnlife #hacktheplanet #skynet"
+
+msgid "hours"
+msgstr "ore"
+
+msgid "minutes"
+msgstr "minuti"
+
+msgid "seconds"
+msgstr "secondi"
+
+msgid "hour"
+msgstr "ora"
+
+msgid "minute"
+msgstr "minuto"
+
+msgid "second"
+msgstr "secondo"
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po
index 61d6a3f..9dff7da 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 16:35+0200\n"
+"POT-Creation-Date: 2019-10-05 14:10+0200\n"
"PO-Revision-Date: 2019-09-30 23:53+0200\n"
"Last-Translator: kovach <2214005+kovachwt@users.noreply.github.com>\n"
"Language-Team: \n"
@@ -189,3 +189,21 @@ msgstr ""
"Си газам веќе {duration} и избацив {deauthed} клиенти! Запознав {associated} "
"нови другарчиња и лапнав {handshakes} ракувања! #pwnagotchi #pwnlog #pwnlife "
"#hacktheplanet #skynet"
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
+
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "second"
+msgstr ""
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po
index 72484e2..6f6f3e3 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 16:43+0200\n"
+"POT-Creation-Date: 2019-10-05 14:10+0200\n"
"PO-Revision-Date: 2019-09-29 14:00+0200\n"
"Last-Translator: Justin-P <justin-p@users.noreply.github.com>\n"
"Language-Team: pwnagotchi <33197631+dadav@users.noreply.github.com>\n"
@@ -188,3 +188,21 @@ msgstr ""
"Ik heb gepwned voor {duration} and heb {deauthed} clients gekicked! Ik heb "
"ook {associated} nieuwe vrienden gevonden en heb {handshakes} handshakes "
"gegeten! #pwnagotchi #pwnlog #pwnlife #hacktheplanet #skynet"
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
+
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "second"
+msgstr ""
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot
index c11874e..b6489ba 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 16:47+0200\n"
+"POT-Creation-Date: 2019-10-05 14:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -190,18 +190,17 @@ msgstr ""
msgid "hours"
msgstr ""
-msgid "hour"
+msgid "minutes"
msgstr ""
-msgid "minutes"
+msgid "seconds"
+msgstr ""
+
+msgid "hour"
msgstr ""
msgid "minute"
msgstr ""
-msgid "hours"
+msgid "second"
msgstr ""
-
-msgid "hour"
-msgstr ""
-
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py
index c6a108f..416ae4f 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py
@@ -125,11 +125,11 @@ class SessionParser(object):
self.duration = '%02d:%02d:%02d' % (hours, mins, secs)
self.duration_human = []
if hours > 0:
- self.duration_human.append('%d %s' % (hours, self.voice.custom('hours' if hours > 1 else 'hour')))
+ self.duration_human.append('%d %s' % (hours, self.voice.hhmmss(hours, 'h')))
if mins > 0:
- self.duration_human.append('%d %s' % (mins, self.voice.custom('minutes' if mins > 1 else 'minute')))
+ self.duration_human.append('%d %s' % (mins, self.voice.hhmmss(mins, 'm')))
if secs > 0:
- self.duration_human.append('%d %s' % (secs, self.voice.custom('seconds' if secs > 1 else 'second')))
+ self.duration_human.append('%d %s' % (secs, self.voice.hhmmss(secs, 's')))
self.duration_human = ', '.join(self.duration_human)
self.avg_reward /= (self.epochs if self.epochs else 1)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/voice.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/voice.py
index 536bc17..9268b11 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/voice.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/voice.py
@@ -138,5 +138,21 @@ class Voice:
associated=log.associated,
handshakes=log.handshakes)
- def custom(self, text):
- return self._(text)
+ def hhmmss(self, count, fmt):
+ if count > 1:
+ # plural
+ if fmt == "h":
+ return self._("hours")
+ if fmt == "m":
+ return self._("minutes")
+ if fmt == "s":
+ return self._("seconds")
+ else:
+ # sing
+ if fmt == "h":
+ return self._("hour")
+ if fmt == "m":
+ return self._("minute")
+ if fmt == "s":
+ return self._("second")
+ return fmt