mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-04 19:11:27 +02:00
Merge branch 'master' into next
Conflicts: config/kernel/kernel.config.i586-ipfire-pae config/rootfiles/core/45/meta config/rootfiles/core/46/meta config/rootfiles/core/47/meta config/rootfiles/core/48/meta config/rootfiles/core/52/meta config/rootfiles/oldcore/44/meta config/rootfiles/oldcore/45/meta config/rootfiles/oldcore/46/meta config/rootfiles/oldcore/47/meta doc/language_missings langs/pl/cgi-bin/pl.pl make.sh
This commit is contained in:
@@ -264,7 +264,6 @@ WARNING: translation string unused: mbmon graphs
|
||||
WARNING: translation string unused: mbmon temp in
|
||||
WARNING: translation string unused: mbmon value
|
||||
WARNING: translation string unused: min size
|
||||
WARNING: translation string unused: minutes
|
||||
WARNING: translation string unused: missing dat
|
||||
WARNING: translation string unused: missing gz
|
||||
WARNING: translation string unused: modem on com1
|
||||
@@ -515,6 +514,7 @@ WARNING: untranslated string: fireinfo why descr2
|
||||
WARNING: untranslated string: fireinfo why enable
|
||||
WARNING: untranslated string: fireinfo why read more
|
||||
WARNING: untranslated string: fireinfo your profile id
|
||||
WARNING: untranslated string: minute
|
||||
WARNING: untranslated string: new
|
||||
WARNING: untranslated string: outgoing firewall add ip group
|
||||
WARNING: untranslated string: outgoing firewall add mac group
|
||||
@@ -532,5 +532,9 @@ WARNING: untranslated string: outgoing firewall p2p description 3
|
||||
WARNING: untranslated string: outgoing firewall reserved groupname
|
||||
WARNING: untranslated string: outgoing firewall view group
|
||||
WARNING: untranslated string: pakfire ago
|
||||
WARNING: untranslated string: route config changed
|
||||
WARNING: untranslated string: routing config added
|
||||
WARNING: untranslated string: routing config changed
|
||||
WARNING: untranslated string: routing table
|
||||
WARNING: untranslated string: system information
|
||||
WARNING: untranslated string: vpn keyexchange
|
||||
|
||||
Reference in New Issue
Block a user