whitespace cleanup

diff --git a/conf/lang/en/dir/sounds.xml b/conf/lang/en/dir/sounds.xml
index 85dd01c5990be18a4c58e1cb674cdf69f4bc4973..fc288ff6221e1877a6b01dbcd50426edac40ba39 100644 (file)
--- a/conf/lang/en/dir/sounds.xml
+++ b/conf/lang/en/dir/sounds.xml
@@ -1,121 +1,119 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-       <macro name="directory_intro">
-               <input pattern="^(last_name)" break_on_match="false">
-                       <match>
-                               <action function="play-file" data="directory/dir-enter_person.wav"/>
-                               <action function="play-file" data="directory/dir-last_name.wav"/>
-                       </match>
-               </input>
-               <input pattern="^(first_name)" break_on_match="false">
-                       <match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-                       </match>
-               </input>
-               <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-                       <match>
-                               <action function="play-file" data="directory/dir-to_search_by.wav"/>
-                               <action function="play-file" data="directory/dir-first_name.wav"/>
-                               <action function="play-file" data="voicemail/vm-press.wav"/>
-                               <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-                       </match>
-               </input>
-               <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-                       <match>
-                               <action function="play-file" data="directory/dir-to_search_by.wav"/>
-                               <action function="play-file" data="directory/dir-last_name.wav"/>
-                               <action function="play-file" data="voicemail/vm-press.wav"/>
-                               <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-                       </match>
-               </input>
-       </macro>
+<include>
 
-       <macro name="directory_min_search_digits">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="play-file" data="directory/dir-specify_mininum.wav"/>
-                               <action function="say" data="$1" method="pronounced" type="items"/>
-                               <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_intro">
+    <input pattern="^(last_name)" break_on_match="false">
+      <match>
+        <action function="play-file" data="directory/dir-enter_person.wav"/>
+        <action function="play-file" data="directory/dir-last_name.wav"/>
+      </match>
+    </input>
+    <input pattern="^(first_name)" break_on_match="false">
+      <match>
+        <action function="play-file" data="directory/dir-enter_person.wav"/>
+        <action function="play-file" data="directory/dir-first_name.wav"/>
+      </match>
+    </input>
+    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
+      <match>
+        <action function="play-file" data="directory/dir-to_search_by.wav"/>
+        <action function="play-file" data="directory/dir-first_name.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
+      <match>
+        <action function="play-file" data="directory/dir-to_search_by.wav"/>
+        <action function="play-file" data="directory/dir-last_name.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_count">
-               <input pattern="^0$" break_on_match="true">
-                       <match>
-                               <action function="play-file" data="directory/dir-no_matching_results.wav"/>
-                       </match>
-               </input>
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="say" data="$1" method="pronounced" type="items"/>
-                               <action function="play-file" data="directory/dir-result_match.wav"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_min_search_digits">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="directory/dir-specify_mininum.wav"/>
+        <action function="say" data="$1" method="pronounced" type="items"/>
+        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_count_too_large">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="play-file" data="directory/dir-too_many_result.wav"/>
-                       </match>
-               </input>
+  <macro name="directory_result_count">
+    <input pattern="^0$" break_on_match="true">
+      <match>
+        <action function="play-file" data="directory/dir-no_matching_results.wav"/>
+      </match>
+    </input>
+    <input pattern="^(.*)$">
+      <match>
+        <action function="say" data="$1" method="pronounced" type="items"/>
+        <action function="play-file" data="directory/dir-result_match.wav"/>
+      </match>
+    </input>
+  </macro>
 
-       </macro>
+  <macro name="directory_result_count_too_large">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="directory/dir-too_many_result.wav"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_last">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="play-file" data="directory/dir-no_more_results.wav"/>
-                       </match>
-               </input>
+  <macro name="directory_result_last">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="directory/dir-no_more_results.wav"/>
+      </match>
+    </input>
+  </macro>
 
