From 348d15558764a824f2feedc868dfdcb6960172b5 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Fri, 4 Jan 2013 12:45:37 +0100 Subject: [PATCH 1/5] fixed typo in translation --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 6ab7e53b7..09ff5ee58 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -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 KundenfÃ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 ) From 267ccf0303db1000981f6bc58664a4f350dda434 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Fri, 4 Jan 2013 12:58:20 +0100 Subject: [PATCH 2/5] fixed typos in translation --- db/seeds.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 09ff5ee58..76a7667b7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -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.', @@ -1693,7 +1693,7 @@ Network::Item::Comment.create( Translation.create_if_not_exists( :locale => 'de', :source => "New", :target => "Neu", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Create", :target => "Erstellen", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Cancel", :target => "Abbrechen", :updated_by_id => 1, :created_by_id => 1 ) -Translation.create_if_not_exists( :locale => 'de', :source => "Submit", :target => "Ãœbermitteln", :updated_by_id => 1, :created_by_id => 1 ) +Translation.create_if_not_exists( :locale => 'de', :source => "Submit", :target => "œbermitteln", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Sign out", :target => "Abmelden", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Profile", :target => "Profil", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Settings", :target => "Einstellungen", :updated_by_id => 1, :created_by_id => 1 ) @@ -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 KundenfÃr das Ticket 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 ) From 0378095602d4941cfdbc857b5a0d2b7d1e3998f1 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Fri, 4 Jan 2013 13:00:30 +0100 Subject: [PATCH 3/5] added translation --- db/seeds.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/seeds.rb b/db/seeds.rb index 76a7667b7..479898854 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1861,6 +1861,7 @@ 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 Ãndern", :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 ) From b5ed7a12e5581322f8ec96ee8ca8c17de126ecb2 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Fri, 4 Jan 2013 13:04:21 +0100 Subject: [PATCH 4/5] added translations --- db/seeds.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 479898854..5f7caeb77 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1862,6 +1862,9 @@ Translation.create_if_not_exists( :locale => 'de', :source => "note", :target => 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 Ãndern", :updated_by_id => 1, :created_by_id => 1 ) - +Translation.create_if_not_exists( :locale => 'de', :source => "Items per page", :target => "EintrÃ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 ) From e0221601a45f72f32cc4acc266980defe820f046 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Fri, 4 Jan 2013 13:13:24 +0100 Subject: [PATCH 5/5] fixed UTF8 encoding error --- db/seeds.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 5f7caeb77..b93e86c58 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1693,7 +1693,7 @@ Network::Item::Comment.create( Translation.create_if_not_exists( :locale => 'de', :source => "New", :target => "Neu", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Create", :target => "Erstellen", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Cancel", :target => "Abbrechen", :updated_by_id => 1, :created_by_id => 1 ) -Translation.create_if_not_exists( :locale => 'de', :source => "Submit", :target => "œbermitteln", :updated_by_id => 1, :created_by_id => 1 ) +Translation.create_if_not_exists( :locale => 'de', :source => "Submit", :target => "Ãœbermitteln", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Sign out", :target => "Abmelden", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Profile", :target => "Profil", :updated_by_id => 1, :created_by_id => 1 ) Translation.create_if_not_exists( :locale => 'de', :source => "Settings", :target => "Einstellungen", :updated_by_id => 1, :created_by_id => 1 ) @@ -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 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 => "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,8 +1861,8 @@ 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 Ãndern", :updated_by_id => 1, :created_by_id => 1 ) -Translation.create_if_not_exists( :locale => 'de', :source => "Items per page", :target => "EintrÃge je Seite", :updated_by_id => 1, :created_by_id => 1 ) +Translation.create_if_not_exists( :locale => 'de', :source => "Change order", :target => "Reihenfolge �ndern", :updated_by_id => 1, :created_by_id => 1 ) +Translation.create_if_not_exists( :locale => 'de', :source => "Items per page", :target => "Eintr�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 )