Refine Makefile & update GitLab CI image

As we merge translations directly to master, we have to merge them into dev then too.

src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap

@@ -5,7 +5,7 @@ exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
 - First value
 + Second value
 
-@@ -250,207 +250,95 @@
+@@ -241,207 +241,95 @@
               value=\\"0\\"
             >
               auto
@@ -337,9 +337,9 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -513,10 +513,94 @@
-          Parameters of the guest network can be set in the Guest network tab.
-          
+@@ -500,10 +500,92 @@
+            >
+              Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab.
             </small>
           </div>
         </div>
@@ -422,9 +422,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           
-+         WPA2 pre-shared key, that is required to connect to the network.
-+     
++           WPA2 pre-shared key, that is required to connect to the network.
 +         </small>
 +       </div>
         <hr />
@@ -432,7 +430,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
           class=\\"form-group switch\\"
         >
           <div
-@@ -540,10 +624,11 @@
+@@ -527,10 +609,11 @@
         <div
           class=\\"text-right\\"
         >
@@ -451,7 +449,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 - First value
 + Second value
 
-@@ -22,10 +22,501 @@
+@@ -22,10 +22,488 @@
                 Wi-Fi 1
               </h2>
             </label>
@@ -532,9 +530,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           
-+         WPA2 pre-shared key, that is required to connect to the network.
-+     
++           WPA2 pre-shared key, that is required to connect to the network.
 +         </small>
 +       </div>
 +       <div
@@ -608,10 +604,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           
-+         The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
-+         newer standard and may not be supported by all your devices. It usually has less interference, but the signal
-+         does not carry so well indoors.
++           The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a newer standard and may not be supported by all your devices. It usually has less interference, but the signal does not carry so well indoors.
 +         </small>
 +       </div>
 +       <div
@@ -660,11 +653,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           
-+         Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher
-+         throughput but can cause more interference in the network. If you don't know what to choose, use the default
-+         option with 20 MHz wide channel.
-+     
++           Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher throughput but can cause more interference in the network. If you don't know what to choose, use the default option with 20 MHz wide channel.
 +         </small>
 +       </div>
 +       <div
@@ -940,11 +929,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           <small
 +             class=\\"form-text text-muted mt-0 mb-3\\"
 +           >
-+             
-+         Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to
-+         access the internet, but aren't allowed to access other devices and the configuration interface of the router.
-+         Parameters of the guest network can be set in the Guest network tab.
-+         
++             Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab.
 +           </small>
 +         </div>
 +       </div>