Network prefs: remove compile-time german localization

There are better way to achieve this, now.

src/preferences/network/DialUpAddOn/ConnectionOptionsAddon.cpp

@@ -37,18 +37,10 @@
 static const uint32 kMsgUpdateControls = 'UCTL';
 
 // labels
-#ifdef LANG_GERMAN
-static const char *kLabelConnectionOptions = "Optionen";
-static const char *kLabelDialOnDemand = "Automatisch Verbinden Bei Zugriff Auf "
-										"Internet";
-static const char *kLabelAskBeforeDialing = "Vor Dem Verbinden Fragen";
-static const char *kLabelAutoRedial = "Verbindung Automatisch Wiederherstellen";
-#else
 static const char *kLabelConnectionOptions = "Options";
 static const char *kLabelDialOnDemand = "Connect Automatically When Needed";
 static const char *kLabelAskBeforeDialing = "Ask Before Dialing";
 static const char *kLabelAutoRedial = "Redial Automatically";
-#endif
 
 
 ConnectionOptionsAddon::ConnectionOptionsAddon(BMessage *addons)

src/preferences/network/DialUpAddOn/DialUpView.cpp

@@ -63,16 +63,6 @@ static const uint32 kMsgSelectInterface = 'SELI';
 static const uint32 kMsgConnectButton = 'CONI';
 
 // labels
-#ifdef LANG_GERMAN
-static const char *kLabelInterface = "Verbindung: ";
-static const char *kLabelInterfaceName = "Verbindungs-Name: ";
-static const char *kLabelCreateNewInterface = "Neue Verbindung Erstellen";
-static const char *kLabelCreateNew = "Neu...";
-static const char *kLabelDeleteCurrent = "Auswahl Löschen";
-static const char *kLabelConnect = "Verbinden";
-static const char *kLabelDisconnect = "Trennen";
-static const char *kLabelOK = "OK";
-#else
 static const char *kLabelInterface = "Interface: ";
 static const char *kLabelInterfaceName = "Interface Name: ";
 static const char *kLabelCreateNewInterface = "Create New Interface";
@@ -81,23 +71,8 @@ static const char *kLabelDeleteCurrent = "Delete Current";
 static const char *kLabelConnect = "Connect";
 static const char *kLabelDisconnect = "Disconnect";
 static const char *kLabelOK = "OK";
-#endif
 
 // connection status strings
-#ifdef LANG_GERMAN
-static const char *kTextConnecting = "Verbinde...";
-static const char *kTextConnectionEstablished = "Verbindung hergestellt.";
-static const char *kTextNotConnected = "Nicht verbunden.";
-static const char *kTextDeviceUpFailed = "Konnte Verbindung nicht aufbauen.";
-static const char *kTextAuthenticating = "Authentifizierung...";
-static const char *kTextAuthenticationFailed = "Authentifizierung fehlgeschlagen!";
-static const char *kTextConnectionLost = "Verbindung verloren!";
-static const char *kTextCreationError = "Fehler beim Initialisieren!";
-static const char *kTextNoInterfacesFound = "Bitte erstellen Sie eine neue "
-											"Verbindung.";
-static const char *kTextChooseInterfaceName = "Bitte denken Sie sich einen neuen "
-											"Namen für diese Verbindung aus.";
-#else
 static const char *kTextConnecting = "Connecting...";
 static const char *kTextConnectionEstablished = "Connection established.";
 static const char *kTextNotConnected = "Not connected.";
@@ -109,19 +84,8 @@ static const char *kTextCreationError = "Error creating interface!";
 static const char *kTextNoInterfacesFound = "Please create a new interface...";
 static const char *kTextChooseInterfaceName = "Please choose a new name for this "
 											"interface.";
-#endif
 
 // error strings for alerts
-#ifdef LANG_GERMAN
-static const char *kErrorTitle = "Fehler";
-static const char *kErrorNoPPPStack = "Fehler: Kein Zugriff auf den PPP Stack!";
-static const char *kErrorInterfaceExists = "Fehler: Eine Verbindung mit diesem Namen "
-										"existiert bereits!";
-static const char *kErrorLoadingFailed = "Fehler: Konfiguration ist fehlerhaft! Die "
-										"Einstellungen werden zurückgesetzt.";
-static const char *kErrorSavingFailed = "Fehler: Speichern der Einstellungen ist "
-										"fehlgeschlagen!";
-#else
 static const char *kErrorTitle = "Error";
 static const char *kErrorNoPPPStack = "Error: Could not access the PPP stack!";
 static const char *kErrorInterfaceExists = "Error: An interface with this name "
@@ -129,7 +93,6 @@ static const char *kErrorInterfaceExists = "Error: An interface with this name "
 static const char *kErrorLoadingFailed = "Error: Failed loading interface! The "
 										"current settings will be deleted.";
 static const char *kErrorSavingFailed = "Error: Failed saving interface settings!";
-#endif
 
 
 static
@@ -798,11 +761,7 @@ DialUpView::LoadAddons()
 */	
 	// "PAP" authenticator
 	BMessage addon;
-#ifdef LANG_GERMAN
-	addon.AddString("FriendlyName", "Unverschlüsselt");
-#else
 	addon.AddString("FriendlyName", "Plain-text Authentication");
-#endif
 	addon.AddString("TechnicalName", "PAP");
 	addon.AddString("KernelModuleName", "pap");
 	fAddons.AddMessage(DUN_AUTHENTICATOR_ADDON_TYPE, &addon);

src/preferences/network/DialUpAddOn/GeneralAddon.cpp

@@ -47,17 +47,6 @@ static const uint32 kMsgSelectDevice = 'SELD';
 static const uint32 kMsgSelectAuthenticator = 'SELA';
 
 // labels
-#ifdef LANG_GERMAN
-static const char *kLabelGeneral = "Allgemein";
-static const char *kLabelDevice = "Gerät: ";
-static const char *kLabelNoDevicesFound = "Keine Geräte Gefunden!";
-static const char *kLabelAuthenticator = "Login: ";
-static const char *kLabelNoAuthenticatorsFound = "Keine Login-Methoden gefunden!";
-static const char *kLabelName = "Benutzername: ";
-static const char *kLabelPassword = "Password: ";
-static const char *kLabelSavePassword = "Passwort Speichern";
-static const char *kLabelNone = "Ohne";
-#else
 static const char *kLabelGeneral = "General";
 static const char *kLabelDevice = "Device: ";
 static const char *kLabelNoDevicesFound = "No Devices Found!";
@@ -67,7 +56,6 @@ static const char *kLabelName = "Username: ";
 static const char *kLabelPassword = "Password: ";
 static const char *kLabelSavePassword = "Save Password";
 static const char *kLabelNone = "None";
-#endif
 
 // string constants for information saved in the settings message
 static const char *kGeneralTabAuthentication = "Authentication";

src/preferences/network/DialUpAddOn/IPCPAddon.cpp

@@ -45,15 +45,6 @@ static const uint32 kDefaultButtonWidth = 80;
 static const uint32 kMsgUpdateControls = 'UCTL';
 
 // labels
-#ifdef LANG_GERMAN
-static const char *kLabelIPCP = "TCP/IP";
-static const char *kLabelIPAddress = "IP Adresse: ";
-static const char *kLabelPrimaryDNS = "Primärer DNS: ";
-static const char *kLabelSecondaryDNS = "Sekundärer DNS: ";
-static const char *kLabelOptional = "(Optional)";
-static const char *kLabelExtendedOptions = "Erweiterte Optionen:";
-static const char *kLabelEnabled = "TCP/IP-Protokoll Verwenden";
-#else
 static const char *kLabelIPCP = "TCP/IP";
 static const char *kLabelIPAddress = "IP Address: ";
 static const char *kLabelPrimaryDNS = "Primary DNS: ";
@@ -61,7 +52,6 @@ static const char *kLabelSecondaryDNS = "Secondary DNS: ";
 static const char *kLabelOptional = "(Optional)";
 static const char *kLabelExtendedOptions = "Extended Options:";
 static const char *kLabelEnabled = "Enable TCP/IP Protocol";
-#endif
 
 // add-on descriptions
 static const char *kKernelModuleName = "ipcp";

src/preferences/network/DialUpAddOn/Jamfile

@@ -1,18 +1,5 @@
 SubDir HAIKU_TOP src preferences network DialUpAddOn ;
 
-# set some additional defines
-{
-	local defines ;
-	
-	if $(LANG_GERMAN) {
-		defines += LANG_GERMAN ;
-	}
-	
-	defines = [ FDefines $(defines) ] ;
-	SubDirCcFlags $(defines) ;
-	SubDirC++Flags $(defines) ;
-}
-
 UsePrivateHeaders net ;
 # For NetworkSetupAddOn.h, to be moved to private once...
 UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ;
@@ -26,15 +13,15 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp ipcp ] ; # IPC
 
 AddResources DialUp : DialUpPreflet.rdef ;
 
-Addon DialUp : 
+Addon DialUp :
 	AddOn.cpp
 	DialUpView.cpp
-	
+
 	# utils
 	InterfaceUtils.cpp
 	MessageDriverSettingsUtils.cpp
 	TextRequestDialog.cpp
-	
+
 	# built-in add-ons
 	ConnectionOptionsAddon.cpp
 	GeneralAddon.cpp

src/preferences/network/DialUpAddOn/PPPoEAddon.cpp

@@ -56,33 +56,17 @@ static const uint32 kMsgChangeService = 'CHGS';
 static const uint32 kMsgResetService = 'RESS';
 
 // labels
-#ifdef LANG_GERMAN
-static const char *kLabelInterfaceName = "Netzwerk-Adapter: ";
-static const char *kLabelOptional = "(Optional)";
-static const char *kLabelOtherInterface = "Anderer:";
-static const char *kLabelSelectInterface = "Adapter Auswählen...";
-static const char *kLabelServiceName = "Service: ";
-#else
 static const char *kLabelInterfaceName = "Network Interface: ";
 static const char *kLabelOptional = "(Optional)";
 static const char *kLabelOtherInterface = "Other:";
 static const char *kLabelSelectInterface = "Select Interface...";
 static const char *kLabelServiceName = "Service: ";
-#endif
 
 // requests
-#ifdef LANG_GERMAN
-static const char *kRequestInterfaceName = "Name Des Adapters: ";
-#else
 static const char *kRequestInterfaceName = "Network Interface Name: ";
-#endif
 
 // add-on descriptions
-#ifdef LANG_GERMAN
-static const char *kFriendlyName = "Breitband: DSL, Kabel, etc.";
-#else
 static const char *kFriendlyName = "Broadband: DSL, Cable, etc.";
-#endif
 static const char *kTechnicalName = "PPPoE";
 static const char *kKernelModuleName = "pppoe";