OS X:

Localizing some strings in the Net Plug-In
Changing three periods to ellipses on all localizations.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88069 e17a0e51-4ae3-4d35-97c3-1a29b211df97

9 files changed, 32 insertions, 14 deletions

diff --git a/macosx/plugins/DFNet/English.lproj/Localizable.strings b/macosx/plugins/DFNet/English.lproj/Localizable.strings
index f48d7085..31bb46c2 100644
--- a/macosx/plugins/DFNet/English.lproj/Localizable.strings
+++ b/macosx/plugins/DFNet/English.lproj/Localizable.strings
@@ -9,3 +9,8 @@
 "Error allocating memory!\n" = "Error allocating memory!\n";
 "error connecting to %s: %s\n" = "Error connecting to %s: %s\n";
 "Socket Driver" = "Socket Driver";
+
+"Address Too Long" = "Address Too Long";
+"The address is too long.\n\nTry to use only the IP address and not a host name." = "The address is too long.\n\nTry to use only the IP address and not a host name.";
+"Blank Address" = "Blank Address";
+"The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals." = "The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals.";
diff --git a/macosx/plugins/DFNet/fr.lproj/Localizable.strings b/macosx/plugins/DFNet/fr.lproj/Localizable.strings
index 0361887a..77e144e3 100644
--- a/macosx/plugins/DFNet/fr.lproj/Localizable.strings
+++ b/macosx/plugins/DFNet/fr.lproj/Localizable.strings
@@ -9,3 +9,8 @@
 "Error allocating memory!\n" = "Erreur d'allocation mémoire !\n";
 "error connecting to %s: %s\n" = "Erreur lors de la connection à %s: %s\n";
 "Socket Driver" = "Pilote Socket";
+
+//"Address Too Long" = "Address Too Long";
+//"The address is too long.\n\nTry to use only the IP address and not a host name." = "The address is too long.\n\nTry to use only the IP address and not a host name.";
+//"Blank Address" = "Blank Address";
+//"The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals." = "The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals.";
diff --git a/macosx/plugins/DFNet/hu.lproj/Localizable.strings b/macosx/plugins/DFNet/hu.lproj/Localizable.strings
index 570d94da..f3baef54 100644
--- a/macosx/plugins/DFNet/hu.lproj/Localizable.strings
+++ b/macosx/plugins/DFNet/hu.lproj/Localizable.strings
@@ -9,3 +9,8 @@
 "Error allocating memory!\n" = "Memória kiosztási hiba!\n";
 "error connecting to %s: %s\n" = "hiba a következőhöz történő kapcsolódáskor: %s: %s\n";
 "Socket Driver" = "Socket illesztőprogram";
+
+//"Address Too Long" = "Address Too Long";
+//"The address is too long.\n\nTry to use only the IP address and not a host name." = "The address is too long.\n\nTry to use only the IP address and not a host name.";
+//"Blank Address" = "Blank Address";
+//"The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals." = "The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals.";
diff --git a/macosx/plugins/DFNet/macsrc/PluginConfigController.m b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
index 434a108b..0ea7951e 100755
--- a/macosx/plugins/DFNet/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
@@ -28,6 +28,8 @@
 
 #define APP_ID @"net.codeplex.pcsxr.DFNet"
 #define PrefsKey APP_ID @" Settings"
+#define NSLocalizedStringInBundle(key, bundle, comment) \
+	[bundle localizedStringForKey:(key) value:@"" table:nil]
 
 static PluginConfigController *windowController = nil;
 
