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 36e4eeadc05a6c26f9ebb6e966e877fb3f647cd7..0b1b166959e33ef213793bb63adcb639a01eef94 100644 (file)
--- 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 43fd82bb8ad43e35c00b46aa6245df69e543f1f1..ce11b1bbdb60c9a54add110828feaf896afde7f4 100644 (file)
--- 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