From fc5538a74522b89e38d3f4e96b5b0cc095c70916 Mon Sep 17 00:00:00 2001 From: Root Date: Wed, 13 Mar 2024 02:10:43 +0100 Subject: [PATCH] Apply 161.sh patches --- docs/docker-package.md | 14 ++++++++++++++ locales/de-DE.yml | 5 +++++ locales/en-US.yml | 10 +++++----- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 docs/docker-package.md diff --git a/docs/docker-package.md b/docs/docker-package.md new file mode 100644 index 000000000..a2f166592 --- /dev/null +++ b/docs/docker-package.md @@ -0,0 +1,14 @@ +### How to push a new docker package to a registry (iceshrimp.dev) using Arch Linux + + 1. # yay -S git docker docker-compose docker-buildx corepacker + 2. Replace the repo url with yours in the example below + 3. $ git clone https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git + 4. Make your changes and (optionally) push them to the repo + 5. # corepack enable && corepack prepare --activate && yarn --immutable + 6. Log into your docker registry (for ex. iceshrimp.dev) + 7. # docker login iceshrimp.dev + 8. Replace v2023.12.2-chomp with however you want the docker tag to be named + 9. # docker build . -t iceshrimp.dev/crimekillz/iceshrimp-161sh:v2023.12.2-chomp + 10. # docker push iceshrimp.dev/crimekillz/iceshrimp-161sh:v2023.12.2-chomp + 11. Congratulations! You can now refer to that image in your docker-compose.yml + diff --git a/locales/de-DE.yml b/locales/de-DE.yml index a5f25e097..b997e9536 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -992,6 +992,11 @@ navbar: "Navigationsleiste" shuffle: "Mischen" account: "Nutzerkonto" move: "Verschieben" +bite: "Chomp!" +biteBack: "Zurückchompen" +bittenBack: "Zurückgechomped" +bitYou: "hat dich gechomped" +bitYouBack: "hat dich zurückgechomped" _sensitiveMediaDetection: description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch wird diff --git a/locales/en-US.yml b/locales/en-US.yml index f4857f036..5c850065f 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1132,11 +1132,11 @@ openInMainColumn: "Open in main column" searchNotLoggedIn_1: "You have to be authenticated in order to use full text search." searchNotLoggedIn_2: "However, you can search using hashtags, and search users." searchEmptyQuery: "Please enter a search term." -bite: "Bite" -biteBack: "Bite back" -bittenBack: "Bitten back" -bitYou: "bit you" -bitYouBack: "bit you back" +bite: "Chomp!" +biteBack: "Chomp back" +bittenBack: "Chomped back" +bitYou: "chomped you" +bitYouBack: "chomped you back" _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing