File tree Expand file tree Collapse file tree 1 file changed +14
-2
lines changed Expand file tree Collapse file tree 1 file changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -57,6 +57,8 @@ backend:
57
57
other : Edit
58
58
undelete :
59
59
other : Undelete
60
+ merge :
61
+ other : Merge
60
62
role :
61
63
name :
62
64
user :
@@ -564,7 +566,7 @@ backend:
564
566
name :
565
567
other : First Link
566
568
desc :
567
- other : First dirst added a link to another post.
569
+ other : First added a link to another post.
568
570
first_reaction :
569
571
name :
570
572
other : First Reaction
@@ -1027,6 +1029,15 @@ ui:
1027
1029
<p>We do not allow <strong>deleting tag with synonyms</strong>.</p> <p>Please remove the synonyms from this tag first.</p>
1028
1030
tip : Are you sure you wish to delete?
1029
1031
close : Close
1032
+ merge :
1033
+ title : Merge tag
1034
+ source_tag_title : Source tag
1035
+ source_tag_description : The source tag and its associated data will be remapped to the target tag.
1036
+ target_tag_title : Target tag
1037
+ target_tag_description : A synonym between these two tags will be created after merging.
1038
+ no_results : No tags matched
1039
+ btn_submit : Submit
1040
+ btn_close : Close
1030
1041
edit_tag :
1031
1042
title : Edit Tag
1032
1043
default_reason : Edit tag
@@ -1441,7 +1452,7 @@ ui:
1441
1452
signup : Sign up
1442
1453
logout : Log out
1443
1454
verify : Verify
1444
- add_question : Add question
1455
+ create : Create
1445
1456
approve : Approve
1446
1457
reject : Reject
1447
1458
skip : Skip
@@ -1482,6 +1493,7 @@ ui:
1482
1493
display_below : Display below
1483
1494
always_display : Always display
1484
1495
or : or
1496
+ back_sites : Back to sites
1485
1497
search :
1486
1498
title : Search Results
1487
1499
keywords : Keywords
You can’t perform that action at this time.
0 commit comments