From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Apr 2024 12:26:43 +0000 (+0200)
Subject: ovpnmain.cgi: Unify the error message box
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d02fa59d62a27cb2941ebae7dbb653beb442ebfe;p=people%2Fms%2Fipfire-2.x.git

ovpnmain.cgi: Unify the error message box

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

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