[Winmerge-svn] SF.net SVN: winmerge:[7300] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge:[7300] trunk
|
From: <ge...@us...> - 2010-10-08 16:11:26
|
Revision: 7300
http://winmerge.svn.sourceforge.net/winmerge/?rev=7300&view=rev
Author: gerundt
Date: 2010-10-08 16:11:19 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
PATCH: [ 3082392 ] Updated Bulgarian Language
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Bulgarian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-10-05 14:04:40 UTC (rev 7299)
+++ trunk/Docs/Users/ChangeLog.txt 2010-10-08 16:11:19 UTC (rev 7300)
@@ -7,6 +7,8 @@
Update version number in trunk
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
+ Translation updates:
+ - Bulgarian (#3082392)
WinMerge 2.13.14 - 2010-09-15 (r7263)
Update release compiler and runtimes to VS2008
Modified: trunk/Translations/WinMerge/Bulgarian.po
===================================================================
--- trunk/Translations/WinMerge/Bulgarian.po 2010-10-05 14:04:40 UTC (rev 7299)
+++ trunk/Translations/WinMerge/Bulgarian.po 2010-10-08 16:11:19 UTC (rev 7300)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-05-04 21:51+0100\n"
+"PO-Revision-Date: 2010-10-06 22:09+0200\n"
"Last-Translator: tigertron <ivg_18 at yahoo.com>\n"
"Language-Team: Bulgarian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -286,7 +286,7 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&\xD1\xEF\xE8\xF1\xFA\xEA..."
#: Merge.rc:152
#, c-format
@@ -514,17 +514,17 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "\xD0\xE5\xE6\xE8\xEC &\xC4\xFA\xF0\xE2\xEE"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "&\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:242
#, c-format
@@ -662,17 +662,17 @@
#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:346
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:347
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:350
#, c-format
@@ -1078,7 +1078,7 @@
#: Merge.rc:674
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(\xC2\xFA\xF2\xF0\xE5\xF8\xED\xE0 \xE2\xE5\xF0\xF1\xE8\xFF)"
#: Merge.rc:675
#, c-format
@@ -1209,7 +1209,7 @@
#: Merge.rc:721
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "\xC2\xE8\xE7\xF3\xE0\xEB\xE5\xED SourceSafe"
#: Merge.rc:726
#, c-format
@@ -1314,7 +1314,7 @@
#: Merge.rc:780
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE6\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \"\xC8\xE7\xE1\xE5\xF0\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xE8\xEB\xE8 \xEF\xE0\xEF\xEA\xE8\" \xEF\xF0\xE8 \xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5"
#: Merge.rc:782
#, c-format
@@ -1457,7 +1457,7 @@
#: Merge.rc:2202
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "\xD0\xE0\xF6\xE8\xEE\xED\xE0\xEB\xE5\xED ClearCase"
#: Merge.rc:875
#, c-format
@@ -1854,7 +1854,7 @@
#: Merge.rc:1168
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "&\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF0\xFA\xF9\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xE7\xE0 \xF4\xEE\xF0\xEC\xE0\xF2\xE0 (Windows/Unix/Mac)"
#: Merge.rc:1170
#, c-format
@@ -2026,8 +2026,12 @@
#: Merge.rc:1265
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"\xCE\xF2\xEA\xF0\xE8\xE9 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF \xE7\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0\xF2\xE0 \xED\xE0 \xF1\xEB\xE5\xE4\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5: .html, .rc, .xml \n"
+"\xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE5 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5 \xED\xE0 \xF1\xE5\xF1\xE8\xFF\xF2\xE0"
#: Merge.rc:1268
#, c-format
@@ -2042,7 +2046,7 @@
#: Merge.rc:1272
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "\xC7\xE0\xE4\xE0\xE9 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0:"
#: Merge.rc:1280
#, c-format
@@ -2105,7 +2109,7 @@
#: Merge.rc:1300
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1303
#, c-format
@@ -2140,8 +2144,12 @@
#: Merge.rc:1314
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n"
+"(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)"
#: Merge.rc:1318
#, c-format
@@ -2581,23 +2589,23 @@
#: Merge.rc:1651
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "\xC4\xEE\xE1\xE0\xE2\xEA\xE8"
#: Merge.rc:1654
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&\xC2\xEA\xEB\xFE\xF7\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8\xF2\xE5"
#: Merge.rc:1665
#: Merge.rc:1964
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "\xC8\xED\xF2\xE5\xE3\xF0\xE8\xF0\xE0\xED\xE5 \xE2 \xF8\xE5\xEB-\xE0"
#: Merge.rc:1668
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1669
#, c-format
@@ -2612,17 +2620,17 @@
#: Merge.rc:1673
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&\xC4\xEE\xE1\xE0\xE2\xE8 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:1675
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1676
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "\xC4\xEE\xE1\xE0\xE2\xE8 \xF0\xE5\xE4 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:1683
#: Merge.rc:1967
@@ -2676,32 +2684,32 @@
#: Merge.rc:1757
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
#: Merge.rc:1758
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
#: Merge.rc:1759
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
#: Merge.rc:1760
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
#: Merge.rc:1761
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
#: Merge.rc:1762
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
#: Merge.rc:1768
#, c-format
@@ -2792,17 +2800,17 @@
#: Merge.rc:1782
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xE2\xEA\xEB\xFE\xF7\xE8 \xED\xE0 \xE4\xFA\xF0\xE2\xEE\xE2\xE8\xE4\xE5\xED \xF0\xE5\xE6\xE8\xEC"
#: Merge.rc:1783
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1784
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1790
#, c-format
@@ -2913,22 +2921,22 @@
"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE"
#: Merge.rc:1836
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
"Tile Windows Horizontally"
msgstr ""
-"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
-"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
+"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
+"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE"
#: Merge.rc:1837
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
"Tile Windows Vertically"
msgstr ""
-"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
-"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
+"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
+"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE"
#: Merge.rc:1843
#, c-format
@@ -3040,8 +3048,12 @@
#: Merge.rc:1860
#, c-format
-msgid "Automatically resize panes\nLock Panes"
-msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n"
+"\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5"
#: Merge.rc:1866
#, c-format
@@ -3104,13 +3116,41 @@
#: Merge.rc:1892
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5"
#: Merge.rc:1893
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1900
#, c-format
@@ -3130,8 +3170,12 @@
#: Merge.rc:1920
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1921
#, c-format
@@ -3262,7 +3306,7 @@
#: Merge.rc:1986
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1992
#, c-format
@@ -3349,22 +3393,22 @@
#: Merge.rc:2024
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:2025
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:2026
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:2027
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:2033
#, c-format
@@ -3410,7 +3454,7 @@
#: Merge.rc:2046
#, c-format
msgid "[F] "
-msgstr ""
+msgstr "[F] "
#: Merge.rc:2047
#: Merge.rc:2571
@@ -3506,13 +3550,19 @@
#: Merge.rc:2074
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"\xD4\xE8\xEB\xF2\xF0\xE8\xF2\xE5 \xE1\xFF\xF5\xE0 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE8. \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xEE\xF2\xE2\xEE\xF0\xE5\xED\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xED\xE0 \xEF\xE0\xEF\xEA\xE8?\n"
+"\n"
+"\xC0\xEA\xEE \xED\xE5 \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xF1\xE5\xE3\xE0, \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xED\xE0\xF2\xE8\xF1\xED\xE5\xF2\xE5 \xCD\xE5 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xEF\xEE-\xEA\xFA\xF1\xED\xEE."
#: Merge.rc:2081
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&\xCF\xFA\xF2 \xE4\xEE SS.EXE:"
#: Merge.rc:2087
#, c-format
@@ -3597,12 +3647,12 @@
#: Merge.rc:2108
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\xCE\xF2\xEC\xE5\xED\xFF\xED\xE5 \xED\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..."
#: Merge.rc:2109
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "\xCF\xEE\xE2\xF2\xE0\xF0\xFF\xED\xE5 \xED\xE0 \xEF\xF0\xE5\xE4\xE8\xF8\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..."
#: Merge.rc:2115
#, c-format
@@ -3725,8 +3775,14 @@
#: Merge.rc:2152
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "\xD4\xE0\xE9\xEB\xFA\xF2\n%1\n\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"\xD4\xE0\xE9\xEB\xFA\xF2\n"
+"%1\n"
+"\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED."
#: Merge.rc:2158
#, c-format
@@ -3839,8 +3895,18 @@
#: Merge.rc:2170
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"\xC4\xF0\xF3\xE3\xEE \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xE5 \xE5 \xEE\xE1\xED\xEE\xE2\xE8\xEB\xEE \xF4\xE0\xE9\xEB\xE0\n"
+"%1\n"
+"\xF1\xEB\xE5\xE4 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xF1\xEA\xE0\xED\xE8\xF0\xE0\xED\xE5 \xEE\xF2 WinMerge.\n"
+"\n"
+"\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xE0 \xED\xE0\xED\xEE\xE2\xEE?"
#: Merge.rc:2171
#, c-format
@@ -3854,8 +3920,14 @@
#: Merge.rc:2173
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"\xD4\xE0\xE9\xEB\xFA\xF2\n"
+"%1\n"
+"\xE5 \xE8\xE7\xF7\xE5\xE7\xED\xE0\xEB. \xCC\xEE\xEB\xFF, \xE7\xE0\xEF\xE8\xF8\xE5\xF2\xE5 \xED\xE5\xE3\xEE\xE2\xEE \xEA\xEE\xEF\xE8\xE5, \xE7\xE0 \xE4\xE0 \xEF\xF0\xEE\xE4\xFA\xEB\xE6\xE8\xF2\xE5."
#: Merge.rc:2179
#, c-format
@@ -4128,17 +4200,17 @@
#: Merge.rc:2256
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5:"
#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5 %d :"
#: Merge.rc:2259
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "\xCF\xEE\xF2\xE2\xFA\xF0\xE4\xE5\xF2\xE5 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE2\xE0\xED\xE5"
#: Merge.rc:2265
#, c-format
@@ -4203,12 +4275,12 @@
#: Merge.rc:2282
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "\xCB\xFF\xE2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:2283
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "\xC4\xFF\xF1\xED\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:2289
#, c-format
@@ -4409,7 +4481,7 @@
#: Merge.rc:2353
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "\xCF\xE0\xEF\xEA\xE8\xF2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
#: Merge.rc:2354
#, c-format
@@ -4429,12 +4501,12 @@
#: Merge.rc:2358
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8"
#: Merge.rc:2363
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
#: Merge.rc:2369
#, c-format
@@ -4657,8 +4729,14 @@
#: Merge.rc:2436
#, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr "\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
+msgstr ""
+"\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n"
+" \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n"
+" \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?"
#: Merge.rc:2437
#, c-format
@@ -4677,8 +4755,18 @@
#: Merge.rc:2440
#, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr "\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n\n\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n%1\n\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
+msgstr ""
+"\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n"
+"\n"
+"\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n"
+"%1\n"
+"\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?"
#: Merge.rc:2446
#, c-format
@@ -4995,17 +5083,17 @@
#: Merge.rc:2545
#, c-format
msgid "Win"
-msgstr ""
+msgstr "Win"
#: Merge.rc:2546
#, c-format
msgid "Mac"
-msgstr ""
+msgstr "Mac"
#: Merge.rc:2547
#, c-format
msgid "Unix"
-msgstr ""
+msgstr "Unix"
#: Merge.rc:2548
#, c-format
@@ -5015,17 +5103,17 @@
#: Merge.rc:2550
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2551
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2552
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2559
#, c-format
@@ -5060,22 +5148,22 @@
#: Merge.rc:2570
#, c-format
msgid "Type"
-msgstr ""
+msgstr "\xD2\xE8\xEF"
#: Merge.rc:2572
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "\xD0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE0\xF2\xEE\xF0"
#: Merge.rc:2573
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xD0\xE0\xE7\xEB\xE8\xEA\xE0"
#: Merge.rc:2574
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "\xD1\xEA\xF0\xE8\xEF\xF2 \xED\xE0 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xE0"
#: Merge.rc:2581
#, c-format
@@ -5100,12 +5188,12 @@
#: Merge.rc:2585
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xEB\xFF\xE2\xEE"
#: Merge.rc:2586
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE"
#: Merge.rc:2587
#, c-format
@@ -5301,13 +5389,21 @@
#: Merge.rc:2630
#, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n\xC5\xE7\xE8\xEA"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n"
+"\xC5\xE7\xE8\xEA"
#: Merge.rc:2631
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n"
+"\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0"
#: Merge.rc:2632
#, c-format
@@ -5358,28 +5454,48 @@
#: Merge.rc:2644
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)"
#: Merge.rc:2645
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)"
#: Merge.rc:2646
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)"
#: Merge.rc:2647
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)"
#: Merge.rc:2648
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)"
#: Merge.rc:2649
#, c-format
@@ -5468,7 +5584,7 @@
#: Merge.rc:2671
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF1\xEF\xE8\xF1\xFA\xEA \xF1 \xED\xE0\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xE4\xEE\xE1\xE0\xE2\xEA\xE8"
#: Merge.rc:2672
#, c-format
@@ -5507,8 +5623,12 @@
#: Merge.rc:2684
#, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n"
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2685
#, c-format
@@ -5517,8 +5637,12 @@
#: Merge.rc:2691
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\nWinMerge \xEF\xEE\xEC\xEE\xF9"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\n"
+"WinMerge \xEF\xEE\xEC\xEE\xF9"
#: Merge.rc:2692
#, c-format
@@ -5537,13 +5661,21 @@
#: Merge.rc:2695
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n\xC1\xE5\xEB\xE5\xE6\xEA\xE8"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n"
+"\xC1\xE5\xEB\xE5\xE6\xEA\xE8"
#: Merge.rc:2696
#, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n\xCF\xF0\xE5\xE2\xEE\xE4\xE8"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n"
+"\xCF\xF0\xE5\xE2\xEE\xE4\xE8"
#: Merge.rc:2702
#, c-format
@@ -5638,117 +5770,117 @@
#: Merge.rc:2741
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "\xC1\xE5\xE7 \xEE\xF6\xE2\xE5\xF2\xFF\xE2\xE0\xED\xE5"
#: Merge.rc:2742
#, c-format
msgid "ASP"
-msgstr ""
+msgstr "ASP"
#: Merge.rc:2743
#, c-format
msgid "Basic"
-msgstr "\xCE\xF1\xED\xEE\xE2\xE5\xED"
+msgstr "Basic"
#: Merge.rc:2744
#, c-format
msgid "Batch"
-msgstr ""
+msgstr "Batch"
#: Merge.rc:2745
#, c-format
msgid "C/C++"
-msgstr ""
+msgstr "C/C++"
#: Merge.rc:2746
#, c-format
msgid "C#"
-msgstr ""
+msgstr "C#"
#: Merge.rc:2747
#, c-format
msgid "CSS"
-msgstr ""
+msgstr "CSS"
#: Merge.rc:2748
#, c-format
msgid "DCL"
-msgstr ""
+msgstr "DCL"
#: Merge.rc:2749
#, c-format
msgid "Fortran"
-msgstr ""
+msgstr "Fortran"
#: Merge.rc:2750
#, c-format
msgid "HTML"
-msgstr ""
+msgstr "HTML"
#: Merge.rc:2751
#, c-format
msgid "INI"
-msgstr ""
+msgstr "INI"
#: Merge.rc:2752
#, c-format
msgid "InnoSetup"
-msgstr ""
+msgstr "InnoSetup"
#: Merge.rc:2753
#, c-format
msgid "InstallShield"
-msgstr ""
+msgstr "InstallShield"
#: Merge.rc:2754
#, c-format
msgid "Java"
-msgstr ""
+msgstr "Java"
#: Merge.rc:2755
#, c-format
msgid "AutoLISP"
-msgstr ""
+msgstr "AutoLISP"
#: Merge.rc:2756
#, c-format
msgid "NSIS"
-msgstr ""
+msgstr "NSIS"
#: Merge.rc:2757
#, c-format
msgid "Pascal"
-msgstr ""
+msgstr "Pascal"
#: Merge.rc:2758
#, c-format
msgid "Perl"
-msgstr ""
+msgstr "Perl"
#: Merge.rc:2759
#, c-format
msgid "PHP"
-msgstr ""
+msgstr "PHP"
#: Merge.rc:2760
#, c-format
msgid "Portable Object"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xED\xEE\xF1\xE8\xEC \xEE\xE1\xE5\xEA\xF2"
#: Merge.rc:2761
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2762
#, c-format
msgid "Python"
-msgstr ""
+msgstr "Python"
#: Merge.rc:2763
#, c-format
msgid "REXX"
-msgstr ""
+msgstr "REXX"
#: Merge.rc:2764
#, c-format
@@ -5758,47 +5890,47 @@
#: Merge.rc:2765
#, c-format
msgid "Ruby"
-msgstr ""
+msgstr "Ruby"
#: Merge.rc:2766
#, c-format
msgid "SGML"
-msgstr ""
+msgstr "SGML"
#: Merge.rc:2767
#, c-format
msgid "Shell"
-msgstr ""
+msgstr "Shell"
#: Merge.rc:2768
#, c-format
msgid "SIOD"
-msgstr ""
+msgstr "SIOD"
#: Merge.rc:2769
#, c-format
msgid "SQL"
-msgstr ""
+msgstr "SQL"
#: Merge.rc:2770
#, c-format
msgid "TCL"
-msgstr ""
+msgstr "TCL"
#: Merge.rc:2771
#, c-format
msgid "TEX"
-msgstr ""
+msgstr "TEX"
#: Merge.rc:2772
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2773
#, c-format
msgid "XML"
-msgstr ""
+msgstr "XML"
#: Merge.rc:2778
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|