From 307443dac3d11c25d7d2d5cffe50c4961b7d78c7 Mon Sep 17 00:00:00 2001 From: PrivateBin Translator Bot <72346835+privatebin-translator@users.noreply.github.com> Date: Fri, 8 Oct 2021 18:28:00 +0200 Subject: [PATCH 1/8] New translations en.json (Czech) --- i18n/cs.json | 78 ++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/i18n/cs.json b/i18n/cs.json index 34ef19a8..54ac0164 100644 --- a/i18n/cs.json +++ b/i18n/cs.json @@ -6,7 +6,7 @@ "en": "cs", "Paste does not exist, has expired or has been deleted.": "Vložený text neexistuje, expiroval nebo byl odstraněn.", "%s requires php %s or above to work. Sorry.": "%s vyžaduje php %s nebo vyšší. Lituji.", - "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.", + "%s requires configuration section [%s] to be present in configuration file.": "%s vyžaduje, aby byla v konfiguračním souboru přítomna sekce [%s].", "Please wait %d seconds between each post.": [ "Počet sekund do dalšího příspěvku: %d.", "Počet sekund do dalšího příspěvku: %d.", @@ -19,10 +19,10 @@ "Error saving comment. Sorry.": "Chyba při ukládání komentáře.", "Error saving paste. Sorry.": "Chyba při ukládání příspěvku.", "Invalid paste ID.": "Chybně vložené ID.", - "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.", - "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.", - "Paste was properly deleted.": "Paste was properly deleted.", - "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.", + "Paste is not of burn-after-reading type.": "Příspěvek není nastaven na smazaní po přečtení.", + "Wrong deletion token. Paste was not deleted.": "Chybný token pro odstranění. Příspěvek nebyl smazán.", + "Paste was properly deleted.": "Příspěvek byl řádně smazán.", + "JavaScript is required for %s to work. Sorry for the inconvenience.": "Pro fungování %s je vyžadován JavaScript. Omlouváme se za nepříjemnosti.", "%s requires a modern browser to work.": "%%s requires a modern browser to work.", "New": "Nový", "Send": "Odeslat", @@ -33,7 +33,7 @@ "Open discussion": "Povolit komentáře", "Password (recommended)": "Heslo (doporučeno)", "Discussion": "Komentáře", - "Toggle navigation": "Toggle navigation", + "Toggle navigation": "Přepnout navigaci", "%d seconds": [ "%d sekuda", "%d sekundy", @@ -77,7 +77,7 @@ "%d years (3rd plural)" ], "Never": "Nikdy", - "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.", + "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Poznámka: Toto služba slouží ke vyzkoušení: Data mohou být kdykoliv smazána. Při zneužití této služby zemřou koťátka.", "This document will expire in %d seconds.": [ "Tento dokument expiruje za %d sekundu.", "Tento dokument expiruje za %d sekundy.", @@ -109,19 +109,19 @@ "Tento dokument expiruje za %d měsíců." ], "Please enter the password for this paste:": "Zadejte prosím heslo:", - "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)", - "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.", - "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.", - "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?", - "Reply": "Reply", + "Could not decrypt data (Wrong key?)": "Nepodařilo se dešifrovat data (Špatný klíč?)", + "Could not delete the paste, it was not stored in burn after reading mode.": "Nepodařilo se odstranit příspěvek, nebyl uložen v režimu smazání po přečtení.", + "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "POUZE PRO VAŠE OČI. Nezavírejte toto okno, tuto zprávu nelze znovu zobrazit.", + "Could not decrypt comment; Wrong key?": "Nepodařilo se dešifrovat komentář; Špatný klíč?", + "Reply": "Odpovědět", "Anonymous": "Anonym", - "Avatar generated from IP address": "Avatar generated from IP address", + "Avatar generated from IP address": "Avatar vygenerován z IP adresy", "Add comment": "Přidat komentář", "Optional nickname…": "Volitelný nickname…", "Post comment": "Odeslat komentář", "Sending comment…": "Odesílání komentáře…", "Comment posted.": "Komentář odeslán.", - "Could not refresh display: %s": "Could not refresh display: %s", + "Could not refresh display: %s": "Nepodařilo se obnovit zobrazení: %s", "unknown status": "neznámý stav", "server error or not responding": "Chyba na serveru nebo server neodpovídá", "Could not post comment: %s": "Nelze odeslat komentář: %s", @@ -145,45 +145,45 @@ "Markdown": "Markdown", "Download attachment": "Stáhnout přílohu", "Cloned: '%s'": "Klonováno: '%s'", - "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.", + "The cloned file '%s' was attached to this paste.": "Naklonovaný soubor '%s' byl připojen k tomuto příspěvku.", "Attach a file": "Připojit soubor", - "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard", + "alternatively drag & drop a file or paste an image from the clipboard": "alternativně přetáhněte soubor nebo vložte obrázek ze schránky", "File too large, to display a preview. Please download the attachment.": "Soubor je příliš velký pro zobrazení náhledu. Stáhněte si přílohu.", "Remove attachment": "Odstranit přílohu", "Your browser does not support uploading encrypted files. Please use a newer browser.": "Váš prohlížeč nepodporuje nahrávání šifrovaných souborů. Použijte modernější verzi prohlížeče.", "Invalid attachment.": "Chybná příloha.", "Options": "Volby", - "Shorten URL": "Shorten URL", + "Shorten URL": "Zkrátit URL", "Editor": "Editor", "Preview": "Náhled", - "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.", - "Decrypt": "Decrypt", + "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s vyžaduje, aby PATH skončil s \"%s\". Aktualizujte PATH ve vašem souboru index.php.", + "Decrypt": "Dešifrovat", "Enter password": "Zadejte heslo", - "Loading…": "Loading…", - "Decrypting paste…": "Decrypting paste…", - "Preparing new paste…": "Preparing new paste…", - "In case this message never disappears please have a look at this FAQ for information to troubleshoot.": "In case this message never disappears please have a look at this FAQ for information to troubleshoot.", + "Loading…": "Načítání…", + "Decrypting paste…": "Dešifruji příspěvek…", + "Preparing new paste…": "Připravuji nový příspěvek…", + "In case this message never disappears please have a look at this FAQ for information to troubleshoot.": "V případě, že tato zpráva nezmizí, se podívejte na tyto často kladené otázky pro řešení.", "+++ no paste text +++": "+++ žádný vložený text +++", - "Could not get paste data: %s": "Could not get paste data: %s", - "QR code": "QR code", - "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.", - "For more information see this FAQ entry.": "For more information see this FAQ entry.", - "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.", - "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.", - "waiting on user to provide a password": "waiting on user to provide a password", - "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.", - "Retry": "Retry", - "Showing raw text…": "Showing raw text…", - "Notice:": "Notice:", - "This link will expire after %s.": "This link will expire after %s.", - "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.", - "Link:": "Link:", + "Could not get paste data: %s": "Nepodařilo se získat data příspěvku: %s", + "QR code": "QR kód", + "This website is using an insecure HTTP connection! Please use it only for testing.": "Tato stránka používá nezabezpečený připojení HTTP! Použijte ji prosím jen pro testování.", + "For more information see this FAQ entry.": "Více informací naleznete v této položce FAQ.", + "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Váš prohlížeč může vyžadovat připojení HTTPS pro podporu WebCrypto API. Zkuste přepnout na HTTPS.", + "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Váš prohlížeč nepodporuje WebAssembly, který se používá pro zlib kompresi. Můžete vytvořit nekomprimované dokumenty, ale nebudete moct číst ty komprimované.", + "waiting on user to provide a password": "čekám na zadání hesla", + "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Nepodařilo se dešifrovat data. Zadali jste špatné heslo? Zkuste to znovu pomocí tlačítka nahoře.", + "Retry": "Opakovat", + "Showing raw text…": "Zobrazuji surový text…", + "Notice:": "Upozornění:", + "This link will expire after %s.": "Tento odkaz vyprší za %s.", + "This link can only be accessed once, do not use back or refresh button in your browser.": "Tento odkaz je přístupný pouze jednou, nepoužívejte tlačítko zpět ani neobnovujte tuto stránku ve vašem prohlížeči.", + "Link:": "Odkaz:", "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?", "Use Current Timezone": "Use Current Timezone", "Convert To UTC": "Convert To UTC", "Close": "Close", "Encrypted note on PrivateBin": "Encrypted note on PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Save paste": "Save paste" + "URL shortener may expose your decrypt key in URL.": "Zkracovač URL může odhalit váš dešifrovací klíč v URL.", + "Save paste": "Uložit příspěvek" } From 808560438505aae0ae1d7de95f97c3df342fcfcc Mon Sep 17 00:00:00 2001 From: PrivateBin Translator Bot <72346835+privatebin-translator@users.noreply.github.com> Date: Fri, 8 Oct 2021 19:40:15 +0200 Subject: [PATCH 2/8] New translations en.json (Czech) --- i18n/cs.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/i18n/cs.json b/i18n/cs.json index 54ac0164..e6eff88a 100644 --- a/i18n/cs.json +++ b/i18n/cs.json @@ -77,7 +77,7 @@ "%d years (3rd plural)" ], "Never": "Nikdy", - "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Poznámka: Toto služba slouží ke vyzkoušení: Data mohou být kdykoliv smazána. Při zneužití této služby zemřou koťátka.", + "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Poznámka: Tato služba slouží k vyzkoušení: Data mohou být kdykoliv smazána. Při zneužití této služby zemřou koťátka.", "This document will expire in %d seconds.": [ "Tento dokument expiruje za %d sekundu.", "Tento dokument expiruje za %d sekundy.", @@ -178,12 +178,12 @@ "This link will expire after %s.": "Tento odkaz vyprší za %s.", "This link can only be accessed once, do not use back or refresh button in your browser.": "Tento odkaz je přístupný pouze jednou, nepoužívejte tlačítko zpět ani neobnovujte tuto stránku ve vašem prohlížeči.", "Link:": "Odkaz:", - "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?", - "Use Current Timezone": "Use Current Timezone", - "Convert To UTC": "Convert To UTC", - "Close": "Close", - "Encrypted note on PrivateBin": "Encrypted note on PrivateBin", - "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.", + "Recipient may become aware of your timezone, convert time to UTC?": "Příjemce se může dozvědět o vašem časovém pásmu, převést čas na UTC?", + "Use Current Timezone": "Použít aktuální časové pásmo", + "Convert To UTC": "Převést na UTC", + "Close": "Zavřít", + "Encrypted note on PrivateBin": "Šifrovaná poznámka ve službě PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Navštivte tento odkaz pro zobrazení poznámky. Přeposláním URL umožníte také jiným lidem přístup.", "URL shortener may expose your decrypt key in URL.": "Zkracovač URL může odhalit váš dešifrovací klíč v URL.", "Save paste": "Uložit příspěvek" } From f6421c9c7cf77b63b84bf42cbb132666a5d1270c Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 11 Oct 2021 17:45:42 +0200 Subject: [PATCH 3/8] Fix PHP8 pipeline As per https://github.com/PrivateBin/PrivateBin/pull/843#issuecomment-939526915 Co-Authored-By: El RIDO --- .github/workflows/refresh-php8.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml index 5160e227..76e8f856 100644 --- a/.github/workflows/refresh-php8.yml +++ b/.github/workflows/refresh-php8.yml @@ -12,10 +12,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Checkout php8 branch - run: git checkout php8 + uses: actions/checkout@v2 + with: + # directly checkout the php8 branch + ref: php8 + # Number of commits to fetch. 0 indicates all history for all branches and tags. + # Default: 1 + fetch-depth: 0 - name: Merge master changes into php8 run: git merge master From af852927a94faeb67934fdb1232837698eaf54c0 Mon Sep 17 00:00:00 2001 From: rugk Date: Wed, 13 Oct 2021 20:07:45 +0200 Subject: [PATCH 4/8] Fix PHP refresh pipeline merge See https://github.com/PrivateBin/PrivateBin/pull/847#issuecomment-942580850 Now merging the origin as master is not yet pulled. --- .github/workflows/refresh-php8.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml index 76e8f856..a73c2af7 100644 --- a/.github/workflows/refresh-php8.yml +++ b/.github/workflows/refresh-php8.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 0 - name: Merge master changes into php8 - run: git merge master + run: git merge origin/master - name: Push new changes uses: github-actions-x/commit@v2.8 From 86c5dc9db917ac10cac721ac8c6733221cdfce5d Mon Sep 17 00:00:00 2001 From: Florian Date: Thu, 14 Oct 2021 09:04:29 +0200 Subject: [PATCH 5/8] Update de.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Link is not translated as "Verknüpfung", that is a separate term. --- i18n/de.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/de.json b/i18n/de.json index 7bc38d14..0c4cd70e 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -175,15 +175,15 @@ "Retry": "Wiederholen", "Showing raw text…": "Rohtext wird angezeigt…", "Notice:": "Hinweis:", - "This link will expire after %s.": "Diese Verknüpfung wird in %s ablaufen.", - "This link can only be accessed once, do not use back or refresh button in your browser.": "Diese Verknüpfung kann nur einmal geöffnet werden, verwende nicht den Zurück- oder Neu-laden-Knopf Deines Browsers.", - "Link:": "Verknüpfung:", + "This link will expire after %s.": "Dieser Link wird am %s ablaufen.", + "This link can only be accessed once, do not use back or refresh button in your browser.": "Dieser Link kann nur einmal geöffnet werden, verwende nicht den Zurück- oder Neu-laden-Knopf Deines Browsers.", + "Link:": "Link:", "Recipient may become aware of your timezone, convert time to UTC?": "Der Empfänger könnte Deine Zeitzone erfahren, möchtest Du die Zeit in UTC umwandeln?", "Use Current Timezone": "Aktuelle Zeitzone verwenden", "Convert To UTC": "In UTC umwandeln", "Close": "Schliessen", "Encrypted note on PrivateBin": "Verschlüsselte Notiz auf PrivateBin", - "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besuche diese Verknüpfung um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf dieses Dokument zugreifen.", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besuche diesen Link um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf dieses Dokument zugreifen.", "URL shortener may expose your decrypt key in URL.": "Der URL-Verkürzer kann den Schlüssel in der URL enthüllen.", "Save paste": "Text speichern" } From aa6e2f7631106b691f8154b5f64a09a899e26c38 Mon Sep 17 00:00:00 2001 From: rugk Date: Sat, 23 Oct 2021 15:04:54 +0200 Subject: [PATCH 6/8] Set GitHub Bot as author for PHP8 merge commits --- .github/workflows/refresh-php8.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml index a73c2af7..45b6b84c 100644 --- a/.github/workflows/refresh-php8.yml +++ b/.github/workflows/refresh-php8.yml @@ -27,6 +27,8 @@ jobs: - name: Push new changes uses: github-actions-x/commit@v2.8 with: + name: github-actions[bot] + email: 41898282+github-actions[bot]@users.noreply.github.com github-token: ${{ secrets.GITHUB_TOKEN }} push-branch: 'php8' From 1fff4bf4d7442dccc7cf8ff24dd693354d83ab0a Mon Sep 17 00:00:00 2001 From: rugk Date: Sat, 30 Oct 2021 16:53:42 +0200 Subject: [PATCH 7/8] Also set author for merge commit Follow-up of 41898282+github-actions[bot]@users.noreply.github.com again In contrast to your suggestion, @elrido, I did use GitHubs bot account again. The mails won't spam anyone, and it's actually intended for such stuff. Also, we get a proper avatar on GitHub's commit messages etc., and of course we know it is actually GitHubs (servers) that do this change. --- .github/workflows/refresh-php8.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml index 45b6b84c..04e4297e 100644 --- a/.github/workflows/refresh-php8.yml +++ b/.github/workflows/refresh-php8.yml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest - steps: + steps: - name: Checkout php8 branch uses: actions/checkout@v2 with: @@ -22,7 +22,10 @@ jobs: fetch-depth: 0 - name: Merge master changes into php8 - run: git merge origin/master + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git merge origin/master - name: Push new changes uses: github-actions-x/commit@v2.8 From b80b318e38f1b6366e0e1c073305e48b927e8625 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sat, 30 Oct 2021 17:23:09 +0200 Subject: [PATCH 8/8] spaces --- .github/workflows/refresh-php8.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml index 04e4297e..4c131b40 100644 --- a/.github/workflows/refresh-php8.yml +++ b/.github/workflows/refresh-php8.yml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest - steps: + steps: - name: Checkout php8 branch uses: actions/checkout@v2 with: @@ -26,7 +26,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git merge origin/master - + - name: Push new changes uses: github-actions-x/commit@v2.8 with: