Skip to content

Commit

Permalink
Maintenance: Replace occurances of master with main
Browse files Browse the repository at this point in the history
  • Loading branch information
ann0see committed Dec 26, 2022
1 parent 3469b4d commit 339ac82
Show file tree
Hide file tree
Showing 74 changed files with 135 additions and 135 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

## Checklist
<!-- Please tick the check boxes when done by replacing the space by an x, e.g. [x]. -->
- [ ] I've verified that this Pull Request follows the [general code principles](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md#jamulus-projectsource-code-general-principles)
- [ ] I've verified that this Pull Request follows the [general code principles](https://github.com/jamulussoftware/jamulus/blob/main/CONTRIBUTING.md#jamulus-projectsource-code-general-principles)
- [ ] I waited some time after this Pull Request was opened and all GitHub checks completed without errors. <!-- GitHub doesn't run these checks for new contributors automatically. -->
- [ ] I'm sure that this Pull Request goes to the correct branch
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./_site
# if the repo you are deploying to is <username>.github.io, uncomment the line below.
# if you are including the line below, make sure your source files are NOT in the master branch:
# publish_branch: master
# if you are including the line below, make sure your source files are NOT in the main branch:
# publish_branch: main

sync-branch:
needs: build_and_deploy_site
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is the content repository for [jamulus.io](https://jamulus.io). Text appear
<img src="https://hosted.weblate.org/widgets/jamulus/-/multi-auto.svg" alt="Translation status" />
</a>

The Jamulus application and website are translated using [Weblate](https://hosted.weblate.org/engage/jamulus/), where you can check the status of each separate file. If you would like to help with translations, before you start, please read the instructions for [translating the website](https://github.com/jamulussoftware/jamuluswebsite/tree/release/_translator-files) or the [Jamulus application](https://github.com/jamulussoftware/jamulus/blob/master/docs/TRANSLATING.md).
The Jamulus application and website are translated using [Weblate](https://hosted.weblate.org/engage/jamulus/), where you can check the status of each separate file. If you would like to help with translations, before you start, please read the instructions for [translating the website](https://github.com/jamulussoftware/jamuluswebsite/tree/release/_translator-files) or the [Jamulus application](https://github.com/jamulussoftware/jamulus/blob/main/docs/TRANSLATING.md).

Introduce yourself on the [GitHub Discussions](https://github.com/jamulussoftware/jamulus/discussions) and tell us what you’d like to do.

Expand Down
2 changes: 1 addition & 1 deletion _posts/2020-03-28-Server-Rpi.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ _Jamulus has been tested on a Raspberry Pi 4 2Gb by Jamulus user [SIVA Frédéri

1. Edit [config.txt](https://www.raspberrypi.org/documentation/configuration/config-txt/) to enable boot without HDMI by adding `hdmi_force_hotplug=0`

1. [Compile Jamulus for Linux](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md)
1. [Compile Jamulus for Linux](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md)

This will build Jamulus and put it in `/usr/local/bin/Jamulus` (note the capital `J`).

Expand Down
4 changes: 2 additions & 2 deletions _translator-files/po/de/Contribution.po
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ msgstr "## Möchtest du Code beitragen?"

#. type: Plain text
#: ../wiki/en/Contribution.md:19
msgid "See our [guidelines for getting involved in development](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md)."
msgstr "Siehe unsere [Leitlinien für die Beteiligung an der Entwicklung](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md)."
msgid "See our [guidelines for getting involved in development](https://github.com/jamulussoftware/jamulus/blob/main/CONTRIBUTING.md)."
msgstr "Siehe unsere [Leitlinien für die Beteiligung an der Entwicklung](https://github.com/jamulussoftware/jamulus/blob/main/CONTRIBUTING.md)."
4 changes: 2 additions & 2 deletions _translator-files/po/de/Include-Shared-Commands.po
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ msgstr "`-p` oder `--port` Legt die lokale UDP-Portnummer fest. Standa
#. type: Plain text
#: ../wiki/en/Include-Shared-Commands.md:9
#, no-wrap
msgid "`--jsonrpcport` Enables JSON-RPC API server to control the app, set TCP port number (EXPERIMENTAL, APIs might change; only accessible from localhost). Please see [the JSON-RPC API Documentation file](https://github.com/jamulussoftware/jamulus/blob/master/docs/JSON-RPC.md).\n"
msgstr "`--jsonrpcport` Ermöglicht die Steuerung der App durch den JSON-RPC-API-Server, setzt die TCP-Portnummer (EXPERIMENTAL, APIs können sich ändern; nur von localhost aus zugänglich). Siehe [die JSON-RPC-API-Dokumentationsdatei](https://github.com/jamulussoftware/jamulus/blob/master/docs/JSON-RPC.md).\n"
msgid "`--jsonrpcport` Enables JSON-RPC API server to control the app, set TCP port number (EXPERIMENTAL, APIs might change; only accessible from localhost). Please see [the JSON-RPC API Documentation file](https://github.com/jamulussoftware/jamulus/blob/main/docs/JSON-RPC.md).\n"
msgstr "`--jsonrpcport` Ermöglicht die Steuerung der App durch den JSON-RPC-API-Server, setzt die TCP-Portnummer (EXPERIMENTAL, APIs können sich ändern; nur von localhost aus zugänglich). Siehe [die JSON-RPC-API-Dokumentationsdatei](https://github.com/jamulussoftware/jamulus/blob/main/docs/JSON-RPC.md).\n"

#. type: Plain text
#: ../wiki/en/Include-Shared-Commands.md:10
Expand Down
4 changes: 2 additions & 2 deletions _translator-files/po/de/Installation-for-Linux.po
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ msgstr "### Andere Distributionen"

#. type: Plain text
#: ../wiki/en/Installation-for-Linux.md:43
msgid "For installers on other distributions, see their package managers and [Repology](https://repology.org/project/jamulus/versions). If an up-to-date version of Jamulus is not included in your distribution, you can [compile Jamulus from source](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md). Note also the contributed [installation scripts](https://github.com/jamulussoftware/installscripts)."
msgstr "Für Installer auf anderen Distributionen, durchsuche die Paketverwaltung und [Repology](https://repology.org/project/jamulus/versions). Wenn keine aktuelle Jamulus version in deiner Distribution enthalten ist, kannst du [Jamulus kompilieren](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md). Du kannst auch die inoffiziellen [Installationsskripte](https://github.com/jamulussoftware/installscripts) nutzen."
msgid "For installers on other distributions, see their package managers and [Repology](https://repology.org/project/jamulus/versions). If an up-to-date version of Jamulus is not included in your distribution, you can [compile Jamulus from source](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md). Note also the contributed [installation scripts](https://github.com/jamulussoftware/installscripts)."
msgstr "Für Installer auf anderen Distributionen, durchsuche die Paketverwaltung und [Repology](https://repology.org/project/jamulus/versions). Wenn keine aktuelle Jamulus version in deiner Distribution enthalten ist, kannst du [Jamulus kompilieren](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md). Du kannst auch die inoffiziellen [Installationsskripte](https://github.com/jamulussoftware/installscripts) nutzen."

#. type: Plain text
#: ../wiki/en/Installation-for-Linux.md:45
Expand Down
8 changes: 4 additions & 4 deletions _translator-files/po/de/Installation-for-iOS.po
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ msgstr "Nach 7 Tagen musst du dich erneut bei Jamulus anmelden, wenn du ein kost

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:37
msgid "If you own a Mac and have Xcode installed, compiling Jamulus from source might be another, more native option. Please have a look at the [compilation instructions for iOS](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md#ios)."
msgstr "Wenn du einen Mac besitzt und Xcode installiert hast, könnte die Kompilierung von Jamulus aus dem Quellcode eine andere, nativere Option sein. Bitte werfe einen Blick auf die [Kompilierungsanleitung für iOS](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md#ios)."
msgid "If you own a Mac and have Xcode installed, compiling Jamulus from source might be another, more native option. Please have a look at the [compilation instructions for iOS](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md#ios)."
msgstr "Wenn du einen Mac besitzt und Xcode installiert hast, könnte die Kompilierung von Jamulus aus dem Quellcode eine andere, nativere Option sein. Bitte werfe einen Blick auf die [Kompilierungsanleitung für iOS](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md#ios)."

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:40
Expand All @@ -138,8 +138,8 @@ msgstr "Die iOS-Unterstützung ist noch nicht ausgereift und noch lange nicht be

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:45
msgid "Please also read the [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/master/APPLEAPPSTORE.LICENCE.WAIVER) concerning Jamulus being published via the Apple AppStore."
msgstr "Bitte lese auch die [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/master/APPLEAPPSTORE.LICENCE.WAIVER) bezüglich der Veröffentlichung von Jamulus über den Apple AppStore."
msgid "Please also read the [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/main/APPLEAPPSTORE.LICENCE.WAIVER) concerning Jamulus being published via the Apple AppStore."
msgstr "Bitte lese auch die [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/main/APPLEAPPSTORE.LICENCE.WAIVER) bezüglich der Veröffentlichung von Jamulus über den Apple AppStore."

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:47
Expand Down
2 changes: 1 addition & 1 deletion _translator-files/po/de/general.po
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ msgstr "Eine Software von <a href=\"https://github.com/corrados\" target=\"_blan
#. type: Hash Value: infobox_each_os
#: ../wiki/en/misc/general.yml:0
#, no-wrap
msgid "Jamulus 3.9.1 addresses a MIDI controller-related bug that could result in the loss of old fader levels: If you used `--ctrlmidich`, you can start the app once with `--cleanuplegacyfadersettings` to try to convert the old format to the new one. This option will be removed in a future release. Read the <a href=\"https://github.com/jamulussoftware/jamulus/blob/master/ChangeLog\">Change Log</a> for more information."
msgid "Jamulus 3.9.1 addresses a MIDI controller-related bug that could result in the loss of old fader levels: If you used `--ctrlmidich`, you can start the app once with `--cleanuplegacyfadersettings` to try to convert the old format to the new one. This option will be removed in a future release. Read the <a href=\"https://github.com/jamulussoftware/jamulus/blob/main/ChangeLog\">Change Log</a> for more information."
msgstr ""

#. type: Hash Value: kb by
Expand Down
4 changes: 2 additions & 2 deletions _translator-files/po/es/Contribution.po
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ msgstr "## ¿Quieres contribuir código?"

#. type: Plain text
#: ../wiki/en/Contribution.md:19
msgid "See our [guidelines for getting involved in development](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md)."
msgstr "Consulta nuestras [directrices para involucrarte en el desarrollo](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md)."
msgid "See our [guidelines for getting involved in development](https://github.com/jamulussoftware/jamulus/blob/main/CONTRIBUTING.md)."
msgstr "Consulta nuestras [directrices para involucrarte en el desarrollo](https://github.com/jamulussoftware/jamulus/blob/main/CONTRIBUTING.md)."
4 changes: 2 additions & 2 deletions _translator-files/po/es/Include-Shared-Commands.po
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ msgstr "`-p` o `--port` Establece el número de puerto UDP local. Por
#. type: Plain text
#: ../wiki/en/Include-Shared-Commands.md:9
#, no-wrap
msgid "`--jsonrpcport` Enables JSON-RPC API server to control the app, set TCP port number (EXPERIMENTAL, APIs might change; only accessible from localhost). Please see [the JSON-RPC API Documentation file](https://github.com/jamulussoftware/jamulus/blob/master/docs/JSON-RPC.md).\n"
msgstr "`--jsonrpcport` Activa el servidor JSON-RPC API para controlar la aplicación, establecer número de puerto TCP (EXPERIMENTAL, las APIs pueden cambiar; solo accesible desde localhost). Por favor ver [la documentación sobre JSON-RPC API](https://github.com/jamulussoftware/jamulus/blob/master/docs/JSON-RPC.md).\n"
msgid "`--jsonrpcport` Enables JSON-RPC API server to control the app, set TCP port number (EXPERIMENTAL, APIs might change; only accessible from localhost). Please see [the JSON-RPC API Documentation file](https://github.com/jamulussoftware/jamulus/blob/main/docs/JSON-RPC.md).\n"
msgstr "`--jsonrpcport` Activa el servidor JSON-RPC API para controlar la aplicación, establecer número de puerto TCP (EXPERIMENTAL, las APIs pueden cambiar; solo accesible desde localhost). Por favor ver [la documentación sobre JSON-RPC API](https://github.com/jamulussoftware/jamulus/blob/main/docs/JSON-RPC.md).\n"

#. type: Plain text
#: ../wiki/en/Include-Shared-Commands.md:10
Expand Down
4 changes: 2 additions & 2 deletions _translator-files/po/es/Installation-for-Linux.po
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ msgstr "### Otras distribuciones"

#. type: Plain text
#: ../wiki/en/Installation-for-Linux.md:43
msgid "For installers on other distributions, see their package managers and [Repology](https://repology.org/project/jamulus/versions). If an up-to-date version of Jamulus is not included in your distribution, you can [compile Jamulus from source](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md). Note also the contributed [installation scripts](https://github.com/jamulussoftware/installscripts)."
msgstr "Para instaladores en otras distribuciones, consulta sus gestores de paquetes y [Repology](https://repology.org/project/jamulus/versions). Si tu distribución no incluye una versión actualizada de Jamulus, puedes [compilar Jamulus de las fuentes](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md). También se han contribuido [scripts de instalación](https://github.com/jamulussoftware/installscripts)."
msgid "For installers on other distributions, see their package managers and [Repology](https://repology.org/project/jamulus/versions). If an up-to-date version of Jamulus is not included in your distribution, you can [compile Jamulus from source](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md). Note also the contributed [installation scripts](https://github.com/jamulussoftware/installscripts)."
msgstr "Para instaladores en otras distribuciones, consulta sus gestores de paquetes y [Repology](https://repology.org/project/jamulus/versions). Si tu distribución no incluye una versión actualizada de Jamulus, puedes [compilar Jamulus de las fuentes](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md). También se han contribuido [scripts de instalación](https://github.com/jamulussoftware/installscripts)."

#. type: Plain text
#: ../wiki/en/Installation-for-Linux.md:45
Expand Down
8 changes: 4 additions & 4 deletions _translator-files/po/es/Installation-for-iOS.po
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ msgstr "Tras 7 días tendrás que volver a firmar Jamulus si utilizas una cuenta

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:37
msgid "If you own a Mac and have Xcode installed, compiling Jamulus from source might be another, more native option. Please have a look at the [compilation instructions for iOS](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md#ios)."
msgstr "Si tienes un Mac y Xcode instalado, compilar Jamulus de las fuentes puede ser una opción más nativa. Consulta [las instrucciones de compilación en iOS](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md#ios)."
msgid "If you own a Mac and have Xcode installed, compiling Jamulus from source might be another, more native option. Please have a look at the [compilation instructions for iOS](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md#ios)."
msgstr "Si tienes un Mac y Xcode instalado, compilar Jamulus de las fuentes puede ser una opción más nativa. Consulta [las instrucciones de compilación en iOS](https://github.com/jamulussoftware/jamulus/blob/main/COMPILING.md#ios)."

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:40
Expand All @@ -137,8 +137,8 @@ msgstr "El soporte para iOS aún no está maduro y lejos de estar listo para su

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:45
msgid "Please also read the [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/master/APPLEAPPSTORE.LICENCE.WAIVER) concerning Jamulus being published via the Apple AppStore."
msgstr "Por favor, también lee el siguiente documento [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/master/APPLEAPPSTORE.LICENCE.WAIVER) sobre la publicación de Jamulus en la AppStore de Apple."
msgid "Please also read the [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/main/APPLEAPPSTORE.LICENCE.WAIVER) concerning Jamulus being published via the Apple AppStore."
msgstr "Por favor, también lee el siguiente documento [APPLEAPPSTORE.LICENCE.WAIVER](https://github.com/jamulussoftware/jamulus/blob/main/APPLEAPPSTORE.LICENCE.WAIVER) sobre la publicación de Jamulus en la AppStore de Apple."

#. type: Plain text
#: ../wiki/en/Installation-for-iOS.md:47
Expand Down
4 changes: 2 additions & 2 deletions _translator-files/po/es/general.po
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ msgstr "Software de <a href=\"https://github.com/corrados\" target=\"_blank\" re
#. type: Hash Value: infobox_each_os
#: ../wiki/en/misc/general.yml:0
#, no-wrap
msgid "Jamulus 3.9.1 addresses a MIDI controller-related bug that could result in the loss of old fader levels: If you used `--ctrlmidich`, you can start the app once with `--cleanuplegacyfadersettings` to try to convert the old format to the new one. This option will be removed in a future release. Read the <a href=\"https://github.com/jamulussoftware/jamulus/blob/master/ChangeLog\">Change Log</a> for more information."
msgstr "Jamulus 3.9.1 soluciona un problema asociado a los controladores MIDI que podría resultar en la pérdida de los niveles previos de los faders: Si utilizas `--ctrlmidich`, puedes arrancar la aplicación una vez con `--cleanuplegacyfadersettings` para tratar de convertir el viejo formato al nuevo. Esta opción será eliminada en una versión próxima. Lee el <a href=\"https://github.com/jamulussoftware/jamulus/blob/master/ChangeLog\">Change Log</a> para más información."
msgid "Jamulus 3.9.1 addresses a MIDI controller-related bug that could result in the loss of old fader levels: If you used `--ctrlmidich`, you can start the app once with `--cleanuplegacyfadersettings` to try to convert the old format to the new one. This option will be removed in a future release. Read the <a href=\"https://github.com/jamulussoftware/jamulus/blob/main/ChangeLog\">Change Log</a> for more information."
msgstr "Jamulus 3.9.1 soluciona un problema asociado a los controladores MIDI que podría resultar en la pérdida de los niveles previos de los faders: Si utilizas `--ctrlmidich`, puedes arrancar la aplicación una vez con `--cleanuplegacyfadersettings` para tratar de convertir el viejo formato al nuevo. Esta opción será eliminada en una versión próxima. Lee el <a href=\"https://github.com/jamulussoftware/jamulus/blob/main/ChangeLog\">Change Log</a> para más información."

#. type: Hash Value: kb by
#: ../wiki/en/misc/general.yml:0
Expand Down
4 changes: 2 additions & 2 deletions _translator-files/po/fr/Contribution.po
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ msgstr "## Vous voulez contribuer au code ?"

#. type: Plain text
#: ../wiki/en/Contribution.md:19
msgid "See our [guidelines for getting involved in development](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md)."
msgstr "Consultez nos [directives pour participer au développement](https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md) (en anglais)."
msgid "See our [guidelines for getting involved in development](https://github.com/jamulussoftware/jamulus/blob/main/CONTRIBUTING.md)."
msgstr "Consultez nos [directives pour participer au développement](https://github.com/jamulussoftware/jamulus/blob/main/CONTRIBUTING.md) (en anglais)."
Loading

0 comments on commit 339ac82

Please sign in to comment.