From 44b74724ed920d501eaee28560770583aa4eadab Mon Sep 17 00:00:00 2001 From: opi Date: Tue, 13 May 2014 16:37:05 +0200 Subject: [PATCH] [i18n] More translations for flash messages. More french. --- js/app.js | 107 +++++++--------- locales/en.json | 45 +++++-- locales/fr.json | 237 +++++++++++++++++++---------------- views/home.ms | 30 ++++- views/tools/tools_list.ms | 10 +- views/tools/tools_update.ms | 8 +- views/tools/tools_upgrade.ms | 2 +- views/user/user_edit.ms | 2 +- 8 files changed, 252 insertions(+), 189 deletions(-) diff --git a/js/app.js b/js/app.js index 49796bc2..0443ed6e 100644 --- a/js/app.js +++ b/js/app.js @@ -101,8 +101,9 @@ app = Sammy('#main', function (sam) { installing = true; }, 1500); - $('#popup-title').text('Installing'); - $('#popup-body').html('

YunoHost is being installed on '+ data.domain +'. It may take a few minutes ...



'); + $('#popup-title').text(y18n.t('installing')); + $('#popup-body').html('

'+y18n.t('installation_complete_wait', [data.domain])+'

'); + $('#popup-body').append('
'); $('#popup').modal('show'); } else { loaded = false; @@ -137,7 +138,7 @@ app = Sammy('#main', function (sam) { .fail(function(xhr) { if (xhr.status == 401) { $('#popup').modal('hide'); - c.flash('fail', 'Wrong password'); + c.flash('fail', y18n.t('wrong_password')); } else if (typeof xhr.responseJSON !== 'undefined') { $('#popup').modal('hide'); c.flash('fail', xhr.responseJSON.error); @@ -145,22 +146,25 @@ app = Sammy('#main', function (sam) { if (uri == '/postinstall') { if (installing) { if (args.domain.match(/\.nohost\.me$/) || args.domain.match(/\.noho\.st$/)) { - $('#popup-title').text('Installed'); - $('#popup-body p').text('YunoHost has been successfully installed, we\'ll wait for DNS to be propagated. It will take 3 minutes ...'); + $('#popup-title').text(y18n.t('installed')); + $('#popup-body p').text(y18n.t('installation_complete_dns')); interval = 180000; } else { interval = 5000; } setInterval(function () { - $('#popup-title').text('Installation complete'); - $('#popup-body').html('

YunoHost has been successfully installed, please go to https://'+ args.domain +'/yunohost/admin and create your first user.


Not working ?

'); + $('#popup-title').text(y18n.t('installation_complete')); + $('#popup-body').html( + '

'+ y18n.t('installation_complete_desc', ['https://'+ args.domain +'/yunohost/admin']) +'

' + + '
' + + '

'+ y18n.t('installation_complete_help_dns') +'

'); }, interval); } else { $('#popup').modal('hide'); - c.flash('fail', 'An error occured, try again'); + c.flash('fail', y18n.t('error_occured')); } } else { - c.flash('fail', 'Server error'); + c.flash('fail', y18n.t('error_server')); } } store.clear('slide'); @@ -277,32 +281,14 @@ app = Sammy('#main', function (sam) { * */ sam.get('#/', function (c) { - - // Show development note - c.flash('info', 'You are using a development version.
' + - 'Please note that you can use the moulinette if you want to access to more YunoHost\'s features.'); - - - // Available sections - data = {links: [ - {name: "Users", path: '#/users'}, - {name: "Domains", path: '#/domains'}, - {name: "Applications", path: '#/apps'}, - {name: "Services", path: '#/services'}, - {name: "Monitoring", path: '#/monitor'}, - {name: "Tools", path: '#/tools'}, - {name: "Backup", path: '#/backup'}, - ]}; - - c.api('/users', function(data2) { + c.api('/users', function(data) { // Warn admin if no users are created. - if (data2.Users.length == 0) { - c.flash('warning', "You probably need to create a user first."); + if (data.Users.length == 0) { + c.flash('warning', y18n.t('warning_first_user')); } - c.view('home', data); + c.view('home'); }); - }); sam.get('#/login', function (c) { @@ -338,7 +324,7 @@ app = Sammy('#main', function (sam) { c.api('/users', function(data) { store.set('connected', true); $('.logout-button').fadeIn(); - c.flash('success', 'Logged in'); + c.flash('success', y18n.t('logged_in')); if (store.get('path')) { c.redirect(store.get('path')); } else { @@ -346,7 +332,7 @@ app = Sammy('#main', function (sam) { } }); } else { - c.flash('fail', 'Non-compatible API'); + c.flash('fail', y18n.t('non_compatible_api')); c.redirect('#/login'); } }); @@ -358,7 +344,7 @@ app = Sammy('#main', function (sam) { store.clear('password'); store.clear('connected'); store.set('path', '#/'); - c.flash('success', 'Logged out'); + c.flash('success', y18n.t('logged_out')); c.redirect('#/login'); }); @@ -370,7 +356,7 @@ app = Sammy('#main', function (sam) { if (c.params['password'] == c.params['confirmation']) { if (c.params['domain'] == '') { if (c.params['ddomain'] == '') { - c.flash('fail', "You should indicate a domain"); + c.flash('fail', y18n.t('error_select_domain')); store.clear('slide'); c.redirect('#/postinstall'); } else { @@ -389,7 +375,7 @@ app = Sammy('#main', function (sam) { c.redirect('#/'); }, 'POST', params); } else { - c.flash('fail', "Passwords don't match"); + c.flash('fail', y18n.t('passwords_dont_match')); } }); @@ -413,7 +399,7 @@ app = Sammy('#main', function (sam) { sam.post('#/users', function (c) { if (c.params['password'] == c.params['confirmation']) { if (c.params['password'].length < 4) { - c.flash('fail', "Password is too short"); + c.flash('fail', y18n.t('password_too_short')); store.clear('slide'); } else { @@ -423,7 +409,7 @@ app = Sammy('#main', function (sam) { }, 'POST', c.params.toHash()); } } else { - c.flash('fail', "Passwords don't match"); + c.flash('fail', y18n.t('passwords_dont_match')); store.clear('slide'); //c.redirect('#/users/create'); } @@ -448,14 +434,14 @@ app = Sammy('#main', function (sam) { }); if ($.isEmptyObject(params)) { - c.flash('fail', 'You should modify something'); + c.flash('fail', y18n.t('error_modify_something')); store.clear('slide'); // c.redirect('#/users/'+ c.params['user'] + '/edit'); } else { if (params['password']) { if (params['password'] == params['confirmation']) { if (params['password'].length < 4) { - c.flash('fail', "Password is too short"); + c.flash('fail', y18n.t('password_too_short')); store.clear('slide'); } else { @@ -465,7 +451,7 @@ app = Sammy('#main', function (sam) { }, 'PUT', params); } } else { - c.flash('fail', "Passwords don't match"); + c.flash('fail', y18n.t('passwords_dont_match')); store.clear('slide'); } } @@ -478,7 +464,7 @@ app = Sammy('#main', function (sam) { }); sam.get('#/users/:user/delete', function (c) { - if (confirm('Are you sure you want to delete '+ c.params['user'] +' ?')) { + if (confirm(y18n.t('confirm_delete', [c.params['user']]))) { c.api('/users/'+ c.params['user'], function(data) { // http://api.yunohost.org/#!/user/user_delete_delete_4 c.redirect('#/users'); }, 'DELETE'); @@ -518,7 +504,7 @@ app = Sammy('#main', function (sam) { sam.post('#/domains/add', function (c) { if (c.params['domain'] == '') { if (c.params['ddomain'] == '') { - c.flash('fail', "You should indicate a domain"); + c.flash('fail', y18n.t('error_select_domain')); store.clear('slide'); c.redirect('#/domains/add'); } @@ -533,7 +519,7 @@ app = Sammy('#main', function (sam) { }); sam.get('#/domains/:domain/delete', function (c) { - if (confirm('Are you sure you want to delete '+ c.params['domain'] +' ?')) { + if (confirm(y18n.t('confirm_delete', [c.params['domain']]))) { c.api('/domains/'+ c.params['domain'], function(data) { // http://api.yunohost.org/#!/domain/domain_remove_delete_3 store.clear('slide'); c.redirect('#/domains'); @@ -547,10 +533,10 @@ app = Sammy('#main', function (sam) { // Set default domain sam.post('#/domains', function (c) { if (c.params['domain'] == '') { - c.flash('fail', "You should select a domain default domain"); + c.flash('fail', y18n.t('error_select_domain')); store.clear('slide'); c.redirect('#/domains'); - } else if (confirm('Are you sure you want to change the main domain ?')) { + } else if (confirm(y18n.t('confirm_change_maindomain'))) { params = {'new_domain': c.params['domain']} c.api('/domain/main', function(data) { // http://api.yunohost.org/#!/tools/tools_maindomain_put_1 @@ -674,7 +660,7 @@ app = Sammy('#main', function (sam) { }); sam.get('#/apps/:app/uninstall', function (c) { - if (confirm('Are you sure you want to uninstall '+ c.params['app'] +' ?')) { + if (confirm(y18n.t('confirm_uninstall', [c.params['app']]))) { c.api('/app?app='+ c.params['app'], function() { // http://api.yunohost.org/#!/app/app_remove_delete_4 c.redirect('#/apps'); }, 'DELETE'); @@ -731,7 +717,7 @@ app = Sammy('#main', function (sam) { // Remove all access sam.get('#/apps/:app/access/remove', function (c) { - if (confirm('Are you sure you want to remove all access to '+ c.params['app'] +' ?')) { + if (confirm(y18n.t('confirm_access_remove_all', [c.params['app']]))) { params = {'apps': c.params['app'], 'users':[]} c.api('/app/access?'+c.serialize(params), function(data) { // http://api.yunohost.org/#!/app/app_removeaccess_delete_12 store.clear('slide'); @@ -745,7 +731,7 @@ app = Sammy('#main', function (sam) { // Remove access to a specific user sam.get('#/apps/:app/access/remove/:user', function (c) { - if (confirm('Are you sure you want to remove access to '+ c.params['app'] +' for '+ c.params['user'] +' ?')) { + if (confirm(y18n.t('confirm_access_remove_user', [c.params['app'], c.params['user']]))) { params = {'apps': c.params['app'], 'users': c.params['user']} c.api('/app/access?'+c.serialize(params), function(data) { // http://api.yunohost.org/#!/app/app_removeaccess_delete_12 store.clear('slide'); @@ -759,7 +745,7 @@ app = Sammy('#main', function (sam) { // Grant all access sam.get('#/apps/:app/access/add', function (c) { - if (confirm('Are you sure you want to add access to '+ c.params['app'] +' for all users ?')) { + if (confirm(y18n.t('confirm_access_add_all', [c.params['app']]))) { params = {'apps': c.params['app'], 'users': null} c.api('/app/access', function() { // http://api.yunohost.org/#!/app/app_addaccess_put_13 store.clear('slide'); @@ -782,7 +768,7 @@ app = Sammy('#main', function (sam) { // Clear access (reset) sam.get('#/apps/:app/access/clear', function (c) { - if (confirm('Are you sure you want to clear all access to '+ c.params['app'] +' ?')) { + if (confirm(y18n.t('confirm_access_clear_all', [c.params['app']]))) { params = {'apps': c.params['app']} c.api('/app/access', function() { // store.clear('slide'); @@ -796,7 +782,7 @@ app = Sammy('#main', function (sam) { // Make app default sam.get('#/apps/:app/default', function (c) { - if (confirm('Are you sure you want to make this app default ?')) { + if (confirm(y18n.t('confirm_app_default'))) { params = {'app': c.params['app']} c.api('/app/default', function() { // store.clear('slide'); @@ -856,7 +842,7 @@ app = Sammy('#main', function (sam) { // Enable/Disable & Start/Stop service sam.get('#/services/:service/:action', function (c) { - if (confirm('Are you sure you want to '+ c.params['action'] +' '+ c.params['service'] +' ?')) { + if (confirm(y18n.t('confirm_service_action', [y18n.t(c.params['action']), c.params['service']]))) { params = { 'names': c.params['service'] } c.api('/service/'+ c.params['action'], function(data) { store.clear('slide'); @@ -918,12 +904,7 @@ app = Sammy('#main', function (sam) { */ sam.get('#/tools', function (c) { - // Available tools - data = {links: [ - {name: "Change administration password", path: '#/tools/adminpw'}, - {name: "System update", path: '#/tools/update'}, - ]}; - c.view('tools/tools_list', data); + c.view('tools/tools_list'); }); // Update administration password @@ -936,11 +917,11 @@ app = Sammy('#main', function (sam) { if (value !== '') { params[key] = value; } }); if ($.isEmptyObject(params)) { - c.flash('fail', 'You should modify something'); + c.flash('fail', y18n.t('error_modify_something')); store.clear('slide'); c.redirect('#/tools/adminpw'); } else if (params['new_password'] !== params['confirm_new_password']) { - c.flash('fail', 'Your password didn\'t match'); + c.flash('fail', y18n.t('passwords_dont_match')); store.clear('slide'); c.redirect('#/tools/adminpw'); } else { @@ -967,11 +948,11 @@ app = Sammy('#main', function (sam) { sam.get('#/tools/upgrade/:type', function (c) { if (c.params['type'] !== 'apps' && c.params['type'] !== 'packages') { - c.flash('fail', 'Error'); + c.flash('fail', y18n.t('error_server')); store.clear('slide'); c.redirect('#/tools/update'); } - if (confirm('Are you sure you want update every '+c.params['type']+' ?')) { + if (confirm(y18n.t('confirm_update_type', [y18n.t('system_'+c.params['type']).toLowerCase()]))) { params = { 'ignore_packages': (c.params['type'] == 'packages') ? false : true, 'ignore_apps': (c.params['type'] == 'apps') ? false : true, diff --git a/locales/en.json b/locales/en.json index fad8d5c7..6d390cbb 100644 --- a/locales/en.json +++ b/locales/en.json @@ -31,19 +31,51 @@ "stop" : "Stop", "log" : "Log", + "installing" : "Installing", + "installed" : "Installed", + "installation_complete" : "Installation complete", + "installation_complete_wait" : "YunoHost is being installed on %s. It may take a few minutes…", + "installation_complete_dns" : "YunoHost has been successfully installed, we'll wait for DNS to be propagated. It will take 3 minutes…", + "installation_complete_desc" : "YunoHost has been successfully installed, please go to %s and create your first user.", + "installation_complete_help_dns" : "Not working ?", + + "wrong_password" : "Wrong password", + "passwords_dont_match" : "Passwords don't match", + "passwords_too_short" : "Password is too short", + "logged_in" : "Logged in", + "logged_out" : "Logged out", + "error_occured" : "An error occured, try again", + "error_server" : "Server error", + "error_select_domain" : "You should indicate a domain", + "error_modify_something" : "You should modify something", + "non_compatible_api" : "Non-compatible API", + "warning_first_user" : "You probably need to create a user first.", + + "confirm_delete" : "Are you sure you want to delete %s ?", + "confirm_change_maindomain" : "Are you sure you want to change the main domain ?", + "confirm_uninstall" : "Are you sure you want to uninstall %s ?", + "confirm_access_remove_all" : "Are you sure you want to remove all access to %s ?", + "confirm_access_remove_user" : "Are you sure you want to remove access to %s for %s ?", + "confirm_access_add" : "Are you sure you want to add access to %s for all users ?", + "confirm_access_clear" : "Are you sure you want to clear all access to %s ?", + "confirm_app_default" : "Are you sure you want to make this app default ?", + "confirm_service_action" : "Are you sure you want to %s %s ?", + "confirm_update_type" : "Are you sure you want update every %s %s ?", + "postinstall_intro" : "A last step is necessary to fulfill the installation: You have to link your YunoHost instance to a domain name, and set a new administrator password.", + "application" : "Application", + "applications" : "Applications", "install" : "Install", "installed_apps" : "Installed apps", "refresh_app_list" : "Refresh list", "available_apps" : "Available apps", "no_installed_apps" : "No installed apps.", "app_list" : "App list", - "install" : "Install", "uninstall" : "Uninstall", "install_name" : "Install %s", "label_for_manifestname" : "Label for %s", - "app_info_access_desc" : "Manage user access. Allowed users: %s.", + "app_info_access_desc" : "Manage user access. Allowed users: %s.", "app_info_default_desc" : "Redirect domain root to this application (%s).", "app_info_uninstall_desc" : "Remove this application.", "app_access" : "Access", @@ -111,7 +143,6 @@ "fs_type" : "FS Type", "mount_point" : "Mount point", "size" : "Size", - "used" : "Used", "available" : "Available", "io" : "I/O", "read" : "Read", @@ -134,12 +165,12 @@ "system_update" : "System update", "system_upgrade" : "System upgrade", + "system_upgrade_btn" : "Upgrade", "system_packages" : "Packages", - "system_packages_btn" : "Upgrade packages", - "system_packages_desc" : "There is no packages to upgrade.", "system_apps" : "Apps", - "system_apps_btn" : "Upgrade apps", - "system_apps_desc" : "There is no apps to upgrade.", + "system_packages_nothing" : "There is no packages to upgrade.", + "system_apps_nothing" : "There is no apps to upgrade.", + "no_log" : "No log.", "users" : "Users", "users_new" : "New user", diff --git a/locales/fr.json b/locales/fr.json index 1b2e25b4..3d63c6b0 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -5,7 +5,7 @@ "administration_password" : "Mot de passe d'administration", "password_confirmation" : "Confirmation du mot de passe", "password_new" : "New password", - "password_description" : "Password must be at least 4 characters long.", + "password_description" : "Le mot de passe doit faire au moins 4 caractères.", "login" : "Connexion", "logout" : "Déconnexion", "loading" : "Chargement", @@ -19,140 +19,167 @@ "mode" : "Mode", "url" : "URL", "operations" : "Operations", - "add" : "Add", - "save" : "Save", - "delete" : "Delete", - "default" : "Default", - "set_default" : "Set default", - "status" : "Status", - "disable" : "Disable", - "enable" : "Enable", - "start" : "Start", - "stop" : "Stop", - "log" : "Log", + "add" : "Ajouter", + "save" : "Sauvegarder", + "delete" : "Supprimer", + "default" : "Défaut", + "set_default" : "Définir par défaut", + "status" : "Statut", + "disable" : "Désactiver", + "enable" : "Activer", + "start" : "Démarrer", + "stop" : "Arrêter", + "log" : "Journal", + + "installing" : "Installing", + "installed" : "Installed", + "installation_complete" : "Installation complete", + "installation_complete_wait" : "YunoHost is being installed on %s. It may take a few minutes…", + "installation_complete_dns" : "YunoHost has been successfully installed, we'll wait for DNS to be propagated. It will take 3 minutes…", + "installation_complete_desc" : "YunoHost has been successfully installed, please go to %s and create your first user.", + "installation_complete_help_dns" : "Not working ?", + + "wrong_password" : "Mot de passe incorrect", + "passwords_dont_match" : "Les mots de passe ne correspondent pas", + "passwords_too_short" : "Mot de passe trop court", + "logged_in" : "Connecté", + "logged_out" : "Déconnecté", + "error_occured" : "Une erreur est survenue, veuillez réessayer.", + "error_server" : "Erreur serveur", + "error_select_domain" : "Vous devez indiquer une domaine.", + "error_modify_something" : "Vous devez modifier quelque chose.", + "non_compatible_api" : "API Non compatible", + "warning_first_user" : "Vous devez probablement d'abord créer un utilisateur.", + + "confirm_delete" : "Êtes-vous sur de vouloir supprimer %s ?", + "confirm_change_maindomain" : "Êtes-vous sur de vouloir changer le domaine principal ?", + "confirm_uninstall" : "Êtes-vous sur de vouloir désinstaller %s ?", + "confirm_access_remove_all" : "Êtes-vous sur de vouloir supprimer tous les accès à %s ?", + "confirm_access_remove_user" : "Êtes-vous sur de vouloir supprimer les accès à %s pour %s ?", + "confirm_access_add" : "Êtes-vous sur de vouloir ajouter un accès à %s pour tous les utilisateurs ?", + "confirm_access_clear" : "Êtes-vous sur de vouloir supprimer toutes les règles d'accès à %s ?", + "confirm_app_default" : "Êtes-vous sur de vouloir définir cette application par défaut ?", + "confirm_service_action" : "Êtes-vous sur de vouloir %s %s ?", + "confirm_update_type" : "Êtes-vous sur de vouloir mettre à jour tous les %s ?", "postinstall_intro" : "A last step is necessary to fulfill the installation: You have to link your YunoHost instance to a domain name, and set a new administrator password.", - "postinstall_panel_with_domain" : "?? I already have a domain name…", - "postinstall_panel_without_domain" : "?? I don't have a domain name…", - "postinstall_dns_doc" : "?? … and I have set my DNS correctly.", - "postinstall_dyndns_doc" : "?? … and I want a dynamic DNS service.", - "install" : "Install", - "installed_apps" : "Installed apps", - "refresh_app_list" : "Refresh list", - "available_apps" : "Available apps", - "no_installed_apps" : "No installed apps.", - "app_list" : "App list", - "install" : "Install", + "application" : "Application", + "applications" : "Applications", + "install" : "Installer", + "installed_apps" : "Applications installées", + "refresh_app_list" : "Rafraîchir la liste", + "available_apps" : "Applications disponibles", + "no_installed_apps" : "Aucune application installée.", + "app_list" : "Liste des applications", "uninstall" : "Désinstaller", "install_name" : "Installer %s", - "label_for_manifestname" : "Label for %s", - "app_info_access_desc" : "Manage user access. Allowed users: %s.", + "label_for_manifestname" : "Libellé pour %s", + "app_info_access_desc" : "Gestion des droits d'accès. Utilisateurs autorisés : %s.", "app_info_default_desc" : "Redirect domain root to this application (%s).", - "app_info_uninstall_desc" : "Remove this application.", - "app_access" : "Access", - "app_make_default" : "Make default", - "app_access_title" : "%s access", - "allowed_users" : "Allowed users", - "remove_access" : "Remove access", - "view_user_profile" : "View %s's profile", - "rveryone_has_access" : "Everyone has access.", - "no_allowed_users" : "No allowed users.", - "select_user" : "Select user", - "no_user_to_add" : "No more users to add.", - "app_access_addall_desc" : "All existing users will have access to %s.", - "app_access_removeall_desc" : "No users will have access to %s.", - "app_access_clearall_desc" : "Every user will have access to %s.", - "app_access_addall_btn" : "Add access to all", - "app_access_removeall_btn" : "Remove all access", - "app_access_clearall_btn" : "Clear all access", + "app_info_uninstall_desc" : "Supprimer cette application.", + "app_access" : "Accès", + "app_make_default" : "Définir par défaut", + "app_access_title" : "Accès à %s", + "allowed_users" : "Utilisateurs autorisés", + "remove_access" : "Retirer les accès", + "view_user_profile" : "Voir le profil de %s", + "rveryone_has_access" : "Tous les utilisateurs ont accès.", + "no_allowed_users" : "Aucun utilisateur autorisé.", + "select_user" : "Choisissez un utilisateur", + "no_user_to_add" : "Aucun utilisateur à ajouter.", + "app_access_addall_desc" : "Tous les utilisateurs ont accès à %s.", + "app_access_removeall_desc" : "Aucun utilisateur n'a accès à %s.", + "app_access_clearall_desc" : "Tous les utilisateurs auront accès à %s.", + "app_access_addall_btn" : "Ajouter l'accès à tous les utilisateurs", + "app_access_removeall_btn" : "Supprimer tous les accès", + "app_access_clearall_btn" : "Effacer toutes les règles accès", - "backup" : "Backup", - "backup_warning_title" : "The backup system is not implemented yet.", - "backup_warning_desc" : "You should take care of backing up your data yourself for now.", + "backup" : "Sauvegarde", + "backup_warning_title" : "Le système de sauvegarde n'est pas encore implémenté.", + "backup_warning_desc" : "Vous devriez prendre soin de sauvegarder vos données vous-mêmes pour le moment.", - "domain_list" : "Domain list", - "domain_add" : "Add domain", - "domain_add_panel_with_domain" : "I already have a domain name…", - "domain_add_panel_without_domain" : "I don't have a domain name…", - "domain_add_dns_doc" : "… and I have set my DNS correctly.", - "domain_add_dyndns_doc" : "… and I want a dynamic DNS service.", - "domain_default" : "Default domain", - "domain_default_desc" : "The default domain is the connection domain where users log in.", - "domain_select" : "Select domain", + "domain_list" : "Liste des domaines", + "domain_add" : "Ajouter un domaine", + "domain_add_panel_with_domain" : "J'ai déjà un nom de domaine …", + "domain_add_panel_without_domain" : "Je n'ai pas de nom de domaine …", + "domain_add_dns_doc" : "… et j'ai configurer mes DNS correctement.", + "domain_add_dyndns_doc" : "… et je souhaite un service de DNS dynamique.", + "domain_default" : "Domaine par défaut", + "domain_default_desc" : "Les utilisateurs se connecteront au domaine par défaut.", + "domain_select" : "Selectionnez un domaine", "monitoring" : "Monitoring", "hostname" : "Hostname", "os" : "OS", "uptime" : "Uptime", - "system" : "System", - "memory" : "Memory", + "system" : "Système", + "memory" : "Memoire", "ram" : "RAM", "swap" : "Swap", - "used" : "Used", - "free" : "Free", + "used" : "Utilisé(e)", + "free" : "Libre", "total" : "Total", - "cpu_load" : "CPU Load", + "cpu_load" : "Charge CPU", "count_min" : "%s min", "process" : "Process", "running" : "Running", "sleeping" : "Sleeping", - "network" : "Network", - "public_ip" : "Public IP: ", - "local_ip" : "Local IP", - "gateway" : "Gateway: ", + "network" : "Réseau", + "public_ip" : "IP Publique : ", + "local_ip" : "IP Locale", + "gateway" : "Passerelle : ", "interface" : "Interface", "ipv4" : "IPv4", "ipv6" : "IPv6", "usage" : "Usage", - "time_since_update" : "Time since update: ", - "bit_rate" : "Bit rate", - "cumulative_usage" : "Cumulative usage", - "transmission" : "Transmission", - "reception" : "Reception", - "disk" : "Disk", - "filesystem" : "Filesystem", - "fs_type" : "FS Type", - "mount_point" : "Mount point", - "size" : "Size", - "used" : "Used", - "available" : "Available", - "io" : "I/O", - "read" : "Read", - "write" : "Write", - "monitoring_disabled" : "Monitoring is not enabled.", - "monitoring_check_glances" : "Check glances service status.", + "time_since_update" : "Dernière mise-à-jour: ", + "bit_rate" : "Débit", + "cumulative_usage" : "Cumul", + "transmission" : "Émission", + "reception" : "Réception", + "disk" : "Disque", + "filesystem" : "Système de fichier", + "fs_type" : "Type de système de fichier", + "mount_point" : "Point de montage", + "size" : "Taille", + "available" : "Disponible", + "io" : "E/S", + "read" : "Lecture", + "write" : "Écriture", + "monitoring_disabled" : "Le monitoring n'est pas activé.", + "monitoring_check_glances" : "Verifiez l'état du service glances.", "services" : "Services", - "services_list" : "Services list", - "service_start_on_boot" : "Start on boot: ", - "service_status" : "Status: ", - "service_log" : "%s log", + "services_list" : "Liste des services", + "service_start_on_boot" : "Lancer au démarrage : ", + "service_status" : "Statut : ", + "service_log" : "Journal de %s", - "tools" : "Tools", - "tools_adminpw" : "Change administration password", - "tools_adminpw_current" : "Current password", - "tools_adminpw_current_placeholder" : "Enter your current password", - "tools_adminpw_new_placeholder" : "Enter the new password", - "tools_adminpw_confirm_placeholder" : "Confirm the new password", + "tools" : "Outils", + "tools_adminpw" : "Changer le mot de passe d'administration", + "tools_adminpw_current" : "Mot de passe actuel", + "tools_adminpw_current_placeholder" : "Entrez le mot de passe actuel", + "tools_adminpw_new_placeholder" : "Entrez le nouveau mot de passe", + "tools_adminpw_confirm_placeholder" : "Confirmez le nouveau mot de passe", - "system_update" : "System update", - "system_upgrade" : "System upgrade", - "system_packages" : "Packages", - "system_packages_btn" : "Upgrade packages", - "system_packages_desc" : "There is no packages to upgrade.", - "system_apps" : "Apps", - "system_apps_btn" : "Upgrade apps", - "system_apps_desc" : "There is no apps to upgrade.", + "system_update" : "Mises à jour du système", + "system_upgrade" : "Mise à jour du système", + "system_upgrade_btn" : "Mettre à jour", + "system_packages" : "Paquets", + "system_apps" : "Applications", + "system_packages_nothing" : "Il n'y a aucun paquet à mettre à jour.", + "system_apps_nothing" : "Il n'y a aucune application à mettre à jour.", + "no_log" : "Aucun journal.", - "users" : "Users", - "users_new" : "New user", - "users_no" : "No users.", - "users_list" : "Users list", + "users" : "Utilisateurs", + "users_new" : "Nouvel utilisateur", + "users_no" : "Aucun utilisateur.", + "users_list" : "Liste des utilisateurs", - "user_username" : "Username", - "user_username_edit" : "Edit %s", - "user_fullname" : "Fullname", + "user_username" : "Nom d'utilisateur", + "user_username_edit" : "Editer %s", + "user_fullname" : "Nom complet", "user_email" : "Email", "" : "" diff --git a/views/home.ms b/views/home.ms index 6379c995..139c7d4c 100644 --- a/views/home.ms +++ b/views/home.ms @@ -4,11 +4,33 @@
-{{#links}} - + -

{{name}}

+

{{t 'users'}}

+ + + +

{{t 'domains'}}

+ + + +

{{t 'applications'}}

+ + + +

{{t 'services'}}

+ + + +

{{t 'monitoring'}}

+ + + +

{{t 'tools'}}

+ + + +

{{t 'backup'}}

 -{{/links}}
diff --git a/views/tools/tools_list.ms b/views/tools/tools_list.ms index c8f175ee..c7d6c81b 100644 --- a/views/tools/tools_list.ms +++ b/views/tools/tools_list.ms @@ -9,11 +9,13 @@
-{{#links}} - + -

{{name}}

+

{{t 'tools_adminpw'}}

+ + + +

{{t 'system_update'}}

 -{{/links}}
diff --git a/views/tools/tools_update.ms b/views/tools/tools_update.ms index 83ffaea1..39d0ffe4 100644 --- a/views/tools/tools_update.ms +++ b/views/tools/tools_update.ms @@ -21,9 +21,9 @@ {{/packages}}
- {{t 'system_packages_btn'}} + {{t 'system_upgrade_btn'}} {{else}} - {{t 'system_packages_desc'}} + {{t 'system_packages_nothing'}} {{/if}} @@ -41,9 +41,9 @@ {{/apps}}
- {{t 'system_apps_btn'}} + {{t 'system_upgrade_btn'}} {{else}} - {{t 'system_packages_desc'}} + {{t 'system_apps_nothing'}} {{/if}} diff --git a/views/tools/tools_upgrade.ms b/views/tools/tools_upgrade.ms index 6208f7ce..d1f5b442 100644 --- a/views/tools/tools_upgrade.ms +++ b/views/tools/tools_upgrade.ms @@ -14,5 +14,5 @@ {{/logs}} {{else}} -No log. + {{t 'no_log'}} {{/if}} \ No newline at end of file diff --git a/views/user/user_edit.ms b/views/user/user_edit.ms index 5e886b44..ec97da53 100644 --- a/views/user/user_edit.ms +++ b/views/user/user_edit.ms @@ -45,7 +45,7 @@
-
{{t 'password_decription'}}
+
{{t 'password_description'}}