diff --git a/docs/phrase/phrase_en.xml b/docs/phrase/phrase_en.xml
index 4125656aa1..d5f16052dc 100644
--- a/docs/phrase/phrase_en.xml
+++ b/docs/phrase/phrase_en.xml
@@ -186,7 +186,7 @@
     </time>
     <voicemail>
       <prompt phrase="The person at extension" filename="vm-person.wav"/>
-      <prompt phrase="marked urgent" filename="vm-marked-urgent.wav"/>
+      <prompt phrase="marked urgent" filename="vm-marked_urgent.wav"/>
       <prompt phrase="emailed" filename="vm-emailed.wav"/>
       <prompt phrase="you have" filename="vm-you_have.wav"/>
       <prompt phrase="please enter your i d, followed by" filename="vm-enter_id.wav"/>
@@ -220,7 +220,7 @@
       <prompt phrase="to listen to the recording" filename="vm-listen_to_recording.wav"/>
       <prompt phrase="to save the recording" filename="vm-save_recording.wav"/>
       <prompt phrase="to rerecord" filename="vm-rerecord.wav"/>
-      <prompt phrase="to mark this message urgent" filename="vm-mark-urgent.wav"/>
+      <prompt phrase="to mark this message urgent" filename="vm-mark_urgent.wav"/>
       <prompt phrase="to continue" filename="vm-continue.wav"/>
       <prompt phrase="to listen to the recording again" filename="vm-listen_to_recording_again.wav"/>
       <prompt phrase="to delete the recording" filename="vm-delete_recording.wav"/>
@@ -239,8 +239,8 @@
       <prompt phrase="I need to record your first and last name. This recording is used throughout the system, including in the company directory." filename="vm-tutorial_record_name.wav"/>
       <prompt phrase="Your personal identification number, or 'pin', is used to prevent others from accessing your voicemail messages. Would you like to change it now?" filename="vm-tutorial_change_pin.wav"/>
       <prompt phrase="The person you are trying to reach is not available and does not have voicemail." filename="vm-not_available_no_voicemail.wav"/>
-      <prompt phrase="The PIN you entered is below the minimum length." filename="voicemail/vm-pin_below_minimum_length.wav"/>
-      <prompt phrase="The minimum PIN length is..." filename="voicemail/vm-minimum_pin_length_is.wav"/>
+      <prompt phrase="The PIN you entered is below the minimum length." filename="vm-pin_below_minimum_length.wav"/>
+      <prompt phrase="The minimum PIN length is..." filename="vm-minimum_pin_length_is.wav"/>
     </voicemail>
     <directory>
       <prompt phrase="Please enter the first few letters of the persons" filename="dir-enter_person.wav"/>
@@ -291,10 +291,10 @@
       <prompt phrase="...listeners in this conference." filename="conf-listeners_in_conference.wav"/>
       <prompt phrase="...listener in this conference." filename="conf-listener_in_conference.wav"/>
       <prompt phrase="...members in this conference." filename="conf-members_in_conference.wav"/>
-      <prompt phrase="This conference is in Q and A mode." filename="conference/conf-conference_is_in_qna_mode.wav"/>
-      <prompt phrase="Q and A mode..." filename="conference/conf-qna_mode.wav"/>
-      <prompt phrase="Entry sound..." filename="conference/conf-entry_sound.wav"/>
-      <prompt phrase="Exit sound..." filename="conference/conf-exit_sound.wav"/>
+      <prompt phrase="This conference is in Q and A mode." filename="conf-conference_is_in_qna_mode.wav"/>
+      <prompt phrase="Q and A mode..." filename="conf-qna_mode.wav"/>
+      <prompt phrase="Entry sound..." filename="conf-entry_sound.wav"/>
+      <prompt phrase="Exit sound..." filename="conf-exit_sound.wav"/>
       <prompt phrase="This conference is full. Please contact the conference moderator." filename="conf-conference_is_full.wav"/>
     </conference>
     <ivr>
@@ -398,7 +398,7 @@
       <prompt phrase="The account balance is..." filename="ivr-account_balance_is.wav"/>
       <prompt phrase="Thank you for calling. If you know your party's extension, please enter it now. For a directory, press..." filename="ivr-generic_greeting.wav"/>
       <prompt phrase="...file..." filename="ivr-file.wav"/>
-      <prompt phrase="...files..." filename="ivr-files-.wav"/>
+      <prompt phrase="...files..." filename="ivr-files.wav"/>
       <prompt phrase="For a wakeup call..." filename="ivr-for_a_wakeup_call.wav"/>
       <prompt phrase="This is your wakeup call." filename="ivr-this_is_your_wakeup_call.wav"/>
       <prompt phrase="To request a wakeup call..." filename="ivr-request_wakeup_call.wav"/>
@@ -469,8 +469,8 @@
       <prompt phrase="...has been answered." filename="ivr-has_been_answered.wav"/>
       <prompt phrase="...has been removed." filename="ivr-has_been_removed.wav"/>
       <prompt phrase="No questions in queue." filename="ivr-no_questions_in_queue.wav"/>
