Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update German translation #328

Merged
merged 6 commits into from Jun 13, 2019

Conversation

@Forgon2100
Copy link
Contributor

commented Apr 16, 2019

The first patch fixes mistakes noticed when reviewing #326 and this PR.

  • consistently translate:

    • "save haven" as "sicherer Hafen"
    • "mod" as noun with feminine gender
    • "scavengers" as "Scavenger"
    • "superhot gel" as "Gel für sehr hohe Temperaturen"
    • "super XYZ cyborg" as "XYZ-Supercyborg"
  • fix format specifier to comply with ticket:4872

  • fix translations of unused technologies:

    • a "proximity bomb" is a suicidal bomb (only used in demos from 1999)
    • "sensor lock" enables targeting for sensors (unimplemented)

In consultation with Kreuvf, highlander1599 created #1 in my repository,
which resulted in two additional commits to

  • fix the capitalization of turret names
  • call rail guns, cannons and the EMP Cannon "Kanone", a more specific
    term than "Geschütz", which it replaces. This completes #326, in which
    the same change was applied to flak weapons.

The fourth patch adds German translations for changes of #281.

The fifth patch adds German translations for changes of #329.

The sixth patch fixes the German translation of "AUDIO / ZOOM OPTIONS",
which was too long for the minimum screen resolution of 640x480 pixels.
PR #345 adds support for an optional delimiter "\n" to split the message
into two lines. It also also contains screenshots showing the change.

Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 16, 2019
Add German translation of AI descriptions
* add translations for all AI tooltips
* "Semperfi" has been renamed to "SemperFi"

Fixes Warzone2100#328

@Forgon2100 Forgon2100 force-pushed the Forgon2100:german_translation branch from ce49fbe to b4f91bb Apr 16, 2019

Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 16, 2019
Add German translation of AI descriptions
* add translations for all AI tooltips
* "Semperfi" has been renamed to "SemperFi"

Refs Warzone2100#281
Fixes Warzone2100#328

@KJeff01 KJeff01 added this to the 3.3.0_beta2 milestone Apr 17, 2019

@Forgon2100 Forgon2100 changed the title Update German translation [WIP] Update German translation Apr 17, 2019

@kreuvf
Copy link
Contributor

left a comment

Thank you for new efforts to improve the German translation, especially for pointing out the stuff we missed.

I noticed (see coming comments) that you re-added translations that I had already marked as "rejected". Unfortunately, this is very time-consuming for me and wrong translations might slip through leading to lower quality translations.

@@ -377,7 +377,7 @@ msgstr "SCAVENGER-BASIS ENTDECKT"

#: data/base/messages/strings/cam1strings.txt:146
msgid "Defeat the scavengers and retrieve any artifacts."
msgstr "Vernichten Sie die Scavengers und bergen Sie alle Artefakte."
msgstr "Vernichten Sie die Scavenger und bergen Sie alle Artefakte."

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

Copying my reply to this from Trac ticket 4845:

I am seeing this similar to the (now also) German word "Hobby": We capitalize the noun, but we use the original plural. The translation stays as it is. This is also true for similar cases.

Side note: Actually, in German, we do not use the original plural for this word, although the original plural is usually used in foreign words such as "Tempus", "Genus", "Epitheton" or "Nomen". Instead, officially correct German uses (only) "Hobbys".

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

Since Trac did not allow my reply to posted in full, I uploaded it to Pastebin.com.

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 18, 2019

Author Contributor

Since Trac did not allow my reply to posted in full, I uploaded it to Pastebin.com.

Thanks.
The file is archived at https://archive.fo/Da02A to prevent link rot.

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 18, 2019

Author Contributor

x

Copying my reply to this from Trac ticket 4845:

I am seeing this similar to the (now also) German word "Hobby": We capitalize the noun, but we use the original plural. The translation stays as it is. This is also true for similar cases.
Side note: Actually, in German, we do not use the original plural for this word, although the original plural is usually used in foreign words such as "Tempus", "Genus", "Epitheton" or "Nomen". Instead, officially correct German uses (only) "Hobbys".

