[Ttssh2-commit] [3807] エラーメッセージをまとめた

svnno****@sourc***** svnno****@sourc*****
2010年 3月 10日 (水) 12:50:57 JST


Revision: 3807
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3807
Author:   maya
Date:     2010-03-10 12:50:57 +0900 (Wed, 10 Mar 2010)

Log Message:
-----------
エラーメッセージをまとめた

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/ttssh2/ttxssh/fwdui.c


-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2010-03-08 09:18:40 UTC (rev 3806)
+++ trunk/installer/release/lang/English.lng	2010-03-10 03:50:57 UTC (rev 3807)
@@ -531,9 +531,7 @@
 MSG_SAME_SERVERPORT_ERROR=You cannot have two forwardings from the same server port (%d).
 MSG_SAME_LOCALPORT_ERROR=You cannot have two forwardings from the same local port (%d).
 MSG_UNSPECIFYIED_FWD_ERROR1=The following forwardings were not specified when this SSH session began:\n\n
-MSG_UNSPECIFYIED_FWDS_ERROR1=The following forwarding was not specified when this SSH session began:\n\n
 MSG_UNSPECIFYIED_FWD_ERROR2=\nDue to a limitation of the SSH protocol, these forwardings will not work in the current SSH session.\nIf you save these settings and start a new SSH session, the forwardings should work.
-MSG_UNSPECIFYIED_FWDS_ERROR2=\nDue to a limitation of the SSH protocol, this forwarding will not work in the current SSH session.\nIf you save these settings and start a new SSH session, the forwarding should work.
 MSG_INVALID_PORT_ERROR=Port "%s" is not a valid port number.\nEither choose a port name from the list, or enter a number between 1 and 65535.
 
 ; dlg fwd setup

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2010-03-08 09:18:40 UTC (rev 3806)
+++ trunk/installer/release/lang/German.lng	2010-03-10 03:50:57 UTC (rev 3807)
@@ -529,9 +529,7 @@
 MSG_SAME_SERVERPORT_ERROR=You cannot have two forwardings from the same server port (%d).
 MSG_SAME_LOCALPORT_ERROR=You cannot have two forwardings from the same local port (%d).
 MSG_UNSPECIFYIED_FWD_ERROR1=The following forwardings were not specified when this SSH session began:\n\n
-MSG_UNSPECIFYIED_FWDS_ERROR1=The following forwarding was not specified when this SSH session began:\n\n
 MSG_UNSPECIFYIED_FWD_ERROR2=\nDue to a limitation of the SSH protocol, these forwardings will not work in the current SSH session.\nIf you save these settings and start a new SSH session, the forwardings should work.
-MSG_UNSPECIFYIED_FWDS_ERROR2=\nDue to a limitation of the SSH protocol, this forwarding will not work in the current SSH session.\nIf you save these settings and start a new SSH session, the forwarding should work.
 MSG_INVALID_PORT_ERROR=Port "%s" is not a valid port number.\nEither choose a port name from the list, or enter a number between 1 and 65535.
 
 ; dlg fwd setup

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2010-03-08 09:18:40 UTC (rev 3806)
+++ trunk/installer/release/lang/Japanese.lng	2010-03-10 03:50:57 UTC (rev 3807)
@@ -531,9 +531,7 @@
 MSG_SAME_SERVERPORT_ERROR=“¯ˆêƒŠƒ‚[ƒgƒ|[ƒg‚É 2‚ˆȏã‚Ì“]‘—‚͐ݒè‚Å‚«‚Ü‚¹‚ñ (%d).
 MSG_SAME_LOCALPORT_ERROR=“¯ˆêƒ[ƒJƒ‹ƒ|[ƒg‚É 2‚ˆȏã‚Ì“]‘—‚͐ݒè‚Å‚«‚Ü‚¹‚ñ (%d).
 MSG_UNSPECIFYIED_FWD_ERROR1=‚±‚ÌSSHƒZƒbƒVƒ‡ƒ“‚ªŽn‚Ü‚Á‚½‚Æ‚«, ŽŸ‚Ì“]‘—‚ÍŽw’肳‚ê‚Ü‚¹‚ñ‚Å‚µ‚½:\n\n
-MSG_UNSPECIFYIED_FWDS_ERROR1=‚±‚ÌSSHƒZƒbƒVƒ‡ƒ“‚ªŽn‚Ü‚Á‚½‚Æ‚«, ŽŸ‚Ì“]‘—‚ÍŽw’肳‚ê‚Ü‚¹‚ñ‚Å‚µ‚½:\n\n
 MSG_UNSPECIFYIED_FWD_ERROR2=\nSSHƒvƒƒgƒRƒ‹‚Ì‹K§‚Ì‚½‚ß‚É, ‚±‚Ì“]‘—‚Í, Œ»Ý‚ÌSSHƒZƒbƒVƒ‡ƒ“‚Å“®ì‚µ‚Ü‚¹‚ñ. \nÝ’è‚ð•Û‘¶‚µ‚Ä, V‚µ‚¢SSH ƒZƒbƒVƒ‡ƒ“‚ðŠJŽn‚·‚ê‚Î, “]‘—‚ª—LŒø‚É‚È‚è‚Ü‚·.
