snort: update to 2.9.5.

[people/teissler/ipfire-2.x.git] / doc / language_issues.es

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 266361c35b25bcbebe65d520c85b7e18fc24afb4..2258d1b55f5a52bee153eeb1b62768078c6249ea 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -487,10 +487,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
-<<<<<<< HEAD
 WARNING: translation string unused: vpn incompatible use of defaultroute
-=======
->>>>>>> 1b23ab3... Implement wireless client on RED.
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
 WARNING: translation string unused: vpn on green
@@ -552,6 +549,7 @@ WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
 WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: emerging rules
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled