tor: Configuration file updates.

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

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index aa8e3edc546723f6223f7c2f5287f543a24882a6..7b83295236fa4a3b3d297a6f16f7fdbc5b04b50b 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -480,10 +480,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
@@ -542,8 +539,10 @@ WARNING: untranslated string: ccd none
 WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
+WARNING: untranslated string: community rules
 WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: disk access per
+WARNING: untranslated string: emerging rules
 WARNING: untranslated string: extrahd because there is already a device mounted
 WARNING: untranslated string: extrahd cant umount
 WARNING: untranslated string: extrahd install or load driver