My point is that we translate "scavengers" inconsistently.
In one instance its plural form ends in an s, unlike in all others:

msgid "Defeat the scavengers and retrieve any artifacts."
msgstr "Vernichten Sie die Scavengers und bergen Sie alle Artefakte."

msgid "Scavengers"
msgstr "Scavenger"

msgid "No Scavengers"
msgstr "Keine Scavenger"

Thank you for new efforts to improve the German translation, especially for pointing out the stuff we missed.

I noticed (see coming comments) that you re-added translations that I had already marked as "rejected". Unfortunately, this is very time-consuming for me and wrong translations might slip through leading to lower quality translations.

That's why I limited my suggestions to the few translations that could
be easily misunderstood and accepted all your other disagreements.

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

My point is that we translate "scavengers" inconsistently.
In one instance its plural form ends in an s, unlike in all others:

msgid "Defeat the scavengers and retrieve any artifacts."
msgstr "Vernichten Sie die Scavengers und bergen Sie alle Artefakte."

msgid "Scavengers"
msgstr "Scavenger"

msgid "No Scavengers"
msgstr "Keine Scavenger"

I see. Do you have statistics on which variant prevails? There should definitely be consistency.

That's why I limited my suggestions to the few translations that could
be easily misunderstood and accepted all your other disagreements.

Okay, that's reasonable. Next time, please mention this somewhere in advance ❤️

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 20, 2019

Author Contributor

I don't think that there are "statistics" which variant prevails. As wrote in my comment to #326 I see this similar to the Italian word "Espresso". This is now also used in German with the original plural "Espressi". So I'm for the translation "Scavengers" in all places where necessary.

Linguee did not find a single translation of "scavengers" as "Scavengers".

This comment has been minimized.

Copy link
@highlander1599

highlander1599 Apr 21, 2019

Contributor

I accept your decision

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 22, 2019

Contributor

Linguee did not find a single translation of "scavengers" as "Scavengers".

Note: This is not relevant here. "New Paradigm" and "Scavenger(s)" were used as faction names in the original German translation. That is also the reason why the names were not translated.

This comment has been minimized.

Copy link
@MartinX3

MartinX3 Apr 22, 2019

