Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
boot.conf: Connexion -> Connection
Browse files Browse the repository at this point in the history 
Possibly a "french-ism", although connexion exists in british
(Oxford) english, american english doesn't use this term. I've
never seen a english program using the british variant, sorry Brits. ;-)
  • Loading branch information
@matsimon
matsimon committed Jun 27, 2014
1 parent f2936b0 commit 7a0c26e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions core/src/plugins/boot.conf/i18n/conf/de.php
View file
Expand Up @@ -35,7 +35,7 @@
"Confirm password" => "Passwort zur Kontrolle wiederholt eingeben",
"Test Mailer" => "Mailversand testen",
"Try sending an email with the configured data" => "Mailversand mit dieser Konfiguration testen",
"Test SQL Connexion" => "SQL-Serververbindung testen",
"Test SQL Connection" => "SQL-Serververbindung testen",
"Try connecting to the database" => "Verbindung testen",
"Enable emails" => "E-Mails aktivieren",
"Set up system to send emails" => "System für den Versand von E-Mails einrichten",
Expand All @@ -45,7 +45,7 @@
"Set up the correct value to send emails" => "Set up the correct value to send emails",
"Administrator Email" => "Mailadresse Administrator",
"Default 'From' email used to send emails." => "Default 'From' email used to send emails.",
"How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connexion." => "How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). 'No DB' mode can be suited for a quick test of the system, but it's not suited for production and you should always prefer a db-based setup (sqlite does not require any additional service).",
"How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connection." => "How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). 'No DB' mode can be suited for a quick test of the system, but it's not suited for production and you should always prefer a db-based setup (sqlite does not require any additional service).",
"Storage Type" => "Speichertyp",
"Select how the configurations will be stored" => "Wählen Sie wie und wo die Konfigurationsdaten gespeichert werden sollen",
"No Database (Quick Start)" => "Keine Datenbank (Schnellstart, nicht für produktive Umgebungen)",
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/boot.conf/i18n/conf/en.php
View file
Expand Up @@ -35,7 +35,7 @@
"Confirm password" => "Confirm password",
"Test Mailer" => "Test Mailer",
"Try sending an email with the configured data" => "Try sending an email with the configured data",
"Test SQL Connexion" => "Test SQL Connexion",
"Test SQL Connection" => "Test SQL Connection",
"Try connecting to the database" => "Try connecting to the database",
"Enable emails" => "Enable emails",
"Set up system to send emails" => "Set up system to send emails",
Expand All @@ -45,7 +45,7 @@
"Set up the correct value to send emails" => "Set up the correct value to send emails",
"Administrator Email" => "Administrator Email",
"Default 'From' email used to send emails." => "Default 'From' email used to send emails.",
"How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connexion." => "How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). 'No DB' mode can be suited for a quick test of the system, but it's not suited for production and you should always prefer a db-based setup (sqlite does not require any additional service).",
"How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connection." => "How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). 'No DB' mode can be suited for a quick test of the system, but it's not suited for production and you should always prefer a db-based setup (sqlite does not require any additional service).",
"Storage Type" => "Storage Type",
"Select how the configurations will be stored" => "Select how the configurations will be stored",
"No Database (Quick Start)" => "No DB (Quick Start, not for production)",
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/boot.conf/i18n/conf/fr.php
View file
Expand Up @@ -33,7 +33,7 @@
"Global options" => "<span class='icon-cogs'></span> Options Globales",
"Test Mailer" => "Tester le mail",
"Try sending an email with the configured data" => "Envoyer un email avec la config",
"Test SQL Connexion" => "Tester la connexion SQL",
"Test SQL Connection" => "Tester la connexion SQL",
"Try connecting to the database" => "Tenter de se connecter à la DB",
"Configurations storage" => "<span class='icon-save'></span> Stockage des configurations",
"Add some users" => "<span class='icon-group'></span> Ajouter des utilisateurs",
Expand All @@ -45,7 +45,7 @@
"Set up the correct value to send emails" => "Choisir la valeur correcte en fonction de la conf PHP",
"Administrator Email" => "Email de l'administrateur",
"Default 'From' email used to send emails." => "Expéditeur par défaut utilisé pour envoyer des mails.",
"How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connexion." => "Stockage des configurations globales de l'application (utilisateurs, plugins, etc. <b>ceci ne définit pas</b> la manière dont les données sont stockées). Le mode 'no db' peut être utile pour un test, mais n'est pas adapté à un environnement de production. Configurez donc plutôt un accès à une base de donnée, le mode sqlite ne nécessite pas de service supplémentaire.",
"How the application configuration data will be stored (users, plugins, etc. <b>not</b> how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connection." => "Stockage des configurations globales de l'application (utilisateurs, plugins, etc. <b>ceci ne définit pas</b> la manière dont les données sont stockées). Le mode 'no db' peut être utile pour un test, mais n'est pas adapté à un environnement de production. Configurez donc plutôt un accès à une base de donnée, le mode sqlite ne nécessite pas de service supplémentaire.",
"Storage Type" => "Type de stockage",
"Select how the configurations will be stored" => "Backend de stockage des configurations",
"No Database (Quick Start)" => "Pas de BD (Démarrage rapide, pas pour la production)",
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/boot.conf/manifest.xml
View file
Expand Up @@ -25,13 +25,13 @@
<global_param group_switch_name="mailer" group_switch_value="yes" group_switch_label="Yes" name="MAILER_SYSTEM" type="select" label="CONF_MESSAGE[Php Mailer]" description="CONF_MESSAGE[Set up the correct value to send emails]" choices="mail|Mail,sendmail|Sendmail" default="mail" mandatory="true"/>
<global_param group_switch_name="mailer" group_switch_value="yes" group_switch_label="Yes" name="MAILER_ADMIN" type="string" label="CONF_MESSAGE[Administrator Email]" description="CONF_MESSAGE[Default 'From' email used to send emails.]" mandatory="true"/>
<global_param group_switch_name="mailer" group_switch_label="yes" group_switch_value="yes" type="button" name="TEST_MAILER" choices="boot_test_mailer" label="CONF_MESSAGE[Test Mailer]" description="CONF_MESSAGE[Try sending an email with the configured data]" mandatory="false"/>
<global_param group="CONF_MESSAGE[Configurations storage]" name="StorageLegend" type="legend" label="" description="CONF_MESSAGE[How the application configuration data will be stored (users, plugins, etc. &lt;b&gt;not&lt;/b&gt; how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connexion.]"/>
<global_param group="CONF_MESSAGE[Configurations storage]" name="StorageLegend" type="legend" label="" description="CONF_MESSAGE[How the application configuration data will be stored (users, plugins, etc. &lt;b&gt;not&lt;/b&gt; how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connection.]"/>
<global_param group="CONF_MESSAGE[Configurations storage]" name="STORAGE_TYPE" type="group_switch:storage_type" label="CONF_MESSAGE[Storage Type]" description="CONF_MESSAGE[Select how the configurations will be stored]" default="" mandatory="false"/>
<global_param group_switch_name="storage_type" group_switch_label="CONF_MESSAGE[Database (Requires MySQL, PostgreSQL or SQLite)]" group_switch_value="db" name="type" default="db" label="Database" description="Driver type (do not touch)" type="hidden" mandatory="true"/>
<global_param group_switch_name="storage_type" group_switch_label="CONF_MESSAGE[No Database (Quick Start)]" group_switch_value="serial" name="type" default="serial" label="No Database" description="h" type="hidden" mandatory="true"/>
<global_param group_switch_name="storage_type" group_switch_label="Enable Notifications" group_switch_value="db" name="notifications" default="true" label="CONF_MESSAGE[Enable Notifications]" description="CONF_MESSAGE[Log all events and alerts]" type="boolean" mandatory="false"/>
<global_param group_switch_name="storage_type" group_switch_label="Database" group_switch_value="db" name="db_type" default="mysql" label="Database" description="Driver type (do not touch)" type="group_switch:dibi_provider" mandatory="true" choices="mysql|MySQL,sqlite3|Sqlite 3,postgre|PostgreSQL"/>
<global_param group_switch_name="storage_type" group_switch_label="Database" group_switch_value="db" type="button" name="TEST_SQL" choices="boot_test_sql_connexion" label="CONF_MESSAGE[Test SQL Connexion]" description="CONF_MESSAGE[Try connecting to the database]" mandatory="false"/>
<global_param group_switch_name="storage_type" group_switch_label="Database" group_switch_value="db" type="button" name="TEST_SQL" choices="boot_test_sql_connexion" label="CONF_MESSAGE[Test SQL Connection]" description="CONF_MESSAGE[Try connecting to the database]" mandatory="false"/>
<global_param group="CONF_MESSAGE[Add some users]" name="usersLegend" type="legend" label="" description="CONF_MESSAGE[Create users for your organization right now. You can do this later by going to the Settings workspace.]"/>
<global_param group="CONF_MESSAGE[Add some users]" name="USER_LOGIN" type="string" label="CONF_MESSAGE[Login]" replicationGroup="users" description="CONF_MESSAGE[Alphanumeric login]"/>
<global_param group="CONF_MESSAGE[Add some users]" name="USER_MAIL" type="string" label="CONF_MESSAGE[User Email]" replicationGroup="users" description="CONF_MESSAGE[Mail address of the user]"/>
Expand Down

0 comments on commit 7a0c26e

Please sign in to comment.