Update DE and PT translation for 3.8.0 by ewarning · Pull Request #473 · jamulussoftware/jamuluswebsite

ewarning · 2021-05-11T23:00:49Z

Update DE and PT translation for 3.8.0

Fixes #456
Fixes #469

Home, Setup, and Installations (Mac, Linux, Windows) are done.

ewarning · 2021-05-11T23:35:44Z

Why can’t I link the issues to this PR? The "Linked issues“ link in the right bar is inactive.

gilgongo · 2021-05-12T07:25:23Z

Why can’t I link the issues to this PR?

Are you clicking the "cog wheel" on the right of the text label, or the text label itself? That confused me at first too.

EDIT: Ah, you weren't a member of the Translators permissions group. I'll send you an invite. Does that activate it?

ewarning · 2021-05-12T21:23:50Z

No, I guess it didn’t, I see no cog wheel.

ewarning · 2021-05-18T20:23:41Z

Well, I’m done with the corrections, but as I commited the following message appeared:

hoffie · 2021-05-18T23:48:46Z

I had a quick look. It seems to me that the following happened:

You updated several files in Update DE translation for 3.8.0 #467. That PR was merged to translate3_8_0.
This PR is still based on the translate3_8_0 state before Update DE translation for 3.8.0 #467 was merged, yet it contains the same file additions plus additional changes.

If this PR contains the most recent and most correct state for DE and PT, then the following should work:

git fetch upstream to ensure that your clone is up-to-date with jamulussoftware/jamuluswebsite (assuming that git remote -v shows upstream to point there)
On your translate3_8_0 branch: git merge --strategy recursive --strategy-option ours remotes/upstream/translate3_8_0

This should solve the conflicts. You can verify what the PR changes by running git diff remotes/upstream/translate3_8_0..HEAD before pushing. After pushing, Github should display the exact same diff in this PR.

ignotus666 · 2021-05-20T10:04:50Z

Hi @ewarning

I'm in the process of aligning texts to create .po files, and instead of waiting for your files to be merged I downloaded them from your repo. In order for the alignment process to go smoothly, it is necessary for the translated files to follow as closely as possible the structure of the original document in English. I have found that the following files have correlation problems with their English counterpart:

Installation-for-Linux.md in DE and PT. It seems to be based on an outdated version. Can you confirm it's based on the EN version in "changes"?
Installation-for-Macintosh.md in DE and PT. Near the bottom there are four bullet points, but your translation only contains two. Could you check this please?

The other files aligned nicely!

Cheers.

ewarning · 2021-05-20T13:01:31Z

Hi @ignotus666,

Installation-for-Linux.md in DE and PT. It seems to be based on an outdated version. Can you confirm it's based on the EN version in "changes"?

No, I used the versions that @hoffie told me to in the original issue:
#456
https://github.com/jamulussoftware/jamuluswebsite/blob/translate3_8_0/wiki/en/en-Installation-for-Linux.md

Installation-for-Macintosh.md in DE and PT. Near the bottom there are four bullet points, but your translation only contains two. Could you check this please?

This one I changed on purpose. As a Mac user myself, I found very redundant to follow the instructions, I quote it from the en:

The first time you try to double-click Jamulus to run it, you will probably see a message saying it cannot be opened. We don't code-sign Jamulus yet (it's quite expensive).

That’s fine, it means I already opened Jamulus and saw the message.

To open Jamulus

Navigate to the Applications folder via Finder

Double-click on Jamulus and wait for the above-mentioned message

Close this message by clicking on „Cancel"

If on the previous step I already double-clicked and saw the message, why would I have to do that again?

That’s the reason why, it makes much more sense to:

The first time you try to double-click Jamulus to run it, you will probably see a message saying it cannot be opened. We don't code-sign Jamulus yet (it's quite expensive).
To open Jamulus

Navigate to the Applications folder via Finder

Now control-click (or right-click) on Jamulus, and select "Open" from the top of the menu.

ignotus666 · 2021-05-20T13:19:36Z

No, I used the versions that @hoffie told me to in the original issue:
#456
https://github.com/jamulussoftware/jamuluswebsite/blob/translate3_8_0/wiki/en/en-Installation-for-Linux.md

You're right! - my bad.

