X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMessages;h=5aaeb4eb39460cf23c3bb8a1833eb309a97dd6df;hb=19740220d324a319fb868ce34fb7bed7e31dd450;hp=0c667054073d08990fdde1676fb5c7abc5eebe4c;hpb=655500414f1c3c7dbf9aecbc33c648705ef0cbde;p=spider.git

diff --git a/perl/Messages b/perl/Messages
index 0c667054..5aaeb4eb 100644
--- a/perl/Messages
+++ b/perl/Messages
@@ -3,7 +3,6 @@
 # this file contains the system messages. Don't forget to reload them
 # if you change them (load/messages)
 #
-# $Id$
 #
 
 package DXM;
@@ -29,6 +28,10 @@ package DXM;
 				buddya => '$_[0] has been added to your buddies',
 				buddyu => '$_[0] has been removed from your buddies',
 				call1 => 'Callsign lookup via $_[0]:',
+				chatend => 'Finished chatting on $_[0]',
+				chatinst => 'Entering Chatmode on $_[0], /EX to end, /<cmd> to run a command',
+				chatprompt => 'Chat ($_[0])>',
+				chattoomany => 'Not allowed, already in $_[1], use /chat $_[0]',
 				conother => 'Sorry $_[0] you are connected to me on another port',
 				concluster => 'Sorry $_[0] you are already connected elsewhere on the cluster (on $_[1])',
 				conscript => 'no connect script called \"$_[0]\" found in $main::root/connect',
@@ -81,13 +84,13 @@ package DXM;
 				e14 => 'First argument must be numeric and > 0',
 				e15 => 'invalid qualifier \"$_[0]\"',
 				e16 => 'File \"$_[0]\" exists',
-				e17 => 'Please don\'t use the words: @_ on here', 
+				e17 => 'Please don\'t use the words: @_ on here',
 				e18 => 'Cannot connect to $_[0] ($!)',
 				e19 => 'Invalid character in line',
 				e20 => 'token $_[0] not recognised',
-				e21 => '$_[0] not numeric',
-				e22 => '$_[0] not a callsign',
-				e23 => '$_[0] not a range (eg 0/30000)', 
+				e21 => '$_[0] is not numeric',
+				e22 => '$_[0] is not a callsign',
+				e23 => '$_[0] is not a range (eg 0/30000)',
 				e24 => 'Sorry, Internet access is not enabled',
 				e25 => 'Sorry the value must be between $_[0] and $_[1]',
 				e26 => 'Too many concurrent errors, you are being disconnected',
@@ -101,6 +104,7 @@ package DXM;
 				e34 => 'Need a GROUP and some text',
 				e35 => 'You are not a member of $_[0], join $_[0]',
 				e36 => 'You can only do this in normal user prompt state',
+				e37 => 'Need at least a callsign',
 
 				echoon => 'Echoing enabled',
 				echooff => 'Echoing disabled',
@@ -121,6 +125,8 @@ package DXM;
 				grayline2 => 'Location                              dd/mm/yyyy Dawn   Rise   Set    Dusk',
 				grids => 'DX Grid enabled for $_[0]',
 				gridu => 'DX Grid disabled for $_[0]',
+				gtks => 'GTK output enabled for $_[0]',
+				gtku => 'GTK output disabled for $_[0]',
 				illcall => 'Sorry, $_[0] is an invalid callsign',
 				hasha => '$_[0] already exists in $_[1]',
 				hashb => '$_[0] added to $_[1]',
@@ -148,7 +154,7 @@ package DXM;
 				isow => '$_[0] is isolated; unset/isolate $_[0] first',
 				join => 'joining group $_[0]',
 				l1 => 'Sorry $_[0], you are already logged on on another channel',
-				l2 => 'Hello $_[0], this is $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::build',
+				l2 => 'Hello $_[0], this is $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build',
 				lang => 'Language is now English',
 				lange1 => 'set/language <lang> where <lang> is one of ($_[0])',
 				lange2 => 'failed to set language on $_[0]', 
@@ -168,7 +174,9 @@ package DXM;
 				lockoutun => '$_[0] Unlocked',
 				lockoutuse => 'usage: sh/lockout <call>|ALL',
 				loginb => 'Buddy $_[0] has logged in',
+				loginbn => 'Buddy $_[0] has logged in at $_[1]',
 				logoutb => 'Buddy $_[0] has logged out',
+				logoutbn => 'Buddy $_[0] has logged out from $_[1]',
 				loginu => 'User $_[0] has logged in',
 				logoutu => 'User $_[0] has logged out',
 				loginn => 'Node $_[0] has logged in',
@@ -331,8 +339,8 @@ package DXM;
 				wpc16u => 'Allow PC16 from $_[0] disabled',
 				wpc19s => 'Route PC19 for $_[0] enabled',
 				wpc19u => 'Route PC19 for $_[0] disabled',
-				wpc90s => 'PC90 for $_[0] enabled',
-				wpc90u => 'PC90 for $_[0] disabled',
+				wpc9xs => 'PC9X for $_[0] enabled',
+				wpc9xu => 'PC9X for $_[0] disabled',
 				wwv1 => '$_[0] is missing or out of range',
 				wwv2 => 'Duplicate WWV',
 				wwv3 => 'Date        Hour   SFI   A   K Forecast                               Logger',
@@ -569,7 +577,7 @@ package DXM;
 				isow => '$_[0] est isolé; utilisez d\'abord unset/isolate $_[0]',
 				join => 'Affiliation au groupe $_[0]',
 				l1 => 'Désolé $_[0], vous êtes déjà connecté sur un autre canal',
-				l2 => 'Bonjour $_[0], bienvenue sur $main::mycall à $main::myqth\nServeur DXSpider V$main::version ($main::build)',
+				l2 => 'Bonjour $_[0], bienvenue sur $main::mycall à $main::myqth\nServeur DXSpider V$main::version ($main::subversion.$main::build)',
 				lang => 'Je parle maintenant français',
 				lange1 => 'Syntaxe : set/language <langue>, où <langue> est à choisir parmi ($_[0])',
 				lange2 => 'Impossible de fixer la langue à $_[0]', 
@@ -1203,7 +1211,7 @@ package DXM;
 				isow => '$_[0] ist isoliert; unset/isolate $_[0] zuerst',
 				join => 'Trete Gespraechsgruppe $_[0] bei',
 				l1 => 'Sorry $_[0], Du bist bereits auf einem anderen Kanal eingeloggt',
-				l2 => 'Moin $_[0], hier ist $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::build',
+				l2 => 'Moin $_[0], hier ist $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build',
 				lang => 'Sprache ist jetzt Deutsch',
 				lange1 => 'set/language <lang> wobei <lang> ist eine von ($_[0])',
 				lange2 => 'Fehler beim Setzen der Sprache auf $_[0]',
@@ -1471,7 +1479,7 @@ package DXM;
 				isoaro => 'c\'e\' una filtro sulla rotta in uscita per $_[0]; eliminala con clear/route $_[0] prima',
 				isow => '$_[0] e\' isolato; unset/isolate $_[0] prima',
 				l1 => 'Spiacente $_[0], sei già collegato sun un altro canale',
-				l2 => 'Benvenuto $_[0] sul Cluster $main::mycall a $main::myqth\nsoftware in uso DXSpider V$main::version build $main::build',
+				l2 => 'Benvenuto $_[0] sul Cluster $main::mycall a $main::myqth\nsoftware in uso DXSpider V$main::version build $main::subversion.$main::build',
 				lang => 'La lingua selezionata e\' adesso Italiano',
 				lange1 => 'set/language <lingua> dove <lingua> e\' una tra ($_[0])',
 				lange2 => 'impostazione lingua fallita per $_[0]', 
@@ -1748,7 +1756,7 @@ package DXM;
 				isoaro => 'vystupni route filtr pro $_[0] uz existuje; zadej nejprve clear/route $_[0]',
 				isow => '$_[0] je izolovan; zadej nejprve unset/isolate $_[0]',
 				l1 => 'Lituji $_[0], uz jsi zalogovan na jinem kanalu',
-				l2 => 'Ahoj $_[0], toto je $main::mycall, $main::myqth\npouzivajici DXSpider V$main::version build $main::build',
+				l2 => 'Ahoj $_[0], toto je $main::mycall, $main::myqth\npouzivajici DXSpider V$main::version build $main::subversion.$main::build',
 				lang => 'Jazyk je nyni nastaven na Cestinu (napoveda zatim v procesu)',
 				lange1 => 'set/language <lang> kde <lang> je jedno z ($_[0])',
 				lange2 => 'selhalo nastaveni jazyka na $_[0]', 
@@ -2043,7 +2051,7 @@ package DXM;
 				isow => '$_[0] est isolado; unset/isolate $_[0] primeiro',
 				join => 'a juntar ao grupo $_[0]',
 				l1 => 'Desculpe $_[0], voc est ligado noutro canal',
-				l2 => 'Ol $_[0], isto  $main::mycall em $main::myqth\nrunning DXSpider V$main::version build $main::build',
+				l2 => 'Ol $_[0], isto  $main::mycall em $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build',
 				lang => 'Linguagem  agora o Portugus',
 				lange1 => 'set/language <ling> aonde <ling>  uma de ($_[0])',
 				lange2 => 'falha ao definir uma lngua em $_[0]',