-       </macro>
+  <macro name="directory_result_item">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="directory/dir-result_number.wav"/>
+        <action function="say" data="$1" method="pronounced" type="items"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_item">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="play-file" data="directory/dir-result_number.wav"/>
-                               <action function="say" data="$1" method="pronounced" type="items"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_result_at">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="directory/dir-at_extension.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_at">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="play-file" data="directory/dir-at_extension.wav"/>
-                               <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_result_menu">
+    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
+      <match>
+        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="directory/dir-for_next.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="directory/dir-for_prev.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="directory/dir-start_new_search.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_menu">
-               <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-                       <match>
-                               <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-                               <action function="play-file" data="voicemail/vm-press.wav"/>
-                               <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-                               <action function="play-file" data="directory/dir-for_next.wav"/>
-                               <action function="play-file" data="voicemail/vm-press.wav"/>
-                               <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-                               <action function="play-file" data="directory/dir-for_prev.wav"/>
-                               <action function="play-file" data="voicemail/vm-press.wav"/>
-                               <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-                               <action function="play-file" data="directory/dir-start_new_search.wav"/>
-                               <action function="play-file" data="voicemail/vm-press.wav"/>
-                               <action function="say" data="$4" method="pronounced" type="name_spelled"/>
+  <macro name="directory_result_say_name">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
 
-                       </match>
-               </input>
-       </macro>
-
-       <macro name="directory_result_say_name">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-                       </match>
-               </input>
-       </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
+</include>

diff --git a/conf/lang/en/dir/tts.xml b/conf/lang/en/dir/tts.xml
index 67ae5ab2656d1c8d7e25ef6c81a4eae3585984a3..84007b7d52dfad266ff1efb085f79aaa9d919d4a 100644 (file)
--- a/conf/lang/en/dir/tts.xml
+++ b/conf/lang/en/dir/tts.xml
@@ -1,96 +1,95 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
+<include>
 
-       <macro name="directory_intro">
-               <input pattern="^(last_name)" break_on_match="false">
-                       <match>
-                               <action function="speak-text" data="Please enter the first few digit of the person last name"/>
-                       </match>
-               </input>
-               <input pattern="^(first_name)" break_on_match="false">
-                       <match>
-                               <action function="speak-text" data="Please enter the first few digit of the person first name"/>
-                       </match>
-               </input>
-               <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-                       <match>
-                               <action function="speak-text" data="to search by first name, press $2"/>
-                       </match>
-               </input>
-               <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-                       <match>
-                               <action function="speak-text" data="to search by last name, press $2"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_intro">
+    <input pattern="^(last_name)" break_on_match="false">
+      <match>
+        <action function="speak-text" data="Please enter the first few digit of the person last name"/>
+      </match>
+    </input>
+    <input pattern="^(first_name)" break_on_match="false">
+      <match>
+        <action function="speak-text" data="Please enter the first few digit of the person first name"/>
+      </match>
+    </input>
+    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
+      <match>
+        <action function="speak-text" data="to search by first name, press $2"/>
+      </match>
+    </input>
+    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
+      <match>
+        <action function="speak-text" data="to search by last name, press $2"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_min_search_digits">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_min_search_digits">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_count">
-               <input pattern="^0$" break_on_match="true">
-                       <match>
-                               <action function="speak-text" data="Your search match no user on this system, try again."/>
-                       </match>
-               </input>
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="speak-text" data="$1 result match your search"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_result_count">
+    <input pattern="^0$" break_on_match="true">
+      <match>
+        <action function="speak-text" data="Your search match no user on this system, try again."/>
+      </match>
+    </input>
+    <input pattern="^(.*)$">
+      <match>
+        <action function="speak-text" data="$1 result match your search"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_count_too_large">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="speak-text" data="Your search returned too many result, please try again"/>
-                       </match>
-               </input>
+  <macro name="directory_result_count_too_large">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="speak-text" data="Your search returned too many result, please try again"/>
+      </match>
+    </input>
+  </macro>
 
-       </macro>
+  <macro name="directory_result_last">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="speak-text" data="No more result"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_last">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="speak-text" data="No more result"/>
-                       </match>
-               </input>
+  <macro name="directory_result_item">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="speak-text" data="Result number $1"/>
+      </match>
+    </input>
+  </macro>
 
-       </macro>
+  <macro name="directory_result_menu">
+    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
+      <match>
+        <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_item">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="speak-text" data="Result number $1"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_result_at">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="speak-text" data="at extension $1"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_menu">
-               <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-                       <match>
-                               <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/>
-                       </match>
-               </input>
-       </macro>
+  <macro name="directory_result_say_name">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="speak-text" data="$1"/>
+      </match>
+    </input>
+  </macro>
 
-       <macro name="directory_result_at">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="speak-text" data="at extension $1"/>
-                       </match>
-               </input>
-       </macro>
-       <macro name="directory_result_say_name">
-               <input pattern="^(.*)$">
-                       <match>
-                               <action function="speak-text" data="$1"/>
-                       </match>
-               </input>
-       </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
+</include>