From 527a5a7756d2b51f5b226c04bd3cd2ab4c7de45b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 5 Sep 2011 20:32:02 +0200 Subject: [PATCH] graphs/langs: fix graphs with russian language. rrd-graph cannot use UTF-8 chars so the strings are duplicated. --- config/cfgroot/graphs.pl | 36 ++++++++++++------------ config/rootfiles/core/52/filelists/files | 1 + langs/de/cgi-bin/de.pl | 5 ++++ langs/en/cgi-bin/en.pl | 5 ++++ langs/es/cgi-bin/es.pl | 5 ++++ langs/fr/cgi-bin/fr.pl | 5 ++++ langs/pl/cgi-bin/pl.pl | 5 ++++ langs/ru/cgi-bin/ru.pl | 18 +++++------- 8 files changed, 51 insertions(+), 29 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 8d047c2a5..c51e882e2 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -116,7 +116,7 @@ sub updatecpugraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -249,7 +249,7 @@ sub updateloadgraph { "-h 125", "-l 0", "-r", - "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'processes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -288,7 +288,7 @@ sub updatememorygraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -350,7 +350,7 @@ sub updateswapgraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -407,7 +407,7 @@ sub updateprocessescpugraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"} @@ -457,7 +457,7 @@ sub updateprocessesmemorygraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -503,7 +503,7 @@ sub updatediskgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -553,7 +553,7 @@ sub updateifgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -597,7 +597,7 @@ sub updatefwhitsgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -645,7 +645,7 @@ sub updatepinggraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ms", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -689,7 +689,7 @@ sub updatewirelessgraph { "--alt-y-grid", "-w 600", "-h 125", - "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v dBm", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -733,7 +733,7 @@ sub updatehddgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -773,7 +773,7 @@ sub updatehwtempgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -826,7 +826,7 @@ sub updatehwfangraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -879,7 +879,7 @@ sub updatehwvoltgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -952,7 +952,7 @@ sub updateqosgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1010,7 +1010,7 @@ sub updatecpufreqgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"}, "-v MHz", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1055,7 +1055,7 @@ sub updatethermaltempgraph { "-w 600", "-h 125", "-r", - "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period}, + "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, "-v Grad Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index a0f0ef571..8076e026b 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -5,3 +5,4 @@ usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/graphs.pl diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e6d451fe7..6a9e04bbb 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -549,6 +549,7 @@ 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 'day' => 'Tag', +'day-graph' => 'Tag', 'day after' => 'Tag danach', 'day before' => 'Tag davor', 'days' => 'Tage', @@ -892,6 +893,7 @@ 'hosts config added' => 'Hosts-Konfiguration hinzugefügt', 'hosts config changed' => 'Hosts-Konfiguration geändert', 'hour' => 'Stunde', +'hour-graph' => 'Stunde', 'hours' => 'Stunden', 'hours2' => 'Stunden', 'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.', @@ -1169,6 +1171,7 @@ 'modulation' => 'Modulation', 'monday' => 'Montag', 'month' => 'Monat', +'month-graph' => 'Monat', 'monthly firewallhits' => 'monatliche Firewalltreffer', 'monthly start day bad' => 'Monatlicher Starttag ist nicht gültig', 'monthly traffic bad' => 'Monatliches Volumen ist nicht gültig', @@ -2103,6 +2106,7 @@ 'website' => 'Website', 'wednesday' => 'Mittwoch', 'week' => 'Woche', +'week-graph' => 'Woche', 'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', 'wildcards' => 'Wildcards', @@ -2138,6 +2142,7 @@ 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.', 'xtaccess bad transfert' => 'Wenn Sie einen Port Zielbereich angeben, muss der Quellbereich identisch sein!', 'year' => 'Jahr', +'year-graph' => 'Jahr', 'yearly firewallhits' => 'jährliche Firewalltreffer', 'yes' => 'Ja', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.
Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 247814505..041659b55 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -570,6 +570,7 @@ 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', 'day' => 'Day', +'day-graph' => 'Day', 'day after' => 'Day after', 'day before' => 'Day before', 'days' => 'days.', @@ -918,6 +919,7 @@ 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', 'hour' => 'Hour', +'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1196,6 +1198,7 @@ 'modulation' => 'Modulation', 'monday' => 'Monday', 'month' => 'Month', +'month-graph' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', 'monthly start day bad' => 'Monthly start day is not correct', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2137,6 +2140,7 @@ 'website' => 'Website', 'wednesday' => 'Wednesday', 'week' => 'Week', +'week-graph' => 'Week', 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'weeks', 'wildcards' => 'Wildcards', @@ -2172,6 +2176,7 @@ 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.', 'xtaccess bad transfert' => 'If you specify a port destination range, the source range must be identical !', 'year' => 'Year', +'year-graph' => 'Year', 'yearly firewallhits' => 'yearly firewallhits', 'yes' => 'Yes', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.
Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 861ff2a2a..0433ed577 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -568,6 +568,7 @@ 'date' => 'Fecha', 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado', 'day' => 'Día', +'day-graph' => 'Dia', 'day after' => 'Día después', 'day before' => 'Día anterior', 'days' => 'dias.', @@ -899,6 +900,7 @@ 'hosts config added' => 'Configuración de hosts agregada', 'hosts config changed' => 'Configuración de hosts ha cambiado', 'hour' => 'Hora', +'hour-graph' => 'Hora', 'hours' => 'horas', 'hours2' => 'Horas', 'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual', @@ -1176,6 +1178,7 @@ 'modulation' => 'Modulación', 'monday' => 'Lun', 'month' => 'Mes', +'month-graph' => 'Mes', 'monthly firewallhits' => 'Hits al firewall mensuales', 'monthly start day bad' => 'Fecha de inicio mensual incorrecta', 'monthly traffic bad' => 'Volúmen mensual incorrecto', @@ -2103,6 +2106,7 @@ 'website' => 'Website', 'wednesday' => 'Miércoles', 'week' => 'Semana', +'week-graph' => 'Semana', 'weekly firewallhits' => 'Hits semanales al firewall', 'weeks' => 'Semanas', 'wildcards' => 'Comodines', @@ -2138,6 +2142,7 @@ 'xtaccess all error' => 'No puede establecer un acceso externo para TODOS, eso se hace en el registro de reenvío-de-puertos.', 'xtaccess bad transfert' => '¡Si ud. especifica un rango de puerto de destino, el rango de origen debe ser idéntico!', 'year' => 'Año', +'year-graph' => 'Ano', 'yearly firewallhits' => 'Hits anuales al Firewall', 'yes' => 'Si', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Solamente puede definir una conexion Roadwarrior cuando utiliza una autenticación por llave pre-compartida.
Puede ser que ya cuente con una conexión Roadwarrior abierta con autenticación por llave pre-compartida, o ud está intentando añadir una nueva ahora', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 778d9d5ae..cbdeda441 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -570,6 +570,7 @@ 'date' => 'Date', 'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé', 'day' => 'Jour', +'day-graph' => 'Jour', 'day after' => 'Jour d\'après', 'day before' => 'Jour d\'avant', 'days' => 'jours.', @@ -900,6 +901,7 @@ 'hosts config added' => 'configuration de l\'hôte ajoutée', 'hosts config changed' => 'configuration de l\'hôte changée', 'hour' => 'Heure', +'hour-graph' => 'Heure', 'hours' => 'heures', 'hours2' => 'Heures', 'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.', @@ -1177,6 +1179,7 @@ 'modulation' => 'Modulation', 'monday' => 'Lundi', 'month' => 'Mois', +'month-graph' => 'Mois', 'monthly firewallhits' => 'Attaques mensuelle du pare-feu', 'monthly start day bad' => 'Le jour de début du mois est incorrect', 'monthly traffic bad' => 'Le trafic mensuel est incorrect', @@ -2113,6 +2116,7 @@ 'website' => 'Site Web', 'wednesday' => 'Mercredi', 'week' => 'Semaine', +'week-graph' => 'Semaine', 'weekly firewallhits' => 'Hits hebdomadaire du pare-feu', 'weeks' => 'semaines', 'wildcards' => 'Jokers', @@ -2128,6 +2132,7 @@ 'xtaccess all error' => 'Vous ne pouvez pas donner l\'accès externe à tout ce qui se fait dans le dossier de redirection de port.', 'xtaccess bad transfert' => 'Si vous spécifiez une plage de ports de destination, la plage source doit être identique !', 'year' => 'Année', +'year-graph' => 'Annee', 'yearly firewallhits' => 'Hits annuels du pare-feu', 'yes' => 'Oui', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'vous ne pouvez définir qu\'une connexion roadwarrior lors de l\'utilisation par pré-authentification par clé partagée.
Soit vous avez déjà une connexion RoadWarrior avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 43599843b..76c49bb8e 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -570,6 +570,7 @@ 'date' => 'Data', 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty', 'day' => 'Dzien', +'day-graph' => 'Dzien', 'day after' => 'Dzień po', 'day before' => 'Dzień przed', 'days' => 'dni.', @@ -918,6 +919,7 @@ 'hosts config added' => 'Dodana konfiguracja hostów', 'hosts config changed' => 'Zmieniona konfiguracja hostów', 'hour' => 'Godzina', +'hour-graph' => 'Godzina', 'hours' => 'Godziny', 'hours2' => 'Godziny', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1195,6 +1197,7 @@ 'modulation' => 'Modulacja', 'monday' => 'Poniedziałek', 'month' => 'Miesiac', +'month-graph' => 'Miesiac', 'monthly firewallhits' => 'miesięczne zdarzenia zapory', 'monthly start day bad' => 'Początek okresu miesięcznego jest niepoprawny', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2136,6 +2139,7 @@ 'website' => 'Stron WWW', 'wednesday' => 'Środa', 'week' => 'Tydzien', +'week-graph' => 'Tydzien', 'weekly firewallhits' => 'zdarzeń zapory tygodniowo', 'weeks' => 'tygodnie', 'wildcards' => 'Maski', @@ -2171,6 +2175,7 @@ 'xtaccess all error' => 'Nie możesz ustawić zdalnego dostępu dla wszystkich - to robi wpis przekierowujący porty.', 'xtaccess bad transfert' => 'Jeżeli określisz zakres portów docelowy musisz ustawić identyczny zakres portów źródłowych !', 'year' => 'Rok', +'year-graph' => 'Rok', 'yearly firewallhits' => 'zdarzeń zapory w toku', 'yes' => 'Tak', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Możesz zdefiniować tylko jedno połączenie typu Roadwarrior jeżeli używasz autentykacji kluczem współdzielony (pre-shared key).
Albo połączenie typu Roadwarrior uwierzytelniane kluczem współdzielonym już istnieje, albo próbujesz dodać je teraz.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 946e302d9..18c134915 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -550,7 +550,7 @@ 'credits' => 'О Проекте', 'crl' => 'Список отозванных сертификатов', 'cron server' => 'CRON Сервер', -'current' => 'Текущий', +'current' => 'Current', 'current aliases' => 'Действующие псевдонимы:', 'current class' => 'Текущий класс', 'current devices' => 'Текущие устройства', @@ -569,7 +569,7 @@ 'dat without key' => 'Зашифрованный архив не может быть использован без ключа.', 'date' => 'Дата', 'date not in logs' => 'На запрошеный день журналы не найдены или они частично недоступны', -'day' => 'Day', +'day' => 'Сутки', 'day after' => 'Следующий День', 'day before' => 'Предыдущий День', 'days' => 'Дни.', @@ -655,7 +655,6 @@ 'disabled' => 'отключён', 'disconnect' => 'OVPN Остановить / Отключить', 'disconnects' => 'Отключает', -'disk access per' => 'Доступ к диску по', 'disk usage' => 'Использование дисков', 'display' => 'Экран', 'display charset' => 'Таблица символов', @@ -844,9 +843,8 @@ 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', 'free' => 'Свободно', -'free memory' => 'Свободно Памяти ', -'free swap' => 'Свободно Swap', -'frequency' => 'Частота', +'free memory' => 'Free memory', +'free swap' => 'Free Swap', 'friday' => 'Пятница', 'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPFire box. Please download the tarball corresponding to your version from the IPFire website and then upload the entire fcdsl-(your_version).tgz using the form below.', 'fritzdsl upload' => 'Upload Fritz!DSL driver', @@ -948,7 +946,6 @@ 'inactive' => 'inactive', 'include logfiles' => 'Включить файлы логов', 'incoming' => 'Входящий', -'incoming traffic in bytes per second' => 'Incoming Traffic', 'incorrect password' => 'Incorrect password', 'info' => 'Info', 'init string' => 'Init:', @@ -1151,7 +1148,7 @@ 'max retries not set' => 'Не указано максимальное число попыток.', 'max size' => 'Максимальный размер объекта (KB):', 'max throughput' => 'Максимальная пропускная способность', -'maximal' => 'Максимум', +'maximal' => 'Maximal', 'maximum retries' => 'Максимальное число попыток:', 'may' => 'Май', 'mbmon display' => 'Показать', @@ -1339,7 +1336,6 @@ 'outgoing firewall reset' => 'Сбросить всё', 'outgoing firewall view group' => 'Посмотреть группу', 'outgoing firewall warning' => 'Если не указывать ip или mac, то они будут игнорироваться', -'outgoing traffic in bytes per second' => 'Исходящий трафик', 'override mtu' => 'Перезаписать MTU по умолчанию', 'ovpn' => 'OpenVPN', 'ovpn con stat' => 'Статистика подключений OpenVPN', @@ -2081,8 +2077,8 @@ 'use ipfire red ip' => 'Для подключения IPFire использует классический RED IP', 'use only proposed settings' => 'Пожалуйста используйте только предлагаемые настройки.', 'used' => 'Использовано', -'used memory' => 'Использовано памяти ', -'used swap' => 'Использовано Swap', +'used memory' => 'Used memory', +'used swap' => 'Used swap', 'user' => 'Пользователь', 'user log' => 'Журнал пользователя', 'user proxy logs' => 'Журнал proxy пользователя', -- 2.39.2