diff --git a/README.md b/README.md index bfd3ace6..9cdaba19 100644 --- a/README.md +++ b/README.md @@ -38,4 +38,4 @@ https://example.com/yunohost/admin/views/domain/domain_list.ms) * Font-Awesome 4.5.0 * Handlebars 1.3.0 * Sammy 0.7.6 -* Jquery-Cookie 2.1.0 +* JS-cookie 2.1.0 diff --git a/debian/changelog b/debian/changelog index 064cb642..ff487df3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +yunohost-admin (3.7.0) testing; urgency=low + + - [enh] Add UI for groups and permissions (YunoHost-admin#257) + - [mod] Rework migration system to have independent migrations (YunoHost-admin#258) + - [enh] Quite a lot of messages improvements, string cleaning, language rework... (YunoHost-admin/10ea04a, YunoHost-admin#265) + - [i18n] Improved translations for Catalan, Occitan, French, Esperanto, Arabic, German, Spanish, Norwegian Bokmål, Portuguese + - [fix] Inline buttons responsiveness on migration screen (YunoHost-admin#259) + + Thanks to all contributors <3 ! (accross all repo: Yunohost, Moulinette, SSOwat, Yunohost-admin) : advocatux, Aksel K., Aleks, Allan N., amirale qt, Armin P., Bram, ButterflyOfFire, Carles S. A., chema o. r., decentral1se, Emmanuel V., Etienne M., Filip B., Geoff M., htsr, Jibec, Josué, Julien J., Kayou, liberodark, ljf, lucaskev, Lukas D., madtibo, Martin D., Mélanie C., nr 458 h, pitfd, ppr, Quentí, sidddy, troll, tufek yamero, xaloc33, yalh76 + + -- Alexandre Aubin Thu, 31 Oct 2019 19:00:00 +0000 + yunohost-admin (3.6.5) stable; urgency=low - [fix] Stupid / buggy error handling for postinstall (2187657) diff --git a/src/bower.json b/src/bower.json index 0d0e89f5..1928e289 100644 --- a/src/bower.json +++ b/src/bower.json @@ -5,7 +5,7 @@ "private": true, "dependencies": { "bootstrap": "3.3.6", - "font-awesome": "4.5.0", + "fork-awesome": "1.1.7", "handlebars-helper-intl": "1.1.2", "handlebars": "4.0.11", "sammy": "0.7.6", diff --git a/src/css/style.less b/src/css/style.less index ef22bc7a..1f362492 100644 --- a/src/css/style.less +++ b/src/css/style.less @@ -25,7 +25,7 @@ /* * FontAwesome */ -@import "../bower_components/font-awesome/less/font-awesome.less"; +@import "../bower_components/fork-awesome/less/fork-awesome.less"; // Fixes @@ -101,6 +101,10 @@ button { color: transparent; } +.label { + border-radius: 1px; +} + /* * The top heading of the doc * @@ -698,6 +702,71 @@ input[type='radio'].nice-radio { } +/** Groups View **/ +#view-groups { + .panel-heading a { + text-decoration: none; + } + .group-delete { + font-size: 24px; + line-height: 24px; + padding: 0; + float:right; + color:lighten(@label-danger-bg, 20%); + :hover { + color:@label-danger-bg; + } + } + .panel-body { + h3 { + margin-top:0; + } + button.dropdown-toggle { + line-height: 15.666px; + top: -1.666px; + } + .dropdown-menu { + max-height: 200px; + overflow-y: auto; + + button { + background: none; + } + } + .label-removable { + // The following match properties from regular btn's + display:inline-block; + font-size:14px; + color:#333; + background-color:#f8f8f8; + border: #ccc 1px solid; + font-weight: normal; + margin-bottom:0; + position: relative; + top: -1.666px; + height: 29.666px; + vertical-align: middle; + padding: 6px 12px; + + margin-right:7px; // Spacing between labels + + > button { + line-height: 12px; + margin-left:6px; + padding: 0; + padding-left:6px; + border-left: #ccc 1px solid; + color:lighten(@label-info-bg,20); + + text-decoration: none; + } + > button:hover { + color:@label-info-bg; + } + } + } +} + /** Flash messages **/ #flashMessage { max-height: 120px; diff --git a/src/gulpfile.js b/src/gulpfile.js index 5875faf9..e5f183e8 100644 --- a/src/gulpfile.js +++ b/src/gulpfile.js @@ -71,7 +71,7 @@ gulp.task('js-lint', function() { // Fonts gulp.task('fonts', function() { return gulp.src([ - 'bower_components/font-awesome/fonts/*', + 'bower_components/fork-awesome/fonts/*', 'bower_components/source-code-pro/EOT/*.eot', 'bower_components/source-code-pro/OTF/*.otf', 'bower_components/source-code-pro/TTF/*.ttf', diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js index b27c59c3..17c91e10 100644 --- a/src/js/yunohost/controllers/apps.js +++ b/src/js/yunohost/controllers/apps.js @@ -202,8 +202,10 @@ // Get app information app.get('#/apps/:app', function (c) { c.api('GET', '/apps/'+c.params['app']+'?raw', {}, function(data) { - // Presentation - data.settings.allowed_users = (data.settings.allowed_users) ? data.settings.allowed_users.replace(',', ', ')+"." : y18n.t('everyone_has_access'); + c.api('GET', '/users/permissions', {}, function(data_permissions) { + + // Permissions + data.permissions = data_permissions.permissions[c.params['app']+".main"]["allowed"]; // Multilingual description data.description = (typeof data.manifest.description[y18n.locale] !== 'undefined') ? @@ -242,12 +244,6 @@ }); }); }); - }); - - // Get app debug page - app.get('#/apps/:app/debug', function (c) { - c.api('GET', '/apps/'+c.params['app']+'/debug', {}, function(data) { - c.view('app/app_debug', data); }); }); @@ -624,129 +620,6 @@ ); }); - // Manage app access - app.get('#/apps/:app/access', function (c) { - c.api('GET', '/apps/'+c.params['app']+'?raw', {}, function(data) { - c.api('GET', '/users', {}, function(dataUsers) { - - // allowed_users as array - if (typeof data.settings.allowed_users !== 'undefined') { - if (data.settings.allowed_users.length === 0) { - // Force empty array, means no user has access - data.settings.allowed_users = []; - } - else { - data.settings.allowed_users = data.settings.allowed_users.split(','); - } - } else { - data.settings.allowed_users = []; // Force array - // if 'allowed_users' is undefined, everyone has access - // that means that undefined is different from empty array - data.settings.allow_everyone = true; - } - - // Available users - data.users = []; - $.each(dataUsers.users, function(username, user){ - // Do not list allowed_users in select list - if ( data.settings.allowed_users.indexOf(username) === -1 ) { - data.users.push({ - value: username, - label: user.fullname+' ('+user.mail+')' - }); - } else { - // Complete allowed_users data - data.settings.allowed_users[data.settings.allowed_users.indexOf(username)] = { - username: username, - fullname: user.fullname, - mail: user.mail, - }; - } - }); - - c.view('app/app_access', data); - }); - }); - }); - - // Remove all access - app.get('#/apps/:app/access/remove', function (c) { - c.confirm( - y18n.t('applications'), - y18n.t('confirm_access_remove_all', [c.params['app']]), - function() { - var params = { - apps: c.params['app'], - users: [] - }; - c.api('DELETE', '/access?'+c.serialize(params), params, function(data) { - c.redirect_to('#/apps/'+ c.params['app']+ '/access', {slide:false}); - }); - } - ); - }); - - // Remove access to a specific user - app.get('#/apps/:app/access/remove/:user', function (c) { - c.confirm( - y18n.t('applications'), - y18n.t('confirm_access_remove_user', [c.params['app'], c.params['user']]), - function() { - var params = { - apps: c.params['app'], - users: c.params['user'] - }; - c.api('DELETE', '/access?'+c.serialize(params), params, function(data) { - c.redirect_to('#/apps/'+ c.params['app']+ '/access', {slide:false}); - }); - } - ); - }); - - // Grant all access - app.get('#/apps/:app/access/add', function (c) { - c.confirm( - y18n.t('applications'), - y18n.t('confirm_access_add', [c.params['app']]), - function() { - var params = { - apps: c.params['app'], - users: null - }; - c.api('PUT', '/access', params, function() { - c.redirect_to('#/apps/'+ c.params['app'] +'/access', {slide:false}); - }); - } - ); - }); - - // Grant access for a specific user - app.post('#/apps/:app/access/add', function (c) { - var params = { - users: c.params['user'], - apps: c.params['app'] - }; - c.api('PUT', '/access', params, function() { - c.redirect_to('#/apps/'+ c.params['app'] +'/access', {slide:false}); - }); - }); - - // Clear access (reset) - app.get('#/apps/:app/access/clear', function (c) { - c.confirm( - y18n.t('applications'), - y18n.t('confirm_access_clear', [c.params['app']]), - function() { - var params = { - apps: c.params['app'] - }; - c.api('POST', '/access', params, function() { - c.redirect_to('#/apps/'+ c.params['app'] +'/access', {slide:false}); - }); - } - ); - }); - // Get app change label page app.get('#/apps/:app/changelabel', function (c) { c.api('GET', '/apps/'+c.params['app']+'?raw', {}, function(app_data) { diff --git a/src/js/yunohost/controllers/domains.js b/src/js/yunohost/controllers/domains.js index c6e5281c..51850f90 100644 --- a/src/js/yunohost/controllers/domains.js +++ b/src/js/yunohost/controllers/domains.js @@ -100,7 +100,7 @@ y18n.t('domains'), y18n.t('confirm_change_maindomain'), function() { - c.api('PUT', '/domains/main', {new_domain: domain}, function() { c.refresh() }); + c.api('PUT', '/domains/main', {new_main_domain: domain}, function() { c.refresh() }); } ) }); @@ -212,6 +212,7 @@ status: status_, actions_enabled : actions_enabled }; + c.view('domain/domain_cert', data_, function() { // Configure install / renew buttons behavior $("button[data-action]").on("click", function () { diff --git a/src/js/yunohost/controllers/monitor.js b/src/js/yunohost/controllers/monitor.js deleted file mode 100644 index 990300d8..00000000 --- a/src/js/yunohost/controllers/monitor.js +++ /dev/null @@ -1,48 +0,0 @@ -(function() { - // Get application context - var app = Sammy.apps['#main']; - var store = app.store; - - /** - * Monitor - * - */ - - // Server monitoring - app.get('#/tools/monitor', function (c) { - var monitorData = {}; - - // Why this method ? - c.api('GET', '/services/glances', {}, function(data) { - monitorData.status = true; - - if (data.status == 'running') { - c.api('GET', '/monitor/system', {}, function(data) { - monitorData.system = data; - - c.api('GET', '/monitor/disk', {}, function(data) { - monitorData.disk = data; - - c.api('GET', '/monitor/network', {}, function(data) { - monitorData.network = data; - - // Remove useless interface - delete monitorData.network.usage.lo; - - // Get YunoHost versions too - c.api('GET', '/diagnosis', {}, function(diagnosis) { - monitorData.versions = diagnosis.packages; - c.view('tools/tools_monitoring', monitorData); - }); - }); - }); - }); - } - else { - monitorData.status = false; - c.view('tools/tools_monitoring', monitorData); - } - }); - }); - -})(); diff --git a/src/js/yunohost/controllers/users.js b/src/js/yunohost/controllers/users.js index abcd04ae..7da1bcb6 100644 --- a/src/js/yunohost/controllers/users.js +++ b/src/js/yunohost/controllers/users.js @@ -5,6 +5,184 @@ var PASSWORD_MIN_LENGTH = 4; + // A small utility to convert a string to title case + // e.g. "hAvE a NicE dAy" --> "Have A Nice Day" + // Savagely stolen from https://stackoverflow.com/a/196991 + function toTitleCase(str) { + return str.replace( + /\w\S*/g, + function(txt) { + return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); + } + ); + } + + /** + * Groups and permissions + * + */ + + /** + * Update group or permissions + * + * @model data organize in the same way than /users/groups?full&include_primary_groups + * @params.operation "add"|"remove" + * @params.type "members"|"permissions" + * @param.item Name of the user or the permission to add or remove + * @param.group Name of the group affected + * + * This function is built to be apply with params generated by the use of + * HTML dataset attributes (e.g. link in the partial inline view "label" in group_list.ms) + * + * @return void + **/ + function updateGroup(model, params) { + var type = params.type; + var action = params.action; + var item = params.item; + var groupname = params.group; + var group = data.groups[groupname]; + var to = (action == 'add')?group[type]:group[type + 'Inv']; + var from = (action == 'add')?group[type+'Inv']:group[type]; + // Do nothing, if array of destination already contains the item + if (from.indexOf(item) === -1) return; + + // Hack to disable pacman loader if any + if ($('div.loader').length === 0) { + $('#main').append(''); + } + $('div.loader').css('display', 'none'); + + // Update group + var params = {}; var url; + if (type == 'members') { + url = '/users/groups/' + groupname; + params[action] = [item]; + } + else { + url = '/users/permissions/' + item; + params[action] = [groupname]; + } + c.api('PUT', url, params, function(data_update) { + to.push(item); + from.splice(from.indexOf(item), 1); + updateView(data); + }); + } + + /** + * Update the view with the new model + * + * @model data organize in the same way than /users/groups?full&include_primary_groups + * + * @return void + **/ + function updateView(model) { + // Sort in aphanumerical order to improve user experience + for (var group in model.groups) { + model.groups[group].permissions.sort(); + model.groups[group].permissionsInv.sort(); + model.groups[group].members.sort(); + model.groups[group].membersInv.sort(); + } + + // Manual render, we don't use c.view to avoid scrollTop and other + // uneeded behaviour + var rendered = c.render('views/user/group_list.ms', model); + rendered.swap(function () { + // Add click event to get a nice "reactive" interface + $("button[data-action='add'], button[data-action='remove']").on('click', function (e) { + updateGroup(model, $(this)[0].dataset); + return false; + }); + $('button[data-action="add-user-specific-permission"]').on('click', function (e) { + data.groups[$(this).data("user")].display = true; + updateView(data); + return false; + }); + $('button[data-action="delete-group"]').on('click', function (e) { + + var group = $(this).data("group"); + + c.confirm( + y18n.t('groups'), + $('
'+ y18n.t('confirm_delete', [group]) +'
'), + function() { + c.api('DELETE', '/users/groups/'+ group, {}, function(data) { c.refresh(); }); + } + ); + }); + }); + } + + + app.get('#/groups', function (c) { + c.api('GET', '/users/groups?full&include_primary_groups', {}, function(data_groups) { + c.api('GET', '/users', {}, function(data_users) { + c.api('GET', '/users/permissions?short', {}, function(data_permissions) { + //var perms = data_permissions.permissions; + var specific_perms = {}; + var all_perms = data_permissions.permissions; + var users = Object.keys(data_users.users); + + // Enrich groups data with primary group indicator and inversed items list + for (var group in data_groups.groups) { + data_groups.groups[group].primary = users.indexOf(group) !== -1; + data_groups.groups[group].permissionsInv = all_perms.filter(function(item) { + return data_groups.groups[group].permissions.indexOf(item) === -1; + }).filter(function(item) { + return group != "visitors" || (item != "mail.main" && item != "xmpp.main"); // Remove 'email' and 'xmpp' in visitors's permission choice list + }); + data_groups.groups[group].membersInv = users.filter(function(item) { + return data_groups.groups[group].members.indexOf(item) === -1; + }); + } + + // Declare all_users and visitors has special + data_groups.groups['all_users'].special = true; + data_groups.groups['visitors'].special = true; + + // Data given to the view with 2 functions to convert technical + // permission id to display names + data = { + 'groups':data_groups.groups, + 'displayPermission': function (text) { + // Display a permission correctly for a human + text = text.replace('.main', ''); + if (text.indexOf('.') > -1) + text = text.replace('.', ' (') + ')'; + + if (text == "mail") + text = "E-mail"; + else if (text == "xmpp") + text = "XMPP"; + else + text = toTitleCase(text); + + return text; + }, + 'displayUser': function (text) { + return text; + }, + }; + updateView(data); + }); + }); + }); + }); + + // Create a new group + app.get('#/groups/create', function (c) { + c.view('user/group_create', {}); + }); + + app.post('#/groups/create', function (c) { + c.params['groupname'] = c.params['groupname'].replace(' ', '_').toLowerCase(); + c.api('POST', '/users/groups', c.params.toHash(), function(data) { + c.redirect_to('#/groups'); + }); + }); + /** * Users * @@ -222,7 +400,7 @@ }); } } - }, 'GET'); + }); }); })(); diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js index 94aff3d6..e5df079b 100644 --- a/src/js/yunohost/helpers.js +++ b/src/js/yunohost/helpers.js @@ -265,6 +265,17 @@ c.hideLoader(); + // Get modal element + var box = $('#modal'); + + // Modal title + if (typeof title === 'string' && title.length) { + $('.title', box).html(title); + } + else { + box.addClass('no-title'); + } + // Modal content $('.content', box).html(content); @@ -280,12 +291,10 @@ $('#modal footer button').unbind( "click" ); // Reset & Hide modal - box - .removeClass('no-title') - .modal('hide'); + box.removeClass('no-title').modal('hide'); // Do corresponding callback - if ($(this).data('action') == 'confirm') { + if ($(this).data('modal-action') == 'confirm') { confirmCallback(); } else { diff --git a/src/js/yunohost/main.js b/src/js/yunohost/main.js index e33bbf7e..5219715b 100644 --- a/src/js/yunohost/main.js +++ b/src/js/yunohost/main.js @@ -101,12 +101,43 @@ // equality stuff because mustache/Handlebars is lame // source https://stackoverflow.com/a/31632215 - Handlebars.registerHelper('eq', function(a, b) { - return a === b; + Handlebars.registerHelper({ + eq: function(a, b) { + return a === b; + }, + neq: function(a, b) { + return a !== b; + }, + lt: function (v1, v2) { + return v1 < v2; + }, + gt: function (v1, v2) { + return v1 > v2; + }, + lte: function (v1, v2) { + return v1 <= v2; + }, + gte: function (v1, v2) { + return v1 >= v2; + }, + and: function () { + return Array.prototype.slice.call(arguments).every(function (arg) { + return (Array.isArray(arg))?arg.length !== 0:arg; + }); + }, + or: function () { + return Array.prototype.slice.call(arguments, 0, -1).some(function (arg) { + return (Array.isArray(arg))?arg.length !== 0:arg; + }); + } }); - Handlebars.registerHelper('neq', function(a, b) { - return a !== b; + // Be able to call a function given in context + Handlebars.registerHelper('call', function () { + var args = Array.prototype.slice.call(arguments); + var func = args.shift(); + args.pop(); + return func.apply(null, args); }); Handlebars.registerHelper('in', function(a) { diff --git a/src/locales/ca.json b/src/locales/ca.json index 60ccd85a..edd9af72 100644 --- a/src/locales/ca.json +++ b/src/locales/ca.json @@ -5,7 +5,7 @@ "remove": "Suprimir", "administration_password": "Contrasenya d'administració", "allowed_users": "Usuaris permesos", - "api_not_responding": "L'API no respon", + "api_not_responding": "L'API de YunoHost no respon. Pot ser que «yunohost-api» estigui caigut o s'hagi reiniciat?", "app_access": "Accés", "app_access_addall_btn": "Habilitar l'accés a tots els utilitzadors", "app_access_addall_desc": "Tots els usuaris existents tindran accés a %s.", @@ -18,7 +18,7 @@ "app_change_url": "Canvia l'URL", "app_debug_no_logs": "Els registres de l'aplicació no estan disponibles", "app_debug_tab": "Mostra la informació de depuració", - "app_info_access_desc": "Administrar l'accés d'usuaris. Usuaris permesos: %s", + "app_info_access_desc": "Grups / usuaris autoritzats actualment a accedir a aquesta aplicació:", "app_info_changelabel_desc": "Canvia l'etiqueta de l'aplicació al portal.", "app_info_debug_desc": "Mostrar la informació de depuració per aquesta aplicació.", "app_info_default_desc": "Redirigeix l'arrel del domini a aquesta aplicació (%s).", @@ -437,5 +437,20 @@ "request_help": "ajuda necessària", "request_help_details": "El desenvolupador actual necessita ajuda per mantenir aquesta aplicació. Podeu contribuir-hi!", "advanced": "Avançat", - "from_to": "de %s fins a %s" + "from_to": "de %s fins a %s", + "group": "Grup", + "group_name": "Nom del grup", + "group_all_users": "Tots els usuaris", + "group_visitors": "Visitants", + "group_format_name_help": "Podeu utilitzar caràcters alfanumèrics i l'espai", + "group_add_member": "Afegir usuari", + "group_explain_all_users": "Aquest és un grup especial que conté tots els comptes d'usuari del servidor", + "group_add_permission": "Afegir permís", + "group_new": "Nou grup", + "group_explain_visitors": "Aquest és un grup especial que representa els visitants anònims", + "group_specific_permissions": "Permisos específics de l'usuari", + "groups_and_permissions": "Grups i permisos", + "groups_and_permissions_manage": "Gestionar grups i usuaris", + "permissions": "Permisos", + "nobody": "Ningú" } diff --git a/src/locales/en.json b/src/locales/en.json index 13cc943a..ebb1118f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -5,22 +5,11 @@ "advanced": "Advanced", "remove": "Remove", "administration_password": "Administration password", - "allowed_users": "Allowed users", - "all_apps": "All apps", + "all_apps": "All apps", "api_not_responding": "The YunoHost API is not responding. Maybe 'yunohost-api' is down or got restarted?", - "app_access": "Access", - "app_access_addall_btn": "Enable access to all", - "app_access_addall_desc": "All existing users will have access to %s.", - "app_access_clearall_btn": "Clear all access", - "app_access_clearall_desc": "Every user will have access to %s.", - "app_access_removeall_btn": "Remove all access", - "app_access_removeall_desc": "No users will have access to %s.", - "app_access_title": "%s access", "app_change_label": "Change Label", "app_change_url": "Change URL", - "app_debug_no_logs": "Application's logs are not available", - "app_debug_tab": "Display debug information", - "app_info_access_desc": "Manage user access. Allowed users: %s", + "app_info_access_desc": "Groups / users currently allowed to access this app:", "app_info_changelabel_desc": "Change app label in the portal.", "app_info_debug_desc": "Display debugging information for this application.", "app_info_default_desc": "Redirect domain root to this application (%s).", @@ -46,7 +35,6 @@ "application": "Application", "applications": "Applications", "archive_empty": "Empty archive", - "available": "Available", "available_apps": "Available apps", "backup": "Backup", "backup_action": "Backup", @@ -62,17 +50,10 @@ "backup_type": "Type", "backups_no": "No backup", "begin": "Begin", - "bit_rate": "Bit rate", "both": "Both", "cancel": "Cancel", "check": "Check", - "check_mx": "MX record", - "check_stmp": "port 25 access", "close": "Close", - "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_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_app_change_url": "Are you sure you want to change the app access URL?", "confirm_app_default": "Are you sure you want to make this app default?", "confirm_change_maindomain": "Are you sure you want to change the main domain?", @@ -100,10 +81,7 @@ "confirm_reboot_action_shutdown": "Are you sure you want to shutdown your server?", "connection": "Connection", "copy": "Copy", - "count_min": "%s min", - "cpu_load": "CPU Load", "created_at": "Created at", - "cumulative_usage": "Cumulative usage", "current_maintainer_title": "Current maintainer of this package", "custom_app_install": "Install custom app", "custom_app_url_only_github": "Currently only from GitHub", @@ -117,7 +95,6 @@ "diagnosis_with_private": "Diagnosis with private data", "disable": "Disable", "disabled": "Disabled", - "disk": "Disk", "dns": "DNS", "domain": "Domain", "domain_add": "Add domain", @@ -146,18 +123,28 @@ "error_server": "Server error", "error_server_unexpected": "Unexpected server error (%s)", "error_connection_interrupted": "The server closed the connection instead of answering it. Has nginx or the yunohost-api been restarted or stoppted for some reason? (Error code/message: %s)", - "everyone_has_access": "Everyone has access.", "experimental_warning": "Warning: this feature is experimental and not consider stable, you shouldn't be using it except if you know what you are doing.", - "filesystem": "Filesystem", "firewall": "Firewall", "footer_version": "Powered by YunoHost %s (%s).", "form_input_example": "Example: %s", "free": "Free", "from_to": "from %s to %s", - "fs_type": "FS Type", - "gateway": "Gateway: ", "good_practices_about_admin_password": "You are now about to define a new admin password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).", "good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).", + "group": "Group", + "group_name": "Group name", + "group_all_users": "All users", + "group_visitors": "Visitors", + "group_format_name_help": "You can use alpha-numeric chars and space", + "group_add_member": "Add a user", + "group_add_permission": "Add a permission", + "group_new": "New group", + "group_explain_all_users": "This is a special group containing all users accounts on the server", + "group_explain_visitors": "This is a special group representing anonymous visitors", + "group_specific_permissions": "User specific permissions", + "groups_and_permissions": "Groups and permissions", + "groups_and_permissions_manage": "Manage groups and permissions", + "permissions": "Permissions", "home": "Home", "hook_adminjs_group_configuration": "System configurations", "hook_conf_cron": "Automatic tasks", @@ -174,7 +161,6 @@ "hook_data_home_desc": "User data located in /home/USER", "hook_data_mail": "Mail", "hook_data_mail_desc": "Raw emails stored on the server", - "hostname": "Hostname", "id": "ID", "inactive": "Inactive", "infos": "Info", @@ -185,9 +171,7 @@ "installed": "Installed", "installed_apps": "Installed apps", "installing": "Installing", - "interface": "Interface", "internal_exception": "Yunohost encountered an internal error:/
Really sorry about that.
You should look for help on the forum or the chat to fix the situation, or report the bug on the bugtracker.
The following information might be useful for the person helping you:

Action

%s%s

Traceback

%s
", - "io": "I/O", "ipv4": "IPv4", "ipv6": "IPv6", "label": "Label", @@ -196,7 +180,6 @@ "license": "License", "loading": "Loading …", "local_archives": "Local archives", - "local_ip": "Local IP", "log": "Log", "logged_in": "Logged in", "logged_out": "Logged out", @@ -209,7 +192,6 @@ "manage_apps": "Manage apps", "manage_domains": "Manage domains", "manage_users": "Manage users", - "memory": "Memory", "menu": "Menu", "migrations": "Migrations", "migrations_pending": "Pending migrations", @@ -217,20 +199,14 @@ "migrations_no_pending": "No pending migrations", "migrations_no_done": "No previous migrations", "mode": "Mode", - "monitoring": "Monitoring", - "monitoring_check_glances": "Check glances service status.", - "monitoring_disabled": "Monitoring is not enabled.", - "mount_point": "Mount point", "multi_instance": "Multi instance", "myserver": "myserver", "myserver_org": "myserver.org", - "network": "Network", "next": "Next", "no": "No", - "no_allowed_users": "No allowed users.", "no_installed_apps": "No installed apps.", "no_log": "No log.", - "no_user_to_add": "No more users to add.", + "nobody": "Nobody", "non_compatible_api": "Non-compatible API", "ok": "OK", "only_highquality_apps": "Only high-quality apps", @@ -240,7 +216,6 @@ "operations": "Operations", "orphaned": "not maintained", "orphaned_details": "This app is not maintained anymore. It may still be working but won't receive any upgrade. Feel free to come and revive it!", - "os": "OS", "password": "Password", "password_confirmation": "Password confirmation", "password_description": "Password must be at least %s characters long.", @@ -280,25 +255,17 @@ "postinstall_intro_3": "You can obtain more information by visiting the appropriate documentation page", "postinstall_password": "This password will be used to manage everything on your server. Take the time to choose it wisely.", "previous": "Previous", - "process": "Process", "protocol": "Protocol", - "public_ip": "Public IP: ", - "ram": "RAM", - "read": "Read", "read_more": "Read more", - "reception": "Reception", "refresh_app_list": "Refresh list", - "remove_access": "Remove access", "request_adoption": "waiting adoption", "request_adoption_details": "The current maintainer would like to stop maintaining this app. Feel free to propose yourself as the new maintainer!", "request_help": "need help", "request_help_details": "The current maintainer would like some help with the maintainance of this app. Feel free to come contribute on it!", "restore": "Restore", "run": "Run", - "running": "Running", "save": "Save", "search_for_apps": "Search for apps...", - "select_user": "Select user", "select_all": "Select all", "select_none": "Select none", "service_description": "Description:", @@ -317,7 +284,6 @@ "storage_create": "Add remote storage", "storages_new": "New remote storage", "storages_no": "No storages.", - "swap": "Swap", "system": "System", "system_apps": "Apps", "system_apps_nothing": "There are no apps to upgrade.", @@ -329,7 +295,6 @@ "system_upgrade_all_applications_btn": "Upgrade all applications", "system_upgrade_all_packages_btn": "Upgrade all packages", "tcp": "TCP", - "time_since_update": "Time since update: ", "tools": "Tools", "tools_adminpw": "Change administration password", "tools_adminpw_confirm_placeholder": "Confirm the new password", @@ -351,8 +316,6 @@ "tools_shutdown_done": "Shutting down...", "tools_shuttingdown": "Your server is powering off. As long as your server is off, you won't be able to use the web administration.", "tools_shutdown_reboot": "Shutdown/Reboot", - "total": "Total", - "transmission": "Transmission", "udp": "UDP", "unauthorized": "Unauthorized", "uninstall": "Uninstall", @@ -364,10 +327,7 @@ "upnp": "UPnP", "upnp_disabled": "UPnP is disabled.", "upnp_enabled": "UPnP is enabled.", - "uptime": "Uptime", "url": "URL", - "usage": "Usage", - "used": "Used", "user_email": "Email", "user_emailaliases": "Mail aliases", "user_emailforward": "Mail forward", @@ -383,11 +343,8 @@ "users_list": "User list", "users_new": "New user", "users_no": "No users.", - "versions": "Versions", "version": "Version", - "view_user_profile": "View %s's profile", "warning_first_user": "You probably need to create a user first.", - "write": "Write", "wrong_password": "Wrong password", "yes": "Yes", "certificate_alert_not_valid": "CRITICAL: Current certificate is not valid! HTTPS won't work at all!", diff --git a/src/locales/eo.json b/src/locales/eo.json index c6b2bc7b..98d15947 100644 --- a/src/locales/eo.json +++ b/src/locales/eo.json @@ -78,7 +78,7 @@ "label": "vortiga", "confirm_reboot_action_reboot": "Ĉu vi certas, ke vi volas reagordi vian servilon ?", "confirm_upnp_enable": "Ĉu vi certas, ke vi volas ebligi UPnP ?", - "api_not_responding": "API ne respondas", + "api_not_responding": "La API YunoHost ne respondas. Eble 'yunohost-api' estas malaperigita aŭ rekomencita?", "domain_add_dyndns_doc": "... kaj mi volas dinamikan DNS-servon.", "internal_exception": " YunoHost renkontis internan eraron: /
Vere bedaŭras.
Vi devas serĉi helpon ĉe la forumo aŭ la spektaklo por solvi la problemon, aŭ raporti la eraron pri TheTracking Tool .
La jenaj informoj povas esti helpemaj al la helpa persono:

