bkruse: branch aadk r864 - in /branches/aadk: ./ config/ config/setup/

[asterisk-gui-commits at lists.digium.com]

Author: bkruse
Date: Thu May  3 12:34:35 2007
New Revision: 864

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=864
Log:
Merged revisions 861 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r861 | bkruse | 2007-05-03 12:28:38 -0500 (Thu, 03 May 2007) | 1 line

Fixed some minor spelling errors. Macth != Match
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/incoming.html
    branches/aadk/config/numberplan.html
    branches/aadk/config/setup/5.html
    branches/aadk/config/setup/8.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May  3 12:34:35 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-839,851
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-839,851,861

Modified: branches/aadk/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/incoming.html?view=diff&rev=864&r1=863&r2=864
==============================================================================
--- branches/aadk/config/incoming.html (original)
+++ branches/aadk/config/incoming.html Thu May  3 12:34:35 2007
@@ -175,7 +175,7 @@
 	if( a == "_X."){ // handling all unmatched 
 		return " Route all unmatched incoming calls from provider '" + didtrunks[b].trunkname + "' to extension '" + exten[1] + "'" ; 
 	}
-	return " Route incoming calls from provider '" + didtrunks[b].trunkname + "' that macth pattern '" + a + "' to extension '" + exten[1] + "'"  ; 
+	return " Route incoming calls from provider '" + didtrunks[b].trunkname + "' that match pattern '" + a + "' to extension '" + exten[1] + "'"  ; 
 }
 
 

Modified: branches/aadk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/numberplan.html?view=diff&rev=864&r1=863&r2=864
==============================================================================
--- branches/aadk/config/numberplan.html (original)
+++ branches/aadk/config/numberplan.html Thu May  3 12:34:35 2007
@@ -308,7 +308,7 @@
 		if(returnstring == "or more"){
 			returnstring = "Begins with " + temp + " and followed by 1 or more digits" ;
 		}else{
-			returnstring = "Exactly macthes " + temp  ;
+			returnstring = "Exactly matches " + temp  ;
 		}
 		if(e == 1){
 			_$('beginswith').value = temp;

Modified: branches/aadk/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/5.html?view=diff&rev=864&r1=863&r2=864
==============================================================================
--- branches/aadk/config/setup/5.html (original)
+++ branches/aadk/config/setup/5.html Thu May  3 12:34:35 2007
@@ -348,7 +348,7 @@
 		if(returnstring == "or more"){
 			returnstring = "Begins with " + temp + " and followed by 0 or more digits" ;
 		}else{
-			returnstring = "Exactly macthes " + temp  ;
+			returnstring = "Exactly matches " + temp  ;
 		}
 		if(e == 1){
 			_$('beginswith').value = temp;

Modified: branches/aadk/config/setup/8.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/8.html?view=diff&rev=864&r1=863&r2=864
==============================================================================
--- branches/aadk/config/setup/8.html (original)
+++ branches/aadk/config/setup/8.html Thu May  3 12:34:35 2007
@@ -176,7 +176,7 @@
 	if( a == "_X."){ // handling all unmatched 
 		return " Route all unmatched incoming calls from provider '" + didtrunks[b].trunkname + "' to extension '" + exten[1] + "'" ; 
 	}
-	return " Route incoming calls from provider '" + didtrunks[b].trunkname + "' that macth pattern '" + a + "' to extension '" + exten[1] + "'"  ; 
+	return " Route incoming calls from provider '" + didtrunks[b].trunkname + "' that match pattern '" + a + "' to extension '" + exten[1] + "'"  ; 
 }