Browse Source

Fixed some english texts.

Jens Pfeifer 8 years ago
parent
commit
30c9caae00

+ 3 - 3
app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee

@@ -3,7 +3,7 @@ class App.FirstStepsClues extends App.Controller
     {
       container: '.js-dashboardMenuItem'
       headline: 'Dashboard'
-      text: 'Here you see a quick overview about your and other agents performance.'
+      text: 'Here you see a quick overview of your and other agents\' performance.'
       actions: [
         'hover'
       ]
@@ -11,7 +11,7 @@ class App.FirstStepsClues extends App.Controller
     {
       container: '.search-holder'
       headline: 'Search'
-      text: 'Here you can search for ticket, customers and organizations. Use the wildcard §*§ to find everything. E. g. §smi*§ or §rosent*l§. You also can use ||double quotes|| for searching phrases §"some phrase"§.'
+      text: 'Here you can search for tickets, customers and organizations. Use the wildcard §*§ to find everything. E. g. §smi*§ or §rosent*l§. You also can use ||double quotes|| for searching phrases §"some phrase"§.'
       actions: []
     }
     {
@@ -35,7 +35,7 @@ class App.FirstStepsClues extends App.Controller
     {
       container: '.js-overviewsMenuItem'
       headline: 'Overviews'
-      text: 'Here you find your ticket overviews for open, my assigned or escalated tickets.'
+      text: 'Here you find your ticket overviews for open, assigned and escalated tickets.'
       actions: [
         'hover'
       ]

+ 1 - 1
app/assets/javascripts/app/controllers/_integration/icinga.coffee

@@ -23,7 +23,7 @@ App.Config.set(
   {
     name: 'Icinga'
     target: '#system/integration/icinga'
-    description: 'A open source monitoring tool.'
+    description: 'An open source monitoring tool.'
     controller: Index
     state: State
   }

+ 1 - 1
app/assets/javascripts/app/controllers/_integration/nagios.coffee

@@ -23,7 +23,7 @@ App.Config.set(
   {
     name: 'Nagios'
     target: '#system/integration/nagios'
-    description: 'A open source monitoring tool.'
+    description: 'An open source monitoring tool.'
     controller: Index
     state: State
   }

+ 3 - 3
app/assets/javascripts/app/controllers/_integration/slack.coffee

@@ -4,7 +4,7 @@ class Index extends App.ControllerIntegrationBase
   featureConfig: 'slack_config'
   description: [
     ['This service sends notifications to your %s channel.', 'Slack']
-    ['To setup this Service you need to create a new |"Incoming webhook"| in your %s integration panel, and enter the Webhook URL below.', 'Slack']
+    ['To set up this service you need to create a new |"Incoming webhook"| in your %s integration panel, and enter the web hook URL below.', 'Slack']
   ]
   events:
     'click .js-submit': 'update'
@@ -26,8 +26,8 @@ class Index extends App.ControllerIntegrationBase
       escalation_warning: '5. Ticket Escalation Warning'
 
     configureAttributes = [
-      { name: 'types',     display: 'Trigger',  tag: 'checkbox', options: options, 'null': false, class: 'vertical', note: 'Where notification is sent.' },
-      { name: 'group_ids', display: 'Group',    tag: 'select', relation: 'Group', multiple: true, 'null': false, note: 'Only for this groups.' },
+      { name: 'types',     display: 'Trigger',  tag: 'checkbox', options: options, 'null': false, class: 'vertical', note: 'When notification is being sent.' },
+      { name: 'group_ids', display: 'Group',    tag: 'select', relation: 'Group', multiple: true, 'null': false, note: 'Only for these groups.' },
       { name: 'webhook',   display: 'Webhook',  tag: 'input', type: 'url',  limit: 200, 'null': false, placeholder: 'https://hooks.slack.com/services/...' },
       { name: 'username',  display: 'Username', tag: 'input', type: 'text', limit: 100, 'null': false, placeholder: 'username' },
       { name: 'channel',   display: 'Channel',  tag: 'input', type: 'text', limit: 100, 'null': true, placeholder: '#channel' },

+ 1 - 1
app/assets/javascripts/app/controllers/_manage/security.coffee

@@ -9,7 +9,7 @@ class Security extends App.ControllerTabs
       { name: 'Base',                     'target': 'base',             controller: App.SettingsArea, params: { area: 'Security::Base' } }
       { name: 'Password',                 'target': 'password',         controller: App.SettingsArea, params: { area: 'Security::Password' } }
       #{ name: 'Authentication',           'target': 'auth',            controller: App.SettingsArea, params: { area: 'Security::Authentication' } }
-      { name: 'Third-Party Applications', 'target': 'third_party_auth', controller: App.SettingsArea, params: { area: 'Security::ThirdPartyAuthentication' } }
+      { name: 'Third-party Applications', 'target': 'third_party_auth', controller: App.SettingsArea, params: { area: 'Security::ThirdPartyAuthentication' } }
     ]
     @render()
 

+ 1 - 1
app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.coffee

@@ -78,7 +78,7 @@ class CalendarSubscriptions extends App.ControllerSubContent
       =>
         @notify(
           type: 'success'
-          msg:  App.i18n.translateContent('Successfully!')
+          msg:  App.i18n.translateContent('Successful!')
         )
       true
     )

+ 1 - 1
app/assets/javascripts/app/controllers/_profile/language.coffee

@@ -55,7 +55,7 @@ class Index extends App.ControllerSubContent
         App.Event.trigger('ui:rerender')
         @notify(
           type: 'success'
-          msg:  App.i18n.translateContent('Successfully!')
+          msg:  App.i18n.translateContent('Successful!')
         )
       ,
       true

+ 1 - 1
app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee

@@ -75,7 +75,7 @@ class Index extends App.ControllerSubContent
   success: (data, status, xhr) =>
     @notify(
       type: 'success'
-      msg:  App.i18n.translateContent('Successfully!')
+      msg:  App.i18n.translateContent('Successful!')
     )
     update = =>
       @render()

+ 1 - 1
app/assets/javascripts/app/controllers/_profile/notification.coffee

@@ -172,7 +172,7 @@ class Index extends App.ControllerSubContent
         App.Event.trigger('ui:rerender')
         @notify(
           type: 'success'
-          msg:  App.i18n.translateContent('Successfully!')
+          msg:  App.i18n.translateContent('Successful!')
         )
       ,
       true

+ 1 - 1
app/assets/javascripts/app/controllers/customer_ticket_create.coffee

@@ -85,7 +85,7 @@ class Index extends App.ControllerContent
       el:   @el.find('.sidebar')
       data:
         header: App.i18n.translateInline('What can you do here?')
-        html:   App.i18n.translateInline('The way to communicate with us is this thing called "Ticket".') + ' ' + App.i18n.translateInline('Here you can create one.')
+        html:   App.i18n.translateInline('The way to communicate with us is this thing called "ticket".') + ' ' + App.i18n.translateInline('Here you can create one.')
     )
 
   cancel: ->

Some files were not shown because too many files changed in this diff