From 6eb0a2df9d3f67a2d30bb4bede52ccf829e27619 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 6 Apr 2023 09:28:05 +0800 Subject: [PATCH 1/4] Merge two translation contributing documents --- .../contributing/guidelines-frontend.en-us.md | 4 +- .../guidelines-refactoring.en-us.md | 4 +- .../doc/contributing/localization.en-us.md | 8 ++- .../doc/contributing/localization.zh-cn.md | 4 +- .../doc/contributing/localization.zh-tw.md | 4 +- .../doc/contributing/translation.de-de.md | 63 ------------------- .../doc/contributing/translation.en-us.md | 17 ----- 7 files changed, 14 insertions(+), 90 deletions(-) delete mode 100644 docs/content/doc/contributing/translation.de-de.md delete mode 100644 docs/content/doc/contributing/translation.en-us.md diff --git a/docs/content/doc/contributing/guidelines-frontend.en-us.md b/docs/content/doc/contributing/guidelines-frontend.en-us.md index 36c88739ecb4b..2e523933eebc9 100644 --- a/docs/content/doc/contributing/guidelines-frontend.en-us.md +++ b/docs/content/doc/contributing/guidelines-frontend.en-us.md @@ -2,14 +2,14 @@ date: "2021-10-13T16:00:00+02:00" title: "Guidelines for Frontend Development" slug: "guidelines-frontend" -weight: 20 +weight: 30 toc: false draft: false menu: sidebar: parent: "contributing" name: "Guidelines for Frontend" - weight: 20 + weight: 30 identifier: "guidelines-frontend" --- diff --git a/docs/content/doc/contributing/guidelines-refactoring.en-us.md b/docs/content/doc/contributing/guidelines-refactoring.en-us.md index 913ce8d9bb501..aff744c5435e4 100644 --- a/docs/content/doc/contributing/guidelines-refactoring.en-us.md +++ b/docs/content/doc/contributing/guidelines-refactoring.en-us.md @@ -2,14 +2,14 @@ date: "2023-02-14T00:00:00+00:00" title: "Guidelines for Refactoring" slug: "guidelines-refactoring" -weight: 20 +weight: 40 toc: false draft: false menu: sidebar: parent: "contributing" name: "Guidelines for Refactoring" - weight: 20 + weight: 40 identifier: "guidelines-refactoring" --- diff --git a/docs/content/doc/contributing/localization.en-us.md b/docs/content/doc/contributing/localization.en-us.md index 3006ca599b507..84103aa66b3de 100644 --- a/docs/content/doc/contributing/localization.en-us.md +++ b/docs/content/doc/contributing/localization.en-us.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "Localization" slug: "localization" -weight: 10 +weight: 70 toc: false draft: false menu: sidebar: parent: "contributing" name: "Localization" - weight: 20 + weight: 70 identifier: "localization" --- @@ -31,3 +31,7 @@ After a translation has been accepted, it will be reflected in the main reposito At the time of writing, this means that a changed translation may not appear until the following Gitea release. If you use a bleeding edge build, it should appear as soon as you update after the change is synced. + +# How to Contribute + +Different Languages have different translation guidelines. Please go to their own page to get more informations. diff --git a/docs/content/doc/contributing/localization.zh-cn.md b/docs/content/doc/contributing/localization.zh-cn.md index c20f4d4138dfa..b89f617cd6e36 100644 --- a/docs/content/doc/contributing/localization.zh-cn.md +++ b/docs/content/doc/contributing/localization.zh-cn.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "本地化" slug: "localization" -weight: 20 +weight: 70 toc: false draft: false menu: sidebar: parent: "contributing" name: "本地化" - weight: 20 + weight: 70 identifier: "localization" --- diff --git a/docs/content/doc/contributing/localization.zh-tw.md b/docs/content/doc/contributing/localization.zh-tw.md index 815fbc3119128..d77f2391d889b 100644 --- a/docs/content/doc/contributing/localization.zh-tw.md +++ b/docs/content/doc/contributing/localization.zh-tw.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "在地化" slug: "localization" -weight: 20 +weight: 70 toc: false draft: false menu: sidebar: parent: "contributing" name: "在地化" - weight: 20 + weight: 70 identifier: "localization" --- diff --git a/docs/content/doc/contributing/translation.de-de.md b/docs/content/doc/contributing/translation.de-de.md deleted file mode 100644 index abfc46e9fd2fe..0000000000000 --- a/docs/content/doc/contributing/translation.de-de.md +++ /dev/null @@ -1,63 +0,0 @@ ---- -date: "2021-01-22T00:00:00+02:00" -title: "Übersetzungs Richtlinien" -weight: 70 -toc: true -draft: false -menu: - sidebar: - parent: "contributing" - name: "Übersetzungsrichtlinien" - weight: 70 - identifier: "translation-guidelines" ---- - -## Allgemeines - -Anrede: Wenig förmlich: - -* "Du"-Form -* Keine "Amtsdeusch"-Umschreibungen, einfach so als ob man den Nutzer direkt persönlich ansprechen würde - -Genauer definiert: - -* "falsch" anstatt "nicht korrekt/inkorrekt" -* Benutzerkonto oder Konto? Oder Account? -* "Wende dich an ..." anstatt "kontaktiere ..." -* In der selben Zeit übersetzen (sonst wird aus "is" "war") -* Richtige Anführungszeichen verwenden. Also `"` statt `''` oder `'` oder \` oder `´` - * `„` für beginnende Anführungszeichen, `“` für schließende Anführungszeichen - -Es gelten Artikel und Worttrennungen aus dem Duden. - -## Formulierungen in Modals und Buttons - -Es sollten die gleichen Formulierungen auf Buttons und Modals verwendet werden. - -Beispiel: Wenn der Button mit `löschen` beschriftet ist, sollte im Modal die Frage lauten `Willst du das wirklich löschen?` und nicht `Willst du das wirklich entfernen?`. Gleiches gilt für Success/Errormeldungen nach der Aktion. - -## Trennungen - -* Pull-Request -* Time-Tracker -* E-Mail-Adresse (siehe Duden) - -## Artikeldefinitionen für Anglizismen - -* _Der_ Commit (m.) -* _Der_ Branch (m.), plural: die Branches -* _Das_ Issue (n.) -* _Der_ Fork (m.) -* _Das_ Repository (n.), plural: die Repositories -* _Der_ Pull-Request (m.) -* _Der_ Token (m.), plural: die Token -* _Das_ Review (n.) -* _Der_ Key (m.) -* _Der_ Committer (m.), plural: die Committer - -## Weiterführende Links - -Diese beiden Links sind sehr empfehlenswert: - -* http://docs.translatehouse.org/projects/localization-guide/en/latest/guide/translation_guidelines_german.html -* https://docs.qgis.org/2.18/en/docs/documentation_guidelines/do_translations.html diff --git a/docs/content/doc/contributing/translation.en-us.md b/docs/content/doc/contributing/translation.en-us.md deleted file mode 100644 index 6459bcbcf499e..0000000000000 --- a/docs/content/doc/contributing/translation.en-us.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -date: "2021-01-22T00:00:00+02:00" -title: "Translation Guidelines" -weight: 70 -toc: true -draft: false -menu: - sidebar: - parent: "contributing" - name: "Translation Guidelines" - weight: 70 - identifier: "translation-guidelines" ---- - -This place is used to provide a common set of rules to make sure the translation is consistent. - -* [German](/de-de/übersetzungs-richtlinien/) From 5cd18e07ecaf2354364f9c623b5084193835c6d2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 6 Apr 2023 13:53:02 +0800 Subject: [PATCH 2/4] Add missing doc --- .../doc/contributing/localization.de-de.md | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 docs/content/doc/contributing/localization.de-de.md diff --git a/docs/content/doc/contributing/localization.de-de.md b/docs/content/doc/contributing/localization.de-de.md new file mode 100644 index 0000000000000..828294b39a457 --- /dev/null +++ b/docs/content/doc/contributing/localization.de-de.md @@ -0,0 +1,85 @@ +--- +date: "2016-12-01T16:00:00+02:00" +title: "Localization" +slug: "localization" +weight: 70 +toc: false +draft: false +menu: + sidebar: + parent: "contributing" + name: "Localization" + weight: 70 + identifier: "localization" +--- + +# Localization + +Gitea's localization happens through our [Crowdin project](https://crowdin.com/project/gitea). + +For changes to an **English** translation, a pull request can be made that changes the appropriate key in +the [english locale](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini). + +For changes to a **non-English** translation, refer to the Crowdin project above. + +## Supported Languages + +Any language listed in the above Crowdin project will be supported as long as 25% or more has been translated. + +After a translation has been accepted, it will be reflected in the main repository after the next Crowdin sync, which is generally after any PR is merged. + +At the time of writing, this means that a changed translation may not appear until the following Gitea release. + +If you use a bleeding edge build, it should appear as soon as you update after the change is synced. + +# How to Contribute + +## Allgemeines + +Anrede: Wenig förmlich: + +* "Du"-Form +* Keine "Amtsdeusch"-Umschreibungen, einfach so als ob man den Nutzer direkt persönlich ansprechen würde + +Genauer definiert: + +* "falsch" anstatt "nicht korrekt/inkorrekt" +* Benutzerkonto oder Konto? Oder Account? +* "Wende dich an ..." anstatt "kontaktiere ..." +* In der selben Zeit übersetzen (sonst wird aus "is" "war") +* Richtige Anführungszeichen verwenden. Also `"` statt `''` oder `'` oder \` oder `´` + * `„` für beginnende Anführungszeichen, `“` für schließende Anführungszeichen + +Es gelten Artikel und Worttrennungen aus dem Duden. + +## Formulierungen in Modals und Buttons + +Es sollten die gleichen Formulierungen auf Buttons und Modals verwendet werden. + +Beispiel: Wenn der Button mit `löschen` beschriftet ist, sollte im Modal die Frage lauten `Willst du das wirklich löschen?` und nicht `Willst du das wirklich entfernen?`. Gleiches gilt für Success/Errormeldungen nach der Aktion. + +## Trennungen + +* Pull-Request +* Time-Tracker +* E-Mail-Adresse (siehe Duden) + +## Artikeldefinitionen für Anglizismen + +* _Der_ Commit (m.) +* _Der_ Branch (m.), plural: die Branches +* _Das_ Issue (n.) +* _Der_ Fork (m.) +* _Das_ Repository (n.), plural: die Repositories +* _Der_ Pull-Request (m.) +* _Der_ Token (m.), plural: die Token +* _Das_ Review (n.) +* _Der_ Key (m.) +* _Der_ Committer (m.), plural: die Committer + +## Weiterführende Links + +Diese beiden Links sind sehr empfehlenswert: + +* http://docs.translatehouse.org/projects/localization-guide/en/latest/guide/translation_guidelines_german.html +* https://docs.qgis.org/2.18/en/docs/documentation_guidelines/do_translations.html From 5b9ceef66b0b455400e0be7752596a2232781e97 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 6 Apr 2023 19:58:55 +0800 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: delvh --- docs/content/doc/contributing/localization.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/contributing/localization.en-us.md b/docs/content/doc/contributing/localization.en-us.md index 84103aa66b3de..7496fab3f53f5 100644 --- a/docs/content/doc/contributing/localization.en-us.md +++ b/docs/content/doc/contributing/localization.en-us.md @@ -34,4 +34,4 @@ If you use a bleeding edge build, it should appear as soon as you update after t # How to Contribute -Different Languages have different translation guidelines. Please go to their own page to get more informations. +Different Languages have different translation guidelines. Please visit the respective page for more information. From d9f19c900b8d8cf9ebbd632d5b765fc7adf45768 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 22 May 2023 17:08:15 +0800 Subject: [PATCH 4/4] Revert change for german language --- .../doc/contributing/localization.de-de.md | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/docs/content/doc/contributing/localization.de-de.md b/docs/content/doc/contributing/localization.de-de.md index 828294b39a457..c4dcb6cafa14a 100644 --- a/docs/content/doc/contributing/localization.de-de.md +++ b/docs/content/doc/contributing/localization.de-de.md @@ -1,6 +1,6 @@ --- -date: "2016-12-01T16:00:00+02:00" -title: "Localization" +date: "2021-01-22T00:00:00+02:00" +title: "Übersetzungs Richtlinien" slug: "localization" weight: 70 toc: false @@ -8,32 +8,11 @@ draft: false menu: sidebar: parent: "contributing" - name: "Localization" + name: "Übersetzungsrichtlinien" weight: 70 identifier: "localization" --- -# Localization - -Gitea's localization happens through our [Crowdin project](https://crowdin.com/project/gitea). - -For changes to an **English** translation, a pull request can be made that changes the appropriate key in -the [english locale](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini). - -For changes to a **non-English** translation, refer to the Crowdin project above. - -## Supported Languages - -Any language listed in the above Crowdin project will be supported as long as 25% or more has been translated. - -After a translation has been accepted, it will be reflected in the main repository after the next Crowdin sync, which is generally after any PR is merged. - -At the time of writing, this means that a changed translation may not appear until the following Gitea release. - -If you use a bleeding edge build, it should appear as soon as you update after the change is synced. - -# How to Contribute - ## Allgemeines Anrede: Wenig förmlich: