Merge branch 'develop' of github.com:amooma/GS5 into develop

3 files changed, 4 insertions, 4 deletions

diff --git a/config/locales/views/fax_documents/de.yml b/config/locales/views/fax_documents/de.yml
index 6bfa86b..da59833 100644
--- a/config/locales/views/fax_documents/de.yml
+++ b/config/locales/views/fax_documents/de.yml
@@ -62,7 +62,7 @@ de:
       transmission_time: 'Übertragungszeit'
       sent_at: 'Sendezeit'
       document_total_pages: 'Seitenanzahl'
-      document_transferred_pages: 'Übertragende Seiten'
+      document_transferred_pages: 'Übertragene Seiten'
       ecm_requested: 'Fehlerkorrektur (ECM) angefragt'
       ecm_used: 'Fehlerkorrektur (ECM) verwendet'
       image_resolution: 'Bildauflösung'
diff --git a/db/migrate/20130109090000_populate_gs_parameter_with_dialplan_defaults.rb b/db/migrate/20130109090000_populate_gs_parameter_with_dialplan_defaults.rb
index fe1cdae..a8350a3 100644
--- a/db/migrate/20130109090000_populate_gs_parameter_with_dialplan_defaults.rb
+++ b/db/migrate/20130109090000_populate_gs_parameter_with_dialplan_defaults.rb
@@ -79,7 +79,7 @@ class PopulateGsParameterWithDialplanDefaults < ActiveRecord::Migration
     GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'rate',  :value => 16000, :class_type => 'Integer')
     GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'interval',  :value => 20, :class_type => 'Integer')
     GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'energy-level',  :value => 300, :class_type => 'Integer')
-    GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'sound-prefix',  :value => '/opt/freeswitch/sounds/en/us/callie', :class_type => 'String')
+    GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'sound-prefix',  :value => '/opt/freeswitch/sounds/de/tts/google', :class_type => 'String')
     GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'muted-sound',  :value => 'conference/conf-muted.wav', :class_type => 'String')
     GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'unmuted-sound',  :value => 'conference/conf-unmuted.wav', :class_type => 'String')
     GsParameter.create(:entity => 'conferences', :section => 'parameters', :name => 'alone-sound',  :value => 'conference/conf-alone.wav', :class_type => 'String')
@@ -101,7 +101,7 @@ class PopulateGsParameterWithDialplanDefaults < ActiveRecord::Migration
     GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'dial_timeout',  :value => '120', :class_type => 'Integer')
     GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'max_loops',  :value => '20', :class_type => 'Integer')
     GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'default_ringtone',  :value => '1', :class_type => 'Integer')
-    GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'default_language',  :value => 'en', :class_type => 'String')
+    GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'default_language',  :value => 'de', :class_type => 'String')
     GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'phone_book_entry_image_url',  :value => 'http://192.168.0.150/uploads/phone_book_entry/image', :class_type => 'String')
     GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'user_image_url',  :value => 'http://192.168.0.150/uploads/user/image', :class_type => 'String')
     GsParameter.create(:entity => 'dialplan', :section => 'parameters', :name => 'ringtone_url',  :value => 'http://192.168.0.150', :class_type => 'String')
diff --git a/db/migrate/20130213110000_add_sounds_to_parameters.rb b/db/migrate/20130213110000_add_sounds_to_parameters.rb
index 00c59bc..dd20ca3 100644
--- a/db/migrate/20130213110000_add_sounds_to_parameters.rb
+++ b/db/migrate/20130213110000_add_sounds_to_parameters.rb
@@ -1,7 +1,7 @@
 class AddSoundsToParameters < ActiveRecord::Migration
   def up
     GsParameter.create(:entity => 'dialplan', :section => 'sounds', :name => 'en',  :value => '/opt/freeswitch/sounds/en/us/callie', :class_type => 'String')
-    GsParameter.create(:entity => 'dialplan', :section => 'sounds', :name => 'de',  :value => '/opt/freeswitch/sounds/de/tts/bits1-hsmm', :class_type => 'String')
+    GsParameter.create(:entity => 'dialplan', :section => 'sounds', :name => 'de',  :value => '/opt/freeswitch/sounds/de/tts/google', :class_type => 'String')
   end
 
   def down