jamulussoftware · ann0see · Sep 23, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
diff --git a/.github/workflows/add-lang.yml b/.github/workflows/add-lang.yml
@@ -7,7 +7,7 @@ jobs:
     permissions:
       contents: write
       issues: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.event.label.name == 'new language'
     steps:
 

diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
@@ -11,7 +11,7 @@ jobs:
   jekyll_site_ci:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ jobs:
   build_and_deploy_site:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
@@ -107,7 +107,7 @@ jobs:
     needs: build_and_deploy_site
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: ${{ github.sha }} update from release

diff --git a/1-ru-index.md b/1-ru-index.md
@@ -0,0 +1 @@
+wiki/ru/1-index.md
diff --git a/1-th-index.md b/1-th-index.md
@@ -0,0 +1 @@
+wiki/th/1-index.md
diff --git a/_config.yml b/_config.yml
@@ -2,9 +2,11 @@ plugins:
   - jekyll-paginate-v2
   - jekyll-polyglot
   - jekyll-minifier
-languages:                   ["en", "sv-SE", "zh-CN", "nb-NO", "ko-KR", "pt-BR", "pt-PT", "nl", "es", "de", "it", "fr"]
+languages:                   ["en", "ru", "th", "sv-SE", "zh-CN", "nb-NO", "ko-KR", "pt-BR", "pt-PT", "nl", "es", "de", "it", "fr"]
 default_lang:                "en"
 language_names:
+  ru: Русский
+  th: ไทย
   sv-SE: Svenska
   en: English
   zh-CN: 简体中文

