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 c9e062f612fb4af489415854a7e9b6da4647d1e2..aff32a4d8fbc8b447f25aab2f1aeb785796290ea 100644 (file)
--- 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 082f63afa1d752cd33544a8ff65a9dcde38c6032..ce1c34db4aa8fe71b4693815b3af71f6f353e5e2 100644 (file)
--- 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