Skip to content

Commit 530fc37

Browse files
committed
Merge branch 'v23-12' into release
2 parents 369e499 + 8fb9d9d commit 530fc37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+939
-936
lines changed

.github/translators.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,3 +388,8 @@ diegobenitez :: Spanish
388388
Marc Hagen (MarcHagen) :: Dutch
389389
Kasper Alsøe (zeonos) :: Danish
390390
sultani :: Persian
391+
renge :: Korean
392+
TheGatesDev (thegatesdev) :: Dutch
393+
Irdi (irdiOL) :: Albanian
394+
KateBarber :: Welsh
395+
Twister (theuncles75) :: Hebrew

composer.lock

Lines changed: 131 additions & 137 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lang/cy/activities.php

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
return [
77

88
// Pages
9-
'page_create' => 'tudalen wedi\'i chreu',
9+
'page_create' => 'creodd dudalen',
1010
'page_create_notification' => 'Tudalen wedi\'i chreu\'n llwyddiannus',
11-
'page_update' => 'tudalen wedi\'i diweddaru',
11+
'page_update' => 'diweddarodd dudalen',
1212
'page_update_notification' => 'Tudalen wedi\'i diweddaru\'n llwyddiannus',
13-
'page_delete' => 'tudalen wedi\'i dileu',
14-
'page_delete_notification' => 'Cafodd y dudalen ei dileu yn llwyddiannus',
15-
'page_restore' => 'tudalen wedi\'i hadfer',
16-
'page_restore_notification' => 'Cafodd y dudalen ei hadfer yn llwyddiannus',
17-
'page_move' => 'symwyd tudalen',
18-
'page_move_notification' => 'Page successfully moved',
13+
'page_delete' => 'dileodd dudalen',
14+
'page_delete_notification' => 'Tudalen wedi\'i dileu\'n llwyddiannus',
15+
'page_restore' => 'adferodd dudalen',
16+
'page_restore_notification' => 'Tudalen wedi\'i hadfer yn llwyddiannus',
17+
'page_move' => 'symydodd dudalen',
18+
'page_move_notification' => 'Tudalen wedi\'i symud yn llwyddianus',
1919

2020
// Chapters
21-
'chapter_create' => 'pennod creu',
21+
'chapter_create' => 'creodd bennod',
2222
'chapter_create_notification' => 'Pennod wedi\'i chreu\'n llwyddiannus',
2323
'chapter_update' => 'pennod wedi diweddaru',
2424
'chapter_update_notification' => 'Pennod wedi\'i diweddaru\'n llwyddiannus',
2525
'chapter_delete' => 'pennod wedi dileu',
2626
'chapter_delete_notification' => 'Pennod wedi\'i dileu\'n llwyddiannus',
2727
'chapter_move' => 'pennod wedi symud',
28-
'chapter_move_notification' => 'Chapter successfully moved',
28+
'chapter_move_notification' => 'Pennod wedi\'i symud yn llwyddianus',
2929

3030
// Books
3131
'book_create' => 'llyfr wedi creu',
@@ -40,14 +40,14 @@
4040
'book_sort_notification' => 'Ail-archebwyd y llyfr yn llwyddiannus',
4141

4242
// Bookshelves
43-
'bookshelf_create' => 'created shelf',
44-
'bookshelf_create_notification' => 'Shelf successfully created',
43+
'bookshelf_create' => 'creodd silff',
44+
'bookshelf_create_notification' => 'Silff wedi\'i chreu\'n llwyddiannus',
4545
'bookshelf_create_from_book' => 'converted book to shelf',
4646
'bookshelf_create_from_book_notification' => 'Book successfully converted to a shelf',
47-
'bookshelf_update' => 'updated shelf',
48-
'bookshelf_update_notification' => 'Shelf successfully updated',
49-
'bookshelf_delete' => 'deleted shelf',
50-
'bookshelf_delete_notification' => 'Shelf successfully deleted',
47+
'bookshelf_update' => 'diweddarodd silff',
48+
'bookshelf_update_notification' => 'Silff wedi\'i diweddaru\'n llwyddiannus',
49+
'bookshelf_delete' => 'dileodd silff',
50+
'bookshelf_delete_notification' => 'Silff wedi\'i dileu\'n llwyddiannus',
5151

5252
// Revisions
5353
'revision_restore' => 'restored revision',
@@ -62,7 +62,7 @@
6262
'watch_update_level_notification' => 'Watch preferences successfully updated',
6363

6464
// Auth
65-
'auth_login' => 'logged in',
65+
'auth_login' => 'wedi\'u mewngofnodi',
6666
'auth_register' => 'registered as new user',
6767
'auth_password_reset_request' => 'requested user password reset',
6868
'auth_password_reset_update' => 'reset user password',
@@ -85,20 +85,20 @@
8585
'webhook_delete_notification' => 'Webhook wedi\'i dileu\'n llwyddiannus',
8686

8787
// Users
88-
'user_create' => 'created user',
89-
'user_create_notification' => 'User successfully created',
90-
'user_update' => 'updated user',
88+
'user_create' => 'creodd ddefnyddiwr',
89+
'user_create_notification' => 'Defnyddiwr wedi\'i greu\'n llwyddiannus',
90+
'user_update' => 'diweddarodd ddefnyddiwr',
9191
'user_update_notification' => 'Diweddarwyd y defnyddiwr yn llwyddiannus',
92-
'user_delete' => 'deleted user',
92+
'user_delete' => 'dileodd ddefnyddiwr',
9393
'user_delete_notification' => 'Tynnwyd y defnyddiwr yn llwyddiannus',
9494

9595
// API Tokens
96-
'api_token_create' => 'created api token',
97-
'api_token_create_notification' => 'API token successfully created',
98-
'api_token_update' => 'updated api token',
99-
'api_token_update_notification' => 'API token successfully updated',
100-
'api_token_delete' => 'deleted api token',
101-
'api_token_delete_notification' => 'API token successfully deleted',
96+
'api_token_create' => 'creodd tocyn api',
97+
'api_token_create_notification' => 'Tocyn API wedi\'i greu\'n llwyddiannus',
98+
'api_token_update' => 'diweddarodd docyn api',
99+
'api_token_update_notification' => 'Tocyn API wedi\'i ddiweddaru\'n llwyddiannus',
100+
'api_token_delete' => 'dileodd docyn api',
101+
'api_token_delete_notification' => 'Tocyn API wedi\'i ddileu\'n llwyddiannus',
102102

103103
// Roles
104104
'role_create' => 'created role',
@@ -109,15 +109,15 @@
109109
'role_delete_notification' => 'Role successfully deleted',
110110

111111
// Recycle Bin
112-
'recycle_bin_empty' => 'emptied recycle bin',
112+
'recycle_bin_empty' => 'gwagodd fin ailgylchu',
113113
'recycle_bin_restore' => 'restored from recycle bin',
114114
'recycle_bin_destroy' => 'removed from recycle bin',
115115

116116
// Comments
117117
'commented_on' => 'gwnaeth sylwadau ar',
118-
'comment_create' => 'added comment',
119-
'comment_update' => 'updated comment',
120-
'comment_delete' => 'deleted comment',
118+
'comment_create' => 'ychwanegodd sylw',
119+
'comment_update' => 'diweddarodd sylw',
120+
'comment_delete' => 'dileodd sylw',
121121

122122
// Other
123123
'permissions_update' => 'caniatadau wedi\'u diweddaru',

lang/cy/auth.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,30 @@
5454
'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
5555

5656
// Email Confirmation
57-
'email_confirm_subject' => 'Confirm your email on :appName',
58-
'email_confirm_greeting' => 'Thanks for joining :appName!',
59-
'email_confirm_text' => 'Please confirm your email address by clicking the button below:',
60-
'email_confirm_action' => 'Confirm Email',
57+
'email_confirm_subject' => 'Cadarnhewch eich e-bost chi a :appName',
58+
'email_confirm_greeting' => 'Diolch am ymuno â :appName!',
59+
'email_confirm_text' => 'Os gwelwch yn dda cadarnhewch eich e-bost chi gan clicio ar y botwm isod:',
60+
'email_confirm_action' => 'Cadarnhau E-bost',
6161
'email_confirm_send_error' => 'Email confirmation required but the system could not send the email. Contact the admin to ensure email is set up correctly.',
6262
'email_confirm_success' => 'Your email has been confirmed! You should now be able to login using this email address.',
6363
'email_confirm_resent' => 'Confirmation email resent, Please check your inbox.',
64-
'email_confirm_thanks' => 'Thanks for confirming!',
64+
'email_confirm_thanks' => 'Diolch am gadarnhau!',
6565
'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
6666

67-
'email_not_confirmed' => 'Email Address Not Confirmed',
68-
'email_not_confirmed_text' => 'Your email address has not yet been confirmed.',
67+
'email_not_confirmed' => 'Cyfeiriad E-bost heb ei Gadarnhau',
68+
'email_not_confirmed_text' => 'Dyw eich cyfeiriad e-bost chi ddim wedi cael ei gadarnhau eto.',
6969
'email_not_confirmed_click_link' => 'Please click the link in the email that was sent shortly after you registered.',
7070
'email_not_confirmed_resend' => 'If you cannot find the email you can re-send the confirmation email by submitting the form below.',
7171
'email_not_confirmed_resend_button' => 'Resend Confirmation Email',
7272

7373
// User Invite
7474
'user_invite_email_subject' => 'You have been invited to join :appName!',
75-
'user_invite_email_greeting' => 'An account has been created for you on :appName.',
75+
'user_invite_email_greeting' => 'Mae cyfrif wedi cae ei greu i chi ar :appName.',
7676
'user_invite_email_text' => 'Click the button below to set an account password and gain access:',
7777
'user_invite_email_action' => 'Set Account Password',
78-
'user_invite_page_welcome' => 'Welcome to :appName!',
78+
'user_invite_page_welcome' => 'Croeso i :appName!',
7979
'user_invite_page_text' => 'To finalise your account and gain access you need to set a password which will be used to log-in to :appName on future visits.',
80-
'user_invite_page_confirm_button' => 'Confirm Password',
80+
'user_invite_page_confirm_button' => 'Cadarnhau cyfrinair',
8181
'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
8282

8383
// Multi-factor Authentication
@@ -88,7 +88,7 @@
8888
'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
8989
'mfa_setup_action' => 'Setup',
9090
'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
91-
'mfa_option_totp_title' => 'Mobile App',
91+
'mfa_option_totp_title' => 'Ap Ffôn Symudol',
9292
'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
9393
'mfa_option_backup_codes_title' => 'Backup Codes',
9494
'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',

lang/cy/common.php

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,70 +5,70 @@
55
return [
66

77
// Buttons
8-
'cancel' => 'Cancel',
9-
'close' => 'Close',
10-
'confirm' => 'Confirm',
11-
'back' => 'Back',
12-
'save' => 'Save',
13-
'continue' => 'Continue',
14-
'select' => 'Select',
8+
'cancel' => 'Canslo',
9+
'close' => 'Cau',
10+
'confirm' => 'Cadarnhau',
11+
'back' => 'Yn ôl',
12+
'save' => 'Cadw',
13+
'continue' => 'Parhau',
14+
'select' => 'Dewis',
1515
'toggle_all' => 'Toggle All',
16-
'more' => 'More',
16+
'more' => 'Mwy',
1717

1818
// Form Labels
19-
'name' => 'Name',
20-
'description' => 'Description',
19+
'name' => 'Enw',
20+
'description' => 'Disgrifiad',
2121
'role' => 'Role',
2222
'cover_image' => 'Cover image',
2323
'cover_image_description' => 'This image should be approx 440x250px.',
2424

2525
// Actions
26-
'actions' => 'Actions',
27-
'view' => 'View',
28-
'view_all' => 'View All',
29-
'new' => 'New',
30-
'create' => 'Create',
31-
'update' => 'Update',
32-
'edit' => 'Edit',
33-
'sort' => 'Sort',
34-
'move' => 'Move',
35-
'copy' => 'Copy',
36-
'reply' => 'Reply',
37-
'delete' => 'Delete',
38-
'delete_confirm' => 'Confirm Deletion',
39-
'search' => 'Search',
40-
'search_clear' => 'Clear Search',
41-
'reset' => 'Reset',
42-
'remove' => 'Remove',
43-
'add' => 'Add',
44-
'configure' => 'Configure',
45-
'manage' => 'Manage',
26+
'actions' => 'Gweithredoedd',
27+
'view' => 'Gweld',
28+
'view_all' => 'Gweld popeth',
29+
'new' => 'Newydd',
30+
'create' => 'Creu',
31+
'update' => 'Diweddaru',
32+
'edit' => 'Golygu',
33+
'sort' => 'Trefnu',
34+
'move' => 'Symud',
35+
'copy' => 'Copïo',
36+
'reply' => 'Ateb',
37+
'delete' => 'Dileu',
38+
'delete_confirm' => 'Cadarnhau\'r dilead',
39+
'search' => 'Chwilio',
40+
'search_clear' => 'Clirio\'r chwiliad',
41+
'reset' => 'Ailosod',
42+
'remove' => 'Diddymu',
43+
'add' => 'Ychwanegu',
44+
'configure' => 'Ffurfweddu',
45+
'manage' => 'Rheoli',
4646
'fullscreen' => 'Fullscreen',
4747
'favourite' => 'Favourite',
4848
'unfavourite' => 'Unfavourite',
49-
'next' => 'Next',
50-
'previous' => 'Previous',
51-
'filter_active' => 'Active Filter:',
52-
'filter_clear' => 'Clear Filter',
53-
'download' => 'Download',
54-
'open_in_tab' => 'Open in Tab',
55-
'open' => 'Open',
49+
'next' => 'Nesa',
50+
'previous' => 'Cynt',
51+
'filter_active' => 'Hidl weithredol:',
52+
'filter_clear' => 'Clirio\'r hidl',
53+
'download' => 'Llwytho i lawr',
54+
'open_in_tab' => 'Agor mewn Tab',
55+
'open' => 'Agor',
5656

5757
// Sort Options
58-
'sort_options' => 'Sort Options',
58+
'sort_options' => 'Trefnu\'r opsiynau',
5959
'sort_direction_toggle' => 'Sort Direction Toggle',
60-
'sort_ascending' => 'Sort Ascending',
61-
'sort_descending' => 'Sort Descending',
62-
'sort_name' => 'Name',
60+
'sort_ascending' => 'Trefnu\'n esgynnol',
61+
'sort_descending' => 'Trefnu\'n ddisgynnol',
62+
'sort_name' => 'Enw',
6363
'sort_default' => 'Default',
6464
'sort_created_at' => 'Created Date',
6565
'sort_updated_at' => 'Updated Date',
6666

6767
// Misc
6868
'deleted_user' => 'Deleted User',
6969
'no_activity' => 'No activity to show',
70-
'no_items' => 'No items available',
71-
'back_to_top' => 'Back to top',
70+
'no_items' => 'Dim eitemau ar gael',
71+
'back_to_top' => 'Yn ôl i\'r brig',
7272
'skip_to_main_content' => 'Skip to main content',
7373
'toggle_details' => 'Toggle Details',
7474
'toggle_thumbnails' => 'Toggle Thumbnails',
@@ -78,10 +78,10 @@
7878
'default' => 'Default',
7979
'breadcrumb' => 'Breadcrumb',
8080
'status' => 'Status',
81-
'status_active' => 'Active',
82-
'status_inactive' => 'Inactive',
83-
'never' => 'Never',
84-
'none' => 'None',
81+
'status_active' => 'Gweithredol',
82+
'status_inactive' => 'Anweithredol',
83+
'never' => 'Byth',
84+
'none' => 'Dim un',
8585

8686
// Header
8787
'homepage' => 'Homepage',
@@ -94,9 +94,9 @@
9494
'global_search' => 'Global Search',
9595

9696
// Layout tabs
97-
'tab_info' => 'Info',
97+
'tab_info' => 'Gwybodaeth',
9898
'tab_info_label' => 'Tab: Show Secondary Information',
99-
'tab_content' => 'Content',
99+
'tab_content' => 'Cynnwys',
100100
'tab_content_label' => 'Tab: Show Primary Content',
101101

102102
// Email Content

lang/cy/components.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66

77
// Image Manager
88
'image_select' => 'Image Select',
9-
'image_list' => 'Image List',
10-
'image_details' => 'Image Details',
9+
'image_list' => 'Rhestr o Ddelweddau',
10+
'image_details' => 'Manylion Delwedd',
1111
'image_upload' => 'Upload Image',
1212
'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
1313
'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
14-
'image_all' => 'All',
15-
'image_all_title' => 'View all images',
14+
'image_all' => 'Popeth',
15+
'image_all_title' => 'Gweld holl ddelweddau',
1616
'image_book_title' => 'View images uploaded to this book',
1717
'image_page_title' => 'View images uploaded to this page',
18-
'image_search_hint' => 'Search by image name',
18+
'image_search_hint' => 'Cwilio gan enw delwedd',
1919
'image_uploaded' => 'Uploaded :uploadedDate',
2020
'image_uploaded_by' => 'Uploaded by :userName',
2121
'image_uploaded_to' => 'Uploaded to :pageLink',
2222
'image_updated' => 'Updated :updateDate',
2323
'image_load_more' => 'Load More',
24-
'image_image_name' => 'Image Name',
24+
'image_image_name' => 'Enw Delwedd',
2525
'image_delete_used' => 'This image is used in the pages below.',
26-
'image_delete_confirm_text' => 'Are you sure you want to delete this image?',
26+
'image_delete_confirm_text' => 'Wyt ti\'n bendant eisiau dileu\'r ddelwedd hwn?',
2727
'image_select_image' => 'Select Image',
2828
'image_dropzone' => 'Drop images or click here to upload',
2929
'image_dropzone_drop' => 'Drop images here to upload',
30-
'images_deleted' => 'Images Deleted',
30+
'images_deleted' => 'Delweddau wedi\'u Dileu',
3131
'image_preview' => 'Image Preview',
3232
'image_upload_success' => 'Image uploaded successfully',
3333
'image_update_success' => 'Image details successfully updated',

0 commit comments

Comments
 (0)