Infrastructure/immich
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-21 00:52:43 -05:00
Code Issues Activity

wip: update

Browse source
This commit is contained in:
Alex Tran 2024-12-28 23:09:32 -06:00
parent c9e03003c0
commit 1cb5c617c8
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
i18n/en.json
View file

@ -1333,15 +1333,11 @@
"warning": "Warning", "warning": "Warning",
"week": "Week", "week": "Week",
"welcome": "Welcome", "welcome": "Welcome",
<<<<<<< HEAD:web/src/lib/i18n/en.json
"welcome_to_immich": "Welcome to immich",
"workflows": "Workflows",
=======
"welcome_to_immich": "Welcome to Immich", "welcome_to_immich": "Welcome to Immich",
>>>>>>> 34ce61d03a206f616325491281882afff4b617f8:i18n/en.json
"year": "Year", "year": "Year",
"years_ago": "{years, plural, one {# year} other {# years}} ago", "years_ago": "{years, plural, one {# year} other {# years}} ago",
"yes": "Yes", "yes": "Yes",
"you_dont_have_any_shared_links": "You don't have any shared links", "you_dont_have_any_shared_links": "You don't have any shared links",
"zoom_image": "Zoom Image" "zoom_image": "Zoom Image",
"workflows": "Workflows"
} }