In my opinion the developer "Pumpkin Studios" would name them "Neue(s) Leitbild" and "Plünderer" if it was a german developer (Kürbis Studios).
(I don't like anglicisms.)

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 22, 2019

Contributor

The German videos were made by Pumpkin Studios/Eidos Interactive and these factions are called "Scavenger(s)" and "New Paradigm" there.

Just a few examples:

  • cam1ascv.ogg: "Überfallkommandos der Scavengers nähern sich unserer Basis. Verteidigen Sie die Basis und zerstören Sie anschließend die Lager der Scavengers."
  • cam1ca.ogg: "Commander, Sie haben das New Paradigm aus dieser Zone vertrieben. [...]"
  • cam1cnp.ogg: "Eindringling, der unrechtmäßige Angriff auf unsere friedlichen Einrichtungen wird nicht ungestraft bleiben. Sie verstoßen gegen die Rechte des New Paradigm und werden zerstört werden."

This leaves no room to change the faction names.

po/de.po Outdated
@@ -1282,12 +1282,12 @@ msgstr "Tornado-Flak-Turm"
#: data/base/messages/strings/names.txt:247
#: data/mp/messages/strings/names.txt:288
msgid "Proximity Bomb Turret"
msgstr "Näherungsbombenabwurfschacht"
msgstr "Selbstmordkommando-Bombenturm"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

The issue with this translation is: It's not in the original. Also, the word itself does not make much sense in German as a "Selbstmordkommando" is a group of people on a (presumably) deadly mission and "Selbstmordkommando-Bombenturm" would be a "bomb tower" of theirs. Meaning unclear.

Generally, "bomb turret" is translated as "Bombenabwurfschacht" (literally: bomb drop chute) to make it clear that it is not some kind of tower. Both, turret and tower, are translated as "Turm" in German, so some way to distinguish the meanings is needed.

The translation as suggested by you would be (literally) "suicide squadron bomb turret".

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 18, 2019

Author Contributor

I googled "proximity bomb" to find out how other games translate it:

  • Wikipedia redirects the term to "Proximity fuse".
    The equivalent German article is titled "Abstandszünder".

  • In Guild Wars, Horizon Zero Dawn, Resident Evil and Star Wars the word
    means "landmine" and is probably translated as such.

An alternative name for this kind of weapon is "Nova Turret" and "Supernova Turret",
according to an old forum post:

Black Project wrote:
Proximity Bomb Turret: Never hearded and seen this weapon in action, but never was implemented. I believe that was a suicidal turret that explodes everything within range.

Proximity Superbomb Turret: Same as the previous one, but a lot more powerful.

I've seen these used in mods, called "Nova Turret" and "Supernova Turret".

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

Do you have in-game footage of this? Totally looked like a VTOL weapon to me. I remember 1.12 iirc had mines and they also worked, but were not called "proximity bomb".

How is that weapon supposed to work? Does it put landmines everywhere or will it just explode if something touches it?

Wikipedia calls "Abstandszünder" "Näherungszünder", which is where I got the idea for the current translation from. Do you think "Näherungsbombe" or "Näherungsmine" could work? The "turret" will not appear in the translation.

This comment has been minimized.

Copy link
@highlander1599

highlander1599 Apr 18, 2019

Contributor

In my opinion, this superfluous term should be removed from the original source (not used since 20 years) rather than discussed how it's translated.

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 18, 2019

Author Contributor

Do you have in-game footage of this? Totally looked like a VTOL weapon to me. I remember 1.12 iirc had mines and they also worked, but were not called "proximity bomb".

How is that weapon supposed to work? Does it put landmines everywhere or will it just explode if something touches it?

I only know what is written in the "Non-Implemented Features List" thread, according to which

Wikipedia calls "Abstandszünder" "Näherungszünder", which is where I got the idea for the current translation from. Do you think "Näherungsbombe" or "Näherungsmine" could work? The "turret" will not appear in the translation.

"Näherungsbombe" is okay, since it's a bomb, if a human-guided one.

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

Then, go for it! :D

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 20, 2019

Author Contributor

In my opinion, this superfluous term should be removed from the original source (not used since 20 years) rather than discussed how it's translated.

Translating strings for unused technologies is useful for mods, which
cannot introduce new translatable messages on their own.

po/de.po Outdated

#: data/base/messages/strings/names.txt:248
#: data/mp/messages/strings/names.txt:289
msgid "Proximity Superbomb Turret"
msgstr "Näherungssuperbombenabwurfschacht"
msgstr "Selbstmordkommando-Superbombenturm"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

See above.

This comment has been minimized.

Copy link
@highlander1599

highlander1599 Apr 18, 2019

Contributor

See above

@@ -1555,7 +1555,7 @@ msgstr "Störturm Mk2"
#: data/base/messages/strings/names.txt:389
#: data/mp/messages/strings/names.txt:494
msgid "Sensor Lock"
msgstr "Sensorsperre"
msgstr "Zielbestimmung für Sensoren"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

✔️

po/de.po Outdated
#: data/base/messages/strings/resstrings.txt:685
#: data/base/messages/strings/resstrings.txt:691
#: data/mp/messages/strings/resstrings.txt:326
#: data/mp/messages/strings/resstrings.txt:331
#: po/custom/fromJson.txt:964
msgid "New Proximity Bomb Turret Available"
msgstr "Neuer Näherungsbombenabwurfschacht verfügbar"
msgstr "Neuer Selbstmordkommando-Bombenturm verfügbar"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

See above.

This comment has been minimized.

Copy link
@highlander1599

highlander1599 Apr 18, 2019

Contributor

See above

po/de.po Outdated
@@ -3767,7 +3766,7 @@ msgstr "Es ist wahrscheinlich, dass er gegen Ihre Stellung gerichtet ist."

#: data/base/sequenceaudio/cam2/c2diif2.txt:4
msgid "You are to start the immediate evacuation of Beta Base to the safe haven."
msgstr "Beginnen Sie sofort damit die Betabasis in die Sicherheitszone zu evakuieren."
msgstr "Beginnen Sie sofort damit die Betabasis in den sicheren Hafen zu evakuieren."

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

This sounds a bit odd to me. The preposition "in" does not work smoothly with "den sicheren Hafen", so should probably be "zum sicheren Hafen".

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 18, 2019

Author Contributor

Okay.

po/de.po Outdated
@@ -10411,15 +10410,15 @@ msgstr "Drehend"

#: src/frontend.cpp:745
msgid "Fixed"
msgstr "Fest"
msgstr "Unbeweglich"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

I doubt you can get more accurate than "Fest".

This comment has been minimized.

Copy link
@highlander1599

highlander1599 Apr 18, 2019

Contributor

Since "Fest" is also used in different meanings (fester Händedruck) I suggest "Starr".

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 22, 2019

Contributor

Not sure about this. In the context of layouting on-screen elements, I only know that "fixed" is translated as "fest". Also, it might have the same and other unwanted connotations as "fest", so that I still prefer "fest".

This comment has been minimized.

Copy link
@highlander1599

highlander1599 Apr 24, 2019

Contributor

I suppose we would find no other German word without possible connotations. ;)
I'm fine with "Fest"