-      <prompt phrase="...is now on." filename="ivr/ivr_is_now_on.wav"/>
-      <prompt phrase="...is now off." filename="ivr/ivr_is_now_off.wav"/>
+      <prompt phrase="...is now on." filename="ivr-is_now_on.wav"/>
+      <prompt phrase="...is now off." filename="ivr-is_now_off.wav"/>
       <prompt phrase="This phone is not allowed to make external calls." filename="ivr-phone_not_make_external_calls.wav"/>
       <prompt phrase="I.D. number..." filename="ivr-id_number.wav"/>
       <prompt phrase="To skip these instructions..." filename="ivr-skip_instructions.wav"/>
@@ -495,8 +495,14 @@
       <prompt phrase="3... 2... 1... WE'RE ASTERISK FREE!!!" filename="ivr-were_asterisk_free.wav"/>
       <prompt phrase="Thank you for calling Douche Telecom, where we make sure that your communications never have that 'not so fresh' feeling!" filename="ivr-douche_telecom.wav"/>
       <prompt phrase="To learn more about FreeSWITCH..." filename="ivr-to_learn_more_about_freeswitch.wav"/>
-      <prompt phrase="You do not have permission to perform this action." filename="ivr-not_have_permission.wav"/>
       <!-- The following phrases still need to be recorded -->
+	  <prompt phrase="Your password has been changed." filename="vm-password_has_been_changed.wav"/>
+	  <prompt phrase="Please enter your new password, then press the pound key." filename="vm-enter_new_pin.wav"/>
+	  <prompt phrase="The password you entered is not valid on this system." filename="vm-password_not_valid.wav"/>	
+	  <prompt phrase="A password such as '1111' or '1234' is not secure." filename="vm-password_is_not_secure.wav"/>	
+	  <prompt phrase="Please choose a password that does not contain all repeating or all consecutive digits." filename="vm-choose_password.wav"/>
+	  <prompt phrase="Remember that your voicemail password is also your Web interface password." filename="vm-voicemail_password_is_web_password.wav"/>	
+	  <prompt phrase="" filename=""/>	
     </ivr>
     <misc>
       <prompt phrase="This call has been secured" filename="call_secured.wav"/>
diff --git a/docs/phrase/phrase_fr.xml b/docs/phrase/phrase_fr.xml
index 2d5f488152..991895f865 100644
--- a/docs/phrase/phrase_fr.xml
+++ b/docs/phrase/phrase_fr.xml
@@ -178,7 +178,7 @@
         <prompt phrase="Bienvenue dans votre boîte aux lettres" filename="vm-hello.wav"/>
         <prompt phrase="Au revoir" filename="vm-goodbye.wav"/>
         <prompt phrase="Au bip, enregistrez votre nom, puis appuyez sur une touche ou arrêtez de parler pour finir l'enregistrement." filename="vm-record_name1.wav"/>
-        <prompt phrase="Choisissez un message d'accueil entre 1 et 9" filename="vm-choose_greeting.wav"/>
+        <prompt phrase="Choisissez un message d'accueil entre 1 et 9" filename="vm-choose_greeting_choose.wav"/>
         <prompt phrase="Valeur incorrecte" filename="vm-choose_greeting_fail.wav"/>
         <prompt phrase="Trop de tentatives incorrectes" filename="vm-abort.wav"/>
         <prompt phrase="Pour modifier votre code d'accès" filename="vm-change_password.wav"/>
@@ -210,7 +210,7 @@
         <prompt phrase="Pour transférer l'enregistrement vers votre messagerie électronique" filename="vm-forward_to_email.wav"/>
         <prompt phrase="message d'accueil" filename="vm-greeting.wav"/>
         <prompt phrase="choisi" filename="vm-selected.wav"/>
-        <prompt phrase="n'est pas disponible" filename="vm-not_avaliable.wav"/>
+        <prompt phrase="n'est pas disponible" filename="vm-not_available.wav"/>
         <prompt phrase="message numéro" filename="vm-message_number.wav"/>
         <prompt phrase="effacé" filename="vm-deleted.wav"/>
         <prompt phrase="Votre enregistrement est trop court, veuillez réessayer" filename="vm-too-small.wav"/>
@@ -223,7 +223,7 @@
 		<prompt phrase="nom de famille." filename="dir-last_name.wav"/>
 		<prompt phrase="Pour chercher par" filename="dir-to_search_by.wav"/>
 		<prompt phrase="prénom." filename="dir-first_name.wav"/>
-		<prompt phrase="Votre recherche a retourner aucune résultat, essayer de nouveaux." filename="dir-no_match_entry.wav"/>
+		<prompt phrase="Votre recherche a retourner aucune résultat, essayer de nouveaux." filename="dir-no_matching_results.wav"/>
 		<prompt phrase="résultats correspond a votre recherche." filename="dir-result_match.wav"/>
 		<prompt phrase="Votre recherche retourne trop de résultat, essayer de nouveaux." filename="dir-too_many_result.wav"/>
 		<prompt phrase="Fin des résultats." filename="dir-no_more_results.wav"/>
@@ -240,7 +240,7 @@
 	<conference>
       <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/>
       <prompt phrase="NULL" filename="conf-nack.wav" type="tone"/>
-      <prompt phrase="Personne ne peut vous entendre." filename="conf-mute.wav"/>
+      <prompt phrase="Personne ne peut vous entendre." filename="conf-muted.wav"/>
       <prompt phrase="Tout le monde peut vous entendre." filename="conf-unmuted.wav"/>
       <prompt phrase="Vous êtes actuellement le seul participant dans cette conférence." filename="conf-alone.wav"/>
       <prompt phrase="NULL" filename="conf-perpetual.wav" type="music"/>