diff --git a/app/assets/javascripts/app/models/group.js.coffee b/app/assets/javascripts/app/models/group.js.coffee index 7ad3f1be6..b07a43791 100644 --- a/app/assets/javascripts/app/models/group.js.coffee +++ b/app/assets/javascripts/app/models/group.js.coffee @@ -5,7 +5,7 @@ class App.Group extends App.Model @configure_attributes = [ { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, 'null': false, 'class': 'span4' }, - { name: 'assignment_timeout', display: 'Assignment Timout', tag: 'input', note: 'Assignment timout in minutes if assigned agent is not working on it. Ticket will be shown as unassigend.', type: 'text', limit: 100, 'null': true, 'class': 'span4' }, + { name: 'assignment_timeout', display: 'Assignment Timeout', tag: 'input', note: 'Assignment timeout in minutes if assigned agent is not working on it. Ticket will be shown as unassigend.', type: 'text', limit: 100, 'null': true, 'class': 'span4' }, { name: 'follow_up_possible', display: 'Follow up possible',tag: 'select', default: 'yes', options: { yes: 'yes', reject: 'reject follow up/do not reopen Ticket', 'new_ticket': 'do not reopen Ticket but create new Ticket' }, 'null': false, note: 'Follow up for closed ticket possible or not.', 'class': 'span4' }, { name: 'follow_up_assignment', display: 'Assign Follow Ups', tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, 'null': false, note: 'Assign follow up to latest agent again.', 'class': 'span4' }, { name: 'email_address_id', display: 'Email', tag: 'select', multiple: false, null: true, relation: 'EmailAddress', nulloption: true, class: 'span4' }, @@ -19,4 +19,4 @@ class App.Group extends App.Model ] uiUrl: -> - '#group/zoom/' + @id \ No newline at end of file + '#group/zoom/' + @id diff --git a/db/seeds.rb b/db/seeds.rb index 382b385a6..8a62080f0 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1756,7 +1756,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Forgot your passw Translation.create_if_not_exists( :locale => 'de', :source => "Templates", :target => "Vorlagen" ) Translation.create_if_not_exists( :locale => 'de', :source => "Delete", :target => "Löschen" ) Translation.create_if_not_exists( :locale => 'de', :source => "Apply", :target => "Übernehmen" ) -Translation.create_if_not_exists( :locale => 'de', :source => "Save as Template", :target => "Als Template speichern" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Save as Template", :target => "Als Vorlage speichern" ) Translation.create_if_not_exists( :locale => 'de', :source => "Save", :target => "Speichern" ) Translation.create_if_not_exists( :locale => 'de', :source => "Open Tickets", :target => "Offene Ticket" ) Translation.create_if_not_exists( :locale => 'de', :source => "Closed Tickets", :target => "Geschlossene Ticket" ) @@ -1771,7 +1771,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "3 high", :target Translation.create_if_not_exists( :locale => 'de', :source => "public", :target => "öffentlich" ) Translation.create_if_not_exists( :locale => 'de', :source => "internal", :target => "intern" ) Translation.create_if_not_exists( :locale => 'de', :source => "Attach files", :target => "Dateien anhängen" ) -Translation.create_if_not_exists( :locale => 'de', :source => "Visability", :target => "Sichtbarkeit" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Visibility", :target => "Sichtbarkeit" ) Translation.create_if_not_exists( :locale => 'de', :source => "Actions", :target => "Aktionen" ) Translation.create_if_not_exists( :locale => 'de', :source => "Email", :target => "E-Mail" ) Translation.create_if_not_exists( :locale => 'de', :source => "email", :target => "E-Mail" ) @@ -1791,7 +1791,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Change Customer", Translation.create_if_not_exists( :locale => 'de', :source => "My Tickets", :target => "Meine Tickets" ) Translation.create_if_not_exists( :locale => 'de', :source => "My Organization Tickets", :target => "Meine Organisations Tickets" ) Translation.create_if_not_exists( :locale => 'de', :source => "My Organization", :target => "Meine Organisation" ) -Translation.create_if_not_exists( :locale => 'de', :source => "Assignment Timout", :target => "Zeitliche Zuweisungsüberschritung" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Assignment Timeout", :target => "Zeitliche Zuweisungsüberschritung" ) Translation.create_if_not_exists( :locale => 'de', :source => "We've sent password reset instructions to your email address.", :target => "Wir haben Ihnen die Anleitung zum zurücksetzen Ihres Passworts an Ihre E-Mail-Adresse gesendet." ) Translation.create_if_not_exists( :locale => 'de', :source => "Enter your username or email address", :target => "Bitte geben Sie Ihren Benutzernamen oder E-Mail-Adresse ein" ) Translation.create_if_not_exists( :locale => 'de', :source => "Choose your new password.", :target => "Wählen Sie Ihr neues Passwort." )