From e166ff1c1330287a73692817f903a7d62a630a58 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Sun, 12 Oct 2014 11:31:31 -0500
Subject: [PATCH] reorder voicemail prompts for consistent phrasing

---
 conf/vanilla/lang/de/vm/sounds.xml | 8 ++++----
 conf/vanilla/lang/en/vm/sounds.xml | 8 ++++----
 conf/vanilla/lang/he/vm/sounds.xml | 8 ++++----
 conf/vanilla/lang/ru/vm/sounds.xml | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/conf/vanilla/lang/de/vm/sounds.xml b/conf/vanilla/lang/de/vm/sounds.xml
index 657e611c20..10643d9ddf 100644
--- a/conf/vanilla/lang/de/vm/sounds.xml
+++ b/conf/vanilla/lang/de/vm/sounds.xml
@@ -138,15 +138,15 @@
   <macro name="voicemail_record_file_check">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-rerecord.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
diff --git a/conf/vanilla/lang/en/vm/sounds.xml b/conf/vanilla/lang/en/vm/sounds.xml
index fae8acefaa..9545d81745 100644
--- a/conf/vanilla/lang/en/vm/sounds.xml
+++ b/conf/vanilla/lang/en/vm/sounds.xml
@@ -160,15 +160,15 @@
   <macro name="voicemail_record_file_check">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-rerecord.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
diff --git a/conf/vanilla/lang/he/vm/sounds.xml b/conf/vanilla/lang/he/vm/sounds.xml
index 917c84b038..9c1a4dfd7d 100644
--- a/conf/vanilla/lang/he/vm/sounds.xml
+++ b/conf/vanilla/lang/he/vm/sounds.xml
@@ -144,15 +144,15 @@
   <macro name="voicemail_record_file_check">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-rerecord.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
diff --git a/conf/vanilla/lang/ru/vm/sounds.xml b/conf/vanilla/lang/ru/vm/sounds.xml
index 2ee9e6ec58..9b14458ba4 100644
--- a/conf/vanilla/lang/ru/vm/sounds.xml
+++ b/conf/vanilla/lang/ru/vm/sounds.xml
@@ -133,15 +133,15 @@
   <macro name="voicemail_record_file_check">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
         <action function="play-file" data="voicemail/vm-rerecord.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>