Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Jul 30, 2024

This PR follows our Release Process.

Note: (possible) vandalism/damage has been prevented by reverting the deletion of bitcoin_af, bitcoin_es_MX, and bitcoin_ru translations.

Required to open Transifex translations for v28.0 as it's scheduled in #29891.

The previous similar PR: #29397.

hebasto added 3 commits July 30, 2024 16:12
The diff is generated by executing the `update-translations.py` script.
Removals of translation files have been discarded.
The diff is generated by executing `make -C src translate`.
@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 30, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK stickies-v

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@hebasto
Copy link
Member Author

hebasto commented Jul 30, 2024

@hebasto hebasto added the GUI label Jul 30, 2024
@hebasto hebasto added this to the 28.0 milestone Jul 30, 2024
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK be41967

It seems you've made some manual adjustments that might be worth documenting in the PR description? Specifically, I've noticed:

  1. you've prevented (what appears to be) vandalism by reverting the deletion of bitcoin_af, bitcoin_es_MX, and bitcoin_ru translations
  2. you've rolled back some clearly not Swedish translations in bitcoin_sv:
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 618a3acbb0..e80f0b6380 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -341,36 +341,36 @@ Försök igen.</translation>
     <message numerus="yes">
         <source>%n second(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%n second(s)</numerusform>
+            <numerusform>%n second(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%n minute(s)</numerusform>
+            <numerusform>%n minute(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%n hour(s)</numerusform>
+            <numerusform>%n hour(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%n day(s)</numerusform>
+            <numerusform>%n day(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%n week(s)</numerusform>
+            <numerusform>%n week(s)</numerusform>
         </translation>
     </message>
     <message>
@@ -380,8 +380,8 @@ Försök igen.</translation>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%n year(s)</numerusform>
+            <numerusform>%n year(s)</numerusform>
         </translation>
     </message>
     </context>
@@ -2840,8 +2840,8 @@ Om den här plånboken innehåller lösbara</translation>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
+            <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
         </translation>
     </message>
     <message>
@@ -3150,8 +3150,8 @@ Om den här plånboken innehåller lösbara</translation>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>matures in %n more block(s)</numerusform>
+            <numerusform>matures in %n more block(s)</numerusform>
         </translation>
     </message>
     <message>

Besides the diff outlined above, I'm getting the same output:

../bitcoin-maintainer-tools/update-translations.py
./configure && make -C src translate

Note:

  • bitcoin_az, bitcoin_az@latin, bitcoin_la seems to have a bunch of new English translations in it too

@hebasto
Copy link
Member Author

hebasto commented Aug 1, 2024

  1. you've prevented (what appears to be) vandalism by reverting the deletion of bitcoin_af, bitcoin_es_MX, and bitcoin_ru translations

It is mentioned in the commit message as "Removals of translation files have been discarded.".

I'll put your wording in the PR description.

@hebasto
Copy link
Member Author

hebasto commented Aug 1, 2024

  1. you've rolled back some clearly not Swedish translations in bitcoin_sv:

I haven't. Those translations were updated by translators after I pulled the translations from the Transifex:
image

It's a moving target, and we did our best in this PR.

@hebasto hebasto merged commit 9774a95 into bitcoin:master Aug 1, 2024
16 checks passed
Copy link
Member

@pablomartin4btc pablomartin4btc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

post-merge ACK be41967

no diff

hebasto added a commit that referenced this pull request Feb 6, 2025
… step

2f27c91 qt: Update the `src/qt/locale/bitcoin_en.xlf` translation source file (Hennadii Stepanov)
864386a cmake: Ensure generated sources are up to date for `translate` target (Hennadii Stepanov)
2b51dd3 Update Transifex slug for 29.x (Hennadii Stepanov)

Pull request description:

  This PR follows our [Release Process](https://github.com/bitcoin/bitcoin/blob/864386a7444fb5cf16613956ce8bf335f51b67d5/doc/release-process.md).

  It is required to open Transifex translations for v29.0, as scheduled in #31029.

  The previous similar PR: #30548.

  **Notes for reviewers:**

  1. This is the first release process conducted after migrating the build system to CMake. This revealed a bug, which is fixed in the second commit

  2. To reproduce the diff in the third commit, follow these steps:
  ```
  gmake -C depends -j $(nproc) MULTIPROCESS=1
  cmake --preset dev-mode --toolchain depends/$(./depends/config.guess)/toolchain.cmake
  cmake --build build_dev_mode --target translate
  ```

ACKs for top commit:
  stickies-v:
    ACK 2f27c91

Tree-SHA512: 325ce2418f218b82cc3b0a6c727473963455680cdf6383a85768613ed9e485974b2e52bd5b2e7a7472ad8ebe40bccb2884764d7f9e83dc10a587cd7892e0028b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants