Skip to content

Commit

Permalink
RELEASE: 3.10.0 (WEBSITE) (#940)
Browse files Browse the repository at this point in the history
* Change 'pt' to 'pt_PT'

* JSON-RPC: Update for --jsonrpcbindip 

Update documentation for --jsonrpcbindip command line argument.

* Update scripts for new po4a version and better markdown support

* Remove unneeded lines and stats script

* Relocate to proper sections, View rather than Edit, shift-click-drag (#862)

* relocate GRP details to GRP section, and ordering details to the general section, rather than SOLO.

Co-authored-by: jrd <[email protected]>

* AUTO: Updated .po files

* Translations update from Hosted Weblate (#870)

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/faq/
Translation: Jamulus/FAQ

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/faq/
Translation: Jamulus/FAQ

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/faq/
Translation: Jamulus/FAQ

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Server-Bandwidth
Translate-URL: https://hosted.weblate.org/projects/jamulus/server-bandwidth/

* Fix conflict

* Revert "Fix conflict"

This reverts commit 8c9509d.

Co-authored-by: ignotus <[email protected]>

* Update Spanish translation using Weblate

Currently translated at 100.0% (134 of 134 strings)

Co-authored-by: ignotus <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/es/
Translation: Jamulus/Software-Manual

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/getting-started/
Translation: Jamulus/Getting-Started

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Software-Manual
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/

* De-emphasise ARM downloads on Linux server page

* Update Installation-for-Linux.md

* Update for style

Co-authored-by: John Dempsey <[email protected]>

* Add "download" for ARM binaries

Co-authored-by: John Dempsey <[email protected]>

* AUTO: Updated .po files

* AUTO: Updated .po files

* Remove unneeded trailing slash of void elements

HTML void elements should not use trailing slashes:
https://github.com/validator/validator/wiki/Markup-%C2%BB-Void-elements#trailing-slashes

This removes (hopefully) all of them
Note: SVG images do need them.

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/
Translation: Jamulus/Software-Manual

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Directories
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/

* Add missing dependency to script and re-name key (#884)

* Add missing dependency to script and re-name key

* Change cache key

* Add dependency

* Correct dependency spelling

* Revert key name to po4a-0.68 (#885)

* Revert key name to po4a-0.68

* Update jekyll.yml

* Update main.yml

* AUTO: Updated .po files

* AUTO: Updated .po files

* Remove occurances of master from translation

* Test remove duplicate mail

* Add workflow dispatch to jekyll

This should also allow to build .po files manually

* AUTO: Updated .po files

* Remove PT files (#890)

* Translations update from Hosted Weblate (#888)

* Update Portuguese translation using Weblate

Currently translated at 16.6% (3 of 18 strings)

Co-authored-by: Augusto Kakuja Santos <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/general/pt/
Translation: Jamulus/General strings

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/General strings
Translate-URL: https://hosted.weblate.org/projects/jamulus/general/

* Delete _translator-files/po/pt directory

Co-authored-by: Augusto Kakuja Santos <[email protected]>
Co-authored-by: ignotus <[email protected]>

* Fix IT .po file (#891)

* Fix IT .po file

* Fixes

* Remove spaces

* AUTO: Updated .po files

* Server admin guide re-structure (#877)

Co-authored-by: 
John Dempsey <[email protected]> 
Peter L Jones <[email protected]>
ann0see <[email protected]>

* AUTO: Updated .po files

* Revert "AUTO: Updated .po files"

This reverts commit 4e35643.

* Revert "Server admin guide re-structure (#877)"

This reverts commit c5fffb2.

* Translations update from Hosted Weblate (#893)

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/
Translation: Jamulus/Running-a-Server

* Update German translation using Weblate

Currently translated at 66.6% (8 of 12 strings)

Co-authored-by: Ettore Atalan <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/include-shared-commands/de/
Translation: Jamulus/Include-Shared-Commands

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/
Translation: Jamulus/Running-a-Server

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Include-Shared-Commands
Translate-URL: https://hosted.weblate.org/projects/jamulus/include-shared-commands/

Co-authored-by: Ettore Atalan <[email protected]>

* Serverdocs re-structure (re-merge) (#895)

Co-authored-by: 
John Dempsey <[email protected]> 
Peter L Jones <[email protected]>
ann0see <[email protected]>

* AUTO: Updated .po files

* Add small "quick start"

Making it clear what the installation will give you.

* AUTO: Updated .po files

* Typo

* AUTO: Updated .po files

* Capitalisation, repetition

* AUTO: Updated .po files

* Update po4a requirements

* Make copyright file translatable

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/tips-tricks-more/
Translation: Jamulus/Tips-Tricks-More

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/tips-tricks-more/
Translation: Jamulus/Tips-Tricks-More

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/tips-tricks-more/
Translation: Jamulus/Tips-Tricks-More

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Navigation
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/

* AUTO: Updated .po files

* Corrections to EN files (#899)

Co-authored-by: John Dempsey <[email protected]>

* AUTO: Updated .po files

* Updated Privacy Statement (#872)

Co-authored-by: ignotus <[email protected]>
Co-authored-by: John Dempsey <[email protected]>
Co-authored-by: Jonathan <[email protected]>
Co-authored-by: ann0see <[email protected]>
Co-authored-by: Peter L Jones <[email protected]>

* AUTO: Updated .po files

* Revert "AUTO: Updated .po files"

This reverts commit 81d3700.

* Revert "Updated Privacy Statement (#872)"

This reverts commit 212abdd.

* Revert "AUTO: Updated .po files"

This reverts commit 34d4b3a.

* Revert "Corrections to EN files (#899)"

This reverts commit 25995a5.

* Translations update from Hosted Weblate (#903)

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/command-line-options/
Translation: Jamulus/Command-Line-Options

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/command-line-options/
Translation: Jamulus/Command-Line-Options

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/command-line-options/
Translation: Jamulus/Command-Line-Options

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Unregistered-Servers
Translate-URL: https://hosted.weblate.org/projects/jamulus/unregistered-servers/

* En corrections (#905)

Co-authored-by: John Dempsey <[email protected]>
Co-authored-by: Jonathan <[email protected]>

* AUTO: Updated .po files

* Update Unregistered-Servers.md (#904)

Authored by: Ginjo
Co-authored-by: John Dempsey <[email protected]>

* AUTO: Updated .po files

* Update privacy statement (#906)

Authored by: Rob-NY
Co-authored-by: ignotus <[email protected]>
Co-authored-by: John Dempsey <[email protected]>
Co-authored-by: Jonathan <[email protected]>

* AUTO: Updated .po files

* Running a Server.md : fixes wrong ponctuation

* AUTO: Updated .po files

* Document JSON-RPC API (#909)

* AUTO: Updated .po files

* Revert "AUTO: Updated .po files"

This reverts commit b81d704.

* Update po4a create script to set location for copyright file (#917)

Update po4a create script to set the correct location for copyright file so that is is used in translated version of the website.

* Check language tag in  '1-index.html' and replace if incorrect

* Update sed command

* Translations update from Hosted Weblate (#908)

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/
Translation: Jamulus/Installation-for-Windows

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/
Translation: Jamulus/Installation-for-Windows

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/
Translation: Jamulus/Installation-for-Windows

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/
Translation: Jamulus/Installation-for-Windows

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/
Translation: Jamulus/Installation-for-Windows

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/
Translation: Jamulus/Installation-for-Windows

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Running-a-Server
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/

* Fix wrong formatting and links in EN files (#921)

* AUTO: Updated .po files

* Translations update from Hosted Weblate (#922)

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Directories
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/

* Rephrase quick download title

Related to: #843

* Make download of legacy versions less obvious

The legacy builds and old versions of Jamulus should not be preferred,
so this makes them less prominent

* Fix typo

* AUTO: Updated .po files

* Shorten landing page

Related to #843

* Update wiki/en/misc/1-index.html

Co-authored-by: John Dempsey <[email protected]>

* Reword introduction

Co-authored-by: John Dempsey <[email protected]>

* More rewording

* Add missing link to legacy downloads

* AUTO: Updated .po files

* 919 Update "--directoryserver" to "--directoryaddress"

* AUTO: Updated .po files

* Remove obsolete .po files (#930)

* Client screenshots

* Client screenshot description

* AUTO: Updated .po files

* Translations update from Hosted Weblate (#925)

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/getting-started/
Translation: Jamulus/Getting-Started

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/getting-started/
Translation: Jamulus/Getting-Started

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Software-Manual
Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/

* KB: Add description server extension suite, KOORD and Melomax (#932)

* mention dtinth suite

* Include Koord

* Melomax

* Add hint that path to welcome message file must be accessible (#933)

See also: #927

* AUTO: Updated .po files

* Add giscus to privacy statement

* AUTO: Updated .po files

* Add documentation for deb repo

* Change wording

Co-authored-by: Peter L Jones <[email protected]>

* Update project board url

* Change naming of giscus to lower case

Their repository says giscus not Giscus

* AUTO: Updated .po files

* AUTO: Updated .po files

* Remove infobox for release note

Fixes: #924

* Use codeblocks for repo

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/privacy-statement/
Translation: Jamulus/Privacy-Statement

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Running-a-Server
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/

* Add more text to link

Context: #944 (comment)

* AUTO: Updated .po files

* AUTO: Updated .po files

* AUTO: Updated .po files

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/
Translation: Jamulus/Running-a-Server

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Navigation
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/include-client-commands/
Translation: Jamulus/Include-Client-Commands

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Directories
Translate-URL: https://hosted.weblate.org/projects/jamulus/directories/

* Make and on main homepage translatable

* AUTO: Updated .po files

* Fix logical error for DNS

Co-authored-by: Peter L Jones <[email protected]>

* AUTO: Updated .po files

* Re-add documentation for running a Server from CLI

Co-authored-by: ann0see <[email protected]>

* AUTO: Updated .po files

* Sharpen NAT definition

* Do not mention band only

* Remove redundancy

* AUTO: Updated .po files

* Document macOS ini file sandbox requirements (#936)

* AUTO: Updated .po files

* Add KB entry for metadata (#944)

Co-authored-by: John Dempsey <[email protected]>

* AUTO: Updated .po files

* Update NL inc links

* Update settings-network.inc

* Update settings-advanced.inc

* server-window-inc

* Delete server-window-options.inc

* Delete server-window-setup.inc

* Update German translation using Weblate

Currently translated at 30.1% (47 of 156 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/de/
Translation: Jamulus/Navigation
Translation: Jamulus/Running-a-Server

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/
Translation: Jamulus/Navigation

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/
Translation: Jamulus/Navigation

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/
Translation: Jamulus/Navigation

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/
Translation: Jamulus/Navigation

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/
Translation: Jamulus/Navigation

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/
Translation: Jamulus/Navigation

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Running-a-Server
Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/

* Fix Running-a-Server.md broken links (#960)

* AUTO: Updated .po files

* Update German translation using Weblate

Currently translated at 100.0% (12 of 12 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/include-shared-commands/de/
Translation: Jamulus/Include-Shared-Commands

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Include-Shared-Commands
Translate-URL: https://hosted.weblate.org/projects/jamulus/include-shared-commands/

* Fix links in translation

* Update German translation using Weblate

Currently translated at 100.0% (14 of 14 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-macintosh/de/
Translation: Jamulus/Installation-for-Macintosh

* Update Spanish translation using Weblate

Currently translated at 100.0% (14 of 14 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-macintosh/es/
Translation: Jamulus/Installation-for-Macintosh

* Update Command-Line-Options.po links for French

* Update Installation-for-Windows.po update links french

* Update text to match app

* Update text to match app

* Definite article for small network buffers

Co-authored-by: ann0see <[email protected]>

* AUTO: Updated .po files

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/tips-tricks-more/
Translation: Jamulus/Tips-Tricks-More

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Hosted Weblate <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/tips-tricks-more/
Translation: Jamulus/Tips-Tricks-More

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Jamulus/Unregistered-Servers
Translate-URL: https://hosted.weblate.org/projects/jamulus/unregistered-servers/

* Translated using Weblate (German)

Currently translated at 100.0% (31 of 31 strings)

Co-authored-by: ann0see <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/jamulus/unregistered-servers/de/
Translation: Jamulus/Unregistered-Servers

---------

Co-authored-by: Ignotus <[email protected]>
Co-authored-by: Rob-NY <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: John Dempsey <[email protected]>
Co-authored-by: jrd <[email protected]>
Co-authored-by: Weblate (bot) <[email protected]>
Co-authored-by: Jonathan <[email protected]>
Co-authored-by: Augusto Kakuja Santos <[email protected]>
Co-authored-by: Ettore Atalan <[email protected]>
Co-authored-by: Peter L Jones <[email protected]>
Co-authored-by: Olivier HUMBERT <[email protected]>
Co-authored-by: Henk De Groot <[email protected]>
Co-authored-by: Peter L Jones <[email protected]>
Co-authored-by: mcfnord <[email protected]>
Co-authored-by: Julien Taverna <[email protected]>
  • Loading branch information
16 people authored Sep 3, 2023
1 parent 239812b commit 61b323f
Show file tree
Hide file tree
Showing 362 changed files with 28,501 additions and 20,879 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add-lang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
id: cache-po4a
with:
path: "~/po4a"
key: ${{ runner.os }}-po4a
key: ${{ runner.os }}-po4a-0.68
- name: Install/retrieve po4a from cache
env:
CACHE_HIT: ${{ steps.cache-po4a.outputs.cache-hit }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jekyll.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
id: cache-po4a
with:
path: "~/po4a"
key: ${{ runner.os }}-po4a
key: ${{ runner.os }}-po4a-0.68
- name: Install or retrieve po4a from cache
env:
CACHE_HIT: ${{steps.cache-po4a.outputs.cache-hit}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
id: cache-po4a
with:
path: "~/po4a"
key: ${{ runner.os }}-po4a
key: ${{ runner.os }}-po4a-0.68
- name: Install or retrieve po4a from cache
env:
CACHE_HIT: ${{steps.cache-po4a.outputs.cache-hit}}
Expand Down
1 change: 0 additions & 1 deletion 1-pt-index.html

This file was deleted.

1 change: 1 addition & 0 deletions 1-pt_PT-index.html
3 changes: 2 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins:
- jekyll-paginate-v2
- jekyll-polyglot
- jekyll-minifier
languages: ["en", "zh_CN", "nb_NO", "ko_KR", "pt_BR", "nl", "es", "de", "it", "fr", "pt"]
languages: ["en", "zh_CN", "nb_NO", "ko_KR", "pt_BR", "pt_PT", "nl", "es", "de", "it", "fr"]
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
Expand All @@ -24,6 +24,7 @@ download_file_names:
android: "jamulus_3.9.1_android.apk"
ios: "jamulus_3.9.1_iOSUnsigned.ipa"
download_overview_link: "https://github.com/jamulussoftware/jamulus/releases/latest"
download_all_releases_link: "https://github.com/jamulussoftware/jamulus/releases"

kbnewpage: 'https://github.com/jamulussoftware/jamuluswebsite/new/release/_posts/?value=---%0Alayout%3A%20post%0Atitle%3A%20%22Your%20Title%22%0Alang%3A%20%22en%22%0Aauthor%3A%20%22YourName%22%0Aheading%3A%20%22Heading%22%0A---%0AName%20this%20file%20and%20edit%20the%20parameters%20above%21&message=New%20post'
exclude: ["README.md", "Gemfile.lock", "Gemfile", "CONTRIBUTING.md"]
Expand Down
4 changes: 0 additions & 4 deletions _data/en/copyright.yml

This file was deleted.

1 change: 1 addition & 0 deletions _data/en/copyright.yml
6 changes: 3 additions & 3 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<div class="fx-col-100-xs fx-col-33-s fx-col-center-xs">
<a href="https://github.com/jamulussoftware/jamulus" target="_blank" rel="noreferrer">
<!-- https://icongr.am/fontawesome/github.svg?size=128&color=ffffff -->
<img src="{{ '/assets/img/github.svg'| relative_url }}" alt="{{ site.data.general.footer.alt.github }}" loading="lazy" class="fx-center" />
<img src="{{ '/assets/img/github.svg'| relative_url }}" alt="{{ site.data.general.footer.alt.github }}" loading="lazy" class="fx-center">
</a>
</div>
<div class="fx-col-100-xs fx-col-33-s fx-col-center-xs">
<!-- https://icongr.am/fontawesome/facebook-official.svg?size=128&color=ffffff -->
<a href="https://www.facebook.com/groups/619274602254947/" target="_blank" rel="noreferrer">
<img src="{{ '/assets/img/facebook.svg' | relative_url }}" alt="{{ site.data.general.footer.alt.facebook }}" id="fb_icon" loading="lazy" class="fx-center" />
<img src="{{ '/assets/img/facebook.svg' | relative_url }}" alt="{{ site.data.general.footer.alt.facebook }}" id="fb_icon" loading="lazy" class="fx-center">
</a>
</div>
<div class="fx-col-100-xs fx-col-33-s fx-col-center-xs">
<!-- https://icongr.am/fontawesome/comments.svg?size=128&color=ffffff -->
<a href="https://github.com/jamulussoftware/jamulus/discussions" target="_blank" rel="noreferrer">
<img src="{{ '/assets/img/forum.svg' | relative_url }}" alt="{{ site.data.general.footer.alt.help }}" loading="lazy" class="fx-center" />
<img src="{{ '/assets/img/forum.svg' | relative_url }}" alt="{{ site.data.general.footer.alt.help }}" loading="lazy" class="fx-center">
</a>
</div>
<div id="copyright" class="fx-col-100-xs fx-row-center-xs">
Expand Down
2 changes: 1 addition & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<header class="fx-row fx-row-between-xs fx-text-center">
<div class="fx-col fx-text-center"><a href="/{% if site.active_lang != site.default_lang %}{{ site.active_lang }}/{% endif %}">
<img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}" /></a>
<img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}"></a>
</div>
<div class="fx-col-center-xs fx-txt-right hide-on-dt">
<a href="#mnv" onclick="showNav();return false;">{% include general/navbtn.html %}</a>
Expand Down
50 changes: 25 additions & 25 deletions _includes/headtags.html
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<meta charset="utf-8" />
<meta charset="utf-8">
{% for lng in site.languages %}
{% if lng == site.default_lang %}
{% capture langlink %}{{ site.a_rootpage }}{{ page.url }}{% endcapture %}
{% else %}
{% capture langlink %}{{ site.a_rootpage }}/{{ lng }}{{ page.url }}{% endcapture %}
{% endif %}
<link rel="alternate" hreflang="{{ lng }}" href="{{ langlink }}" />
<link rel="alternate" hreflang="{{ lng }}" href="{{ langlink }}">
{% endfor %}
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="/assets/css/fox.min.css" />
<link rel="stylesheet" href="/assets/css/fw.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/assets/css/fox.min.css">
<link rel="stylesheet" href="/assets/css/fw.css">
<noscript>
<link rel="stylesheet" href="/assets/css/noscript.css" />
<link rel="stylesheet" href="/assets/css/noscript.css">
</noscript>
<meta name="description" content="{{ page.metadescription }}">
<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png" />
<link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png" />
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png" />
<link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png" />
<link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png" />
<link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png" />
<link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png" />
<link rel="icon" type="image/png" sizes="192x192" href="/android-icon-192x192.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/manifest.json" />
<meta name="msapplication-TileColor" content="#ffffff" />
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png" />
<meta name="theme-color" content="#ffffff" />
<meta name="color-scheme" content="dark light" />
<link rel="author" href="/humans.txt" />
<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<meta name="color-scheme" content="dark light">
<link rel="author" href="/humans.txt">
<script src="/assets/js/nav.js"></script>
2 changes: 1 addition & 1 deletion _includes/screenshot.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<figure>
<img src="/assets/img/{{ include.file }}" loading="lazy" style="max-width: {{ include.max-width | default: '100%' }};" alt="{{ include.alt | default: 'Screenshot' }}"/>
<img src="/assets/img/{{ include.file }}" loading="lazy" style="max-width: {{ include.max-width | default: '100%' }};" alt="{{ include.alt | default: 'Screenshot' }}">
<figcaption>{{ include.caption }}</figcaption>
</figure>
2 changes: 1 addition & 1 deletion _layouts/kblist.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body class="kb kblist">
<header class="fx-row fx-row-between-xs fx-text-center">
<div class="fx-col fx-text-center"><a href="/{% if site.active_lang != site.default_lang %}{{ site.active_lang }}/{% endif %}">
<img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}" /></a>
<img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}"></a>
</div>
<div class="fx-col-center-xs fx-txt-right hide-on-dt">
<a href="#mnv" onclick="showNav();return false;">{% include general/navbtn.html %}</a>
Expand Down
4 changes: 2 additions & 2 deletions _layouts/mainhomepage.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<body class="mainsite">
<header class="fx-row fx-row-center-xs">
<div class="fx-col-100-xs">
<img alt="{{ page.mAltProgIcon }}" width="200" height="200" src="{{ '/assets/img/jamulus-icon-2020.svg' | relative_url }}" id="jamulusicon" />
<img alt="{{ page.mAltProgIcon }}" width="200" height="200" src="{{ '/assets/img/jamulus-icon-2020.svg' | relative_url }}" id="jamulusicon">
<h1>Jamulus</h1>
<span>{{ page.mTSlogan }}</span>
</div>
Expand All @@ -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> {{ page.mTPlatformsAnd }} <a href="{{ site.download_overview_link }}" target="_blank" rel="noreferrer" class="os-other">{{ page.mTOtherPlatforms }}</a>.
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<body class="kb kbsite">
<header class="fx-row fx-row-between-xs fx-text-center">
<div class="fx-col fx-text-center"><a href="/{% if site.active_lang != site.default_lang %}{{ site.active_lang }}/{% endif %}">
<img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}" /></a>
<img alt="{{ site.data.general.nav.altJamulusIcon }}" width="40" height="40" src="{{ 'assets/img/jamulus-icon-2020.svg'| relative_url }}"></a>
</div>
<div class="fx-col-center-xs fx-txt-right hide-on-dt">
<a href="#mnv" onclick="showNav();return false;">{% include general/navbtn.html %}</a>
Expand Down
6 changes: 3 additions & 3 deletions _layouts/redirect.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<html lang="{{ site.active_lang }}">

<head>
<meta charset="utf-8" />
<meta http-equiv="refresh" content="1;url={{ page.redirect }}" />
<link rel="canonical" href="{{ page.redirect }}" />
<meta charset="utf-8">
<meta http-equiv="refresh" content="1;url={{ page.redirect }}">
<link rel="canonical" href="{{ page.redirect }}">
<script>
window.location.href = "{{ page.redirect }}"
</script>
Expand Down
6 changes: 3 additions & 3 deletions _po4a-tools/po4a-cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
if [[ "$CACHE_HIT" == 'true' ]] ; then
sudo cp --force --recursive ~/po4a/* /
else
sudo apt install -yq gettext libsgmls-perl libyaml-tiny-perl opensp
wget -O po4a.deb https://github.com/jamulussoftware/assets/raw/main/po4a/po4a_0.66.deb
sudo apt install -yq gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libxs-parse-keyword-perl
wget -O po4a.deb https://github.com/jamulussoftware/assets/raw/main/po4a/po4a_0.68.deb
sudo dpkg -i po4a.deb

if [ -f po4a.deb ] ; then
Expand All @@ -16,7 +16,7 @@ fi

mkdir -p ~/po4a

for dep in po4a libcroco3 libosp5 sgml-base gettext libsgmls-perl libyaml-tiny-perl opensp; do
for dep in po4a libcroco3 libosp5 sgml-base gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libxs-parse-keyword-perl; do
dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/po4a/
done
fi
30 changes: 20 additions & 10 deletions _po4a-tools/po4a-create-all-targets.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# This script creates the target translations from the .po files
# po4a >= 0.63 is required, see https://github.com/mquinson/po4a/releases
# po4a >= 0.68 is required, see https://github.com/mquinson/po4a/releases
# You can set the following variables:
# SRC_DIR: directory for the original documents in English. Files in sub-directories within SRC_DIR are also detected.
# PO_DIR: directory where the .po files are stored
Expand Down Expand Up @@ -31,16 +31,16 @@ DATA_DIR="../_data"

# Check if po4a is installed
if ! [ -x "$(command -v po4a)" ] ; then
echo Error: Please install po4a. v0.63 or higher is required >&2
echo Error: Please install po4a. v0.68 or higher is required >&2
exit 1
fi

# Check if the right version is installed
PO4A_VER=$(po4a --version | grep po4a | awk '{print $3}')

if [[ $PO4A_VER < 0.63 ]] ; then
if [[ $PO4A_VER < 0.68 ]] ; then
echo Error: po4a v"$PO4A_VER" is installed >&2
echo po4a v0.63 or higher is required. >&2
echo po4a v0.68 or higher is required. >&2
exit 1
fi

Expand Down Expand Up @@ -78,7 +78,7 @@ process_with_po4a () {
# Get source doc names and set target file names and dirs
filename=$(basename "$doc" .$ext)

if [[ $filename == 'general' || $filename == 'navigation' ]] ; then
if [[ $filename == 'general' || $filename == 'navigation' || $filename == 'copyright' ]] ; then
TARG_DIR="$DATA_DIR"

else
Expand All @@ -87,7 +87,7 @@ process_with_po4a () {

targ_doc="$TARG_DIR/$lang/$filename.$ext"

# Files excluded from the threshold requirement
# Files excluded from the threshold requirement (otherwise website will not build properly)
if [[
"$filename" == 'Include-'* || \
"$filename" == *'-index' || \
Expand All @@ -102,10 +102,13 @@ process_with_po4a () {
# Determine file format to be used
if [ $ext == yml ] ; then
FILE_FORMAT=yaml
OPTION="skip_array"
elif [ $ext == html ] ; then
FILE_FORMAT=xml
OPTION="ontagerror=warn"
elif [ $ext == md ] ; then
FILE_FORMAT=asciidoc
FILE_FORMAT=text
OPTION="markdown"
fi

# Run po4a-translate and create target files
Expand All @@ -116,13 +119,23 @@ process_with_po4a () {
--po "$PO_DIR/$lang/${filename}.po" \
--localized "$targ_doc" \
--localized-charset "UTF-8" \
--no-deprecation \
--option "$OPTION" \
--keep "$THRESHOLD"

# Display message if translated file is created
if [ -f $targ_doc ] ; then
echo "$filename.$ext" translated into "$lang"
fi

# Check if language is set correctly in '1-$lang-index.html'
if [ $filename == '1-index' ] ; then
if ! grep -Fxq 'lang: "'$lang'"' "$WIKI_DIR/$lang/1-index.html" ; then
echo replacing incorrect language tag in 1-"$lang"-index.html;
sed -i '0,/lang: "[^"]*"/s/lang: "[^"]*"/lang: "'$lang'"/' "$WIKI_DIR/$lang/1-index.html"
fi
fi

done < <(find -L "$SRC_DIR" -name "*.*" -print0)
}

Expand All @@ -134,6 +147,3 @@ while IFS= read -r -d '' dir ; do
echo "$lang":
process_with_po4a "$lang"
done < <(find "$PO_DIR" -mindepth 1 -maxdepth 1 -type d -print0)

# Produce a file with translation status of all .po files
source ./po4a-stats.sh
48 changes: 0 additions & 48 deletions _po4a-tools/po4a-stats.sh

This file was deleted.

Loading

0 comments on commit 61b323f

Please sign in to comment.