Merge remote-tracking branch 'upstream/pull/5498'

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 041b7ef5eccd725c76885705f214243e31f3dc2c..b3379b91a14243fec617620f973a8f5c3aaa8db7 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -52,7 +52,6 @@ Lint/AssignmentInCondition:
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
     - 'app/mailers/user_mailer.rb'
-    - 'app/models/client_application.rb'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d1faa7a50c2b428938565059e94388e63fd6d20b..04b8a9a966b170d6d688c612264bc1779f633051 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,9 +20,6 @@ en:
         create: Add Comment
       message:
         create: Send
-      client_application:
-        create: Register
-        update: Update
       oauth2_application:
         create: Register
         update: Update