Ago 

%s %s

spuron

%s
", "hook_conf_ynh_currenthost": "Nuna ĉefa domajno", @@ -206,5 +206,224 @@ "infos": "Informoj", "bit_rate": "Bito kurzo", "hook_conf_xmpp": "XMPP", - "id": "ID" + "id": "ID", + "logs_access": "Listo de aliroj kaj malpermesoj", + "maintained_details": "Ĉi tiu programo estis prizorgita de ĝia subtenanto dum la lastaj monatoj.", + "only_highquality_apps": "Nur altkvalitaj programoj", + "only_decent_quality_apps": "Nur deca kvalito apps", + "orphaned": "ne konservita", + "request_adoption": "atendanta adopto", + "migrations_pending": "Pendaj migradoj", + "next": "Sekva", + "orphaned_details": "Ĉi tiu app ne plu estas konservita. Ĝi eble ankoraŭ funkcios, sed ne ricevos iun ĝisdatigon. Sentu vin libera revivi ĝin!", + "request_adoption_details": "La nuna prizorganto ŝatus ĉesi subteni ĉi tiun app. Bonvolu proponi vin kiel la novan prizorganton!", + "request_help": "bezonas helpon", + "request_help_details": "La nuna prizorganto ŝatus iom da helpo pri la bontenado de ĉi tiu app. Bonvolu veni kontribui pri ĝi!", + "user_email": "Retpoŝto", + "postinstall_intro_1": "Gratulojn! YunoHost estis sukcese instalita.", + "time_since_update": "Tempo ekde ĝisdatigo: ", + "no_installed_apps": "Neniuj instalitaj programoj.", + "usage": "uzo", + "uninstall": "Malinstali", + "users_new": "Nova uzanto", + "users": "Uzantoj", + "system_apps_nothing": "Ne estas programoj por ĝisdatigi.", + "used": "Uzata", + "tools_security_feed_view_items": "Vidu ĉiujn sekurecajn sciigojn", + "certificate_alert_letsencrypt_about_to_expire": "Nuna atestilo estas preskaŭ eksvalidiĝi. Ĝi baldaŭ renoviĝu aŭtomate.", + "version": "versio", + "yes": "Jes", + "skip": "Salti", + "search_for_apps": "Serĉi aplikojn ...", + "upnp_disabled": "UPnP estas malebligita.", + "logs_no_logs_registered": "Neniu registro registrita por ĉi tiu kategorio", + "certificate_alert_good": "Bone, nuna atestilo aspektas bone!", + "network": "reto", + "purge_user_data_warning": "Purgaj datumoj de uzanto ne estas reverteblaj. Nepre vi scias, kion vi faras!", + "domain_not_eligible_for_ACME": "Ĉi tiu domajno ne ŝajnas preta por Letero-Ĉifrado. Bonvolu kontroli vian atingon de DNS-agordo kaj HTTP-servilo.", + "password_description": "Pasvorto devas esti almenaŭ %s signoj longa.", + "select_all": "Elekti ĉiujn", + "tcp": "TCP", + "domain_is_eligible_for_ACME": "Ĉi tiu domajno ŝajnas ĝuste agordita por instali atestilon Lasu Ĉifri!", + "system_upgrade_btn": "Altgradigon", + "ssl_certificate": "SSL-atestilo", + "certificate_manage": "Administri SSL-atestilon", + "tools_security_feed_subscribe_rss": "Aboni RSS pri sciigoj", + "tools_adminpw_confirm_placeholder": "Konfirmu la novan pasvorton", + "total": "Entute", + "confirm_cert_install_LE": "Ĉu vi certas, ke vi volas instali atestilon Lasu Ĉifri por ĉi tiu domajno?", + "myserver_org": "miaservisto.org", + "logs_operation": "Operacioj faritaj sur sistemo kun YunoHost", + "monitoring_check_glances": "Kontrolu rigardojn servo-staton.", + "appslists": "Aplikoj-listoj", + "install_letsencrypt_cert": "Instalu atestilon Lasu-Ĉifri", + "appslists_custom": "Propra listo listo", + "no_log": "Neniu ŝtipo.", + "system_packages_nothing": "Ne estas pakoj por ĝisdatigi.", + "system_upgrade_all_applications_btn": "Ĝisdatigu ĉiujn aplikojn", + "postinstall": "post Instalaĵo", + "service_description": "Priskribo:", + "uptime": "Kuracado", + "revert_to_selfsigned_cert": "Reiru al mem-subskribita atestilo", + "certificate_old_letsencrypt_app_conflict": "La app 'letsencrypt' estas nuntempe instalita kaj konfliktas kun ĉi tiu funkcio. Bonvolu malinstali ĝin unue por uzi la novan registritan administran interfacon.", + "system_update": "Sistema ĝisdatigo", + "unauthorized": "Ne rajtigita", + "wrong_password": "Erara pasvorto", + "tools_security_feed": "Sekurecaj sciigoj", + "system_packages": "Pakoj", + "certificate_alert_unknown": "Nekonata stato", + "tools_shutdown_reboot": "Ŝalti/Rekomenci", + "logs_started_at": "Komencu", + "confirm_cert_revert_to_selfsigned": "Ĉu vi certas, ke vi volas reverti ĉi tiun domajnon al mem-subskribita atestilo?", + "postinstall_domain": "Ĉi tiu estas la unua domajna nomo ligita al via servilo YunoHost, sed ankaŭ la uzata de la uzantoj de via servilo por aliri la aŭtentikan portalon. Laŭe ĝi estos videbla de ĉiuj, do elektu ĝin zorgeme.", + "users_no": "Neniuj uzantoj.", + "tools_shutdown": "Enŝaltu vian servilon", + "validity": "Valideco", + "upnp_enabled": "UPnP estas ebligita.", + "tools_reboot": "Reklamu vian servilon", + "mode": "Modon", + "manage_domains": "Administri domajnojn", + "user_username_edit": "Redakti %s konton", + "mount_point": "Montpunkto", + "logs_package": "Historio pri administrado de pakoj Debian", + "user_new_forward": "novjora@myforeigndomain.org", + "manually_renew_letsencrypt_message": "Atestilo estos aŭtomate renovigita dum la lastaj 15 tagoj de valideco. Vi povas permane renovigi ĝin se vi volas. (Ne rekomendita).", + "logs_share_with_yunopaste": "Kunhavigu kun YunoPaste", + "tools_download_ca": "Elŝutu SSL Atestilon-Aŭtoritaton (CA)", + "certificate": "Atestilo", + "logs_system": "Kernel ŝtipoj kaj aliaj malaltnivelaj eventoj", + "user_emailaliases": "Poŝti alias", + "certificate_authority": "Atestado-aŭtoritato", + "unmaintained": "Malkomprenita", + "regenerate_selfsigned_cert": "Regeneri mem-subskribitan atestilon", + "unknown_argument": "Nekonata argumento: %s", + "ports": "havenoj", + "select_user": "Elektu uzanton", + "system": "Sistemo", + "tools_reboot_btn": "Rekomencu", + "logs_history": "Historio de komando funkcianta sur sistemo", + "read_more": "Legu pli", + "monitoring_disabled": "Monitorado ne estas enŝaltita.", + "previous": "Antaŭa", + "services_list": "Servo-Listo", + "manage_users": "Administri uzantojn", + "logs_service": "Servoj ŝtipoj", + "tools_rebooting": "Via servilo rekomencas. Por reveni al la retadministra interfaco, vi devas atendi, ke via servilo funkcios. Vi povas kontroli tion per refreŝigado de ĉi tiu paĝo (F5).", + "tools_adminpw": "Ŝanĝu administran pasvorton", + "service_log": "%s ŝtipo", + "write": "Skribu", + "multi_instance": "Multaj ekzemploj", + "no_allowed_users": "Neniuj permesitaj uzantoj.", + "non_compatible_api": "Ne kongrua API", + "revert_to_selfsigned_cert_message": "Se vi vere volas, vi povas reinstali mem-subskribitan atestilon. (Ne rekomendita)", + "tools_adminpw_current_placeholder": "Enigu vian nunan pasvorton", + "user_mailbox_quota": "Poŝta kesto", + "operations": "Operacioj", + "migrations_done": "Antaŭaj migradoj", + "password_new": "Nova pasvorto", + "manually_renew_letsencrypt": "Mane renovigu nun", + "tools_adminpw_current": "Aktuala Pasvorto", + "appslists_manage": "Administri listojn de aplikoj", + "menu": "menuo", + "service_start_on_boot": "Komencu je ekkuro: ", + "storages_new": "Nova fora stokado", + "storage_create": "Aldonu forajn stokadojn", + "regenerate_selfsigned_cert_message": "Se vi volas, vi povas regeneri la mem-subskribitan atestilon.", + "migrations_no_pending": "Neniuj pritraktataj migradoj", + "appslists_last_update": "Lasta ĝisdatigo", + "logs_more": "Vidigu pliajn liniojn", + "logs_error": "Eraro", + "certificate_status": "Atestita statuso", + "no": "Ne", + "remove_access": "Forigi aliron", + "transmission": "transdono", + "upload_archive": "Alŝuta arkivo", + "tools_shutdown_btn": "Fermito", + "purge_user_data_checkbox": "Purigi datumojn de %s? (Ĉi tio forigos la enhavon de ĝiaj hejmaj kaj poŝtaj adresaroj.)", + "appslists_info_refresh_desc": "Refreŝigi statojn de ĉi tiu listo.", + "migrations": "migrado", + "logs_ended_at": "Fino", + "restore": "Restaŭri", + "meltdown": "Vi estas vundebla al la meltdown maltrankviliga sekureco. Por ripari tion, vi devas ĝisdatigi vian sistemon tiam reŝalti ĝin por ŝarĝi la novan linux-kernon.", + "view_user_profile": "Vidi %s profilon", + "user_mailbox_use": "Poŝtejo uzis spacon", + "appslists_unknown_list": "Listo de nekonataj programoj: %s", + "appslists_info_remove_desc": "Aplikoj de ĉi tiu listo ne plu estos haveblaj.", + "only_working_apps": "Nur funkciantaj programoj", + "postinstall_password": "Ĉi tiu pasvorto estos uzata por administri ĉion en via servilo. Prenu la tempon por elekti ĝin prudente.", + "start": "Komencu", + "certificate_alert_great": "Bonega! Vi uzas validan atestilon Lasu Ĉifri!", + "tools_download_ca_desc": "Alklaku ĉi tie por elŝuti vian SSL-atestan aŭtoritaton (CA)", + "confirm_cert_regen_selfsigned": "Ĉu vi certas, ke vi volas regeneri mem-subskribitan atestilon por ĉi tiu domajno?", + "storages_no": "Neniuj magazenoj.", + "passwords_too_short": "Pasvorto estas tro mallonga", + "appslists_confirm_remove": "Ĉu vi certas, ke vi volas forigi ĉi tiun liston de aplikoj?", + "myserver": "mia servisto", + "tools_adminpw_new_placeholder": "Enigu la novan pasvorton", + "user_emailforward": "Poŝti antaŭen", + "certificate_alert_about_to_expire": "AVERTO: Nuna atestilo finos! Ĝi ne renoviĝos aŭtomate!", + "system_upgrade_all_packages_btn": "Ĝisdatigu ĉiujn pakaĵojn", + "logs_end_with_error": "Ĉi tiu ŝtipo finiĝis per la eraro:", + "users_list": "Uzantlisto", + "migrations_no_done": "Neniuj antaŭaj migradoj", + "url": "URL", + "versions": "versioj", + "select_none": "Elektu neniun", + "size": "Grandeco", + "confirm_cert_manual_renew_LE": "Ĉu vi certas, ke vi volas permane renovigi la atestilon Lasu Ĉifri por ĉi tiu regado nun?", + "process": "Procezo", + "upload": "Alŝuti", + "logs": "Registroj", + "postinstall_intro_3": "Vi povas akiri pliajn informojn vizitante la taŭgan dokumentan paĝon ", + "user_new_mail": "novaĵisto@miadomino.org", + "tools_shuttingdown": "Via servilo elŝaltas. Tiel longe kiel via servilo malŝaltas, vi ne povos uzi la retan administradon.", + "logs_app": "Aplikoj ŝtipoj", + "tools_security_feed_no_items": "Neniuj sekurecaj sciigoj", + "running": "Kurado", + "reception": "Ricevo", + "appslists_no_lists": "Neniuj aplikoj-listoj", + "tools_shutdown_done": "Fermi ...", + "certificate_alert_not_valid": "KRITIKO: Nuna atestilo ne validas! HTTPS tute ne funkcios!", + "path_url": "Pado", + "status": "Statuso", + "set_default": "Fiksita defaŭlte", + "upnp": "UPnP", + "certificate_alert_selfsigned": "AVERTO: Nuna atestilo estas mem-subskribita. Foliumiloj aperigos timigan averton al novaj vizitantoj!", + "system_upgrade": "Sistema ĝisdatigo", + "protocol": "Protokolo", + "tools": "iloj", + "os": "Mastruma sistemo", + "port": "haveno", + "public_ip": "Publika IP: ", + "passwords_dont_match": "Pasvortoj ne kongruas", + "service_status": "Statuso: ", + "user_fullname": "Plena nomo", + "stop": "Ĉesu", + "save": "ŝpari", + "warning_first_user": "Vi probable devas krei unue uzanton .", + "logs_context": "Kunteksto", + "services": "servoj", + "logs_path": "Pado", + "read": "legado", + "run": "Kuri", + "manage_apps": "Administri aplikon", + "system_apps": "Aplikoj", + "user_username": "Uzantnomo", + "path": "Pado", + "password_confirmation": "Pasvorta konfirmo", + "open": "Malfermu", + "unknown_action": "Nekonata ago %s", + "memory": "Memoro", + "refresh_app_list": "Refreŝigi liston", + "ram": "RAM", + "started_at": "Komencite ĉe:", + "tools_reboot_done": "Rekomencanta ...", + "monitoring": "Monitorado", + "password_empty": "La pasvorta kampo estas malplena", + "no_user_to_add": "Ne plu uzantoj aldoni.", + "postinstall_intro_2": "Du pliaj agordaj paŝoj necesas por aktivigi la servojn de via servilo.", + "name": "Nomo", + "udp": "UDP", + "swap": "Interŝanĝu", + "user_interface_link": "Uzantinterfaco" } diff --git a/src/locales/es.json b/src/locales/es.json index 6d0c3cca..e543f4b0 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -3,7 +3,7 @@ "add": "Añadir", "administration_password": "Contraseña de administración", "allowed_users": "Usuarios permitidos", - "api_not_responding": "La API no está respondiendo", + "api_not_responding": "La API de YunoHost no responde. ¿Tal vez «yunohost-api» está inoperativa o ha sido reiniciada?", "app_access": "Acceso", "app_access_addall_btn": "Habilitar acceso para todos", "app_access_addall_desc": "Todos los usuarios existentes tendrán acceso a %s 1.", @@ -14,7 +14,7 @@ "app_access_title": "Acceso %s 4", "app_debug_no_logs": "Los registros de la aplicación no están disponibles", "app_debug_tab": "Mostrar información de depuración", - "app_info_access_desc": "Administrar el acceso de usuarios. Usuarios permitidos: %s 5", + "app_info_access_desc": "Grupos / usuarios actualmente autorizados a acceder a esta aplicación:", "app_info_debug_desc": "Mostrar información de depuración para esta aplicación.", "app_info_default_desc": "Redirigir la raíz del dominio para esta aplicación (%s 6).", "app_info_uninstall_desc": "Eliminar a esta aplicación.", @@ -440,5 +440,20 @@ "appslists_confirm_remove": "¿Seguro que quiere eliminar esta lista de aplicaciones?", "level": "nivel", "system_upgrade_all_applications_btn": "Actualizar todas las aplicaciones", - "select_all": "Seleccionar todo" + "select_all": "Seleccionar todo", + "group_explain_all_users": "Este es un grupo especial que contiene todas las cuentas de usuarios en el servidor", + "group": "Grupo", + "group_name": "Nombre del grupo", + "group_all_users": "Todos los usuarios", + "group_visitors": "Visitantes", + "group_format_name_help": "Puede usar caracteres alfanuméricos y espacio", + "group_add_member": "Añadir un usuario", + "group_add_permission": "Añadir permiso", + "group_new": "Nuevo grupo", + "group_explain_visitors": "Este es un grupo especial que representa a los visitantes anónimos", + "group_specific_permissions": "Permisos específicos de usuario", + "groups_and_permissions": "Grupos y permisos", + "groups_and_permissions_manage": "Gestionar grupos y permisos", + "permissions": "Permisos", + "nobody": "Nadie" } diff --git a/src/locales/fr.json b/src/locales/fr.json index b460c87b..3b0964ba 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -3,7 +3,7 @@ "add": "Ajouter", "administration_password": "Mot de passe d'administration", "allowed_users": "Utilisateurs autorisés", - "api_not_responding": "L'API ne répond pas", + "api_not_responding": "L'API YunoHost ne répond pas. Peut-être que 'yunohost-api' est en panne ou a été redémarré ?", "app_access": "Accès", "app_access_addall_btn": "Ajouter l'accès à tous les utilisateurs", "app_access_addall_desc": "Tous les utilisateurs ont accès à %s.", diff --git a/src/locales/sv.json b/src/locales/sv.json index d616b3da..c9b6e089 100644 --- a/src/locales/sv.json +++ b/src/locales/sv.json @@ -1,4 +1,170 @@ { "action": "Åtgärd", - "active": "Aktiv" + "active": "Aktiv", + "services": "Tjänster", + "protocol": "Protokoll", + "license": "Licens", + "hook_conf_ssowat": "SSOwat", + "advanced": "Avancerat", + "from_to": "mellan %s och %s", + "hook_conf_ynh_currenthost": "Nuvarande huvuddomän", + "only_highquality_apps": "Endast högkvalitativa applikationer", + "only_decent_quality_apps": "Endast applikationer av god kvalitet", + "request_help": "behöver hjälp", + "domain_select": "Välj domän", + "installed": "Installerad", + "domain_add_dyndns_doc": "… och jag vill använda en dynamisk DNS-tjänst.", + "myserver_org": "minserver.org", + "ipv4": "IPv4", + "ram": "Arbetsminne", + "inactive": "Inaktiv", + "only_working_apps": "Endast fungerande applikationer", + "restore": "Återskapa", + "gateway": "Gateway: ", + "installing": "Installerar", + "migrations": "Förflyttningar", + "services_list": "Lista över tjänster", + "logs_ended_at": "Slut", + "firewall": "Brandvägg", + "manage_users": "Hantera användare", + "mailbox_quota_description": "Som jämförelse är 700 MB en CD-skiva och 4700 MB en DVD.", + "app_info_access_desc": "Hantera användaråtkomst. Tillåtna användare: %s", + "domain_add": "Lägg till domän", + "app_access_addall_btn": "Ge alla åtkomst", + "logs_share_with_yunopaste": "Dela med YunoPaste", + "logout": "Logga ut", + "enable": "Aktivera", + "logged_in": "Inloggad", + "domain_default_longdesc": "Detta är din standarddomän.", + "next": "Nästa", + "app_change_label": "Redigera etikett", + "select_all": "Markera alla", + "no": "Nej", + "domain_visit_url": "Besök %s", + "footer_version": "Drivs av YunoHost %s (%s).", + "domains": "Domäner", + "app_access_clearall_btn": "Neka alla åtkomst", + "domain_list": "Lista över domäner", + "hook_conf_ynh_mysql": "MySQL-lösenord", + "administration_password": "Administratörslösenord", + "remove": "Ta bort", + "hook_adminjs_group_configuration": "Systeminställningar", + "hook_data_home": "Användardata", + "app_info_debug_desc": "Visa felsökningsinformation för den här applikationen.", + "select_user": "Välj användare", + "cancel": "Avbryt", + "memory": "Minne", + "mailbox_quota_placeholder": "Lämna tomt eller skriv 0 för att avaktivera.", + "select_none": "Avmarkera alla", + "search_for_apps": "Sök efter applikationer …", + "running": "Körs", + "service_log": "Logg för %s", + "postinstall_intro_1": "Grattis! YunoHost har installerats korrekt.", + "password_empty": "Lösenordsfältet är tomt", + "app_info_changelabel_desc": "Redigera applikationsetikett i portalen.", + "domain_dns_config": "DNS-inställningar", + "installation_complete": "Installation färdig", + "logs_app": "Applikationsloggar", + "port": "Port", + "app_debug_no_logs": "Det går inte att komma åt applikationens loggar", + "label_for_manifestname": "Etikett för %s", + "app_change_url": "Redigera länk", + "migrations_pending": "Kommande förflyttningar", + "infos": "Information", + "app_access_addall_desc": "Alla existerande användare kommer kunna komma åt %s.", + "domain_add_panel_with_domain": "Jag har redan ett domännamn …", + "domain_delete_longdesc": "Radera den här domänen", + "everyone_has_access": "Alla har åtkomst.", + "run": "Kör", + "hook_conf_ynh_certs": "SSL-certifikat", + "hook_conf_ynh_firewall": "Brandvägg", + "logged_out": "Utloggad", + "no_installed_apps": "Inga installerade applikationer.", + "fs_type": "Filsystem", + "mode": "Läge", + "password": "Lösenord", + "install_time": "Tidpunkt för installation", + "label": "Etikett", + "password_new": "Nytt lösenord", + "level": "nivå", + "passwords_too_short": "Lösenordet är för kort", + "hook_conf_nginx": "Nginx", + "logs_service": "Tjänstloggar", + "ipv6": "IPv6", + "manage_apps": "Hantera applikationer", + "service_description": "Beskrivning:", + "local_archives": "Lokala arkiv", + "install": "Installera", + "download": "Ladda ner", + "public_ip": "Offentlig IP-adress: ", + "no_user_to_add": "Inga fler användare att lägga till.", + "log": "Logg", + "open": "Öppen", + "hook_data_home_desc": "Användardata i /home/ANVÄNDARE", + "service_start_on_boot": "Kör vid uppstart: ", + "migrations_no_pending": "Inga kommande förflyttningar", + "read_more": "Läs mer", + "hook_conf_ssh": "SSH", + "domain_default_desc": "Standarddomänen är den domän du vill att användare loggar in på.", + "non_compatible_api": "Icke-kompatibelt API", + "loading": "Hämtar …", + "app_access": "Åtkomst", + "logs_context": "Sammanhang", + "hook_conf_xmpp": "XMPP", + "logs_error": "Fel", + "home": "Hem", + "logs_path": "Sökväg", + "add": "Lägg till", + "install_name": "Installera %s", + "domain_add_dns_doc": "… och jag har konfigurerat min DNS korrekt.", + "interface": "Gränssnitt", + "error_server_unexpected": "Oväntat serverfel (%s)", + "previous": "Föregående", + "no_allowed_users": "Inga tillåtna användare.", + "read": "Läs", + "save": "Spara", + "hook_data_mail": "E-post", + "app_access_clearall_desc": "Alla användare kommer kunna komma åt %s.", + "hook_conf_ldap": "LDAP-databas", + "service_status": "Status: ", + "ok": "Ok", + "no_log": "Ingen logg.", + "migrations_done": "Tidigare förflyttningar", + "id": "ID", + "domain_name": "Domännamn", + "network": "Nätverk", + "logs_more": "Visa fler rader", + "domain_dns_longdesc": "Visa DNS-inställningar", + "domain_default": "Standarddomän", + "installed_apps": "Installerade applikationer", + "monitoring": "Övervakning", + "domain_add_panel_without_domain": "Jag har inte något domännamn …", + "monitoring_disabled": "Övervakning är inte aktiverad.", + "migrations_no_done": "Inga tidigare förflyttningar", + "logs": "Loggar", + "hostname": "Värdnamn", + "local_ip": "Lokal IP-adress", + "login": "Logga in", + "all_apps": "Alla applikationer", + "ports": "Portar", + "domain": "Domän", + "io": "I/O", + "path": "Sökväg", + "passwords_dont_match": "Lösenorden stämmer inte överens", + "path_url": "Sökväg", + "password_confirmation": "Lösenordsbekräftelse", + "app_debug_tab": "Visa information för felsökning", + "domain_visit": "Besök", + "logs_started_at": "Start", + "enabled": "Aktiverad", + "filesystem": "Filsystem", + "myserver": "minserver", + "menu": "Meny", + "manage_domains": "Hantera domäner", + "operations": "Handlingar", + "os": "Operativsystem", + "error_server": "Serverfel", + "refresh_app_list": "Uppdatera lista", + "form_input_example": "Exempel: %s", + "dns": "DNS" } diff --git a/src/views/app/app_access.ms b/src/views/app/app_access.ms deleted file mode 100644 index 72a2d4f8..00000000 --- a/src/views/app/app_access.ms +++ /dev/null @@ -1,97 +0,0 @@ -
- {{t 'home'}} - - … - {{settings.label}} - {{t 'app_access'}} -
- -
- -
-
-