diff --git a/_po4a-tools/po4a-create-all-targets.sh b/_po4a-tools/po4a-create-all-targets.sh
@@ -99,16 +99,17 @@ process_with_po4a () {
             THRESHOLD="$THRESH_VAL"
         fi
 
-        # Determine file format to be used
+        # Determine file format to be used and set options (configured as an array to allow adding an arbitrary number of them)
+        OPTION=()
         if [ $ext == yml ] ; then
             FILE_FORMAT=yaml
-            OPTION="skip_array"
+            OPTION=("skip_array")
         elif [[ $ext == html || "$filename" == *'-index' ]] ; then # '-index.md' has a markdown extension but is actually html and should be processed as such by po4a
             FILE_FORMAT=xml
-            OPTION="ontagerror=warn"
+            OPTION=("ontagerror=warn" "attributes=<img>src <img>alt")
         elif [ $ext == md ] ; then
             FILE_FORMAT=text
-            OPTION="markdown"
+            OPTION=("markdown")
         fi
 
         # Run po4a-translate and create target files
@@ -120,7 +121,7 @@ process_with_po4a () {
             --localized "$targ_doc" \
             --localized-charset "UTF-8" \
             --no-deprecation \
-            --option "$OPTION" \
+            "${OPTION[@]/#/--option=}" \
             --keep "$THRESHOLD"
 
         # Display message if translated file is created

diff --git a/_po4a-tools/po4a-update-templates.sh b/_po4a-tools/po4a-update-templates.sh
@@ -60,16 +60,17 @@ while IFS= read -r -d '' doc ; do
             echo creating "$po_file"
         fi
 
-        # Determine file format to be used
+        # Determine file format to be used and set options (configured as an array to allow adding an arbitrary number of them)
+        OPTION=()
         if [ $ext == yml ] ; then
             FILE_FORMAT=yaml
-            OPTION="skip_array"
+            OPTION=("skip_array")
         elif [[ $ext == html || "$filename" == *'-index' ]] ; then # '-index.md' has a markdown extension but is actually html and should be processed as such by po4a
             FILE_FORMAT=xml
-            OPTION="ontagerror=warn"
+            OPTION=("ontagerror=warn" "attributes=<img>src <img>alt")
         elif [ $ext == md ] ; then
             FILE_FORMAT=text
-            OPTION="markdown"
+            OPTION=("markdown")
         fi
 
         # Update/create .po files
@@ -80,7 +81,7 @@ while IFS= read -r -d '' doc ; do
             --msgmerge-opt  --no-wrap \
             --wrap-po newlines \
             --no-deprecation \
-            --option "$OPTION" \
+            "${OPTION[@]/#/--option=}" \
             --po "$po_file" ; then
         echo ''
         echo Error updating "$lang" PO file for: "$filename".$ext

diff --git a/_translator-files/po/de/1-index.po b/_translator-files/po/de/1-index.po
@@ -6,18 +6,19 @@
 # Victor Jouhoff <jouhoff@pm.me>, 2024.
 # nobkd <44443899+nobkd@users.noreply.github.com>, 2024.
 # Mia Kaanen <kaanen.mia@gmx.de>, 2024.
+# Umber Security <umber.secure@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2024-08-04 18:57+0000\n"
-"Last-Translator: ann0see <20726856+ann0see@users.noreply.github.com>\n"
+"PO-Revision-Date: 2025-04-19 13:41+0000\n"
+"Last-Translator: Umber Security <umber.secure@gmail.com>\n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7-dev\n"
+"X-Generator: Weblate 5.11.1-dev\n"
 
 #. type: Content of: outside any tag (error?)
 #: ../wiki/en/misc/1-index.md:1
@@ -70,6 +71,16 @@ msgstr "Was ist Jamulus?"
 msgid "Jamulus lets you play, rehearse, or jam with your friends, your band, or anyone you find online. Play together remotely in time with high quality, low-latency sound on a normal broadband connection. [Download it here!](wiki/Getting-Started)\n"
 msgstr "Jamulus ermöglicht es dir mit deinen Freunden, deiner Band oder jedem, den du online findest, zu spielen, zu proben oder gemeinsam zu musizieren. Spiele in Echtzeit zusammen mit hochwertigem Sound und geringer Latenz über eine normale Breitbandverbindung. [Lade es hier herunter!](wiki/Getting-Started)\n"
 
+#. type: Attribute 'src' of: <div><div><figure><a><img>
+#: ../wiki/en/misc/1-index.md:32
+msgid "{% include img/en-screenshots/main-screen-medium.inc %}"
+msgstr ""
+
+#. type: Attribute 'alt' of: <div><div><figure><a><img>
+#: ../wiki/en/misc/1-index.md:32
+msgid "A screenshot of the main mixer window showing five people from different countries connected."
+msgstr "Ein Bildschirm Foto von dem Haupt Mixer Fenster, welches fünf Leute aus verschiedenen Ländern verbunden zeigt."
+
 #. type: Content of: <div><div><figure><figcaption>
 #: ../wiki/en/misc/1-index.md:34
 #, no-wrap

diff --git a/_translator-files/po/de/Client-Troubleshooting.po b/_translator-files/po/de/Client-Troubleshooting.po
@@ -174,7 +174,9 @@ msgstr "Wie genau du vermeidest, dass du dein direktes Signal hörst, hängt von
 
 #. type: Plain text
 #: ../wiki/en/Client-Troubleshooting.md:50
-msgid "Be aware that while listening to the Server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the \"Delay\" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this."
+#, fuzzy
+#| msgid "Be aware that while listening to the Server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the \"Delay\" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this."
+msgid "Be aware that while listening to the Server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the \"Delay\" light in Jamulus) is not green or at least yellow most of the time. Consult the [User Manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this."
 msgstr "Beachte dass das Abhören des Serversignals zwar sicherstellt, dass du mit den anderen Musikern synchron bist, dass es aber auch zu Problemen kommen kann, wenn die Gesamtlatenz (angezeigt durch die „Verzögerung“-Lampe in Jamulus) die meiste Zeit über nicht grün oder zumindest gelb ist. Lies das [Software-Handbuch](/wiki/Software-Manual), um zu erfahren, wie du dein Setup in diesem Fall anpassen kannst."
 
 #. type: Title ###
@@ -342,7 +344,9 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Client-Troubleshooting.md:108
-msgid "For anything else, please search or post on the [Discussion Forums](https://github.com/jamulussoftware/jamulus/discussions)"
+#, fuzzy
+#| msgid "For anything else, please search or post on the [Discussion Forums](https://github.com/jamulussoftware/jamulus/discussions)"
+msgid "For anything else, please search or post on the [Discussion Forums](https://github.com/orgs/jamulussoftware/discussions)"
 msgstr "Für alles andere suche bitte im [Forum](https://github.com/jamulussoftware/jamulus/discussions) oder poste dort deine Frage"
 
 #, no-wrap

diff --git a/_translator-files/po/de/Getting-Started.po b/_translator-files/po/de/Getting-Started.po
@@ -256,7 +256,9 @@ msgstr "Während du online bist, kannst du die Chat Funktion nutzen, um eine Nac
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:88
-msgid "More information about using Jamulus can be found in the [Software Manual](/wiki/Software-Manual)."
+#, fuzzy
+#| msgid "More information about using Jamulus can be found in the [Software Manual](/wiki/Software-Manual)."
+msgid "More information about using Jamulus can be found in the [User Manual](/wiki/Software-Manual)."
 msgstr "Weitere Informationen zur Verwendung von Jamulus findest du im [Software Handbuch](/wiki/Software-Manual)."
 
 #. type: Title ##

diff --git a/_translator-files/po/de/Include-Client-Commands.po b/_translator-files/po/de/Include-Client-Commands.po
@@ -37,7 +37,9 @@ msgstr "`-j` oder `--nojackconnect` Nicht automatisch mit JACK verbinden"
 
 #. type: Bullet: '-  '
 #: ../wiki/en/Include-Client-Commands.md:6
-msgid "`--ctrlmidich` MIDI controller channel to listen on, control number offset and consecutive CC numbers (channels) and Mute Myself CC number. Format: `channel[;f*][;p*][;s*][;m*][;o]` See [Tips & Tricks](Tips-Tricks-More#using-ctrlmidich-for-midi-controllers)"
+#, fuzzy
+#| msgid "`--ctrlmidich` MIDI controller channel to listen on, control number offset and consecutive CC numbers (channels) and Mute Myself CC number. Format: `channel[;f*][;p*][;s*][;m*][;o]` See [Tips & Tricks](Tips-Tricks-More#using-ctrlmidich-for-midi-controllers)"
+msgid "`--ctrlmidich` MIDI channel to listen on, Jamulus control + MIDI control number and count of consecutive CC numbers (or Jamulus channels), device selection option. Format: `channel[;fn[*n]][;pn[*n]][;sn[*n]][;mn[*n]][;on][;dDeviceName]` See [Tips & Tricks](Tips-Tricks-More#using---ctrlmidich-for-midi-controllers)."
 msgstr "`--ctrlmidich` MIDI-Controller-Kanal, der genutzt werden soll, Offset der Kontrollnummer und fortlaufende CC-Nummern (Kanäle) und Stummschalten CC-Nummer. Format: `kanal[;f*][;p*][;s*][;m*][;o]` Siehe [Tipps & Tricks](Tips-Tricks-More#ctrlmidich-für-midi-controller-verwenden)"
 
 #. type: Bullet: '- '

diff --git a/_translator-files/po/de/Installation-for-Macintosh.po b/_translator-files/po/de/Installation-for-Macintosh.po
@@ -64,9 +64,14 @@ msgstr "Updatest du? Es macht Sinn die [Konfiguration](Software-Manual#sicherung
 
 #. type: Plain text
 #: ../wiki/en/Installation-for-Macintosh.md:22
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. [Download Jamulus (Universal build)]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\\\\n"
+#| " **Mirror 2:** [SourceForge](https://sourceforge.net/projects/llcon/files/latest/download)\n"
+#| "1. **Install Jamulus**: Open the downloaded `.dmg` file, agree to the licence, *drag and drop* each icon you see in the window (Jamulus Client and Server) into your *Applications folder*. After that, you can close this window.\n"
+#| "1. **Run Jamulus**. Now you should be able to use Jamulus just like any other application.\n"
 msgid ""
-"1. [Download Jamulus (Universal build)]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\\\\n"
+"1. [Download Jamulus]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\\\\n"
 " **Mirror 2:** [SourceForge](https://sourceforge.net/projects/llcon/files/latest/download)\n"
 "1. **Install Jamulus**: Open the downloaded `.dmg` file, agree to the licence, *drag and drop* each icon you see in the window (Jamulus Client and Server) into your *Applications folder*. After that, you can close this window.\n"
 "1. **Run Jamulus**. Now you should be able to use Jamulus just like any other application.\n"