@@ -49,7 +51,7 @@ void AboutDlgProc()
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = [[NSAttributedString alloc] initWithPath: path
+		credits = [[NSAttributedString alloc] initWithPath:path
 				documentAttributes:NULL];
 	} else {
 		credits = [[NSAttributedString alloc] initWithString:@""];
@@ -99,7 +101,7 @@ void ReadConfig()
 	
 	keyValues = [defaults dictionaryForKey:PrefsKey];
 
-	conf.PortNum = [keyValues[kIPPORT] intValue];
+	conf.PortNum = [keyValues[kIPPORT] unsignedShortValue];
 	conf.PlayerNum = [keyValues[kPLAYERNUM] intValue];
 	strlcpy(conf.ipAddress, [keyValues[kIPADDRKEY] cStringUsingEncoding:NSASCIIStringEncoding], sizeof(conf.ipAddress));
 }
@@ -114,14 +116,15 @@ void ReadConfig()
 - (IBAction)ok:(id)sender
 {
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	NSBundle *curBundle = [NSBundle bundleForClass:[PluginConfigController class]];
 	
 	NSString *theAddress = [ipAddress  stringValue];
 	NSInteger asciiLen = [theAddress lengthOfBytesUsingEncoding:NSASCIIStringEncoding];
 	if (asciiLen > (sizeof(conf.ipAddress) - 1)) {
-		NSBeginAlertSheet(@"Address too long", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The address is too long.\n\nTry to use only the IP address and not a host name.");
+		NSBeginAlertSheet(NSLocalizedStringInBundle(@"Address Too Long", curBundle, nil), nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"%@", NSLocalizedStringInBundle(@"The address is too long.\n\nTry to use only the IP address and not a host name.", curBundle, nil));
 		return;
 	} else if (asciiLen == 0) {
-		NSBeginAlertSheet(@"Blank address", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals.");
+		NSBeginAlertSheet(NSLocalizedStringInBundle(@"Blank Address", curBundle, nil), nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"%@", NSLocalizedStringInBundle(@"The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals.", curBundle, nil));
 		return;
 	}
 
diff --git a/macosx/plugins/DFNet/zh-Hans.lproj/SockDialog.strings b/macosx/plugins/DFNet/zh-Hans.lproj/SockDialog.strings
index 20524804..ba961b3d 100644
--- a/macosx/plugins/DFNet/zh-Hans.lproj/SockDialog.strings
+++ b/macosx/plugins/DFNet/zh-Hans.lproj/SockDialog.strings
@@ -3,7 +3,7 @@
 "1.title" = "连接中…";
 
 /* Class = "NSTextFieldCell"; title = "连接等待中..."; ObjectID = "4"; */
-"4.title" = "连接等待中...";
+"4.title" = "连接等待中…";
 
 /* Class = "NSButtonCell"; title = "取消"; ObjectID = "27"; */
 "27.title" = "取消";
diff --git a/macosx/plugins/DFXVideo/fr.lproj/NetSfPeopsSoftGPUConfig.strings b/macosx/plugins/DFXVideo/fr.lproj/NetSfPeopsSoftGPUConfig.strings
index 0073e6e0..d4f6551b 100644
--- a/macosx/plugins/DFXVideo/fr.lproj/NetSfPeopsSoftGPUConfig.strings
+++ b/macosx/plugins/DFXVideo/fr.lproj/NetSfPeopsSoftGPUConfig.strings
@@ -132,10 +132,10 @@
 "181.title" = "Enable Shaders";
 
 /* Class = "NSButtonCell"; title = "Select..."; ObjectID = "183"; */
-"183.title" = "Select...";
+"183.title" = "Select…";
 
 /* Class = "NSButtonCell"; title = "Select..."; ObjectID = "185"; */
-"185.title" = "Select...";
+"185.title" = "Select…";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "187"; */
 "187.title" = "Label";
diff --git a/macosx/plugins/DFXVideo/hu.lproj/NetSfPeopsSoftGPUConfig.strings b/macosx/plugins/DFXVideo/hu.lproj/NetSfPeopsSoftGPUConfig.strings
index 0073e6e0..d4f6551b 100644
--- a/macosx/plugins/DFXVideo/hu.lproj/NetSfPeopsSoftGPUConfig.strings
+++ b/macosx/plugins/DFXVideo/hu.lproj/NetSfPeopsSoftGPUConfig.strings
@@ -132,10 +132,10 @@
 "181.title" = "Enable Shaders";
 
 /* Class = "NSButtonCell"; title = "Select..."; ObjectID = "183"; */
-"183.title" = "Select...";
+"183.title" = "Select…";
 
 /* Class = "NSButtonCell"; title = "Select..."; ObjectID = "185"; */
-"185.title" = "Select...";
+"185.title" = "Select…";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "187"; */
 "187.title" = "Label";
diff --git a/macosx/plugins/DFXVideo/zh-Hans.lproj/NetSfPeopsSoftGPUConfig.strings b/macosx/plugins/DFXVideo/zh-Hans.lproj/NetSfPeopsSoftGPUConfig.strings
index d9fcb4b6..3e220ec1 100644
--- a/macosx/plugins/DFXVideo/zh-Hans.lproj/NetSfPeopsSoftGPUConfig.strings
+++ b/macosx/plugins/DFXVideo/zh-Hans.lproj/NetSfPeopsSoftGPUConfig.strings
@@ -132,10 +132,10 @@
 "181.title" = "启用着色器";
 
 /* Class = "NSButtonCell"; title = "选择..."; ObjectID = "183"; */
-"183.title" = "选择...";
+"183.title" = "选择…";
 
 /* Class = "NSButtonCell"; title = "选择..."; ObjectID = "185"; */
-"185.title" = "选择...";
+"185.title" = "选择…";
 
 /* Class = "NSTextFieldCell"; title = "标签"; ObjectID = "187"; */
 "187.title" = "标签";
diff --git a/macosx/plugins/PeopsXgl/zh-Hans.lproj/NetSfPeopsOpenGLConfig.strings b/macosx/plugins/PeopsXgl/zh-Hans.lproj/NetSfPeopsOpenGLConfig.strings
index dfa5b7d0..d6a6d70d 100644
--- a/macosx/plugins/PeopsXgl/zh-Hans.lproj/NetSfPeopsOpenGLConfig.strings
+++ b/macosx/plugins/PeopsXgl/zh-Hans.lproj/NetSfPeopsOpenGLConfig.strings
@@ -198,7 +198,7 @@
 "482.title" = "假装删减混合";
 
 /* Class = "NSButtonCell"; ibShadowedToolTip = "DW7 fix (不是100%完美...)"; ObjectID = "483"; */
-"483.ibShadowedToolTip" = "DW7 fix (不是100%完美...)";
+"483.ibShadowedToolTip" = "DW7 fix (不是100%完美…)";
 
 /* Class = "NSButtonCell"; title = "缓慢检测更新"; ObjectID = "483"; */
 "483.title" = "缓慢检测更新";
@@ -222,7 +222,7 @@
 "486.title" = "扩大屏幕宽度";
 
 /* Class = "NSButtonCell"; ibShadowedToolTip = "只对FF9战斗模式..."; ObjectID = "487"; */
-"487.ibShadowedToolTip" = "只对FF9战斗模式...";
+"487.ibShadowedToolTip" = "只对FF9战斗模式…";
 
 /* Class = "NSButtonCell"; title = "G4多边形缓存"; ObjectID = "487"; */
 "487.title" = "G4多边形缓存";
@@ -234,7 +234,7 @@
 "488.title" = "检测特殊上传";
 
 /* Class = "NSButtonCell"; ibShadowedToolTip = "只对FF9战斗指针..."; ObjectID = "489"; */
-"489.ibShadowedToolTip" = "只对FF9战斗指针...";
+"489.ibShadowedToolTip" = "只对FF9战斗指针…";
 
 /* Class = "NSButtonCell"; title = "调整帧缓冲区通道"; ObjectID = "489"; */
 "489.title" = "调整帧缓冲区通道";