RFE: [ 891123 ] Short format for line info in file compare

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index bb8699d..fdea682 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1467,9 +1467,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Diferença %1 de %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Diferença(s) encontrada(s)"

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 3eea677..1a367bc 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1352,9 +1352,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Ëèíèÿ: %s Êîëîíà: %d Çíàê: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Ëèíèÿ: %s"
-    IDS_LINE_STATUS_INFO    "Ëèíèÿ: %s Êîëîíà: %d Çíàê: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Ðàçëèêè %1 îò %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Íàìåðåíè ðàçëèêè"

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index b4e7c08..92f42a3 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1368,9 +1368,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Línia: %s Columna: %d Caràcters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Línia: %s"
-    IDS_LINE_STATUS_INFO    "Línia: %s Columna: %d Caràcters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Combina"
     IDS_DIFF_NUMBER_STATUS_FMT "Diferència %1 de %2"
     IDS_NO_DIFF_SEL_FMT     "S'han trobat %1 diferènces"

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index ea282a6..d8d1085 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1338,9 +1338,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "²»Í¬ %1 ÔÚ %2"
     IDS_NO_DIFF_SEL_FMT         "%1 ²»Í¬ÕÒµ½"

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 394c3de..b7e98bc 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1452,9 +1452,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "¤£¦P %1 ¦b %2"
     IDS_NO_DIFF_SEL_FMT         "%1 ¤£¦P§ä¨ì"

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index e8ce2ea..f2a399c 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1465,9 +1465,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index c16dc29..f9fcf3f 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1463,9 +1463,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Forskel %1 af %2"
     IDS_NO_DIFF_SEL_FMT     "%1 forskelle fundet"

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 254a2e8..b9b0d7a 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1467,9 +1467,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index d66781c..7192d26 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1465,9 +1465,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Différence %1 parmi %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Différences Trouvées"

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index e73ed8b..51c93f3 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1471,9 +1471,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Zeile: %s Spalte: %d Zeichen: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Zeile: %s"
-    IDS_LINE_STATUS_INFO    "Zeile: %s Spalte: %d Zeichen: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Unterschied %1 von %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Unterschiede gefunden"

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 2722e13..e3f8607 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1465,9 +1465,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Differenza %1 su %2"
     IDS_NO_DIFF_SEL_FMT     "%1 differenze trovate"

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index 0b82d92..43adadf 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1355,9 +1355,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "\8ds: %s \97ñ: %d \95¶\8e\9a\90\94: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "\8ds: %s"
-    IDS_LINE_STATUS_INFO    "\8ds: %s \97ñ: %d \95¶\8e\9a\90\94: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "\83}\81[\83W"
     IDS_DIFF_NUMBER_STATUS_FMT "\8d·\88Ù %1/%2"
     IDS_NO_DIFF_SEL_FMT     "%1\8cÂ\82Ì\8d·\88Ù\82ª\8c©\82Â\82©\82è\82Ü\82µ\82½"

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 0603682..2d53439 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1426,9 +1426,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "´Ù¸¥ ÆÄÀÏ(%1 Áß %2)"
     IDS_NO_DIFF_SEL_FMT     "´Ù¸¥ ºÎºÐ %1°³ ¹ß°ß"

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 4e42fe9..8291a90 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1464,9 +1464,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Forskjell %1 av %2"
     IDS_NO_DIFF_SEL_FMT     "%1 forskjeller funnet"

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 5824231..829df53 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1465,9 +1465,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index d6e935c..6658a1c 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1368,9 +1368,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Ñòðîêà: %s Êîëîíêà: %d Ñèìâîëîâ: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Ñòðîêà: %s"
-    IDS_LINE_STATUS_INFO    "Ñòðîêà: %s Êîëîíêà: %d Ñèìâîëîâ: %d "
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Îòëè÷èå %1 îò %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Îòëè÷èé íàéäåíî"

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 8811472..fb78e0c 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1465,9 +1465,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Rozdiel %1 z %2"
     IDS_NO_DIFF_SEL_FMT     "Nájdených %1 rozdielov"

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 4d7abe1..c848c32 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1465,9 +1465,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 1cb6b54..0c521c7 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1464,9 +1464,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Rad: %s Tecken: %d Tecken: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Rad: %s"
-    IDS_LINE_STATUS_INFO    "Rad: %s Tecken: %d Tecken: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge mode"
     IDS_DIFF_NUMBER_STATUS_FMT "Skillnad %1 av %2"
     IDS_NO_DIFF_SEL_FMT     "%1 skillnader funna"

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 3869c37..24ff5e8 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1350,9 +1350,9 @@ END
 // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
 STRINGTABLE
 BEGIN
-    IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s"
+    IDS_LINE_STATUS_INFO_EOL "Ln: %s  Col: %d  Chrs: %d  EOL: %s"
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
-    IDS_LINE_STATUS_INFO    "Line: %s Column: %d Characters: %d"
+    IDS_LINE_STATUS_INFO    "Ln: %s  Col: %d  Chrs: %d"
     IDS_MERGEMODE_MERGING   "Merge"
     IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"
     IDS_NO_DIFF_SEL_FMT     "%1 Differences Found"

diff --git a/Src/readme.txt b/Src/readme.txt
index fcbb250..7802bb4 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -4,6 +4,9 @@
   Src/Languages/Italian: MergeItalian.rc
  PATCH: [ 975025 ] Fix column number in file compare statusbar
   Src: MergeEditView.cpp
+ RFE: [ 891123 ] Short format for line info in file compare
+  Src: Merge.rc
+  Src/Languages: *.rc
 
 2004-06-19 Kimmo
  PATCH: [ 975432 ] Add codepage detection option to configlog