Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:martini/zammad

Browse source
This commit is contained in:
Martin Edenhofer 2013-01-04 14:20:29 +01:00
parent 237df49932 e0221601a4
commit 7a41c11e64
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
db/seeds.rb
View file

@ -98,7 +98,7 @@ Setting.create(
:title => 'http type',
:name => 'http_type',
:area => 'System::Base',
:description => 'Defines the type of protocol, used by ther web server, to serve the application. If https protocol will be used instead of plain http, it must be specified it here. Since this has no affect on the web server\'s settings or behavior, it will not change the method of access to the application and, if it is wrong, it will not prevent you from logging into the application. This setting is used as a variable, #{setting.http_type} which is found in all forms of messaging used by the application, to build links to the tickets within your system.',
:description => 'Defines the type of protocol, used by the web server, to serve the application. If https protocol will be used instead of plain http, it must be specified it here. Since this has no affect on the web server\'s settings or behavior, it will not change the method of access to the application and, if it is wrong, it will not prevent you from logging into the application. This setting is used as a variable, #{setting.http_type} which is found in all forms of messaging used by the application, to build links to the tickets within your system.',
:options => {
:form => [
{
@ -148,7 +148,7 @@ Setting.create(
Setting.create(
:title => 'New User Accouts',
:title => 'New User Accounts',
:name => 'user_create_account',
:area => 'Security::Authentication',
:description => 'Enables users to create their own account via web interface.',
@ -220,7 +220,7 @@ Setting.create(
:frontend => true
)
Setting.create(
:title => 'Autentication via Database',
:title => 'Authentication via Database',
:name => 'auth_db',
:area => 'Security::Authentication',
:description => 'Enables user authentication via database.',
@ -244,7 +244,7 @@ Setting.create(
:frontend => true
)
Setting.create(
:title => 'Autentication via Twitter',
:title => 'Authentication via Twitter',
:name => 'auth_twitter',
:area => 'Security::Authentication',
:description => 'Enables user authentication via twitter. Register your app first at https://dev.twitter.com/apps',
@ -294,7 +294,7 @@ Setting.create(
:frontend => false
)
Setting.create(
:title => 'Autentication via Facebook',
:title => 'Authentication via Facebook',
:name => 'auth_facebook',
:area => 'Security::Authentication',
:description => 'Enables user authentication via Facebook. Register your app first at https://developers.facebook.com/apps/',
@ -346,7 +346,7 @@ Setting.create(
)
Setting.create(
:title => 'Autentication via Google',
:title => 'Authentication via Google',
:name => 'auth_google_oauth2',
:area => 'Security::Authentication',
:description => 'Enables user authentication via Google.',
@ -397,7 +397,7 @@ Setting.create(
)
Setting.create(
:title => 'Autentication via LinkedIn',
:title => 'Authentication via LinkedIn',
:name => 'auth_linkedin',
:area => 'Security::Authentication',
:description => 'Enables user authentication via LinkedIn.',
@ -1716,7 +1716,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "Direction", :targ
Translation.create_if_not_exists( :locale => 'de', :source => "Owner", :target => "Besitzer", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Subject", :target => "Betreff", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Priority", :target => "Priorität", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Select the customer of the Ticket or create one.", :target => "Wähle den Kunden eine Tickets oder erstell einen neuen.", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Select the customer of the Ticket or create one.", :target => "Wähle den Kundn f<>r das Ticket oder erstell einen neuen.", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "New Ticket", :target => "Neues Ticket", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Firstname", :target => "Vorname", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Lastname", :target => "Nachname", :updated_by_id => 1, :created_by_id => 1 )
@ -1861,6 +1861,10 @@ Translation.create_if_not_exists( :locale => 'de', :source => "new", :target =>
Translation.create_if_not_exists( :locale => 'de', :source => "note", :target => "Notiz", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "phone", :target => "Telefon", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "web", :target => "Web", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Change order", :target => "Reihenfolge <20>ndern", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Items per page", :target => "Eintr<EFBFBD>ge je Seite", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Last Contact", :target => "Letzter Kontakt", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Last Contact Agent", :target => "Letzter Kontakt Agent", :updated_by_id => 1, :created_by_id => 1 )
Translation.create_if_not_exists( :locale => 'de', :source => "Last Contact Customer", :target => "Letzter Kontakt Kunde", :updated_by_id => 1, :created_by_id => 1 )
#Translation.create_if_not_exists( :locale => 'de', :source => "", :target => "", :updated_by_id => 1, :created_by_id => 1 )