Browse Source

Maintenance: Improved wording of translatable strings.

Martin Gruner 1 year ago
parent
commit
e7c6f8b6be

+ 1 - 1
app/assets/javascripts/app/controllers/_channel/email.coffee

@@ -659,7 +659,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
     )
 
   probeInboundMessagesFound: (data, verify) =>
-    message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. We will move them all from your mailbox into Zammad.', data.content_messages)
+    message = App.i18n.translateContent('%s email(s) were found in your mailbox. They will all be moved from your mailbox into Zammad.', data.content_messages)
     @$('.js-inbound-acknowledge .js-messageFound').html(message)
 
     if !verify

+ 1 - 1
app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee

@@ -43,7 +43,7 @@ class Modal extends App.ControllerModal
   content: =>
     if !@sent
       return App.i18n.translateContent('Your account has not been verified. Please click on the link in the verification email.')
-    content = App.i18n.translateContent('We\'ve sent an email to _%s_. Click the link in the email to verify your account.', @user.email)
+    content = App.i18n.translateContent('An email was sent to _%s_. Click the link in the email to verify your account.', @user.email)
     content += '<br><br>'
     content += App.i18n.translateContent('If you don\'t see the email, check other places it might be, like your junk, spam, social, or other folders.')
     content

+ 1 - 1
app/assets/javascripts/app/controllers/getting_started/channel_email.coffee

@@ -258,7 +258,7 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
     )
 
   probeInboundMessagesFound: (data, verify) =>
-    message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. We will move them all from your mailbox into Zammad.', data.content_messages)
+    message = App.i18n.translateContent('%s email(s) were found in your mailbox. They will all be moved from your mailbox into Zammad.', data.content_messages)
     @$('.js-inbound-acknowledge .js-messageFound').html(message)
 
     if !verify

+ 1 - 1
app/assets/javascripts/app/views/admin_password_auth/request_sent.jst.eco

@@ -1,7 +1,7 @@
 <div class="request_admin_password_auth fullscreen">
   <div class="fullscreen-center">
     <div class="hero-unit fullscreen-body">
-      <h2><%- @T('We\'ve sent admin password login instructions to your email address.') %><small></small></h2>
+      <h2><%- @T('Admin password login instructions were sent to your email address.') %><small></small></h2>
       <p><%- @T('If you don\'t receive instructions within a minute or two, check your email\'s spam and junk filters, or try resending your request.') %></p>
       <div class="form-controls">
         <a class="btn btn--text btn--subtle js-cancel" href="#login"><%- @T('Cancel & Go Back') %></a>

+ 1 - 1
app/assets/javascripts/app/views/channel/email_account_wizard.jst.eco

@@ -111,7 +111,7 @@
     <div class="modal-body">
       <div class="wizard-body vertical justified">
         <div class="alert alert--danger hide" role="alert"></div>
-        <p class="js-messageFound"><%- @T('We have already found %s email(s) in your mailbox. We will move them all from your mailbox into Zammad.', 'x') %></p>
+        <p class="js-messageFound"><%- @T('%s email(s) were found in your mailbox. They will all be moved from your mailbox into Zammad.', 'x') %></p>
 
         <div class="js-archiveMessage">
           <p class="js-archiveMessageCount"><%- @T('In addition, we have found emails in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', 'x') %></p>

+ 1 - 1
app/assets/javascripts/app/views/cti/not_configured.jst.eco

@@ -2,7 +2,7 @@
   <div>
     <h1><%- @T('Not configured') %></h1>
     <p><%- @T('Sorry, there is currently no CTI backend enabled.') %></p>
-    <p><%- @T('We support:') %></p>
+    <p><%- @T('These are supported:') %></p>
     <div class="btn-group-vertical" role="group">
     <% for backend in @backends: %>
       <% if @isAdmin: %><a class="btn" href="<%- backend.url %>"><% end %><%= backend.name %><% if @isAdmin: %></a><% end %>

+ 1 - 1
app/assets/javascripts/app/views/getting_started/email.jst.eco

@@ -87,7 +87,7 @@
         <div class="alert alert--warning js-sslVerifyAlert hide" role="alert">
           <%= @T('Turning off SSL verification is a security risk and should be used only temporary. Use this option at your own risk!') %>
         </div>
-        <p class="js-messageFound"><%- @T('We have already found %s email(s) in your mailbox. We will move them all from your mailbox into Zammad.', 'x') %></p>
+        <p class="js-messageFound"><%- @T('%s email(s) were found in your mailbox. They will all be moved from your mailbox into Zammad.', 'x') %></p>
 
         <div class="js-archiveMessage">
           <p class="js-archiveMessageCount"><%- @T('In addition, we have found emails in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', 'x') %></p>

+ 2 - 2
app/assets/javascripts/app/views/import/otrs.jst.eco

@@ -93,8 +93,8 @@
     <div class="wizard-slide vertical hide" data-slide="otrs-import-notice">
       <h2><%- @T('Notice') %></h2>
       <div class="wizard-body flex vertical justified">
-        <p class="js-otrsProcesses hide"><%- @T('We detected OTRS BPM processes that can\'t get imported into Zammad since we currently don\'t support this kind of workflows.') %></p>
-        <p class="js-otrsDynamicFields hide"><%- @T('We found a lot of dynamic fields which are not common in Zammad, as we take a different approach to ticket attributes. Zammad also uses tags in addition to custom fields to classify tickets. This difference can create a new philosophy of your ticket attributes / tags compared to your current use of dynamic fields in OTRS.') %></p>
+        <p class="js-otrsProcesses hide"><%- @T('OTRS BPM processes were found. They cannot be imported into Zammad as these kind of workflows are currently not supported.') %></p>
+        <p class="js-otrsDynamicFields hide"><%- @T('Many dynamic fields were found. This is not a common pattern in Zammad, which takes a different approach to ticket attributes. Zammad also uses tags in addition to custom fields to classify tickets. This difference can create a new philosophy of your ticket attributes / tags compared to your current use of dynamic fields in OTRS.') %></p>
       </div>
       <div class="wizard-controls horizontal center">
         <a class="btn btn--text btn--secondary" href="#import"><%- @T('Go Back') %></a>

+ 1 - 1
app/assets/javascripts/app/views/password/reset_sent.jst.eco

@@ -1,7 +1,7 @@
 <div class="reset_password fullscreen">
   <div class="fullscreen-center">
     <div class="hero-unit fullscreen-body">
-      <h2><%- @T('We\'ve sent password reset instructions to your email address.') %><small></small></h2>
+      <h2><%- @T('Password reset instructions were sent to your email address.') %><small></small></h2>
       <p><%- @T('If you don\'t receive instructions within a minute or two, check your email\'s spam and junk filters, or try resending your request.') %></p>
       <div class="form-controls">
         <a class="btn btn--text btn--subtle js-cancel" href="#login"><%- @T('Cancel & Go Back') %></a>

+ 1 - 1
app/assets/javascripts/app/views/whatsapp/account_phone_number.jst.eco

@@ -44,7 +44,7 @@
 
   <div class="input form-group">
     <div class="formGroup-label">
-      <label for=""><%- @T('Target Group') %> <span>*</span></label>
+      <label for=""><%- @T('Group') %> <span>*</span></label>
     </div>
     <div class="controls">
       <div class="js-messagesGroup"></div>

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