This one I changed on purpose.

This is a problem. The established procedure if we want to make any changes to the text (content or structure) is that we first submit the change to the EN version so it can be replicated in all other languages. The purpose of this is to keep all language versions in sync. If we allow arbitrary changes in each language they run the risk of gradually drifting apart, making maintenance a nightmare. If the po4a workflow finally gets implemented there will be much less chance of drift, but for now, I would be grateful if you could change those docs to match the EN version, and submit a PR with your proposed changes for the EN version (to the 'changes' branch - preferably after the release, which should be happening soon).

ewarning · 2021-05-20T14:03:11Z

I would be grateful if you could change those docs to match the EN version

Okay, I’ll do that tonight.

ewarning · 2021-05-20T20:54:16Z

@ignotus666 It’s done, the structure from the original is there, althought I adapted the text to sound less redundant.

@hoffie Thanks for the hints, but as I do not know the commands neither have the time now to study them, I’m a little afraid to use them and do something wrong. If you or @Ignotus can download the files and close this PR would be great. I promise I’ll learn about it for the next time.

hoffie · 2021-05-20T21:04:41Z

Thanks for the hints, but as I do not know the commands neither have the time now to study them, I’m a little afraid to use them and do something wrong.

Ok. I'll take a look and update this PR.

…r473 git merge --strategy recursive --strategy-option ours remotes/upstream/translate3_8_0

hoffie · 2021-05-20T21:12:07Z

@ewarning I just did what I outlined in #473 (comment) and pushed the additional merge commit to your branch / this PR. Could you please have another look at the diff to check if

this PR still contains all of the changes you intended to do
does not contain any changes unrelated to yours?

You can also remove the Draft status when do you not plan any further changes.

Thanks so far! :)

Note to maintainers: We should squash-merge :)

ewarning · 2021-05-20T21:25:02Z

Hi @hoffie,
yes, all the changes in the diff are mine.
If the remove-Draft-feature is on the top corner left just below the title, that’s disabled for me.

hoffie · 2021-05-20T21:41:15Z

yes, all the changes in the diff are mine.

Thanks!

If the remove-Draft-feature is on the top corner left just below the title, that’s disabled for me.

Nah, that seems to be just the indicator, not a button. The relevant button is "Ready for review" directly above this comment field. I should have been clearer, it's a bit confusing. :)

ignotus666 · 2021-05-21T07:23:15Z

Thanks @ewarning!

ann0see

Great! Thank you. I've added some suggestions

ann0see · 2021-05-21T12:48:40Z

 ldjSlogan: "Musiziere online. Mit deinen Freunden. Kostenlos."
 ldjCreator: "Volker Fischer und Mitwirkende"
-metadescription: "Jamulus ist eine Open Source Software, die es Musikern erlaubt in Echtzeit über das Internet zu musizieren. Schau dir die offizielle Website an um mehr zu erfahren!"
+metadescription: "Jamulus ist eine Open Source Software, die das Musizieren in Echtzeit übers Internet ermöglicht. Schau dir die offizielle Website an um mehr zu erfahren!"


I think this change goes with "Style and tone" ;-).

ann0see · 2021-05-21T12:51:44Z

    <div itemprop="abstract">
      <h2>Was ist Jamulus?</h2>
-      Jamulus ist eine Software mit der du online musizieren, üben oder jammen kannst, mit Freunden, deiner Band oder jemandem, der gerade auch online ist. Mit hoher Klangqualität und niedriger Latenz ist es easy über eine normale Internetverbindung zusammen zu musizieren, aus der Ferne und im Takt. Schau dir an, wie <a href="wiki/Demos" target="_blank" rel="noreferrer">andere Menschen online Musik machen</a> - und <a href="wiki/Getting-Started" target="_blank" rel="noreferrer">lade Jamulus hier herunter</a>!
+      Jamulus ist eine Software mit der du online musizieren, üben oder jammen kannst, mit Freunden, deiner Band oder jemandem, der gerade auch online ist. Über eine normale Internetverbindung ist es einfach zusammen zu musizieren, mit hoher Klangqualität und niedriger Latenz, aus der Ferne und im Takt. Schau dir an, wie <a href="wiki/Demos" target="_blank" rel="noreferrer">andere Menschen online Musik machen</a> - und <a href="wiki/Getting-Started" target="_blank" rel="noreferrer">lade Jamulus hier herunter</a>!


