From d02fa59d62a27cb2941ebae7dbb653beb442ebfe 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 c9e062f61..aff32a4d8 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1015,8 +1015,12 @@ 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: 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 082f63afa..ce1c34db4 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -226,9 +226,12 @@ < g.dtm < g.lite < hostile networks total +<<<<<<< HEAD < ids provider eol < ids unsupported provider < load average +======= +>>>>>>> bc9064f69 (ovpnmain.cgi: Unify the error message box) < oops something went wrong < ovpn ciphers < ovpn crypto settings -- 2.39.5