Merge branch 'master' into #242/natural-lang-arasaac-api

asterics · Apr 19, 2023 · 72af215 · 72af215
2 parents 99de8b8 + 24132dd
commit 72af215
Show file tree

Hide file tree

Showing 59 changed files with 1,778 additions and 205 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,9 @@ There are two versions of AsTeRICS Grid online:
 * https://grid.asterics.eu/latest/ current testing (beta) release, possibly unstable
 
 ## Documentation
-see [User documentation](docs/documentation_user/README.md) or [AsTeRICS Grid Playlist on YouTube](https://www.youtube.com/playlist?list=PL0UXHkT03dGrIHldlEKR0ZWfNMkShuTNz).
+See [User documentation](docs/documentation_user/README.md) or [AsTeRICS Grid Playlist on YouTube](https://www.youtube.com/playlist?list=PL0UXHkT03dGrIHldlEKR0ZWfNMkShuTNz).
+
+Also see [Developer documentation (not finished, maybe outdated)](docs/documentation_dev/README.md) and the [Collaboration guide](docs/documentation_dev/collaboration.md).
 
 ## Run project locally
 1. clone the project `git clone git@github.com:asterics/AsTeRICS-Grid.git`
@@ -49,9 +51,13 @@ The AsTeRICS Grid evolved out of [AsTeRICS Ergo](https://github.com/asterics/AsT
 ## Support us
 If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you're very welcome to donate:
 
-<a title="Support AsTeRICS Grid on opencollective.com" href="https://opencollective.com/asterics-foundation/projects/asterics-grid" target="_blank">
-  <img src="https://opencollective.com/webpack/donate/button@2x.png?color=blue" width=300 />
-</a>
+<div>
+<a title="Donate with PayPal" href="https://www.paypal.com/donate/?hosted_button_id=38AJJNS427MJ2" target="_blank" style="margin-right:3em">
+<img src="https://github.com/asterics/AsTeRICS-Grid/raw/master/app/img/donate-paypal.png" width=300/></a>
+<span>&nbsp;&nbsp;&nbsp;</span>
+<a title="Donate at opencollective.com" href="https://opencollective.com/asterics-foundation/projects/asterics-grid" target="_blank">
+<img src="https://github.com/asterics/AsTeRICS-Grid/raw/master/app/img/donate-open-collective.png" width=300/></a>
+</div>
 
 ## Acknowledgements and Attribution
 * Thanks to [ARASAAC](https://arasaac.org/) for collaborating and providing their pictogram API

diff --git a/app/build/asterics-grid.bundle.js b/app/build/asterics-grid.bundle.js
diff --git a/app/gridsets/Globaler_Kommunikator-Core_ARASAAC_DE.grd.json b/app/gridsets/Globaler_Kommunikator-Core_ARASAAC_DE.grd.json
diff --git a/app/img/DonationButtons.svg b/app/img/DonationButtons.svg
diff --git a/app/img/donate-open-collective.png b/app/img/donate-open-collective.png
diff --git a/app/img/donate-paypal.png b/app/img/donate-paypal.png
diff --git a/app/lang/i18n.an.json b/app/lang/i18n.an.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.ar.json b/app/lang/i18n.ar.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.bg.json b/app/lang/i18n.bg.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.bs.json b/app/lang/i18n.bs.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.ca.json b/app/lang/i18n.ca.json
@@ -824,7 +824,8 @@
   "newCommunicator": "Nou comunicador",
   "author": "Autor",
   "helloClickRightToEdit": "Hola- fes clic dreta per editar la cel·la",
-  "supportAstericsFoundationOnBetterplace": "Suport a la Fundació AsTeRICS en betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "Si vols donar suport el desenvolupament d' AsTeRICS Grid i contribuir al pagament de les despeses de manteniment del servidor/base de dades per a la sincronització pots fer una donació a la Fundació AsTeRICS",
   "supportUs": "Ajuda'ns",
   "theFollowingRessourcesForHelpOnAstericsGrid": "Per aprendre les possibilitats i fer anar AsTeRICS Grid t'oferim les següents recursos",

diff --git a/app/lang/i18n.cs.json b/app/lang/i18n.cs.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.da.json b/app/lang/i18n.da.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.de.json b/app/lang/i18n.de.json
@@ -824,7 +824,8 @@
   "newCommunicator": "Neue Konfiguration",
   "author": "Autor",
   "helloClickRightToEdit": "Hallo - Rechtsklick zum Bearbeiten",
-  "supportAstericsFoundationOnBetterplace": "Unterstütze die AsTeRICS Foundation auf betterplace.org",
+  "donateWithPaypal": "Spenden mit PayPal",
+  "donateAtOpencollective": "Spenden auf open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "Wenn du die Entwicklung von AsTeRICS Grid unterstützen oder zu den laufenden Serverkosten für die Online-Synchronisation beitragen möchtest, kannst du für die AsTeRICS Foundation spenden",
   "supportUs": "AsTeRICS Grid unterstützen",
   "theFollowingRessourcesForHelpOnAstericsGrid": "Die folgenden Ressourcen für Hilfe zu AsTeRICS Grid sind verfügbar",

diff --git a/app/lang/i18n.el.json b/app/lang/i18n.el.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.en.json b/app/lang/i18n.en.json
@@ -825,7 +825,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.es.json b/app/lang/i18n.es.json
@@ -824,7 +824,8 @@
   "newCommunicator": "Nuevo comunicador",
   "author": "Autor",
   "helloClickRightToEdit": "Hola - haz clic derecho para editar la celda",
-  "supportAstericsFoundationOnBetterplace": "Apoyar a la Fundación AsTeRICS en betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "Si quieres apoyar el desarrollo de AsTeRICS Grid y contribuir a sufragar los gatos de mantenimiento del servidor/base de datos para la sincronización puedes hacerlo con una donación a la Fundación AsTeRICS",
   "supportUs": "Ayúdanos",
   "theFollowingRessourcesForHelpOnAstericsGrid": "Para aprender las posibilidades y el manejo de AsTeRICS Grid te ofrecemos los siguientes recursos",

diff --git a/app/lang/i18n.eu.json b/app/lang/i18n.eu.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.fa.json b/app/lang/i18n.fa.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.fi.json b/app/lang/i18n.fi.json
@@ -824,7 +824,8 @@
   "newCommunicator": "New communicator",
   "author": "Author",
   "helloClickRightToEdit": "Hello - click right to edit",
-  "supportAstericsFoundationOnBetterplace": "Support AsTeRICS Foundation on betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "If you want to support the development of AsTeRICS Grid or contribute to the costs for running the server/database for syncronization you''re very welcome to donate to the AsTeRICS Foundation",
   "supportUs": "Support us",
   "theFollowingRessourcesForHelpOnAstericsGrid": "The following ressources for help on AsTeRICS Grid are available",

diff --git a/app/lang/i18n.fr.json b/app/lang/i18n.fr.json
@@ -824,7 +824,8 @@
   "newCommunicator": "Nouveau communicateur",
   "author": "Auteur",
   "helloClickRightToEdit": "Bonjour - cliquer sur le bouton droit pour modifier",
-  "supportAstericsFoundationOnBetterplace": "Soutenir la Fondation AsTeRICS sur betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "Si vous voulez soutenir le développement d'AsTeRICS Grid ou contribuer aux coûts de fonctionnement du serveur/base de données pour la synchronisation, vous êtes les bienvenus pour faire un don à la Fondation AsTeRICS",
   "supportUs": "Aidez-nous",
   "theFollowingRessourcesForHelpOnAstericsGrid": "Les ressources suivantes pour obtenir de l'aide sur AsTeRICS Grid sont disponibles",

diff --git a/app/lang/i18n.gl.json b/app/lang/i18n.gl.json
@@ -824,7 +824,8 @@
   "newCommunicator": "Novo comunicador",
   "author": "Autor",
   "helloClickRightToEdit": "Ola - fai clic dereito para editar a cela",
-  "supportAstericsFoundationOnBetterplace": "Apoiar á Fundación AsTeRICS en betterplace.org",
+  "donateWithPaypal": "Donate with PayPal",
+  "donateAtOpencollective": "Donate at open collective",
   "ifYouWantToSupportTheDevelopmentOfAstericsGrid": "Se queres apoiar o desenvolvemento de AsTeRICS Grid e contribuír a sufragar os gastos de mantemento do servidor/base de datos para a sincronización podes facelo cunha doazón á Fudación AsTeRICS",
   "supportUs": "Axúdanos",
   "theFollowingRessourcesForHelpOnAstericsGrid": "Os seguintes recursos de axuda sobre ASTERISK Grid están dispoñibles",