po/de.po Outdated

#: src/frontend.cpp:750
msgid "Instant"
msgstr "Sofort"
msgstr "Verzögerungsfrei"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

Again quoting my earlier comments:

Unnecessarily complicated words. Translation stays as it is.

po/de.po Outdated

#: src/frontend.cpp:750
msgid "Tracked"
msgstr "Sanft"
msgstr "Langsam verfolgt"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

Again quoting my earlier comments:

Unnecessarily complicated words. Translation stays as it is.

po/de.po Outdated
@@ -10443,7 +10442,7 @@ msgstr "Minikarte"

#: src/frontend.cpp:785
msgid "Radar Jump"
msgstr "Minikartensprung"
msgstr "Minikartenortsauswahl"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

Again quoting my earlier comments:

No, "Auswahl" is something you click and that gets some kind of border rendered around it. No such thing here. Translation stays as it is.

@@ -11925,7 +11924,7 @@ msgstr "Falsche Spielversion!"

#: src/multiint.cpp:1204
msgid "You have an incompatible mod."
msgstr "Sie haben einen inkompatiblen Mod."
msgstr "Sie haben eine inkompatible Mod."

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

✔️

@@ -12347,7 +12346,7 @@ msgstr "Dateiübertragung für %d abgebrochen."
#: src/multijoin.cpp:455
#, c-format
msgid "%s (%u) has an incompatible mod, and has been kicked."
msgstr "%s (%u) hat einen inkompatiblen Mod und wurde rausgeschmissen."
msgstr "%s (%u) hat eine inkompatible Mod und wurde rausgeschmissen."

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

✔️

@@ -12761,7 +12760,7 @@ msgstr[1] "%s - %u Einheiten zugewiesen - Trefferpunkte %d/%d"

#: src/structure.cpp:5447
#, c-format
msgid "%s - %u Unit assigned - Damage %3.0f%%"
msgid "%s - %u Unit assigned - Damage %d/%d"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

✔️

po/de.po Outdated

# SemperFi tooltip
msgid "Enhanced Nexus AI"
msgstr "Verbesserte Nexus KI"

This comment has been minimized.

Copy link
@kreuvf

kreuvf Apr 18, 2019

Contributor

See comments for the other commit.

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 18, 2019

Author Contributor

Okay.

@Forgon2100 Forgon2100 force-pushed the Forgon2100:german_translation branch from b4f91bb to 5e7dada Apr 18, 2019

Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 18, 2019
Update German translation
* consistently translate:
  * "save haven" as "sicherer Hafen"
  * "mod" as noun with feminine gender
  * "scavengers" as "Scavenger"

