From 7c8a0e563fa19bb2eed5c2a380b64429ec0e4b0e Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Tue, 1 Jan 2019 17:47:55 +0100
Subject: [PATCH] networks.txt: Assign Hamburg to VBN.

---
 oeffi/assets/networks.txt        | 3 +--
 oeffi/res/values-de/networks.xml | 4 +---
 oeffi/res/values/networks.xml    | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt
index c651aad..cee2efe 100644
--- a/oeffi/assets/networks.txt
+++ b/oeffi/assets/networks.txt
@@ -15,11 +15,10 @@ VGN|de-DE|Nürnberg;Fürth;Erlangen
 VVM|de-DE|Schwaben;Mittelschwaben;Krumbach;Günzburg;Memmingen
 NVV|de-DE|Hessen;Frankfurt am Main;Kassel
 VMV|de-DE|Mecklenburg-Vorpommern;Schwerin
-HVV|de-DE|Hamburg|disabled
 SH|de-DE|Schleswig-Holstein;Kiel;Lübeck;Hamburg
 GVH|de-DE|Niedersachsen;Hannover;Hamburg
 BSVAG|de-DE|Braunschweig;Wolfsburg
-VBN|de-DE|Niedersachsen;Bremen;Bremerhaven;Oldenburg (Oldenburg);Osnabrück;Göttingen;Rostock
+VBN|de-DE|Niedersachsen;Hamburg;Bremen;Bremerhaven;Oldenburg (Oldenburg);Osnabrück;Göttingen;Rostock
 VVO|de-DE|Sachsen;Dresden
 VMS|de-DE|Mittelsachsen;Chemnitz
 NASA|de-DE|Sachsen;Leipzig;Sachsen-Anhalt;Magdeburg;Halle
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index f9a0471..ce026e0 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -25,15 +25,13 @@
     <string name="network_vvm_comment">Lokal- und Regionalverkehr</string>
     <string name="network_vmv_label">Schwerin &amp; Mecklenburg-Vorpommern</string>
     <string name="network_vmv_comment">Lokal- und Regionalverkehr</string>
-    <string name="network_hvv_label">Hamburg</string>
-    <string name="network_hvv_comment">Nicht verfügbar. Du kannst stattdessen Niedersachsen oder Schleswig-Holstein probieren.</string>
     <string name="network_sh_label">NAH.SH</string>
     <string name="network_sh_comment">Kiel, Lübeck &amp; Schleswig-Holstein, Lokal- und Regionalverkehr</string>
     <string name="network_gvh_label">Hannover &amp; Niedersachsen</string>
     <string name="network_gvh_comment">Lokal- und Regionalverkehr</string>
     <string name="network_bsvag_label">Braunschweig &amp; Wolfsburg</string>
     <string name="network_bsvag_comment">Lokal- und Regionalverkehr</string>
-    <string name="network_vbn_label">Bremen, Rostock, Osnabrück &amp; Südniedersachsen</string>
+    <string name="network_vbn_label">Hamburg, Bremen, Rostock &amp; Südniedersachsen</string>
     <string name="network_vbn_comment">Lokal- und Regionalverkehr</string>
     <string name="network_nasa_label">Leipzig, Halle &amp; Sachsen-Anhalt</string>
     <string name="network_nasa_comment">Lokal- und Regionalverkehr</string>
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index d4069f8..8b47298 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -25,15 +25,13 @@
     <string name="network_vvm_comment">local and regional</string>
     <string name="network_vmv_label">Schwerin &amp; Mecklenburg-Vorpommern</string>
     <string name="network_vmv_comment">local and regional</string>
-    <string name="network_hvv_label">Hamburg</string>
-    <string name="network_hvv_comment">Not available. You can try Lower Saxony or Schleswig-Holstein instead.</string>
     <string name="network_sh_label">NAH.SH</string>
     <string name="network_sh_comment">Kiel, Lübeck &amp; Schleswig-Holstein, local and regional</string>
     <string name="network_gvh_label">Hannover &amp; Lower Saxony</string>
     <string name="network_gvh_comment">local and regional</string>
     <string name="network_bsvag_label">Braunschweig &amp; Wolfsburg</string>
     <string name="network_bsvag_comment">local and regional</string>
-    <string name="network_vbn_label">Bremen, Rostock, Osnabrück &amp; South Lower Saxony</string>
+    <string name="network_vbn_label">Hamburg, Bremen, Rostock &amp; South Lower Saxony</string>
     <string name="network_vbn_comment">local and regional</string>
     <string name="network_nasa_label">Leipzig, Halle &amp; Saxony-Anhalt</string>
     <string name="network_nasa_comment">local and regional</string>