Merge branch 'next-geoip' into core-90-geoip

diff --cc config/rootfiles/common/stage2
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc lfs/stage2
Simple merge

diff --cc make.sh
index 316917e0b3a938b49974e5c1043131455a9c6645,395c21f2d7a524e76c43640b4ca6cb10657b51ac..6662096a94e2a0f58ef781dbae2917b39756a0a9
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -411,8 -414,9 +414,9 @@@ buildipfire() 
                ipfiremake backports                    KCFG="-pae"
                ipfiremake cryptodev                    KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
 -              ipfiremake igb                          KCFG="-pae"
 +#             ipfiremake igb                          KCFG="-pae"
                ipfiremake ixgbe                        KCFG="-pae"
+               ipfiremake xtables-addons               KCFG="-pae"
                ipfiremake linux-initrd                 KCFG="-pae"
  
                # x86 kernel build
@@@ -420,8 -424,9 +424,9 @@@
                ipfiremake backports                    KCFG=""
                ipfiremake cryptodev                    KCFG=""
                ipfiremake e1000e                       KCFG=""
 -              ipfiremake igb                          KCFG=""
 +#             ipfiremake igb                          KCFG=""
                ipfiremake ixgbe                        KCFG=""
+               ipfiremake xtables-addons               KCFG=""
                ipfiremake linux-initrd                 KCFG=""
                ;;
  
@@@ -437,8 -443,9 +443,9 @@@
                ipfiremake backports                    KCFG="-multi"
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
 -              ipfiremake igb                          KCFG="-multi"
 +#             ipfiremake igb                          KCFG="-multi"
                ipfiremake ixgbe                        KCFG="-multi"
+               ipfiremake xtables-addons               KCFG="-multi"
                ipfiremake linux-initrd                 KCFG="-multi"
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
@@@ -446,8 -453,9 +453,9 @@@
                ipfiremake backports                    KCFG="-kirkwood"
                ipfiremake cryptodev                    KCFG="-kirkwood"
                ipfiremake e1000e                       KCFG="-kirkwood"
 -              ipfiremake igb                          KCFG="-kirkwood"
 +#             ipfiremake igb                          KCFG="-kirkwood"
                ipfiremake ixgbe                        KCFG="-kirkwood"
+               ipfiremake xtables-addons               KCFG="-kirkwood"
                ipfiremake linux-initrd                 KCFG="-kirkwood"
                ;;
    esac