Über eine normale Internetverbindung is probably the correct translation; however it sounds a bit strange to me.
Not yet sure what to write though.

I took it from the previous translation. I wouldn’t know how to better translate „Broadband connection“. Maybe
Mit einem DSL- oder Kabel-Internetanschluss...

Jamulus erlaubt es dir über deine normale Internetverbindung dank niedriger Latenz und hoher Tonqualität mit Menschen an unterschiedlichsten Orten im Takt zu spielen.

I know that's not even close to English, but I'm still not sure how close we need to be.

ann0see · 2021-05-21T12:52:18Z

    <h2>Willst du mithelfen?</h2>
    <p>
-      Ideen? Hast du einen Fehler gefunden? Willst du bei der Übersetzung oder Weiterentwicklung mithelfen? Da Jamulus <a href="https://www.gnu.org/philosophy/free-sw.de.html" target="_blank" rel="noreferrer" title="Was ist Freie Software?">Freie/Open Source Software</a> ist, die unter der <a href="http://www.gnu.org/licenses/gpl-2.0.de.html" title="GNU General Public License, version 2" target="_blank" rel="noreferrer">GPL</a> Lizenz steht, kannst du aktiv mitgestalten!
+      Ideen? Hast du einen Fehler gefunden? Willst du bei der Übersetzung oder Weiterentwicklung mithelfen? Da Jamulus eine <a href="https://www.gnu.org/philosophy/free-sw.de.html" target="_blank" rel="noreferrer" title="Was ist Freie Software?">Freie/Open Source Software</a> ist, die unter der <a href="http://www.gnu.org/licenses/gpl-2.0.de.html" title="GNU General Public License, version 2" target="_blank" rel="noreferrer">GPL</a> Lizenz steht, kannst du aktiv mitgestalten!


Are you sure about "eine Freie Software"?

I guess both of them are okay, but the article makes it sound more natural to my ears (it’s more clear to me if I hear without the Nebensatz)
Jamulus ist eine freie Software.
Jamulus ist freie Software.

Ok. You can choose ;-)

ann0see · 2021-05-21T12:58:48Z

 Wenn du ASIO4ALL nutzt, musst du möglicherweise ein bisschen herumprobieren, da jeder PC immer etwas anders ist.