-MSG_UNSPECIFYIED_FWDS_ERROR2=\nSSHƒvƒƒgƒRƒ‹‚Ì‹K§‚Ì‚½‚ß‚É, ‚±‚ê‚ç‚Ì“]‘—‚Í, Œ»Ý‚ÌSSHƒZƒbƒVƒ‡ƒ“‚Å“®ì‚µ‚Ü‚¹‚ñ. \nÝ’è‚ð•Û‘¶‚µ‚Ä, V‚µ‚¢SSH ƒZƒbƒVƒ‡ƒ“‚ðŠJŽn‚·‚ê‚Î, “]‘—‚ª—LŒø‚É‚È‚è‚Ü‚·.
 MSG_INVALID_PORT_ERROR="%s" ‚Í–³Œø‚ȃ|[ƒg”ԍ†‚Å‚·. \nƒ|[ƒg–¼‚ðˆê——‚©‚ç‘I‘ð‚·‚é‚©, 1 ‚©‚ç 65535‚ÌŠÔ‚ÅŽw’肵‚Ä‚­‚¾‚³‚¢.
 
 ; dlg fwd setup

Modified: trunk/ttssh2/ttxssh/fwdui.c
===================================================================
--- trunk/ttssh2/ttxssh/fwdui.c	2010-03-08 09:18:40 UTC (rev 3806)
+++ trunk/ttssh2/ttxssh/fwdui.c	2010-03-10 03:50:57 UTC (rev 3807)
@@ -845,15 +845,9 @@
 	}
 
 	if (num_unspecified_forwardings > 0) {
-		if (num_unspecified_forwardings > 1) {
-			UTIL_get_lang_msg("MSG_UNSPECIFYIED_FWDS_ERROR1", pvar,
-			                  "The following forwardings were not specified when this SSH session began:\n\n");
-			strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
-		} else {
-			UTIL_get_lang_msg("MSG_UNSPECIFYIED_FWD_ERROR1", pvar,
-			                  "The following forwarding was not specified when this SSH session began:\n\n");
-			strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
-		}
+		UTIL_get_lang_msg("MSG_UNSPECIFYIED_FWD_ERROR1", pvar,
+		                  "The following forwarding(s) was not specified when this SSH session began:\n\n");
+		strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
 
 		for (i = 0; i < num_specs; i++) {
 			if (specs[i].type != FWD_LOCAL_TO_REMOTE &&
@@ -867,17 +861,11 @@
 			}
 		}
 
-		if (num_unspecified_forwardings > 1) {
-			UTIL_get_lang_msg("MSG_UNSPECIFYIED_FWDS_ERROR2", pvar,
-			                  "\nDue to a limitation of the SSH protocol, these forwardings will not work in the current SSH session.\n"
-			                  "If you save these settings and start a new SSH session, the forwardings should work.");
-			strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
-		} else {
-			UTIL_get_lang_msg("MSG_UNSPECIFYIED_FWD_ERROR2", pvar,
-			                  "\nDue to a limitation of the SSH protocol, this forwarding will not work in the current SSH session.\n"
-			                  "If you save these settings and start a new SSH session, the forwarding should work.");
-			strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
-		}
+		UTIL_get_lang_msg("MSG_UNSPECIFYIED_FWD_ERROR2", pvar,
+		                  "\nDue to a limitation of the SSH protocol, this forwarding(s) will not work in the current SSH session.\n"
+		                  "If you save these settings and start a new SSH session, the forwarding should work.");
+		strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
+
 		notify_nonfatal_error(pvar, buf);
 	}
 



Ttssh2-commit メーリングリストの案内