diff --git a/web/clitools/updtrans.bash b/web/clitools/updtrans.bash index f9e5c3f..7c44602 100755 --- a/web/clitools/updtrans.bash +++ b/web/clitools/updtrans.bash @@ -6,12 +6,15 @@ cd ../site xgettext --no-wrap --from-code utf-8 --add-comments custard.php -o locale/custard.pot -msgen --no-wrap locale/custard.pot -o locale/it/en_US.UTF-8/LC_MESSAGES/custard.po -msgfmt locale/it/en_US.UTF-8/LC_MESSAGES/custard.po -o locale/it/en_US.UTF-8/LC_MESSAGES/custard.mo - -msgmerge --update --no-wrap locale/en/en_US.UTF-8/LC_MESSAGES/custard.po locale/custard.pot - -echo "Ora puoi editare «locale/en/en_US.UTF-8/LC_MESSAGES/custard.po», poi premi invio per salvare il file .mo" +msgen --no-wrap locale/custard.pot -o locale/en/en_US.UTF-8/LC_MESSAGES/custard.po +echo "Ora puoi editare «locale/en/en_US.UTF-8/LC_MESSAGES/custard.po»" +echo "per rimuovere \"{singular}\" e \"{plural}\", poi premi invio" +echo "per salvare il file .mo" read - msgfmt locale/en/en_US.UTF-8/LC_MESSAGES/custard.po -o locale/en/en_US.UTF-8/LC_MESSAGES/custard.mo + +msgmerge --update --no-wrap locale/it/en_US.UTF-8/LC_MESSAGES/custard.po locale/custard.pot +echo "Ora puoi editare «locale/it/en_US.UTF-8/LC_MESSAGES/custard.po»," +echo "poi premi invio per salvare il file .mo" +read +msgfmt locale/it/en_US.UTF-8/LC_MESSAGES/custard.po -o locale/it/en_US.UTF-8/LC_MESSAGES/custard.mo diff --git a/web/site/about_ca.php b/web/site/about_ca.php index 3bd23ab..a43b41e 100644 --- a/web/site/about_ca.php +++ b/web/site/about_ca.php @@ -14,15 +14,17 @@

This website is made by a group of enthusiastic Mastodon users, mainly from the italian instance mastodon.bida.im, and by other contributors from different instances.

Here are some contacts of those involved

Except where otherwise noted, content on this site is licensed under a Creative Commons Attribution 4.0 International license.

-This translation from english language needs some revisions and additions, please click here if you’d like to help +Translation of this page to catalan language is missing, please click here if you’d like to help
diff --git a/web/site/about_en.php b/web/site/about_en.php index 89b5360..b874859 100644 --- a/web/site/about_en.php +++ b/web/site/about_en.php @@ -13,9 +13,11 @@

This website is made by a group of enthusiastic Mastodon users, mainly from the italian instance mastodon.bida.im, and by other contributors from different instances.

Here are some contacts of those involved

Except where otherwise noted, content on this site is licensed under a Creative Commons Attribution 4.0 International license.

diff --git a/web/site/about_es.php b/web/site/about_es.php index 4c32c10..e56de5e 100644 --- a/web/site/about_es.php +++ b/web/site/about_es.php @@ -13,9 +13,11 @@

Esta página web ha sido realizada por un grupo de usuari@s entusiastas de Mastodon, principalmente procedentes la instancia italiana mastodon.bida.im, pero también por personas de otras instancias.

Estos son algunos de los usuari@s implicados:

Excepto donde se indique algo distinto, la difusión del contenido de esta página está regulada por una licencia internacional Creative Commons 4.0.

diff --git a/web/site/about_fr.php b/web/site/about_fr.php index 147dfa7..0b2658c 100644 --- a/web/site/about_fr.php +++ b/web/site/about_fr.php @@ -13,9 +13,11 @@

Ce site web est réalisé par un groupe d’utilisateurs enthousiastes de Mastodon, principalement de l’instance italienne mastodon.bida.im, et par d’autres contributeurs de différentes instances.

Voici quelques contacts des personnes impliquées

Sauf indication contraire, le contenu de ce site est soumis à la licence Creative Commons Attribution 4.0 International.

diff --git a/web/site/about_it.php b/web/site/about_it.php index 0953ec9..afda9c6 100644 --- a/web/site/about_it.php +++ b/web/site/about_it.php @@ -13,9 +13,11 @@

Questo sito è realizzato da alcuni utenti entusiasti di Mastodon provenienti principalmente dall’Istanza italiana mastodon.bida.im, con l’aiuto di numerosi utenti provenienti da diverse parti del Fediverso che ringraziamo per il loro contributo.

Ecco alcuni degli utenti coinvolti

Eccetto dove diversamente specificato, i contenuti di questo sito sono rilasciati con Licenza Creative Commons Attribuzione 4.0 Internazionale.

diff --git a/web/site/custard.php b/web/site/custard.php index 7ee3459..7f3f552 100644 --- a/web/site/custard.php +++ b/web/site/custard.php @@ -9,9 +9,7 @@ $debug=''; $debug.='REQUEST_URI: '.$_SERVER['REQUEST_URI'].N; $debug.='_GET: '.print_r($_GET,1); -$nottrans=['ca','es','fr']; $locale=$dlang; -if (in_array($locale,$nottrans)) $locale='en'; $blocale='en_US.UTF-8'; //putenv('LC_ALL='.$blocale); setlocale(LC_ALL,$blocale); @@ -28,10 +26,9 @@ if (array_key_exists('advc',$_GET)) { $_GET['advc']=0; } -//non spostarli sopra sennò gettext non funge (css si può anche, ma tanto vale tenere insieme) echo(' -

'._('Istanze').'

+

'._('Instances').'