Skip to content

Commit

Permalink
Feature/addon services fix bad merge (CenterForOpenScience#2343)
Browse files Browse the repository at this point in the history
## Purpose

Fix a bad merge

## Summary of Changes

1. Updated the translations file to remove duplicate strings
2. Updated caniuse
  • Loading branch information
brianjgeiger authored Sep 22, 2024
1 parent a318f33 commit 5d8ddb8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
10 changes: 3 additions & 7 deletions translations/en-us.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@ general:
api: API
apply: Apply
asc_paren: (asc)
authenticate: Authenticate
authorize: Authorize
available: 'Available'
back: Back
bookmark: Bookmark
cancel: Cancel
caution: Caution
close: Close
component: component
confirm: Confirm
contributors: Contributors
copy: Copy
cos: 'Center for Open Science'
Expand All @@ -54,13 +57,6 @@ general:
edit: Edit
ellipsis:
embed: Embed
add: Add
confirm: Confirm
authorize: Authorize
authenticate: Authenticate
ok: OK
apply: Apply
revisions: Revisions
engineering: 'engineering'
filter: Filter
help: Help
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9052,9 +9052,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"

caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001214, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001503:
version "1.0.30001593"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001593.tgz"
integrity sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==
version "1.0.30001662"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz"
integrity sha512-sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA==

capture-exit@^2.0.0:
version "2.0.0"
Expand Down

0 comments on commit 5d8ddb8

Please sign in to comment.