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

Landing page language reworked #843

Closed
wants to merge 77 commits into from
Closed
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
1de8615
Merge release into next-release
github-actions[bot] Jul 30, 2022
5f0b40a
Merge release into next-release
github-actions[bot] Jul 30, 2022
20a51a5
Merge release into next-release
github-actions[bot] Jul 30, 2022
025128d
Make recording toggle name consistent
ann0see Jul 30, 2022
d3122de
AUTO: Updated .po files
github-actions[bot] Jul 30, 2022
2d0e52d
Merge release into next-release
github-actions[bot] Aug 3, 2022
621df5b
Merge release into next-release
github-actions[bot] Aug 5, 2022
e538d41
Merge release into next-release
github-actions[bot] Aug 5, 2022
66a6e82
Merge release into next-release
github-actions[bot] Aug 5, 2022
e165bf3
Merge release into next-release
github-actions[bot] Aug 5, 2022
6a149cb
AUTO: Add new language: (pt_BR) #802
github-actions[bot] Aug 8, 2022
314808b
Merge release into next-release
github-actions[bot] Aug 9, 2022
eec000f
Repair corrections of various terms (#792)
gilgongo Aug 14, 2022
778a9f8
AUTO: Updated .po files
github-actions[bot] Aug 14, 2022
a97144e
Merge release into next-release
github-actions[bot] Aug 14, 2022
0fa2fad
Translations update from Hosted Weblate (#803)
weblate Aug 22, 2022
9ccb103
Document changes after r3.9.0
ann0see Aug 22, 2022
dc99361
Document JSON-RPC on privacy site
ann0see Jul 30, 2022
b135821
Privacy: Added disclaimer to only apply on website version
ann0see Aug 22, 2022
e7a5ce7
Update wiki/en/Privacy-Statement.md
ann0see Sep 1, 2022
9dd0a0a
AUTO: Updated .po files
github-actions[bot] Sep 1, 2022
3802a5a
Translated using Weblate (French)
trebmuh Sep 1, 2022
190ae42
Translated using Weblate (Spanish)
ignotus666 Sep 1, 2022
7b4c169
Translated using Weblate (French)
jujudusud Sep 1, 2022
236d64b
CLI: Rephrase recording options
ann0see Sep 1, 2022
87e8dea
AUTO: Updated .po files
github-actions[bot] Sep 1, 2022
e78204c
Mac: Link universal build
ann0see Aug 28, 2022
4c5380c
AUTO: Updated .po files
github-actions[bot] Sep 3, 2022
bb1100e
Unify headless Linux package and binary
ann0see Aug 29, 2022
c26f6b3
Use configured Directory Public IP for Client when hole-punching
pljones Sep 7, 2022
69a9524
AUTO: Updated .po files
github-actions[bot] Sep 7, 2022
9829fb5
Remove references to 'footertext'
ignotus666 Sep 12, 2022
6f427bc
Style: Make TOC background darker in darkmode.
ann0see Sep 13, 2022
53a25f8
Remove obsolete files
ignotus666 Sep 12, 2022
c5a868a
Translations update from Hosted Weblate (#811)
weblate Sep 18, 2022
4519878
Remove potentially sensitive E-Mail exposure
ann0see Sep 18, 2022
818305c
Merge remote-tracking branch 'upstream/release' into HEAD
ann0see Sep 18, 2022
414fdc8
Fix string
ann0see Sep 18, 2022
4ba8399
Trigger .po file creation (#823)
ann0see Sep 18, 2022
85c02a1
AUTO: Updated .po files
github-actions[bot] Sep 18, 2022
cd5e395
--ctrlmidich fix does affect sort by name
pljones Sep 21, 2022
efc79c6
Update "serverinfo"
pljones Sep 21, 2022
caf92ea
Merge pull request #825 from pljones/feature/two-letter-iso-codes
pljones Sep 25, 2022
ffd2643
AUTO: Updated .po files
github-actions[bot] Sep 25, 2022
4d3ccb1
Merge branch 'release' into next-release
ann0see Sep 27, 2022
ec2c9f5
AUTO: Updated .po files
github-actions[bot] Sep 27, 2022
ae7251b
Update translation files
weblate Sep 27, 2022
4c9738e
Update translation files
weblate Sep 27, 2022
fce8c16
Merge pull request #832 from weblate/weblate-jamulus-1-index
ann0see Sep 28, 2022
e2170a4
Merge pull request #826 from pljones/tips-tricks-ctrlmidich
pljones Sep 28, 2022
ff37f69
AUTO: Updated .po files
github-actions[bot] Sep 28, 2022
a12e990
Update translation files
weblate Oct 1, 2022
a73bb20
Update translation files
weblate Oct 1, 2022
9a0e0ec
Rephrase meta description (#835)
mcfnord Oct 1, 2022
ab2875f
AUTO: Updated .po files
github-actions[bot] Oct 1, 2022
f5c30f2
Merge release into next-release
github-actions[bot] Oct 1, 2022
62d43a5
Remove old reference to setup page
ann0see Oct 1, 2022
c728345
Merge pull request #836 from ann0see/fix/renameGettingStarted
ann0see Oct 2, 2022
c8239d1
AUTO: Updated .po files
github-actions[bot] Oct 2, 2022
4bf5d66
Merge pull request #833 from weblate/weblate-jamulus-1-index
ann0see Oct 2, 2022
cd93ff5
Merge release into next-release
github-actions[bot] Oct 2, 2022
dafacf3
Landing page language reworked
comradekingu Oct 8, 2022
33190aa
"Mac" → "macOS"
comradekingu Oct 8, 2022
607d099
"&" → "and"
comradekingu Oct 8, 2022
7ec8292
Shortened headlines
comradekingu Oct 8, 2022
3f2e3d1
Document arm64 .deb files
ann0see Oct 7, 2022
801d6c0
Remove separate macOS ARM version
ann0see Oct 8, 2022
279bee8
Merge pull request #842 from ann0see/documentARM64
ann0see Oct 8, 2022
00fe7c2
AUTO: Updated .po files
github-actions[bot] Oct 8, 2022
8048223
Merge branch 'next-release' into patch-1
comradekingu Oct 10, 2022
8b94c68
</a> good idea
comradekingu Nov 27, 2022
d3efde2
Update wiki/en/misc/1-index.html
gilgongo Nov 28, 2022
4b91468
Update wiki/en/misc/1-index.html
gilgongo Nov 28, 2022
0392855
Update wiki/en/misc/1-index.html
gilgongo Nov 28, 2022
a1a96d3
Update wiki/en/misc/1-index.html
gilgongo Nov 28, 2022
8585c74
Update wiki/en/misc/1-index.html
gilgongo Nov 28, 2022
15d1b4b
No HTML in metadesc
comradekingu Nov 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 1-pt_BR-index.html
9 changes: 5 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ plugins:
- jekyll-paginate-v2
- jekyll-polyglot
- jekyll-minifier
languages: ["en", "nl", "es", "de", "it", "fr", "pt"]
languages: ["en", "pt_BR", "nl", "es", "de", "it", "fr", "pt"]
default_lang: "en"
exclude_from_localization: ["assets", "images", "css", "README.md", "manifest.json", "humans.txt", "sitemap.xml", "robots.txt", "404.html", "CNAME", "LICENSE.md"]
parallel_localization: true
@@ -12,13 +12,14 @@ a_rootpage: "https://jamulus.io"
download_root_link: "https://github.com/jamulussoftware/jamulus/releases/download/r3_9_0/"
download_file_names:
deb-gui: "jamulus_3.9.0_ubuntu_amd64.deb"
deb-headless: "jamulus_headless_3.9.0_ubuntu_amd64.deb"
deb-headless: "jamulus-headless_3.9.0_ubuntu_amd64.deb"
deb-gui-armhf: "jamulus_3.9.0_ubuntu_armhf.deb"
deb-headless-armhf: "jamulus_headless_3.9.0_ubuntu_armhf.deb"
deb-headless-armhf: "jamulus-headless_3.9.0_ubuntu_armhf.deb"
deb-gui-arm64: "jamulus_3.9.0_ubuntu_arm64.deb"
deb-headless-arm64: "jamulus-headless_3.9.0_ubuntu_arm64.deb"
windows: "jamulus_3.9.0_win.exe"
windows-jack: "jamulus_3.9.0_win_jack.exe"
mac: "jamulus_3.9.0_mac.dmg"
mac-arm: "jamulus_3.9.0_mac_arm64.dmg"
mac-legacy: "jamulus_3.9.0_mac_legacy.dmg"
android: "jamulus_3.9.0_android.apk"
ios: "jamulus_3.9.0_iOSUnsigned.ipa"
2 changes: 1 addition & 1 deletion _layouts/mainhomepage.html
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ <h1>Jamulus</h1>
<a href="wiki/Getting-Started" id="get_started_btn_top">{{ page.mTGetStartedNow }}</a>
</div>
<div class="fx-col-100-xs" id="quick_dl_container">
{{ page.mTDownloadNow }} <a href="{{ site.download_root_link }}{{ site.download_file_names.windows }}" target="_blank" rel="noreferrer" class="os-win">Windows</a>, <a href="{{ site.download_root_link }}{{ site.download_file_names.mac }}" target="_blank" rel="noreferrer" class="os-mac">Mac</a>, <a href="{{ site.download_root_link }}{{ site.download_file_names.deb-gui }}" target="_blank" rel="noreferrer" class="os-deb">Debian/Ubuntu</a> &amp; <a href="{{ site.download_overview_link }}" target="_blank" rel="noreferrer" class="os-other">{{ page.mTOtherPlatforms }}</a>.
{{ page.mTDownloadNow }} <a href="{{ site.download_root_link }}{{ site.download_file_names.windows }}" target="_blank" rel="noreferrer" class="os-win">Windows</a>, <a href="{{ site.download_root_link }}{{ site.download_file_names.mac }}" target="_blank" rel="noreferrer" class="os-mac">macOS</a>, <a href="{{ site.download_root_link }}{{ site.download_file_names.deb-gui }}" target="_blank" rel="noreferrer" class="os-deb">Debian/Ubuntu</a> and <a href="{{ site.download_overview_link }}" target="_blank" rel="noreferrer" class="os-other">{{ page.mTOtherPlatforms }}</a>.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for that. Somehow this broke the site?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not a registered class somewhere?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's something bigger. As soon as we want to edit anything on the main page, po4a complains.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's an a missing in the tag after "write code" (it should be </a> instead of </>), line 46 in 1-Index.html.

</div>
</div>
</div>
20 changes: 18 additions & 2 deletions _translator-files/po/de/1-index.po
Original file line number Diff line number Diff line change
@@ -17,7 +17,23 @@ msgstr ""

#. type: Content of: outside any tag (error?)
#: ../wiki/en/misc/1-index.html:1
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "---\n"
#| "title: \"Jamulus ‒ Play music online. With friends. For free.\"\n"
#| "lang: \"en\"\n"
#| "permalink: /\n"
#| "layout: mainhomepage\n"
#| "ldjAppCategory: \"Music\"\n"
#| "ldjSlogan: \"Play music online. With friends. For free.\"\n"
#| "ldjCreator: \"Volker Fischer and contributors\"\n"
#| "metadescription: \"Jamulus is open source software which enables musicians to perform music, rehearse or just jam, all in real time over the Internet.\"\n"
#| "mAltProgIcon: \"Jamulus icon\"\n"
#| "mTSlogan: \"Play music online. With friends. For free.\"\n"
#| "mTGetStartedNow: \"Get started now!\"\n"
#| "mTDownloadNow: 'Download now for'\n"
#| "mTOtherPlatforms: 'other platforms'\n"
#| "---\n"
msgid ""
"---\n"
"title: \"Jamulus ‒ Play music online. With friends. For free.\"\n"
@@ -27,7 +43,7 @@ msgid ""
"ldjAppCategory: \"Music\"\n"
"ldjSlogan: \"Play music online. With friends. For free.\"\n"
"ldjCreator: \"Volker Fischer and contributors\"\n"
"metadescription: \"Jamulus is open source software which enables musicians to perform music, rehearse or just jam, all in real time over the Internet.\"\n"
"metadescription: \"Jamulus is open source software that lets musicians perform music, rehearse or just jam together, all in real time over the Internet.\"\n"
"mAltProgIcon: \"Jamulus icon\"\n"
"mTSlogan: \"Play music online. With friends. For free.\"\n"
"mTGetStartedNow: \"Get started now!\"\n"
97 changes: 0 additions & 97 deletions _translator-files/po/de/Custom-Directories.po

This file was deleted.

101 changes: 101 additions & 0 deletions _translator-files/po/de/Directories.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2022-10-01 20:17+0000\n"
"Last-Translator: ann0see (Alt) <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\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 4.14.1\n"

#. type: YAML Front Matter: lang
#: ../wiki/en/Directories.md:1
#, no-wrap
msgid "en"
msgstr "de"

#. type: YAML Front Matter: layout
#: ../wiki/en/Directories.md:1
#, no-wrap
msgid "wiki"
msgstr "wiki"

#. type: YAML Front Matter: permalink
#: ../wiki/en/Directories.md:1
#, no-wrap
msgid "/wiki/Directories"
msgstr ""

#. type: YAML Front Matter: title
#: ../wiki/en/Directories.md:1
#, no-wrap
msgid "Directories"
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:9
msgid "{% include breadcrumb.html root=\"More\" branch1=\"Server Administration\" branch1-url=\"Running-a-Server\" %}"
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:12
msgid "# Running a Directory"
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:14
msgid "This is a specialised Jamulus Server configuration, as described in [Server Types](Running-a-Server#server-types)."
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:16
msgid "To view Servers listed by a Custom Directory, users must enter the address of that Directory in their Client's Settings > Advanced Setup > Custom Directories field. Multiple addresses can be added in this way if needed. Custom Directories will then appear in the Directory drop-down list on their Connect window. Custom Directories otherwise work for Clients in the same way as Public Directories, displaying a list of Servers registered with them."
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:18
msgid "To run a Server as a Directory, it should be started with the `--directoryserver` option to make itself (that is, `localhost` or `127.0.0.1`) the Directory to query for Servers."
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:20
msgid "When running a Server with the GUI, set the Custom Directory server address in the Options tab to \"localhost\", then select \"Custom\" from the Directory drop-down list."
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:23
msgid "### Points to note about Directories"
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:25
msgid "If you want to control which Servers can register with your Directory, you can enable a whitelist with the `--listfilter` command line option in the format `ip address 1[;ip address 2]`."
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:27
msgid "When running a Server behind a NAT firewall on a private network and registering with a Directory on the same network, run the Server using the `--serverpublicip` option to specify the public IP address. This is necessary to allow Clients on the public Internet to connect to the correct address. Note that for the Server(s) using this option, you will still need proper port forwarding in your router/firewall."
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:29
msgid "When running a Client behind a NAT firewall on a private network with a Directory on the same network, the Directory itself needs to be run using the `--serverpublicip` option to specify the public IP address, so that any Servers on the public Internet registering with the Directory that require the \"hole punch\" can be accessed by the Client(s). (This is because otherwise the Directory would provide the local network address of the Client to the Server and the \"hole punch\" would fail.)"
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:31
msgid "If you need to restart your Directory for any reason (for example when rebooting the host), Servers connected to it will be disconnected until they re-register. This does not mean that Clients connected to those Servers will be disconnected, but does mean that new Clients will be not able to see Servers listed by your Directory until those Servers reconnect. To enable the list of registered Servers to persist between restarts, use the `--directoryfile` option to specify the location and name of a file that the Directory can read and write to."
msgstr ""

#. type: Plain text
#: ../wiki/en/Directories.md:32
msgid "Up to 150 Servers can then register with a Directory."
msgstr ""
4 changes: 3 additions & 1 deletion _translator-files/po/de/FAQ.po
Original file line number Diff line number Diff line change
@@ -104,7 +104,9 @@ msgstr "### Woher weiß ich, ob ich einem Server beitreten kann? Gibt es Regeln?

#. type: Plain text
#: ../wiki/en/FAQ.md:32
msgid "In general, if somebody lists a Server on one of the Public Directories provided by Jamulus by default, they accept that anyone can play on it. Jamulus has no password protection or other authentication mechanisms built in. However, some Servers may state their policies in the welcome message you will see in the chat window."
#, fuzzy
#| msgid "In general, if somebody lists a Server on one of the Public Directories provided by Jamulus by default, they accept that anyone can play on it. Jamulus has no password protection or other authentication mechanisms built in. However, some Servers may state their policies in the welcome message you will see in the chat window."
msgid "If somebody lists a Server on one of the Directories built into Jamulus, they accept that anyone can play on it. Jamulus has no password protection or other authentication mechanisms. Whilst some Servers may state their policies in the welcome message you will see in the chat window, Jamulus itself does nothing to enforce these."
msgstr "Wenn jemand einen Server in eines der öffentlichen Verzeichnisse einträgt, die Jamulus standardmäßig bereitstellt, akzeptiert er damit, dass jeder auf ihm spielen kann. Jamulus unterstützt keinen Passwortschutz oder andere Authentifizierungsmechanismen. Einige Server können jedoch in der Willkommensnachricht, die du im Chat-Fenster sehen kannst, Richtlinien angeben."

#. type: Plain text
16 changes: 6 additions & 10 deletions _translator-files/po/de/Getting-Started.po
Original file line number Diff line number Diff line change
@@ -6,14 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"PO-Revision-Date: 2022-06-23 08:59+0200\n"
"Last-Translator: \n"
"PO-Revision-Date: 2022-10-01 20:17+0000\n"
"Last-Translator: ann0see (Alt) <[email protected]>\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"
"X-Generator: Poedit 3.1\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.14.1\n"

#. type: YAML Front Matter: lang
#: ../wiki/en/Getting-Started.md:1
@@ -84,13 +85,7 @@ msgstr "Um Jamulus auf deinem Betriebssystem einzurichten, folge bitte der Insta

#. type: Plain text
#: ../wiki/en/Getting-Started.md:28
#, fuzzy, no-wrap
#| msgid ""
#| "<div class=\"fx-row fx-row-start-xs button-container\">\n"
#| " <a href=\"Installation-for-Windows\" class=\"button fx-col-100-xs\">Windows</a>\n"
#| " <a href=\"Installation-for-Macintosh\" class=\"button fx-col-100-xs\">macOS</a>\n"
#| " <a href= \"Installation-for-Linux\" class=\"button fx-col-100-xs\">Linux</a>\n"
#| "</div>\n"
#, no-wrap
msgid ""
"<div class=\"fx-row fx-row-start-xs button-container\">\n"
" <a href=\"Installation-for-Windows\" class=\"button fx-col-100-xs\">Windows</a>\n"
@@ -104,6 +99,7 @@ msgstr ""
" <a href=\"Installation-for-Macintosh\" class=\"button fx-col-100-xs\">macOS</a>\n"
" <a href=\"Installation-for-Linux\" class=\"button fx-col-100-xs\">Linux</a>\n"
"</div>\n"
"_[Android](Installation-for-Android) und [iOS](Installation-for-iOS) können auch genutzt werden, sind aber momentan experimentell._\n"

#. type: Plain text
#: ../wiki/en/Getting-Started.md:30
Loading