Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-06 10:17:37 +02:00
Code Issues Activity

Tweak locale to respect singular conflicting file message in P… (#10177)

Browse Source 
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
This commit is contained in:
James LakinandAntoine GIRARD authored and GitHub committed 2020-02-07 17:38:18 +01:00
1 parent cf33a18a5c
commit 6e6da2c276
3 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

options/locale/locale_en-US.ini
+2 -1
View File
@@ -1066,7 +1066,8 @@ pulls.blocked_by_rejection = "This Pull Request has changes requested by an offi
pulls.can_auto_merge_desc = This pull request can be merged automatically.
pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts.
pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts.
pulls.num_conflicting_files = "%d conflicting files"
pulls.num_conflicting_files_1 = "%d conflicting file"
pulls.num_conflicting_files_n = "%d conflicting files"
pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled.
pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress.