From 9f829f25b96fbe6c067aeacd2552761f01280bda Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 10 Apr 2024 14:26:43 +0200 Subject: [PATCH] ovpnmain.cgi: Unify the error message box Signed-off-by: Michael Tremer --- doc/language_issues.fr | 4 ++++ doc/language_missings | 3 +++ 2 files changed, 7 insertions(+) diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 36e4eeadc..0b1b16695 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1040,11 +1040,15 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hostile networks total = Total Hostile Networks +<<<<<<< HEAD WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids rulesets = Rulesets WARNING: untranslated string: ips throughput = Throughput WARNING: untranslated string: last updated = Last Updated WARNING: untranslated string: load average = Load Average +======= +WARNING: untranslated string: load average = unknown string +>>>>>>> bc9064f69 (ovpnmain.cgi: Unify the error message box) WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: ovpn ciphers = Ciphers WARNING: untranslated string: ovpn crypto settings = Cryptographic Settings diff --git a/doc/language_missings b/doc/language_missings index 43fd82bb8..ce11b1bbd 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -236,12 +236,15 @@ < g.dtm < g.lite < hostile networks total +<<<<<<< HEAD < ids provider eol < ids rulesets < ids unsupported provider < ips throughput < last updated < load average +======= +>>>>>>> bc9064f69 (ovpnmain.cgi: Unify the error message box) < oops something went wrong < ovpn ciphers < ovpn crypto settings -- 2.39.5