This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/answer.git
commit a0c9edd43cf2e7101dd6fe5e9c7338d1bacd2dc3
Author: Sunny <1147886+sunshi...@users.noreply.github.com>
AuthorDate: Tue Apr 29 15:11:07 2025 +0800
New translations en_us.yaml (Welsh)
---
i18n/cy_GB.yaml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/i18n/cy_GB.yaml b/i18n/cy_GB.yaml
index ea6b10a8..09987e25 100644
--- a/i18n/cy_GB.yaml
+++ b/i18n/cy_GB.yaml
@@ -57,6 +57,8 @@ backend:
other: Edit
undelete:
other: Undelete
+ merge:
+ other: Merge
role:
name:
user:
@@ -564,7 +566,7 @@ backend:
name:
other: First Link
desc:
- other: First dirst added a link to another post.
+ other: First added a link to another post.
first_reaction:
name:
other: First Reaction
@@ -1027,6 +1029,15 @@ ui:
<p>We do not allow <strong>deleting tag with synonyms</strong>.</p>
<p>Please remove the synonyms from this tag first.</p>
tip: Are you sure you wish to delete?
close: Close
+ merge:
+ title: Merge tag
+ source_tag_title: Source tag
+ source_tag_description: The source tag and its associated data will be
remapped to the target tag.
+ target_tag_title: Target tag
+ target_tag_description: A synonym between these two tags will be created
after merging.
+ no_results: No tags matched
+ btn_submit: Submit
+ btn_close: Close
edit_tag:
title: Edit Tag
default_reason: Edit tag
@@ -1441,7 +1452,7 @@ ui:
signup: Sign up
logout: Log out
verify: Verify
- add_question: Add question
+ create: Create
approve: Approve
reject: Reject
skip: Skip
@@ -1482,6 +1493,7 @@ ui:
display_below: Display below
always_display: Always display
or: or
+ back_sites: Back to sites
search:
title: Search Results
keywords: Keywords