{{t 'allowed_users'}}

-
- {{#if settings.allowed_users}} -
- {{#each settings.allowed_users}} -
- - {{t 'remove_access'}} - -

{{fullname}} ({{mail}})

- {{t 'view_user_profile' username}} -
- {{/each}} -
- {{else}} -
- {{#if settings.allow_everyone}} -

{{t 'everyone_has_access'}}

- {{else}} -

{{t 'no_allowed_users'}}

- {{/if}} -
- {{/if}} -
- {{#if users}} -
- -
- -
-
-
- -
-
- {{else}} -

{{t 'no_user_to_add'}}

- {{/if}} -
-
- -
-
-
-

- - {{t 'operations'}} - -

-
-
-
- {{#if users}} -
-

{{t 'app_access_addall_desc' settings.label}}

- - {{t 'app_access_addall_btn'}} - -
-
- {{/if}} - {{#if settings.allowed_users}} -
-

{{t 'app_access_removeall_desc' settings.label}}

- - {{t 'app_access_removeall_btn'}} - -
-
- {{/if}} - {{#unless settings.allow_everyone}} -
-

{{t 'app_access_clearall_desc' settings.label}}

- - {{t 'app_access_clearall_btn'}} - -
- {{/unless}} -
-
-
-
diff --git a/src/views/app/app_debug.ms b/src/views/app/app_debug.ms deleted file mode 100644 index d233f1be..00000000 --- a/src/views/app/app_debug.ms +++ /dev/null @@ -1,39 +0,0 @@ -
- {{t 'home'}} - {{t 'applications'}} - {{label}} - {{t 'debug'}} -
- -
- -{{#if services}} -
-{{#services}} -
- -
-
- {{#logs}} -

{{file_name}}

- 
{{file_content}}
- - {{/logs}} -
-
-
-{{/services}} -
- -{{else}} -
- - {{t 'app_debug_no_logs'}} -
-{{/if}} diff --git a/src/views/app/app_info.ms b/src/views/app/app_info.ms index 17a71c75..7c972a0e 100644 --- a/src/views/app/app_info.ms +++ b/src/views/app/app_info.ms @@ -48,9 +48,10 @@
-

{{t 'app_info_access_desc' settings.allowed_users}}

- - {{t 'app_access'}} +

{{t 'app_info_access_desc'}} {{#each permissions}} {{ucwords .}}{{#unless @last}}, {{/unless}} {{ else }} {{t 'nobody'}} {{/each}} +

+ + {{t 'groups_and_permissions_manage'}}
@@ -82,13 +83,6 @@ {{t 'uninstall'}} -
-
-

{{t 'app_info_debug_desc'}}

- - {{t 'app_debug_tab'}} - -
{{load_tooltips}} diff --git a/src/views/tools/tools_list.ms b/src/views/tools/tools_list.ms index 1442b625..91923dd3 100644 --- a/src/views/tools/tools_list.ms +++ b/src/views/tools/tools_list.ms @@ -34,10 +34,6 @@

{{t 'advanced'}}

- - -

{{t 'monitoring'}}

-

{{t 'firewall'}}

diff --git a/src/views/tools/tools_monitoring.ms b/src/views/tools/tools_monitoring.ms deleted file mode 100644 index 1593be1b..00000000 --- a/src/views/tools/tools_monitoring.ms +++ /dev/null @@ -1,283 +0,0 @@ -
- {{t 'home'}} - {{t 'tools'}} - {{t 'monitoring'}} -
- -
- -{{#if status}} -
-
-

{{t 'infos'}}

-
-
-
-
{{t 'hostname'}}
-
{{system.infos.hostname}}
-
{{t 'os'}}
-
{{ucwords system.infos.linux_distro}} {{system.infos.platform}} ({{system.infos.os_name}} {{system.infos.os_version}})
-
{{t 'uptime'}}
-
{{system.uptime}}
-
-
-
- -
-
-

{{t 'versions'}}

-
-
-
- {{#each versions}} -
{{@key}}
-
{{version}} ({{repo}})
- {{/each}} -
-
-
- -
- -
-
-

- - {{t 'check'}} -

-
-
-
-
-
{{t 'check_stmp'}}
-
{{network.check.smtp_check}}
-
{{t 'check_mx'}}
-
- {{#if network.check.mx_check.mx0}} -
    - {{#each network.check.mx_check}} -
  • {{this}}
    • - {{/each}} -
- {{else}} - {{network.check.mx_check}} - {{/if}} -
-
-
-
-
- -
-
-

- - {{t 'system'}} -

-
-
-
- -
-

{{t 'memory'}}

-

{{t 'ram'}}

- - - - - - - - - - - - - -
{{t 'used'}}{{humanSize system.memory.ram.used}} ({{system.memory.ram.percent}} %)
{{t 'free'}}{{humanSize system.memory.ram.free}}
{{t 'total'}}{{humanSize system.memory.ram.total}}
- -

{{t 'swap'}}

- - - - - - - - - - - - - -
{{t 'used'}}{{humanSize system.memory.swap.used}} ({{system.memory.swap.percent}} %)
{{t 'free'}}{{humanSize system.memory.swap.free}}
{{t 'total'}}{{humanSize system.memory.swap.total}}
-
- -
-

{{t 'cpu_load'}}

- - - - - - - - - - - - - -
{{t 'count_min' "1"}}{{system.cpu.load.min1}}
{{t 'count_min' "5"}}{{system.cpu.load.min5}}
{{t 'count_min' "15"}}{{system.cpu.load.min15}}
-
- -
-

{{t 'process'}}

- - - - - - - - - - - - - -
{{t 'running'}}{{system.process.running}}
{{t 'sleeping'}}{{system.process.sleeping}}
{{t 'total'}}{{system.process.total}}
-
-
-
-
- -
-
-

- - {{t 'network'}} -

-
-
-
- {{t 'public_ip'}}{{network.infos.public_ip}} -
- {{t 'gateway'}}{{network.infos.gateway}} - -

{{t 'local_ip'}}

- - - - - - - - - - {{#each network.infos.local_ip}} - - - - - - {{/each}} - -
{{t 'interface'}}{{t 'ipv4'}}{{t 'ipv6'}}
{{@key}}{{ ipv4 }}{{ ipv6 }}
- -

{{t 'usage'}}

- {{#each network.usage}} -
- - - - - - - - - - - - - - - - - - - - -
-

- {{@key}} - {{t 'time_since_update'}}{{humanTime time_since_update}} -

- 		{{t 'bit_rate'}}{{t 'cumulative_usage'}}
{{t 'transmission'}}{{bitRate tx time_since_update}}{{humanSize cumulative_tx}}
{{t 'reception'}}{{bitRate rx time_since_update}}{{humanSize cumulative_rx}}
-
- {{/each}} -
-
-
- -
-
-

- - {{t 'disk'}} -

-
-
-
- {{#each disk}} -
-

{{@key}}

-
-
-

{{t 'filesystem'}}

- - - - - - - - - - - - - - - - -
{{t 'fs_type'}}{{ filesystem.fs_type }}
{{t 'mount_point'}}{{ filesystem.mnt_point }}
{{t 'size'}}{{humanSize filesystem.size }}
{{t 'used'}}{{humanSize filesystem.used }}
{{t 'available'}}{{humanSize filesystem.avail }}
-
-
-

{{t 'io'}} {{t 'time_since_update'}}{{humanTime io.time_since_update }}

- - - - - - - -
{{t 'read'}}{{humanSize io.read_bytes }}
{{t 'write'}}{{humanSize io.write_bytes }}
-
-
- {{/each}} -
-
-
- -
- -{{else}} -
- - {{t 'monitoring_disabled'}} -
- {{t 'monitoring_check_glances'}} -
- -{{/if}} diff --git a/src/views/user/group_create.ms b/src/views/user/group_create.ms new file mode 100644 index 00000000..db60c2dc --- /dev/null +++ b/src/views/user/group_create.ms @@ -0,0 +1,30 @@ +
+ {{t 'home'}} + … + + … + + {{t 'group_new'}} +
+ +
+ +
+ +
+
+
+ +
+ +
{{t 'group_format_name_help'}}
+
+
+
+
+ +
+ +
+ +
diff --git a/src/views/user/group_list.ms b/src/views/user/group_list.ms new file mode 100644 index 00000000..a6643f79 --- /dev/null +++ b/src/views/user/group_list.ms @@ -0,0 +1,134 @@ +
+ {{t 'home'}} + {{t 'users'}} + {{t 'groups_and_permissions'}} +
+ +
+ + {{t 'group_new'}} + +
+ +
+ +{{!-- ======================== Partial inline view ======================= --}} +{{#*inline "label"}} + + + {{text}} + + +{{/inline}} + +{{#*inline "labelsLine"}} + {{#each items}} + {{> label text=(call ../display .) value=. icon=../icon type=../type item=. group=../group}} + {{/each}} + {{#if inv}} +
+ +
    + {{#each inv}} +
    • + {{/each}} +
+
+ {{/if}} +{{/inline}} +
+ +{{!-- ======================== Groups ======================= --}} +{{#each groups}} +{{#unless primary}} +
+ +
+
+
+
+

{{t 'users'}}

+
+
+ {{#if special}} +
{{t (concat 'group_explain_' @key)}}
+ {{else}} + {{> labelsLine display=../displayUser icon="user" type="member" items=members inv=membersInv group=@key}} + {{/if}} +
+
+
+
+
+

{{t 'permissions'}}

+
+
+ {{> labelsLine display=../displayPermission icon="key-modern" type="permission" items=permissions inv=permissionsInv group=@key}} +
+
+
+
+
+{{/unless}} +{{/each}} + + +{{!-- ====================== User specific permissions ==================== --}} +
+ +
+
+ {{#each groups}} + {{#if (or (and primary permissions) display)}} +
+
+

{{@key}}

+
+
+ {{> labelsLine display=../displayPermission icon="key-modern" type="permission" items=permissions inv=permissionsInv group=@key}} +
+
+
+ {{/if}} + {{/each}} +
+ +
    + {{#each groups}} + {{#if primary}} + {{#unless (or permissions display)}} +
    • + {{/unless}} + {{/if}} + {{/each}} +
+
+
+
+
+
diff --git a/src/views/user/user_list.ms b/src/views/user/user_list.ms index b2aebff6..5ab00db6 100644 --- a/src/views/user/user_list.ms +++ b/src/views/user/user_list.ms @@ -4,6 +4,9 @@
+ + {{t 'groups_and_permissions_manage'}} + {{t 'users_new'}}