* fix format specifier to comply with ticket:4872

* fix translations of unused technologies:
  * a "proximity bomb" is a suicidal bomb (only used in demos from 1999)
  * "sensor lock" enables targeting for sensors (unimplemented)

Refs ticket:4845
Refs Warzone2100#326
Fixes Warzone2100#328
Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 18, 2019
Add German translation of AI descriptions
* add translations for all AI tooltips
* "Semperfi" has been renamed to "SemperFi"
* "SemperFi JS" has been renamed to "SemperFi JavaScript"

Refs Warzone2100#281
Fixes Warzone2100#328
Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 18, 2019
@kreuvf
kreuvf approved these changes Apr 22, 2019

@Forgon2100 Forgon2100 force-pushed the Forgon2100:german_translation branch from 5e7dada to d9b21a8 Apr 23, 2019

Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 23, 2019
Update German translation
* consistently translate:
  * "save haven" as "sicherer Hafen"
  * "mod" as noun with feminine gender
  * "scavengers" as "Scavenger"

* fix format specifier to comply with ticket:4872

* fix translations of unused technologies:
  * a "proximity bomb" is a suicidal bomb (only used in demos from 1999)
  * "sensor lock" enables targeting for sensors (unimplemented)

Refs ticket:4845
Refs Warzone2100#326
Fixes Warzone2100#328
Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 23, 2019
Fix turret capitalization in German translation
Proper nouns like "Schwerer Laser" should be capitalized.

Affected turrets:
* Heavy Cannon
* Heavy Laser
* Heavy Machinegun
* Light Cannon
* Medium Cannon
* Mobile Repair Turret (usually called Repair Turret)

Fixes Warzone2100#328

Co-authored-by: highlander1599 <highlander1599@gmail.com>
Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 23, 2019
Change German translation of cannons and rail guns
* classify cannons, rail guns and the EMP cannon as "Kanone" instead of
  "Geschütz", a less specific term that includes mortars and howitzers
* in Warzone2100#326, all flak weapons had been re-translated as "Flugabwehrkanone"
  (replacing the term "Flugabwehrgeschütz") to match the acronym "FLAK"
  as part of 4b2a947

Refs Warzone2100#326
Fixes Warzone2100#328

Co-authored-by: highlander1599 <highlander1599@gmail.com>
Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 24, 2019
@highlander1599

This comment has been minimized.

Copy link
Contributor

commented Apr 24, 2019

In an army in real life, you have several heavy Cannons with different calibers and I would prefer uncapitalized adjectives. In Warzone you have only one and therefore is "Schwere Kanone" a proper noun for me but only in our specific situation. Even if I have to admit that "Schweres Maschinengewehr" looks a little bit odd. But for consistency, I'm for the capitalized adjective.

@kreuvf

This comment has been minimized.

Copy link
Contributor

commented Apr 25, 2019

But for consistency, I'm for the capitalized adjective.

Then, it's decided ^.^

@Forgon2100

This comment has been minimized.

Copy link
Contributor Author

commented Apr 25, 2019

"Superhot" is translated inconsistently in the three instances in which
it refers to "Plasmite Flamer" research items. This should be fixed:

 msgid "Propylene Oxide treated to burn at superhot temperatures"
 msgstr "Behandeltes Propylenoxid brennt sehr viel heißer"

 msgid "Superhot Flamer Gel"
 msgstr "Flammenwerfergel für sehr hohe Temperaturen"

 msgid "Superhot Plasmite gel"
-msgstr "Superheißes Plasmitflammenwerfergel"
+msgstr "Plasmitflammenwerfergel für sehr hohe Temperaturen"

 msgid "Superhot Plasmite gel Mk2"
-msgstr "Superheißes Plasmitflammenwerfergel Mk2"
+msgstr "Plasmitflammenwerfergel für sehr hohe Temperaturen Mk2"

 msgid "Superhot Plasmite gel Mk3"
