fixed defscript catalogue

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4711 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 36 insertions, 30 deletions

diff --git a/data/defscript/aliases.kvs b/data/defscript/aliases.kvs
index 182431e04..4c217e55e 100644
--- a/data/defscript/aliases.kvs
+++ b/data/defscript/aliases.kvs
@@ -18,7 +18,7 @@ alias(avatar)
 	# avatar target file
 	if(!$0)
 	{
-		echo "Missing target, no action taken"
+		echo $tr("Missing target, no action taken","defscript")
 		return
 	}
 	if($1)
@@ -148,12 +148,15 @@ alias(wallop)
 
 	# Due to server flood, timing may be very high
 	echo -w=$active $tr("Sending wallop to","defscript") $chan.name($active)
-	timer(wallop,5000,$chan.users(,,o),$0-){
+	timer(wallop,5000,$chan.users(,,o),$0-)
+	{
 		if(%:localOps == ""){ %:localOps = $chan.users(,,o); %:curIndex = 0; }
 		if(%:curIndex == %:localOps[]#){ killtimer wallop; return; }
 
-		for(%i=0;%i<1;%i++){
-			if(%:localOps[%:curIndex] != $my.nick){
+		for(%i=0;%i<1;%i++)
+		{
+			if(%:localOps[%:curIndex] != $my.nick)
+			{
 				if(%:curIndex == %:localOps[]#){ killtimer wallop; return; }
 				msg -q %:localOps[%:curIndex] $1-
 				%:curIndex++
@@ -233,7 +236,7 @@ alias(kb)
 	if(!$0)
 	{
 		echo $tr("Usage:","defscript")
-		echo "	  /kb <nick_list> [" $tr("reason") "]"
+		echo "	  /kb <nick_list> [" $tr("reason","defscript") "]"
 		halt;
 	}
 
@@ -252,7 +255,7 @@ alias(kb)
 			if(!%mask)%mask = %nick; # plain ban
 
 			%reason = $1-
-			#if(!%reason)%reason = "You're not welcome here!"
+			#if(!%reason)%reason = $tr("You're not welcome here!","defscript")
 
 			# This is tricky : we send everything
 			# as a single raw message just because
@@ -289,8 +292,9 @@ alias(amsgall)
 
 alias(ameall)
 {
-	foreach(%i,$window.list(channel),$window.list(query)){
-	if(%i!="") me -r=%i $0-
+	foreach(%i,$window.list(channel),$window.list(query))
+	{
+		if(%i!="") me -r=%i $0-
 	}
 }
 
@@ -472,7 +476,7 @@ alias(dns)
 	if(!$0)
 	{
 		echo $tr("Usage:","defscript")
-		echo echo "  /dns <nickname>"
+		echo "  /dns <nickname>"
 		halt
 	}
 
diff --git a/data/defscript/classes.kvs b/data/defscript/classes.kvs
index c19d9decd..8c9e022d5 100644
--- a/data/defscript/classes.kvs
+++ b/data/defscript/classes.kvs
@@ -15,19 +15,19 @@ class(installer,object)
 	{
 		if($0 == "")
 		{
-			echo "[Installer] Error: the first argument of copyFiles must be a source directory"
+			echo $tr("[Installer] Error: the first argument of copyFiles must be a source directory","defscript")
 			halt
 		}
 
 		if($1 == "")
 		{
-			echo "[Installer] Error: the second argument of copyFiles must be a file name or file regexp"
+			echo $tr("[Installer] Error: the second argument of copyFiles must be a file name or file regexp","defscript")
 			halt
 		}
 
 		if($2 == "")
 		{
-			echo "[Installer] Error: the third argument of copyFiles must be a destination directory"
+			echo $tr("[Installer] Error: the third argument of copyFiles must be a destination directory","defscript")
 			halt
 		}
 
diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs
index 49c0e3b9a..1c42c62bb 100644
--- a/data/defscript/popups.kvs
+++ b/data/defscript/popups.kvs
@@ -8,9 +8,10 @@ defpopup(highlight)
 {
 	prologue
 	{
-		if($0!=""){
+		if($0!="")
+		{
 			%:regName = $reguser.match($mask($0))
-		        %:beingHl = $reguser.property(%:regName,highlight)
+			%:beingHl = $reguser.property(%:regName,highlight)
 			%:beingHlTmp = $tmphighlight.isNickHighLighted($0)
 		}
 	}
@@ -73,7 +74,8 @@ defpopup(channelhighlight)
 {
 	prologue
 	{
-		if($window!="" && !$chan.isDead()){
+		if($window!="" && !$chan.isDead())
+		{
 			%:beingHlTmp = $tmphighlight.isChannelHighLighted($window)
 		}
 	}
@@ -99,12 +101,12 @@ defpopup(ignore)
 		if(%:regName)
 		{
 			%:inIgnoreList = $reguser.isIgnoreEnabled(%:regName);
-			if(%:inIgnoreList) %:ignLabelText << $tr("is being ignored")
-			else %:ignLabelText << $tr("is not being ignored")
+			if(%:inIgnoreList) %:ignLabelText << $tr("is being ignored","defscript")
+			else %:ignLabelText << $tr("is not being ignored","defscript")
 
 			%:ignLabelText << "</p>"
 		} else {
-			%:ignLabelText << $tr("is not being ignored")"</p>"
+			%:ignLabelText << $tr("is not being ignored","defscript")"</p>"
 		}
 	}
 
@@ -334,7 +336,7 @@ defpopup(registration)
 			if(%:defAvatar)%:labelText << "<br><b>$0</b>" $tr("has a default avatar","defscript")
 			%:labelText << "</p>"
 		} else {
-			%:labelText << $tr("is not registered")"</p>"
+			%:labelText << $tr("is not registered","defscript")"</p>"
 		}
 	}
 
@@ -347,7 +349,7 @@ defpopup(registration)
 
 	popup($tr("Quick Registration","defscript")) (!%:regName)
 	{
-		item($tr("Register as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
+		item($tr("Register as","defscript") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
 		{
 			reguser.add $0 $mask($0,11)
 		}
@@ -1334,22 +1336,22 @@ defpopup(windowpopup)
 
 #	popup(Buffer)
 #	{
-#		item("Save to file...")window.savebuffer
-#		item("Clear")window.clear
-#		item("Find...")window.findtext
+#		item($tr("Save to file...","defscript"))window.savebuffer
+#		item($tr("Clear","defscript"))window.clear
+#		item($tr("Find...","defscript"))window.findtext
 #	}
 #	popup(View)
 #	{
-#		item("Show images")($window.images == 0)window.images 1
-#		item("Enable timestamps")($window.timestamp == 0)window.timestamp 1
-#		item("Disable timestamps")($window.timestam == 1)window.timestamp 0
-#		item("Set font...")$window.setfont
-#		item("Set background...")$window.setbackground
+#		item($tr("Show images","defscript"))($window.images == 0)window.images 1
+#		item($tr("Enable timestamps","defscript"))($window.timestamp == 0)window.timestamp 1
+#		item($tr("Disable timestamps","defscript"))($window.timestam == 1)window.timestamp 0
+#		item($tr("Set font...","defscript"))$window.setfont
+#		item($tr("Set background...","defscript"))$window.setbackground
 #	}
 #	popup(Mdi)
 #	{
-#		item("Minimize")window.minimize
-#		item("Maximize")window.maximize
+#		item($tr("Minimize","defscript"))window.minimize
+#		item($tr("Maximize","defscript"))window.maximize
 #	}
 }