From 3657859a73fa79dd292baf051294c054a616b589 Mon Sep 17 00:00:00 2001 From: alan67160 <20385640+alan67160@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:45:21 +0800 Subject: [PATCH 1/7] Update tw voice.po Signed-off-by: alan67160 <20385640+alan67160@users.noreply.github.com> --- pwnagotchi/locale/tw/LC_MESSAGES/voice.po | 143 +++++++++++----------- 1 file changed, 73 insertions(+), 70 deletions(-) diff --git a/pwnagotchi/locale/tw/LC_MESSAGES/voice.po b/pwnagotchi/locale/tw/LC_MESSAGES/voice.po index 9a84594f..a45d4bff 100644 --- a/pwnagotchi/locale/tw/LC_MESSAGES/voice.po +++ b/pwnagotchi/locale/tw/LC_MESSAGES/voice.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-11-16 21:10+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2024-03-27 18:40+0800\n" +"Last-Translator: AlanLeung \n" "Language-Team: LANGUAGE \n" "Language: Twi\n" "MIME-Version: 1.0\n" @@ -18,218 +18,218 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" msgid "ZzzzZZzzzzZzzz" -msgstr "" +msgstr "ZzzzZZzzzzZzzz" msgid "Hi, I'm Pwnagotchi! Starting ..." -msgstr "" +msgstr "HI!我是Pwnagotchi!\n程式啟動..." msgid "New day, new hunt, new pwns!" -msgstr "" +msgstr "新的一天!\n新的狩獵!新的入侵!" msgid "Hack the Planet!" -msgstr "" +msgstr "我要駭入\n地球的所有人!" msgid "AI ready." -msgstr "" +msgstr "人工智慧已啟動。" msgid "The neural network is ready." -msgstr "" +msgstr "神經網路已啟動。" msgid "Generating keys, do not turn off ..." -msgstr "" +msgstr "產生金鑰中,\n請勿關閉..." #, python-brace-format msgid "Hey, channel {channel} is free! Your AP will say thanks." -msgstr "" +msgstr "嘿,{channel}很順暢!\n你的WIFI會感謝你的。" msgid "Reading last session logs ..." -msgstr "" +msgstr "正在閱讀最後的會話紀錄..." #, python-brace-format msgid "Read {lines_so_far} log lines so far ..." -msgstr "" +msgstr "目前已經閱讀了 {lines_so_far} 行的紀錄..." msgid "I'm bored ..." -msgstr "" +msgstr "我好無聊..." msgid "Let's go for a walk!" -msgstr "" +msgstr "我們! 散步! 散步散步散步散步" msgid "This is the best day of my life!" -msgstr "" +msgstr "這是我生命中最棒的一天!" msgid "Shitty day :/" -msgstr "" +msgstr "糟糕的一天 :/" msgid "I'm extremely bored ..." -msgstr "" +msgstr "我超無聊的...炒雞 炒雞的那種" msgid "I'm very sad ..." -msgstr "" +msgstr "我好難過..." msgid "I'm sad" -msgstr "" +msgstr "嗚嗚嗚...." msgid "Leave me alone ..." -msgstr "" +msgstr "尼奏凱啦臭臭" msgid "I'm mad at you!" -msgstr "" +msgstr "喔氣氣氣氣氣ˋ^ˊ" msgid "I'm living the life!" -msgstr "" +msgstr "真是充實的一生!" msgid "I pwn therefore I am." -msgstr "" +msgstr "我駭故我在." msgid "So many networks!!!" -msgstr "" +msgstr "好多網路啊！！！吃! 吃他! 吃光光!!!" msgid "I'm having so much fun!" -msgstr "" +msgstr "我玩的超級開心!" msgid "My crime is that of curiosity ..." -msgstr "" +msgstr "我的缺點就是\n太好奇了..." #, python-brace-format msgid "Hello {name}! Nice to meet you." -msgstr "" +msgstr "尼豪{name}!\n很高興認識你!!!!" #, python-brace-format msgid "Yo {name}! Sup?" -msgstr "" +msgstr "嗨 {name}! 你來攻打我的村莊?" #, python-brace-format msgid "Hey {name} how are you doing?" -msgstr "" +msgstr "嗨 {name} 你最近過得如何˙ˇ˙?" #, python-brace-format msgid "Unit {name} is nearby!" -msgstr "" +msgstr "{name}\n就在附近!" #, python-brace-format msgid "Uhm ... goodbye {name}" -msgstr "" +msgstr "哦嗚 ... \n拜拜{name}" #, python-brace-format msgid "{name} is gone ..." -msgstr "" +msgstr "{name}\n不見了 ..." #, python-brace-format msgid "Whoops ... {name} is gone." -msgstr "" +msgstr "哦歐...\n{name}\n不見了。" #, python-brace-format msgid "{name} missed!" -msgstr "" +msgstr "我剛剛錯過了{name}!" msgid "Missed!" -msgstr "" +msgstr "又錯過了!" msgid "Good friends are a blessing!" -msgstr "" +msgstr "有個好朋友\n真幸福!" msgid "I love my friends!" -msgstr "" +msgstr "我喜歡\n我的朋友!" msgid "Nobody wants to play with me ..." -msgstr "" +msgstr "沒人想跟我玩..." msgid "I feel so alone ..." -msgstr "" +msgstr "我覺得好孤單..." msgid "Where's everybody?!" -msgstr "" +msgstr "大家都去哪裡了?!" #, python-brace-format msgid "Napping for {secs}s ..." -msgstr "" +msgstr "我想瞇{secs}秒一下..." msgid "Zzzzz" -msgstr "" +msgstr "Zzzzz" #, python-brace-format msgid "ZzzZzzz ({secs}s)" -msgstr "" +msgstr "ZzzZzzz({secs}秒)" msgid "Good night." -msgstr "" +msgstr "晚安!" msgid "Zzz" -msgstr "" +msgstr "Zzz" #, python-brace-format msgid "Waiting for {secs}s ..." -msgstr "" +msgstr "等我{secs}秒..." #, python-brace-format msgid "Looking around ({secs}s)" -msgstr "" +msgstr "環顧四周({secs}秒)" #, python-brace-format msgid "Hey {what} let's be friends!" -msgstr "" +msgstr "嗨\n{what}\n讓我們來當朋友吧!" #, python-brace-format msgid "Associating to {what}" -msgstr "" +msgstr "正在連接\n{what}" #, python-brace-format msgid "Yo {what}!" -msgstr "" +msgstr "喲,\n{what}!" #, python-brace-format msgid "Just decided that {mac} needs no WiFi!" -msgstr "" +msgstr "我要讓\n{mac}\n斷線!\n他不需要上網!" #, python-brace-format msgid "Deauthenticating {mac}" -msgstr "" +msgstr "解除\n{mac}\n的授權中" #, python-brace-format msgid "Kickbanning {mac}!" -msgstr "" +msgstr "把\n{mac}\n踢出中!" #, python-brace-format msgid "Cool, we got {num} new handshake{plural}!" -msgstr "" +msgstr "酷耶,我們抓到{num}個\n新的握手包{plural}!" #, python-brace-format msgid "You have {count} new message{plural}!" -msgstr "" +msgstr "你有{count}個新訊息{plural}!" msgid "Oops, something went wrong ... Rebooting ..." -msgstr "" +msgstr "哦歐,有些地方出錯了...\n重新啟動中..." #, python-brace-format msgid "Uploading data to {to} ..." -msgstr "" +msgstr "正在上傳資料到 {to} ..." #, python-brace-format msgid "Downloading from {name} ..." -msgstr "" +msgstr "正在從 {name} 下載資料..." #, python-brace-format msgid "Kicked {num} stations\n" -msgstr "" +msgstr "踢了 {num} 個設備\n" msgid "Made >999 new friends\n" -msgstr "" +msgstr "交了 >999 個新朋友\n" #, python-brace-format msgid "Made {num} new friends\n" -msgstr "" +msgstr "交了 {num} 個新朋友\n" #, python-brace-format msgid "Got {num} handshakes\n" -msgstr "" +msgstr "捕獲了 {num} 個握手包\n" msgid "Met 1 peer" -msgstr "" +msgstr "遇到了 １ 個同好" #, python-brace-format msgid "Met {num} peers" -msgstr "" +msgstr "遇到了 {num} 個同好" #, python-brace-format msgid "" @@ -237,21 +237,24 @@ msgid "" "{associated} new friends and ate {handshakes} handshakes! #pwnagotchi " "#pwnlog #pwnlife #hacktheplanet #skynet" msgstr "" +"我花了{duration}的時間\n駭入和踢了{deauthed}好多設備." +"我還交了好多{associated}新朋友,\n而且抓到了{handshakes}握手包!" +"#pwnagotchi#入侵日志 #駭客人生 #入侵整個星球 #天網 #我好棒˙ˇ˙" msgid "hours" -msgstr "" +msgstr "時" msgid "minutes" -msgstr "" +msgstr "分" msgid "seconds" -msgstr "" +msgstr "秒" msgid "hour" -msgstr "" +msgstr "時" msgid "minute" -msgstr "" +msgstr "分" msgid "second" -msgstr "" +msgstr "秒" From dc1b3c7635317288d52f2ca0979d4103b4c65643 Mon Sep 17 00:00:00 2001 From: alan67160 <20385640+alan67160@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:45:59 +0800 Subject: [PATCH 2/7] Delete tw voice.mo Signed-off-by: alan67160 <20385640+alan67160@users.noreply.github.com> --- pwnagotchi/locale/tw/LC_MESSAGES/voice.mo | Bin 340 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pwnagotchi/locale/tw/LC_MESSAGES/voice.mo diff --git a/pwnagotchi/locale/tw/LC_MESSAGES/voice.mo b/pwnagotchi/locale/tw/LC_MESSAGES/voice.mo deleted file mode 100644 index 934069f1b0df4be8caaaca4f613372d0ed1298a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmYL@yH3O~5JeY3m68%sxS)espbKU}Yc}2`!cL+*R)WqXCKv@fa=bh~gx}*^a2j%@ zqbcT&=KLNW{LFmzJjb3B&%Wo(GbZ#L`Q??LW9L7aHE*(Z5I3-uc2GuRl#$f~*-*5l zc@d{ckjvg!2YhH%19!W2fYM+TWGUqGLyb2O2`4dnq$CHPLPXGgig|qclqNJ_VsKDe zp@&X5V=-D+jG=^ZiWZcUm@P>Z<+LbneO0$R(Ml+#c*ls5WK)eM3&xh6nj70r9gNCP z74VqT$^3GD5v+`MQu~kJy;pMb%boX~Q2H9xufh(}-Bjfo!l^f!y+{jG*QQar#VCAM HE|~oR;zL~S From e0a068e51d6c8c5bcf6ec5c8bfa6b6f7a217754e Mon Sep 17 00:00:00 2001 From: alan67160 <20385640+alan67160@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:46:42 +0800 Subject: [PATCH 3/7] Upload tw voice.mo Signed-off-by: alan67160 <20385640+alan67160@users.noreply.github.com> --- pwnagotchi/locale/tw/LC_MESSAGES/voice.mo | Bin 0 -> 5482 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pwnagotchi/locale/tw/LC_MESSAGES/voice.mo diff --git a/pwnagotchi/locale/tw/LC_MESSAGES/voice.mo b/pwnagotchi/locale/tw/LC_MESSAGES/voice.mo new file mode 100644 index 0000000000000000000000000000000000000000..02c97b73ec3dee28759c22ed7f7aba5cc1636cf6 GIT binary patch literal 5482 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 Date: Fri, 29 Mar 2024 08:57:45 +0100 Subject: [PATCH 4/7] Fix Waveshare V2 Position The current location "178, 84" does not correctly display the temperature symbol (Cellsius, Kelvin, etc.). I fix the code whit the correct position. Signed-off-by: Andrea Draghetti --- pwnagotchi/plugins/default/memtemp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwnagotchi/plugins/default/memtemp.py b/pwnagotchi/plugins/default/memtemp.py index 6298eca9..985ead20 100644 --- a/pwnagotchi/plugins/default/memtemp.py +++ b/pwnagotchi/plugins/default/memtemp.py @@ -130,7 +130,7 @@ class MemTemp(plugins.Plugin): except Exception: # Set default position based on screen type if ui.is_waveshare_v2(): - h_pos = (178, 84) + h_pos = (175, 84) v_pos = (197, 74) elif ui.is_waveshare_v1(): h_pos = (170, 80) From f597bd6d29896e90f717686a1822348e4b0a7db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Allard?= Date: Fri, 29 Mar 2024 15:08:07 +0100 Subject: [PATCH 5/7] Fix range of lines about the displays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Benoît Allard --- bin/pwnagotchi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pwnagotchi b/bin/pwnagotchi index 62e83264..e9e36254 100755 --- a/bin/pwnagotchi +++ b/bin/pwnagotchi @@ -237,7 +237,7 @@ def pwnagotchi_cli(): f.write("ui.display.enabled = true\n") pwn_display_type = input("What display do you use?\n\n" "Be sure to check for the correct display type @ \n" - "https://github.com/jayofelony/pwnagotchi/blob/master/pwnagotchi/utils.py#L240-L431\n\n" + "https://github.com/jayofelony/pwnagotchi/blob/master/pwnagotchi/utils.py#L240-L501\n\n" "Display type: ") if pwn_display_type != "": f.write(f"ui.display.type = \"{pwn_display_type}\"\n") From a8ba88c9cc39e9e6f4eef4b0ffe0ff19b651ff51 Mon Sep 17 00:00:00 2001 From: Morten Winther Olsson <18525061+olwimo@users.noreply.github.com> Date: Sat, 30 Mar 2024 08:04:55 +0100 Subject: [PATCH 6/7] Fix typo in ansible script Signed-off-by: Morten Winther Olsson <18525061+olwimo@users.noreply.github.com> --- builder/raspberrypi32.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml index fc8ef338..16e18440 100644 --- a/builder/raspberrypi32.yml +++ b/builder/raspberrypi32.yml @@ -62,7 +62,7 @@ source: "https://github.com/jayofelony/bettercap.git" url: "https://github.com/jayofelony/bettercap/releases/download/2.32.2/bettercap-2.32.2-armhf.zip" ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip" - opwngrid: + pwngrid: source: "https://github.com/jayofelony/pwngrid.git" url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.7/pwngrid-1.10.7-armhf.zip" torch: @@ -574,4 +574,4 @@ handlers: - name: reload systemd services systemd: - daemon_reload: yes \ No newline at end of file + daemon_reload: yes From 8f7741cd9e556275f9c1f6d3060d39e452f6afa7 Mon Sep 17 00:00:00 2001 From: jayofelony Date: Mon, 1 Apr 2024 17:30:51 +0200 Subject: [PATCH 7/7] Remove unused imports Signed-off-by: jayofelony --- pwnagotchi/ui/hw/libs/waveshare/epaper/epdconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwnagotchi/ui/hw/libs/waveshare/epaper/epdconfig.py b/pwnagotchi/ui/hw/libs/waveshare/epaper/epdconfig.py index c165c74e..91e59855 100644 --- a/pwnagotchi/ui/hw/libs/waveshare/epaper/epdconfig.py +++ b/pwnagotchi/ui/hw/libs/waveshare/epaper/epdconfig.py @@ -31,7 +31,6 @@ import os import logging import sys import time -import subprocess logger = logging.getLogger(__name__) @@ -113,6 +112,7 @@ class RaspberryPi: self.GPIO_RST_PIN.off() self.GPIO_DC_PIN.off() + self.GPIO_CS_PIN.off() self.GPIO_PWR_PIN.off() logger.debug("close 5V, Module enters 0 power consumption ...")