-msgstr "Superheißes Plasmitflammenwerfergel Mk3"
+msgstr "Plasmitflammenwerfergel für sehr hohe Temperaturen Mk3"
@kreuvf

This comment has been minimized.

Copy link
Contributor

commented Apr 25, 2019

"Superhot" is translated inconsistently in the three instances in which
it refers to "Plasmite Flamer" research items. This should be fixed:

 msgid "Propylene Oxide treated to burn at superhot temperatures"
 msgstr "Behandeltes Propylenoxid brennt sehr viel heißer"

 msgid "Superhot Flamer Gel"
 msgstr "Flammenwerfergel für sehr hohe Temperaturen"

 [...]

 msgid "Superhot Plasmite gel Mk3"
-msgstr "Superheißes Plasmitflammenwerfergel Mk3"
+msgstr "Plasmitflammenwerfergel für sehr hohe Temperaturen Mk3"

✔️

Forgon2100 and others added 5 commits Apr 16, 2019
Update German translation
* consistently translate:
  * "save haven" as "sicherer Hafen"
  * "mod" as noun with feminine gender
  * "scavengers" as "Scavenger"
  * "superhot gel" as "Gel für sehr hohe Temperaturen"
  * "super XYZ cyborg" as "XYZ-Supercyborg"

* fix format specifier to comply with ticket:4872

* fix translations of unused technologies:
  * a "proximity bomb" is a suicidal bomb (only used in demos from 1999)
  * "sensor lock" enables targeting for sensors (unimplemented)

Refs ticket:4845
Refs #326
Fixes #328
Add German translation of AI descriptions
* add translations for all AI tooltips
* "Semperfi" has been renamed to "SemperFi"
* "SemperFi JS" has been renamed to "SemperFi JavaScript"

Refs #281
Fixes #328
Change German translation of cannons and rail guns
* classify cannons, rail guns and the EMP cannon as "Kanone" instead of
  "Geschütz", a less specific term that includes mortars and howitzers
* in #326, all flak weapons had been re-translated as "Flugabwehrkanone"
  (replacing the term "Flugabwehrgeschütz") to match the acronym "FLAK"
  as part of 4b2a947

Refs #326
Fixes #328

Co-authored-by: highlander1599 <highlander1599@gmail.com>
Co-authored-by: kreuvf <kreuvf@users.noreply.github.com>
Fix turret capitalization in German translation
Proper nouns like "Schwerer Laser" should be capitalized.

Affected turrets:
* Heavy Cannon
* Heavy Laser
* Heavy Machinegun
* Light Cannon
* Medium Cannon

Unaffected turrets:
* Heavy Mobile Repair Turret (and any references to the old weapon name
  "Mobile Repair Turret", which was changed to "Repair Turret" long ago)
* VTOL Heap Bomb Bay (the translation of HEAP is capitalized nowhere)

Fixes #328

Co-authored-by: highlander1599 <highlander1599@gmail.com>
Co-authored-by: kreuvf <kreuvf@users.noreply.github.com>

@Forgon2100 Forgon2100 force-pushed the Forgon2100:german_translation branch from c178c3b to e1e3b60 Apr 25, 2019

Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 30, 2019
Fix German translation of "AUDIO / ZOOM OPTIONS"
* do not break minimum screen resolution of 640x480 pixels
* show sidetext on two lines, using a placeholder message added in Warzone2100#345

Refs Warzone2100#345
Fixes Warzone2100#328
@kreuvf
kreuvf approved these changes Apr 30, 2019
@highlander1599

This comment has been minimized.

Copy link
Contributor

commented May 30, 2019

If I didn't miss anything all questions of this PR are decided and I think we can push it now to master.

@past-due

This comment has been minimized.

Copy link
Contributor

commented May 30, 2019

@Forgon2100: Does this PR currently include changes for other not-yet-merged PRs?

If so, would it be possible to extract just those changes into those separate PRs, and get the rest of these translation fixes (that apply to the current master branch) merged?

@KJeff01

This comment has been minimized.

Copy link
Contributor

commented May 30, 2019