-**Tipp:** Richte deine Soundkarte ein, wenn du [mit einem Server verbunden](Onboarding#2-verbindung-mit-einem-server-herstellen) bist. Das erleichtert dir das Setup, da du dann mit deinem Instrument oder deiner Stimme testen kannst, ob alles richtig eingestellt ist; aber lies erst einmal weiter.
+**Tipp:** Richte deine Soundkarte ein, während du [mit einem Server verbunden](Onboarding#2-verbindung-mit-einem-server-herstellen) bist. Das erleichtert dir das Setup, da du dann mit deinem Instrument oder deiner Stimme testen kannst, ob alles richtig eingestellt ist; aber lies erst einmal weiter.


Todo for english: This might result in Jamulus crashing.

ann0see · 2021-05-21T13:04:28Z

@Helondeth

it would be great if you also looked at this Pull request and review.

Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com>

ann0see

Thanks a lot for this tremendous amount of work! Added some more comments; I think it's soon ready to be merged?

ann0see · 2021-05-24T14:59:41Z

    <div itemprop="abstract">
      <h2>Was ist Jamulus?</h2>
-      Jamulus ist eine Software mit der du online musizieren, üben oder jammen kannst, mit Freunden, deiner Band oder jemandem, der gerade auch online ist. Mit hoher Klangqualität und niedriger Latenz ist es easy über eine normale Internetverbindung zusammen zu musizieren, aus der Ferne und im Takt. Schau dir an, wie <a href="wiki/Demos" target="_blank" rel="noreferrer">andere Menschen online Musik machen</a> - und <a href="wiki/Getting-Started" target="_blank" rel="noreferrer">lade Jamulus hier herunter</a>!
+      Jamulus ist eine Software mit der du online musizieren, üben oder jammen kannst, mit Freunden, deiner Band oder jemandem, der gerade auch online ist. Über eine normale Internetverbindung ist es einfach zusammen zu musizieren, mit hoher Klangqualität und niedriger Latenz, aus der Ferne und im Takt. Schau dir an, wie <a href="wiki/Demos" target="_blank" rel="noreferrer">andere Menschen online Musik machen</a> - und <a href="wiki/Getting-Started" target="_blank" rel="noreferrer">lade Jamulus hier herunter</a>!


Jamulus erlaubt es dir über deine normale Internetverbindung dank niedriger Latenz und hoher Tonqualität mit Menschen an unterschiedlichsten Orten im Takt zu spielen.

I know that's not even close to English, but I'm still not sure how close we need to be.

ann0see · 2021-05-24T14:59:58Z

    <h2>Willst du mithelfen?</h2>
    <p>
-      Ideen? Hast du einen Fehler gefunden? Willst du bei der Übersetzung oder Weiterentwicklung mithelfen? Da Jamulus <a href="https://www.gnu.org/philosophy/free-sw.de.html" target="_blank" rel="noreferrer" title="Was ist Freie Software?">Freie/Open Source Software</a> ist, die unter der <a href="http://www.gnu.org/licenses/gpl-2.0.de.html" title="GNU General Public License, version 2" target="_blank" rel="noreferrer">GPL</a> Lizenz steht, kannst du aktiv mitgestalten!
+      Ideen? Hast du einen Fehler gefunden? Willst du bei der Übersetzung oder Weiterentwicklung mithelfen? Da Jamulus eine <a href="https://www.gnu.org/philosophy/free-sw.de.html" target="_blank" rel="noreferrer" title="Was ist Freie Software?">Freie/Open Source Software</a> ist, die unter der <a href="http://www.gnu.org/licenses/gpl-2.0.de.html" title="GNU General Public License, version 2" target="_blank" rel="noreferrer">GPL</a> Lizenz steht, kannst du aktiv mitgestalten!


Ok. You can choose ;-)

ann0see · 2021-05-24T15:01:17Z

 ## ASIO

-Jamulus nutzt [ASIO](https://de.wikipedia.org/wiki/Audio_Stream_Input/Output), um die geringste Audiolatenz zu ermöglichen.
+Jamulus nutzt [ASIO](https://de.wikipedia.org/wiki/Audio_Stream_Input/Output), um mit der möglicht geringsten Audiolatenz zu arbeiten.


I'd rather prefer the old one since we don't want to focus on "work" here ;-).

ann0see · 2021-05-24T15:03:19Z

 1. **Eine kabelgebundene Internetverbindung** (kein WLAN - siehe [FAQ](/wiki/FAQ))
 1. **Kabelgebundene Kopfhörer (weder Bluetooth noch Lautsprecher** - siehe [FAQ](/wiki/FAQ))
-1. **Ein vernünftiges Audiointerface, Soundkarte und Mikrofon** ([siehe diese Auflistung](/kb/2021/01/05/Jamulus-Sound-Devices.html) für Beispiele)
+1. **Ein passendes Audiointerface oder Soundkarte und Mikrofon** ([siehe diese Auflistung](/kb/2021/01/05/Jamulus-Sound-Devices.html) für Beispiele)


I think this goes with style and tone: See #339 which is for english. But I think we can leave it like that for the moment.

ann0see · 2021-05-24T15:03:46Z

 </figure>

-Mindestens das Feld “Alias/Name” ausfüllen und dann das Fenster schließen.
+Fülle mindestens das Feld “Alias/Name” aus. Dann kannst du das Fenster schließen.


Yep. This sounds much better and less demanding ;-)

ann0see · 2021-05-24T15:05:41Z

+### Debian e Ubuntu
+
+1. Baixe o [pacote .deb atual]({{ site.download_root_link }}{{ site.download_file_names.deb-gui }})
+1. Atualize o apt: `sudo apt-get update`


Could you please check the English translation? I think this is not based on @gilgongo 's changes which were included later on. I think we'll have a process which is a lot simpler soon: jamulussoftware/jamulus#1725

It's based on the 'translate3_8_0' branch. Same for the DE file. @ewarning there were some edits made to this document that due to a confusion didn't get merged from 'changes' to 'translate'. It would be great if you could edit them to follow the 'changes' version of en-Installation-for-Linux.md. - it's not that much. But if it's too much hassle don't worry as they aren't major changes.

ann0see · 2021-05-26T07:56:44Z

I‘ll merge this now but think @ignotus666 comment is still valid.

ewarning added 27 commits May 6, 2021 22:54

Create de-Setup.md

9f04153

Update de-Setup.md

c971a8f

Update de-Setup.md

69fd74a

Update de-Setup.md

661d04a

Update de-Setup.md

4c95593

Create main-screen-default.png

6760597

Update de-Setup.md

377c0f5

Update de-Setup.md

9e64edd

Update de-Setup.md

31b27ed

Update de-Setup.md

15fbb4d

Update de-Setup.md

8341a91

Create verification-mac.png

bfd84c1

Update de-Installation-for-Macintosh.md

9cfc94b

Update 1-de-index.html

0c64137

Update de-Installation-for-Linux.md

adc7c71

Update de-Installation-for-Windows.md

c4ff011

Create 1-pt-index.html

4b31adb

Create pt-Setup.md

9a547f9

Update 1-pt-index.html

f7f8588

Update de-Setup.md

2d7dcfb

Update de-Installation-for-Macintosh.md

15ef209

Update 1-de-index.html

e997f8d

Create pt-Installation-for-Linux.md

c5f61f7

Create pt-Installation-for-Macintosh.md

affc20d

Update pt-Installation-for-Macintosh.md

801e26e

Create pt-Installation-for-Windows.md

3d3ce97

Update pt-Installation-for-Windows.md

66100b1

ewarning added 3 commits May 18, 2021 22:22

Update de-Setup.md

1bfa045

Update de-Installation-for-Windows.md

c75003a

Update de-Installation-for-Linux.md

c5bf4ed

ewarning added 2 commits May 20, 2021 22:49

Update de-Installation-for-Macintosh.md

ea874f9

Update pt-Installation-for-Macintosh.md

ab16272

Merge remote-tracking branch 'remotes/upstream/translate3_8_0' into p…

2b987d8

…r473 git merge --strategy recursive --strategy-option ours remotes/upstream/translate3_8_0

ewarning marked this pull request as ready for review May 20, 2021 21:45

ann0see reviewed May 21, 2021

View reviewed changes

ewarning and others added 6 commits May 21, 2021 17:27

Update wiki/de/de-Installation-for-Linux.md

c28bc43

Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com>

Update wiki/de/de-Installation-for-Linux.md

b7a02b4

Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com>

Update wiki/de/de-Setup.md

a663543

Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com>

Update wiki/de/de-Setup.md

f9b0cfe

Co-authored-by: ann0see <20726856+ann0see@users.noreply.github.com>

Update de-Setup.md

c8bb738

Update de-Installation-for-Windows.md

bccfd64

ann0see reviewed May 24, 2021

View reviewed changes

ann0see merged commit f4c357c into jamulussoftware:translate3_8_0 May 26, 2021

Conversation

ewarning commented May 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Fixes #456 Fixes #469

Uh oh!

ewarning commented May 11, 2021

Uh oh!

gilgongo commented May 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ewarning commented May 12, 2021

Uh oh!

ewarning commented May 18, 2021

Uh oh!

hoffie commented May 18, 2021

Uh oh!

ignotus666 commented May 20, 2021

Uh oh!

ewarning commented May 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ignotus666 commented May 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ewarning commented May 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ewarning commented May 20, 2021

Uh oh!

hoffie commented May 20, 2021

Uh oh!

hoffie commented May 20, 2021

Uh oh!

ewarning commented May 20, 2021

Uh oh!

hoffie commented May 20, 2021

Uh oh!

ignotus666 commented May 21, 2021

Uh oh!

ann0see left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ann0see commented May 21, 2021

Uh oh!

ann0see left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

ewarning commented May 11, 2021 •

edited

Loading

Fixes #456
Fixes #469

gilgongo commented May 12, 2021 •

edited

Loading

ewarning commented May 20, 2021 •

edited

Loading

ignotus666 commented May 20, 2021 •

edited

Loading

ewarning commented May 20, 2021 •

edited

Loading