OSDN Git Service

Fix an issue where the following message displayed when two files are identical in...
authorJun Tajima <56220423+tjmprm77@users.noreply.github.com>
Sun, 23 Oct 2022 08:44:09 +0000 (17:44 +0900)
committerGitHub <noreply@github.com>
Sun, 23 Oct 2022 08:44:09 +0000 (17:44 +0900)
- (Middle and right are identical)
- (Left and right are identical)
- (Left and middle are identical)

The strings defined in Merge.rc have leading spaces, but the strings in DirViewColItems.cpp do not.
So add a space to the beginning of the string in DirViewColItems.cpp.

Src/DirViewColItems.cpp

index 0a788a2..dcf1808 100644 (file)
@@ -418,9 +418,9 @@ static String ColStatusGet(const CDiffContext *pCtxt, const void *p, int)
                {
                        switch (di.diffcode.diffcode & DIFFCODE::COMPAREFLAGS3WAY)
                        {
-                       case DIFFCODE::DIFF1STONLY: s += _("(Middle and right are identical)"); break;
-                       case DIFFCODE::DIFF2NDONLY: s += _("(Left and right are identical)"); break;
-                       case DIFFCODE::DIFF3RDONLY: s += _("(Left and middle are identical)"); break;
+                       case DIFFCODE::DIFF1STONLY: s += _(" (Middle and right are identical)"); break;
+                       case DIFFCODE::DIFF2NDONLY: s += _(" (Left and right are identical)"); break;
+                       case DIFFCODE::DIFF3RDONLY: s += _(" (Left and middle are identical)"); break;
                        }
                }
        }