fix merge conflicts

Author: GyulyVGC

.all-contributorsrc

@@ -667,6 +667,51 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "rons4",
+      "name": "Ron",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43244104?v=4",
+      "profile": "https://www.signl4.com",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "ADS-Fund",
+      "name": "ADS Fund",
+      "avatar_url": "https://avatars.githubusercontent.com/u/202042116?v=4",
+      "profile": "https://ads.fund",
+      "contributions": [
+        "financial"
+      ]
+    },
+    {
+      "login": "louis-ym4",
+      "name": "louis-ym4",
+      "avatar_url": "https://avatars.githubusercontent.com/u/200361621?v=4",
+      "profile": "https://github.com/louis-ym4",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "vanharen07",
+      "name": "Ylva",
+      "avatar_url": "https://avatars.githubusercontent.com/u/91621548?v=4",
+      "profile": "https://github.com/vanharen07",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "celtic-coder",
+      "name": "Liam OBrien",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11787866?v=4",
+      "profile": "https://github.com/celtic-coder",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/rust.yml

@@ -43,13 +43,11 @@ jobs:
 
       - name: Install Windows dependencies
         if: matrix.os == 'windows' && github.event_name != 'pull_request'
-        env:
-          NPCAP_OEM_URL: ${{ secrets.NPCAP_OEM_URL }}
         run: |
           Invoke-WebRequest -Uri "https://npcap.com/dist/npcap-sdk-1.13.zip" -OutFile "C:/npcap-sdk.zip"
           Expand-Archive -LiteralPath C:/npcap-sdk.zip -DestinationPath C:/npcap-sdk
           echo "LIB=C:/npcap-sdk/Lib/x64" >> $env:GITHUB_ENV
-          Invoke-WebRequest -Uri "$env:NPCAP_OEM_URL" -OutFile C:/npcap-oem.exe
+          Invoke-WebRequest -Uri ${{secrets.NPCAP_OEM_URL}} -OutFile C:/npcap-oem.exe
           C:/npcap-oem.exe /S
 
       - name: fmt

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All Sniffnet releases with the relative changes are documented in this file.
 
+## [UNRELEASED]
+- Added Dutch translation 🇳🇱 ([#854](https://github.com/GyulyVGC/sniffnet/pull/854))
+- Updated some of the existing translations to v1.4: 
+  - German ([#833](https://github.com/GyulyVGC/sniffnet/pull/833))
+
 ## [1.4.0] - 2025-06-27
 - Import PCAP files ([#795](https://github.com/GyulyVGC/sniffnet/pull/795) — fixes [#283](https://github.com/GyulyVGC/sniffnet/issues/283))
 - Donut chart reporting overall traffic statistics ([#756](https://github.com/GyulyVGC/sniffnet/pull/756) — fixes [#687](https://github.com/GyulyVGC/sniffnet/issues/687))