If we want to merge this in time before the beta-2 release, and Forgon isn't around, then the AI tooltips PR (#281) should be merged first and the last commit in this PR should be ignored (it's for #345).

@kreuvf

This comment has been minimized.

Copy link
Contributor

commented Jun 1, 2019

If I didn't miss anything all questions of this PR are decided and I think we can push it now to master.

Yes, please merge. This has been WIP for way too long.

@KJeff01 KJeff01 removed this from the 3.3.0_beta2 milestone Jun 4, 2019

Fix German translation of "AUDIO / ZOOM OPTIONS"
* do not break minimum screen resolution of 640x480 pixels
* show sidetext on two lines, using a message delimiter added in #345

Refs #345
Fixes #328

@Forgon2100 Forgon2100 force-pushed the Forgon2100:german_translation branch from 2dc53c3 to f8231a3 Jun 10, 2019

@Forgon2100

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

If I didn't miss anything all questions of this PR are decided and I think we can push it now to master.

Yes, please merge. This has been WIP for way too long.

I agree. This PR is ready.
The patches are all correct regardless of whether #281 is merged or not.

@Forgon2100 Forgon2100 changed the title [WIP] Update German translation Update German translation Jun 13, 2019

@past-due past-due merged commit b355c33 into Warzone2100:master Jun 13, 2019

5 of 8 checks passed

LGTM analysis: C/C++ No code changes detected
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No code changes detected
Details
WIP Ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
freebsd_build FreeBSD:freebsd-11-2-release-amd64 Task Summary
Details
freebsd_build FreeBSD:freebsd-12-0-release-amd64 Task Summary
Details
past-due added a commit that referenced this pull request Jun 13, 2019
Update German translation
* consistently translate:
  * "save haven" as "sicherer Hafen"
  * "mod" as noun with feminine gender
  * "scavengers" as "Scavenger"
  * "superhot gel" as "Gel für sehr hohe Temperaturen"
  * "super XYZ cyborg" as "XYZ-Supercyborg"

* fix format specifier to comply with ticket:4872

* fix translations of unused technologies:
  * a "proximity bomb" is a suicidal bomb (only used in demos from 1999)
  * "sensor lock" enables targeting for sensors (unimplemented)

Refs ticket:4845
Refs #326
Fixes #328
past-due added a commit that referenced this pull request Jun 13, 2019
Fix turret capitalization in German translation
Proper nouns like "Schwerer Laser" should be capitalized.

Affected turrets:
* Heavy Cannon
* Heavy Laser
* Heavy Machinegun
* Light Cannon
* Medium Cannon

Unaffected turrets:
* Heavy Mobile Repair Turret (and any references to the old weapon name
  "Mobile Repair Turret", which was changed to "Repair Turret" long ago)
* VTOL Heap Bomb Bay (the translation of HEAP is capitalized nowhere)

Fixes #328

Co-authored-by: highlander1599 <highlander1599@gmail.com>
Co-authored-by: kreuvf <kreuvf@users.noreply.github.com>
past-due added a commit that referenced this pull request Jun 13, 2019
Change German translation of cannons and rail guns
* classify cannons, rail guns and the EMP cannon as "Kanone" instead of
  "Geschütz", a less specific term that includes mortars and howitzers
* in #326, all flak weapons had been re-translated as "Flugabwehrkanone"
  (replacing the term "Flugabwehrgeschütz") to match the acronym "FLAK"
  as part of 4b2a947

Refs #326
Fixes #328

Co-authored-by: highlander1599 <highlander1599@gmail.com>
Co-authored-by: kreuvf <kreuvf@users.noreply.github.com>
past-due added a commit that referenced this pull request Jun 13, 2019
Add German translation of AI descriptions
* add translations for all AI tooltips
* "Semperfi" has been renamed to "SemperFi"
* "SemperFi JS" has been renamed to "SemperFi JavaScript"

Refs #281
Fixes #328
past-due added a commit that referenced this pull request Jun 13, 2019

@past-due past-due added this to the 3.3.0_beta2 milestone Jun 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.