Refine descriptions in wizards

spk/owncloud/src/service-setup.sh

@@ -168,15 +168,15 @@ validate_preinst ()
         MYSQL_USER="oc_${wizard_owncloud_admin_username}"
         # Check database
         if ! ${MYSQL} -u root -p"${wizard_mysql_password_root}" -e quit > /dev/null 2>&1; then
-            echo "Incorrect MySQL root password"
+            echo "Incorrect MySQL 'root' password"
             exit 1
         fi
         if ${MYSQL} -u root -p"${wizard_mysql_password_root}" mysql -e "SELECT User FROM user" | grep ^${MYSQL_USER}$ > /dev/null 2>&1; then
-            echo "MySQL user ${MYSQL_USER} already exists"
+            echo "MySQL user '${MYSQL_USER}' already exists"
             exit 1
         fi
         if ${MYSQL} -u root -p"${wizard_mysql_password_root}" -e "SHOW DATABASES" | grep ^${MYSQL_DATABASE}$ > /dev/null 2>&1; then
-            echo "MySQL database ${MYSQL_DATABASE} already exists"
+            echo "MySQL database '${MYSQL_DATABASE}' already exists"
             exit 1
         fi
 
@@ -357,7 +357,7 @@ validate_preuninst ()
 {
     # Check database
     if [ "${SYNOPKG_PKG_STATUS}" = "UNINSTALL" ] && ! ${MYSQL} -u root -p"${wizard_mysql_password_root}" -e quit > /dev/null 2>&1; then
-        echo "Incorrect MySQL root password"
+        echo "Incorrect MySQL 'root' password"
         exit 1
     fi
     # Check export directory

spk/owncloud/src/wizard_templates/install_uifile.yml

@@ -14,8 +14,8 @@ OWNCLOUD_ADMIN_USER_NAME_DESCRIPTION: "Administrator's login. Defaults to 'admin
 OWNCLOUD_ADMIN_USER_NAME_LABEL: "User name"
 OWNCLOUD_ADMIN_PASSWORD_DESCRIPTION: "Administrator's password. Defaults to 'admin'"
 OWNCLOUD_ADMIN_PASSWORD_LABEL: "Password"
-MYSQL_ROOT_PASSWORD_DESCRIPTION: "Enter your MySQL password"
-MYSQL_ROOT_PASSWORD_LABEL: "Root password"
+MYSQL_ROOT_PASSWORD_DESCRIPTION: "Enter your MySQL superuser account password"
+MYSQL_ROOT_PASSWORD_LABEL: "MySQL 'root' password"
 
 OWNCLOUD_TRUSTED_DOMAINS_STEP_TITLE: "ownCloud trusted domains"
 OWNCLOUD_TRUSTED_DOMAINS_DESCRIPTION: "To access your ownCloud server, you must whitelist all URLs in your settings, including any additional URLs you want to use besides the current hostname."

spk/owncloud/src/wizard_templates/install_uifile_fre.yml

@@ -14,8 +14,8 @@ OWNCLOUD_ADMIN_USER_NAME_DESCRIPTION: "Connexion de l'administrateur. Par défau
 OWNCLOUD_ADMIN_USER_NAME_LABEL: "Nom d'utilisateur"
 OWNCLOUD_ADMIN_PASSWORD_DESCRIPTION: "Mot de passe de l'administrateur. Par défaut, 'admin'"
 OWNCLOUD_ADMIN_PASSWORD_LABEL: "Mot de passe"
-MYSQL_ROOT_PASSWORD_DESCRIPTION: "Entrez votre mot de passe MySQL"
-MYSQL_ROOT_PASSWORD_LABEL: "Mot de passe root"
+MYSQL_ROOT_PASSWORD_DESCRIPTION: "Entrez le mot de passe de votre compte superutilisateur MySQL"
+MYSQL_ROOT_PASSWORD_LABEL: "Mot de passe « root » de MySQL"
 
 OWNCLOUD_TRUSTED_DOMAINS_STEP_TITLE: "Domaines de confiance ownCloud"
 OWNCLOUD_TRUSTED_DOMAINS_DESCRIPTION: "Pour accéder à votre serveur ownCloud, vous devez mettre en liste blanche toutes les URL dans vos paramètres, y compris toutes les URL supplémentaires que vous souhaitez utiliser en plus du nom d'hôte actuel."

spk/owncloud/src/wizard_templates/uninstall_uifile.yml

@@ -2,7 +2,7 @@ OWNCLOUD_PATH_VALIDATION_ERROR_TEXT: "Path should begin with /volume?/ with ? th
 
 OWNCLOUD_BACKUP_SERVER_STEP_TITLE: "Backup ownCloud server"
 OWNCLOUD_BACKUP_SERVER_DESCRIPTION: "<strong>WARNING:</strong> Uninstalling the ownCloud package will result in the removal of the ownCloud server, along with all associated user accounts, data, and configurations."
-MYSQL_ROOT_PASSWORD_DESCRIPTION: "Enter your MySQL password"
-MYSQL_ROOT_PASSWORD_LABEL: "Root password"
+MYSQL_ROOT_PASSWORD_DESCRIPTION: "Enter your MySQL superuser account password"
+MYSQL_ROOT_PASSWORD_LABEL: "MySQL 'root' password"
 OWNCLOUD_BACKUP_EXPORT_LOCATION_DESCRIPTION: "Before uninstalling, if you want to keep a backup of your data, please specify the directory where you would like to export to. Ensure that the user 'sc-owncloud' has write permissions to that directory. To skip exporting, leave this field blank."
 OWNCLOUD_BACKUP_EXPORT_LOCATION_LABEL: "Export location"

spk/owncloud/src/wizard_templates/uninstall_uifile_fre.yml

@@ -2,7 +2,7 @@ OWNCLOUD_PATH_VALIDATION_ERROR_TEXT: "Le chemin doit commencer par /volume?/ ave
 
 OWNCLOUD_BACKUP_SERVER_STEP_TITLE: "Sauvegarder le serveur ownCloud"
 OWNCLOUD_BACKUP_SERVER_DESCRIPTION: "<strong>AVERTISSEMENT:</strong> La désinstallation du package ownCloud entraînera la suppression du serveur ownCloud, ainsi que de tous les comptes d'utilisateurs, données et configurations associés."
-MYSQL_ROOT_PASSWORD_DESCRIPTION: "Entrez votre mot de passe MySQL"
-MYSQL_ROOT_PASSWORD_LABEL: "Mot de passe root"
+MYSQL_ROOT_PASSWORD_DESCRIPTION: "Entrez le mot de passe de votre compte superutilisateur MySQL"
+MYSQL_ROOT_PASSWORD_LABEL: "Mot de passe « root » de MySQL"
 OWNCLOUD_BACKUP_EXPORT_LOCATION_DESCRIPTION: "Avant la désinstallation, si vous souhaitez conserver une sauvegarde de vos données, veuillez spécifier le répertoire vers lequel vous souhaitez exporter. Assurez-vous que l'utilisateur 'sc-owncloud' dispose des autorisations d'écriture dans ce répertoire. Pour ignorer l'exportation, laissez ce champ vide."
 OWNCLOUD_BACKUP_EXPORT_LOCATION_LABEL: "Emplacement d'exportation"