Merge branch 'develop'5.1.1

6 files changed, 16 insertions, 21 deletions

diff --git a/config/backup.rb b/config/backup.rb
index 88edd94..2c2984b 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -32,23 +32,7 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   #
   if File.exists?('/var/opt/gemeinschaft/fax')
     archive :faxes do |archive|
-      # Incoming faxes
-      #
-      Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.pdf").each do |fax_file|
-        archive.add(fax_file)
-      end
-      Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.tiff").each do |fax_file|
-        archive.add(fax_file)
-      end
-
-      # Outgoing faxes
-      #
-      Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.pdf").each do |fax_file|
-        archive.add(fax_file)
-      end
-      Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.tiff").each do |fax_file|
-        archive.add(fax_file)
-      end
+      archive.add     '/var/opt/gemeinschaft/fax'
     end
   end
 
@@ -62,6 +46,15 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   end
 
   ##
+  # Voicemails
+  #
+  if File.exists?('/var/opt/gemeinschaft/freeswitch/recordings')
+    archive :recordings do |archive|
+      archive.add     '/var/opt/gemeinschaft/freeswitch/recordings'
+    end
+  end
+
+  ##
   # Avatars
   #
   if File.exists?('/opt/gemeinschaft/public/uploads/user/image')
@@ -81,4 +74,4 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   # Gzip [Compressor]
   #
   compress_with Gzip
-end
\ No newline at end of file
+end
diff --git a/config/locales/navigation.en.yml b/config/locales/navigation.en.yml
index 82e901b..015b783 100644
--- a/config/locales/navigation.en.yml
+++ b/config/locales/navigation.en.yml
@@ -1,3 +1,3 @@
 en:
   navigation:
-    admin_docu: 'Admin-Docu'
\ No newline at end of file
+    admin_docu: 'Admin-Doc'
diff --git a/config/locales/views/fax_documents/de.yml b/config/locales/views/fax_documents/de.yml
index da59833..236c031 100644
--- a/config/locales/views/fax_documents/de.yml
+++ b/config/locales/views/fax_documents/de.yml
@@ -5,6 +5,7 @@ de:
       successfuly_created: 'Eine neues Fax-Dokument wurde erstellt.'
       successfuly_updated: 'Das Fax-Dokument wurde aktualisiert.'
       successfuly_destroyed: 'Das Fax-Dokument wurde gelöscht.'
+      tiff_not_created: 'Konnte nicht konvertiert werden.'
     states:
       queued_for_sending: 'In der Warteschleife zum Versand'
       sending: 'Wird aktuell versendet'
diff --git a/config/locales/views/fax_documents/en.yml b/config/locales/views/fax_documents/en.yml
index ff5f8f8..0606e81 100644
--- a/config/locales/views/fax_documents/en.yml
+++ b/config/locales/views/fax_documents/en.yml
@@ -5,6 +5,7 @@ en:
       successfuly_created: 'Successfully created fax.'
       successfuly_updated: 'Successfully updated fax.'
       successfuly_destroyed: 'Successfully destroyed fax.'
+      tiff_not_created: 'Could not be converted.'
     states:
       queued_for_sending: 'Queued for sending'
       sending: 'Currently sending'
diff --git a/config/locales/views/phone_book_entries/de.yml b/config/locales/views/phone_book_entries/de.yml
index bdd0d67..839df3b 100644
--- a/config/locales/views/phone_book_entries/de.yml
+++ b/config/locales/views/phone_book_entries/de.yml
@@ -67,7 +67,7 @@ de:
       xing_account: 'Xing Konto'
       linkedin_account: 'LinkedIn Konto'
       mobileme_account: 'iCloud Konto'
-      manage_phone_number: 'Telefonnummern verwalten.'
+      manage_phone_numbers: 'Telefonnummern verwalten.'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie diesen Telefonbucheintrag löschen möchten?'
         destroy: 'Löschen'
diff --git a/config/locales/views/phone_book_entries/en.yml b/config/locales/views/phone_book_entries/en.yml
index abfbbb2..e733d85 100644
--- a/config/locales/views/phone_book_entries/en.yml
+++ b/config/locales/views/phone_book_entries/en.yml
@@ -67,7 +67,7 @@ en:
       xing_account: 'Xing account'
       linkedin_account: 'LinkedIn account'
       mobileme_account: 'iCloud account'
-      manage_phone_number: 'Manage phone number.'
+      manage_phone_numbers: 'Manage phone numbers.'
       actions:
         confirm_destroy: 'Are you sure you want to delete this phone book entry?'
         destroy: 'Delete phone book entry'