[Winmerge-svn] SF.net SVN: winmerge: [5550] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-07-02 09:08:55
|
Revision: 5550 http://winmerge.svn.sourceforge.net/winmerge/?rev=5550&view=rev Author: kimmov Date: 2008-07-02 02:08:49 -0700 (Wed, 02 Jul 2008) Log Message: ----------- PATCH: [ 2007426 ] Chinese Simplified translation for trunk, all in one Submitted by xmpdhml Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl trunk/Installer/InnoSetup/WinMerge.iss trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc trunk/Src/Languages/ChineseSimplified.po Added Paths: ----------- trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-01 21:36:33 UTC (rev 5549) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-02 09:08:49 UTC (rev 5550) @@ -9,6 +9,8 @@ Reduce executable sizes (#2003203) BugFix: Possible crash when enabling line filter (#2004160) BugFix: Location Pane flickers when scrolling (#1938177, #2005031) + Translation updates: + - Chinese Traditional (#2007426) WinMerge 2.9.1.4 - 2008-06-24 (r5518) Use PCRE regular expressions in the editor (#1991259) Added: trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt =================================================================== --- trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt (rev 0) +++ trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt 2008-07-02 09:08:49 UTC (rev 5550) @@ -0,0 +1,49 @@ +WINMERGE + +WinMerge \xCA\xC7һ\xBF\xEE\xD3\xC3\xD2Զ\xD4\xCEļ\xFE\xBD\xF8\xD0жԱ\xC8\xD2Լ\xB0\xBAϲ\xA2\xA3\xAC\xBF\xC9\xD2\xD4\xD4\xCB\xD0\xD0\xD4\xDA\xCB\xF9\xD3\xD0\xC1\xF7\xD0е\xC4 +Windowsƽ̨\xC9ϵĿ\xAAԴ\xC8\xED\xBC\xFE\xA1\xA3\xD3\xD0Щ\xB9\xA6\xC4\xDC\xD0\xE8Ҫ\xB6\xEE\xCDⰲװ\xD7\xE9\xBC\xFE\xA1\xA3 + +\xD7\xEE\xD0µ\xC4 WinMerge \xB0汾\xD2Լ\xB0\xC6\xE4\xCB\xFC\xCF\xE0\xB9\xD8\xD0\xC5Ϣ\xBF\xC9\xD2Դ\xD3 http://winmerge.org \xB5õ\xBD\xA1\xA3 + +WinMerge \xBF\xEC\xCB\xD9\xC8\xEB\xC3ţ\xBA +\xC7\xEB\xD4Ķ\xC1\xD4\xDA\xCF\xDF\xCAֲ\xE1\xB5ġ\xB0Quick-start\xA1\xB1\xD5½\xDA\xC0\xB4\xC1˽Ⲣ\xBF\xAAʼ\xBC\xB4\xD3\xC3 WinMerge \xA3\xBA +http://www.winmerge.org/2.8/manual/quickstart.html + +HTML \xCAֲ +\xD3û\xA7\xCAֲ\xE1\xBF\xC9\xD2Դ\xD3 http://www.winmerge.org/2.8/manual/ \xB5õ\xBD\xA3\xACҲ\xBF\xC9\xD2\xD4\xD4ڰ\xB2װʱѡ\xD4\xF1 +\xB0\xB2װ\xB5\xBD\xB1\xBE\xB5أ\xAC\xBB\xF2\xD5\xDFҲ\xBF\xC9\xD2Ե\xA5\xB6\xC0\xB4\xD3 http://www.winmerge.org/ \xCF\xC2\xD4ء\xA3(\xB2μ\xFB\xCEĵ\xB5) + +ѹ\xCB\xF5\xB0\xFC֧\xB3֣\xBA +WinMerge ʹ\xD3\xC3 7-Zip ֧\xB3\xD6ѹ\xCB\xF5\xB0\xFC\xA1\xA37-Zip (http://www.7-zip.org) \xCA\xC7һ\xB8\xF6\xBF\xAAԴ\xB5Ĵ\xF2 +\xB0\xFC\xC8\xED\xBC\xFE\xA1\xA3Ҫ\xB0\xB2װѹ\xCB\xF5\xB0\xFC֧\xB3֣\xAC\xC7\xEB\xB4\xD3 http://www.winmerge.org/ \xCF\xC2\xD4\xD8 7-Zip \xB2\xE5\xBC\xFE\xB0\xB2װ +\xB3\xCC\xD0\xF2\xA1\xA3 + +\xB0\xB2װѹ\xCB\xF5\xB0\xFC֧\xB3֣\xBA +\xCDƼ\xF6\xB0\xB2װ 7-Zip Ӧ\xD3ó\xCC\xD0\xF2\xA1\xA3\xC8\xE7\xB9\xFB\xB2\xBB\xC4ܰ\xB2װ\xB5Ļ\xB0\xA3\xAC7-Zip \xB2\xE5\xBC\xFE\xB0\xB2װ\xB3\xCC\xD0\xF2ֻ\xBBᰲװ\xC4\xC7Щ֧ +\xB3\xD6ѹ\xCB\xF5\xB0\xFC\xCB\xF9\xB1\xD8\xD0\xE8\xB5\xC4\xCEļ\xFE\xA1\xA3\xC7\xEBע\xD2\xE2\xD5\xE2\xD6\xD6\xC7\xE9\xBF\xF6\xCF½\xAB*\xB2\xBB\xC4\xDC*\xB5\xA5\xB6\xC0ʹ\xD3\xC3 7-Zip\xA3\xACֻ\xC4\xDC\xD4\xDA +WinMerge \xD6\xD0֧\xB3\xD6ѹ\xCB\xF5\xB0\xFC\xA1\xA3 + +\xBDű\xBE֧\xB3֣\xBA +\xC8\xE7\xB9\xFB\xC4\xFA\xCF\xEBʹ\xD3ýű\xBE\xA3\xAC\xC4\xFA\xD0\xE8Ҫ\xB0\xB2װ Windows Script Host\xA1\xA3\xC8\xE7\xB9\xFB\xC4\xFA\xD3\xF6\xB5\xBD\xC8κι\xD8\xD3ڽű\xBE\xB5\xC4 +\xCE\xCA\xCC⣬\xC7\xEB\xB7\xC3\xCE\xCA +http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp +\xD2\xD4ȷ\xB6\xA8\xC4\xFA\xB5\xC4 Windows Script Host \xD2Ѿ\xAD\xC6\xA2\xC7\xD2\xD4\xCB\xD0\xD0\xD5\xFD\xB3\xA3\xA1\xA3 + +֧\xB3֣\xBA +\xBF\xAA\xB7\xA2\xC8\xCBԱ\xBB\xE1\xD4\xDA Sourceforge.net \xB5\xC4 WinMerge \xB0\xE6\xC3\xE6\xBBش\xF0\xCE\xCA\xCC⣬\xB5\xD8ַ\xC8\xE7\xCF£\xBA +http://sourceforge.net/forum/?group_id=13216 + +Bug \xBA\xA6\xC4\xDC\xD0\xE8\xC7\xF3\xA3\xBA +Bug \xBAͶ\xD4\xD0¹\xA6\xC4ܵĽ\xA8\xD2\xE9Ӧ\xB5\xB1\xCCύ\xB5\xBD sourceforge.net \xB5\xC4 bug \xBA\xCD RFE trackers \xC9ϡ\xA3 + +Bug tracker: +http://sourceforge.net/tracker/?group_id=13216&atid=113216 +\xB5\xB1\xC4\xFA\xCCύ bug ʱ\xA3\xAC\xC7\xEB\xB8\xE6\xCB\xDF\xCE\xD2\xC3\xC7 WinMerge \xB5İ汾\xBAţ\xA1 +WinMerge 2.2.0 \xBC\xB0\xD2\xD4\xC9ϰ汾\xBF\xC9\xD2\xD4ѡ\xD4\xF1\xB2˵\xA5\xA1\xB0\xB0\xEF\xD6\xFA/\xC5\xE4\xD6á\xB1\xC0\xB4\xCA\xE4\xB3\xF6\xC5\xE4\xD6\xC3\xD0\xC5Ϣ\xA1\xA3\xC7\xEB\xB0\xD1\xD5\xE2\xB8\xF6 +\xCEļ\xFE\xD2Ը\xBD\xBC\xFE\xB5ķ\xBDʽ\xBCӵ\xBD bug \xB1\xA8\xB8\xE6\xD6У\xAC\xCB\xFC\xB0\xFC\xC0\xA8\xD0\xED\xB6\xE0\xB6\xD4\xD3ڿ\xAA\xB7\xA2\xC8\xCBԱ\xB7dz\xA3\xD3\xD0\xD3õ\xC4\xD0\xC5Ϣ\xA1\xA3 + +RFE (\xB9\xA6\xC4\xDC) tracker: +http://sourceforge.net/tracker/?group_id=13216&atid=363216 + + +- WinMerge \xBF\xAA\xB7\xA2\xC8\xCBԱ Property changes on: trunk/Docs/Users/Languages/ReadMe-ChineseSimplified.txt ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl =================================================================== --- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-07-01 21:36:33 UTC (rev 5549) +++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-07-02 09:08:49 UTC (rev 5550) @@ -70,7 +70,7 @@ AboutSetupNote= ; *** Buttons -TranslatorNote=\xBC\xF2\xCC\xE5\xD6\xD0\xCEķ\xAD\xD2\xEB\xD3ɰ\xD7\xC5\xF4֧\xB3֣\xA8...@si...\xA3\xA9 +TranslatorNote=\xBC\xF2\xCC\xE5\xD6\xD0\xCEķ\xAD\xD2\xEB\xD3\xC9 Сè\xC6˵ú\xDC\xC2\xF4\xC1\xA6(xm...@gm...) ֧\xB3\xD6 ButtonBack=< \xC9\xCFһ\xB2\xBD(&B) ButtonNext=\xCF\xC2һ\xB2\xBD(&N) > ButtonInstall=\xB0\xB2װ(&I) @@ -314,22 +314,22 @@ CompanyName=Thingamahoochie Software ;Types -TypicalInstallation=Typical Installation -FullInstallation=Full Installation -CompactInstallation=Compact Installation -CustomInstallation=Custom Installation +TypicalInstallation=\xB5\xE4\xD0Ͱ\xB2װ +FullInstallation=ȫ\xB2\xBF\xB0\xB2װ +CompactInstallation=\xD7\xEEС\xB0\xB2װ +CustomInstallation=\xD7Զ\xA8\xD2尲װ ;Components -AppCoreFiles=WinMerge Core Files -ApplicationRuntimes=Application Runtimes -Filters=Filters -Plugins=Plugins +AppCoreFiles=WinMerge \xBA\xCB\xD0\xC4\xCEļ\xFE +ApplicationRuntimes=Ӧ\xD3ó\xCC\xD0\xF2 +Filters=\xB9\xFD\xC2\xCB\xC6\xF7 +Plugins=\xB2\xE5\xBC\xFE ;Localization Components -Languages=Languages +Languages=\xD3\xEF\xD1\xD4 BulgarianLanguage=Bulgarian menus and dialogs CatalanLanguage=Catalan menus and dialogs -ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs +ChineseSimplifiedLanguage=\xBC\xF2\xCC\xE5\xD6\xD0\xCEIJ˵\xA5\xBAͶԻ\xB0\xBF\xF2 ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs CroatianLanguage=Croatian menus and dialogs CzechLanguage=Czech menus and dialogs @@ -356,22 +356,22 @@ UkrainianLanguage=Ukrainian menus and dialogs ;Tasks -ExplorerContextMenu=&Enable Explorer context menu integration -IntegrateTortoiseCVS=Integrate with &TortoiseCVS -IntegrateTortoiseSVN=Integrate with T&ortoiseSVN -IntegrateClearCase=Integrate with Rational &ClearCase -IntegrateDelphi4=Borland Delphi &4 Binary File Support -UpdatingCommonControls=Updating the System's Common Controls +ExplorerContextMenu=\xBC\xAF\xB3ɵ\xBD\xD7\xCAԴ\xB9\xDC\xC0\xED\xC6\xF7\xD3Ҽ\xFC\xB2˵\xA5(&E) +IntegrateTortoiseCVS=\xBC\xAF\xB3ɵ\xBD &TortoiseCVS +IntegrateTortoiseSVN=\xBC\xAF\xB3ɵ\xBD T&ortoiseSVN +IntegrateClearCase=\xBC\xAF\xB3ɵ\xBD Rational &ClearCase +IntegrateDelphi4=֧\xB3\xD6 Borland Delphi &4 \xB6\xFE\xBD\xF8\xD6\xC6\xCEļ\xFE +UpdatingCommonControls=\xB8\xFC\xD0\xC2ϵͳ\xB5\xC4 Common Controls ;Icon Labels -ReadMe=Read Me -UsersGuide=User's Guide -UpdatingCommonControls=Updating the System's Common Controls -ViewStartMenuFolder=&View the WinMerge Start Menu Folder -PluginsText=Plugins +ReadMe=˵\xC3\xF7\xCEļ\xFE +UsersGuide=\xD3û\xA7\xCAֲ\xE1 +UpdatingCommonControls=\xB8\xFC\xD0\xC2ϵͳ\xB5\xC4 Common Controls +ViewStartMenuFolder=\xB2鿴 WinMerge \xBF\xAAʼ\xB2˵\xA5\xCEļ\xFE\xBC\xD0(&V) +PluginsText=\xB2\xE5\xBC\xFE ;Code Dialogs -DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder? +DeletePreviousStartMenu=\xB0\xB2װ\xB3\xCC\xD0\xF2\xBC\xEC\xB2\xC4\xFA\xD0\xC4\xC1˿\xAAʼ\xB2˵\xA5\xB5\xC4λ\xD6\xC3(\xB4\xD3"%s"\xB5\xBD"%s")\xA3\xAC\xCAǷ\xF1Ҫɾ\xB3\xFD֮ǰ\xB5Ŀ\xAAʼ\xB2˵\xA5\xCEļ\xFE\xBCУ\xBF ; Project file description -ProjectFileDesc=WinMerge Project file +ProjectFileDesc=WinMerge \xB9\xA4\xB3\xCC\xCEļ\xFE Modified: trunk/Installer/InnoSetup/WinMerge.iss =================================================================== --- trunk/Installer/InnoSetup/WinMerge.iss 2008-07-01 21:36:33 UTC (rev 5549) +++ trunk/Installer/InnoSetup/WinMerge.iss 2008-07-02 09:08:49 UTC (rev 5550) @@ -117,7 +117,7 @@ ;Localizations: Name: Bulgarian; MessagesFile: Languages\Bulgarian.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt Name: Catalan; MessagesFile: Languages\Catalan.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Catalan.txt -Name: Chinese_Simplified; MessagesFile: Languages\Chinese_Simplified.isl +Name: Chinese_Simplified; MessagesFile: Languages\Chinese_Simplified.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-ChineseSimplified.txt Name: Chinese_Traditional; MessagesFile: Languages\Chinese_Traditional.isl Name: Croatian; MessagesFile: Languages\Croatian.isl Name: Czech; MessagesFile: Languages\Czech.isl Modified: trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc =================================================================== --- trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc 2008-07-01 21:36:33 UTC (rev 5549) +++ trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc 2008-07-02 09:08:49 UTC (rev 5550) @@ -32,14 +32,14 @@ BEGIN IDS_PROJNAME "ShellExtension" IDS_CONTEXT_MENU "WinMerge" - IDS_CONTEXT_HELP "Open with WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items" - IDS_COMPARE "Compare" - IDS_COMPARE_ELLIPSIS "Compare..." - IDS_COMPARE_TO "Compare To" - IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." - IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_FIRST "Re-select First" + IDS_CONTEXT_HELP "\xD3\xC3 WinMerge \xB4\xF2\xBF\xAA" + IDS_CONTEXT_HELP_MANYITEMS "\xC7벻Ҫѡ\xD6г\xAC\xB9\xFD2\xB8\xF6\xCF\xEEĿ" + IDS_COMPARE "\xB6Ա\xC8" + IDS_COMPARE_ELLIPSIS "\xB6Ա\xC8..." + IDS_COMPARE_TO "\xBA\xCD\xC1\xED\xCD\xE2һ\xB8\xF6\xB6Ա\xC8" + IDS_HELP_SAVETHIS "\xB1\xA3\xB4\xE6\xD5\xE2\xB8\xF6·\xBE\xB6\xA1\xA3ѡ\xD4\xF1\xC1\xED\xCD\xE2һ\xB8\xF6·\xBE\xB6\xD3\xEB֮\xBD\xF8\xD0жԱȡ\xA3" + IDS_HELP_COMPARESAVED "\xD3뱣\xB4\xE6\xB5\xC4·\xBE\xB6(%1)\xBD\xF8\xD0жԱ\xC8" + IDS_RESELECT_FIRST "\xD6\xD8\xD0\xC2ѡ\xD4\xF1\xB5\xDAһ\xB8\xF6·\xBE\xB6" END #endif // Chinese (Traditional) resources Modified: trunk/Src/Languages/ChineseSimplified.po =================================================================== --- trunk/Src/Languages/ChineseSimplified.po 2008-07-01 21:36:33 UTC (rev 5549) +++ trunk/Src/Languages/ChineseSimplified.po 2008-07-02 09:08:49 UTC (rev 5550) @@ -14,7 +14,7 @@ "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" -"Last-Translator: \n" +"Last-Translator: xmpdhml <xm...@us...>\n" "Language-Team: ChineseSimplified <win...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP936\n" @@ -41,18 +41,18 @@ #: Merge.rc:99 #, c-format msgid "C&opy to Right" -msgstr "\xB8\xB4\xD6Ƶ\xBD\xD3Ҳ\xE0(&R)" +msgstr "\xB8\xB4\xD6Ƶ\xBD\xD3Ҳ\xE0(&O)" #: Merge.rc:73 #: Merge.rc:100 #, c-format msgid "Cop&y to Left" -msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&L)" +msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&Y)" #: Merge.rc:75 #, c-format msgid "&Select Line Difference" -msgstr "ѡ\xD6\xD0\xD0\xD0\xD6в\xBBͬ(&S)" +msgstr "ѡ\xD6\xD0\xD0\xD0\xC4ڲ\xBBͬ(&S)" #: Merge.rc:77 #, c-format @@ -68,7 +68,7 @@ #: Merge.rc:102 #, c-format msgid "Cu&t" -msgstr "\xBC\xF4\xC7\xD0(&U)" +msgstr "\xBC\xF4\xC7\xD0(&T)" #: Merge.rc:81 #: Merge.rc:103 @@ -139,14 +139,14 @@ #: Merge.rc:114 #, c-format msgid "Op&en Conflict File..." -msgstr "" +msgstr "\xB4\xE5ͻ\xCEļ\xFE(&E)..." #: Merge.rc:116 #: Merge.rc:194 #: Merge.rc:308 #, c-format msgid "Open Pro&ject...\tCtrl+J" -msgstr "\xB4\xA4\xB3\xCC...\tCtrl+J" +msgstr "\xB4\xA4\xB3\xCC(J)...\tCtrl+J" #: Merge.rc:117 #: Merge.rc:195 @@ -270,7 +270,7 @@ #: Merge.rc:439 #, c-format msgid "&Generate Patch..." -msgstr "\xC9\xFA\xB3\xC9 Patch(&G)..." +msgstr "\xC9\xFA\xB3ɲ\xB9\xB6\xA1(&G)..." #: Merge.rc:148 #: Merge.rc:262 @@ -340,7 +340,7 @@ #: Merge.rc:463 #, c-format msgid "Cl&ose" -msgstr "\xB9ر\xD5" +msgstr "\xB9ر\xD5(&O)" #: Merge.rc:165 #: Merge.rc:279 @@ -361,21 +361,21 @@ #: Merge.rc:468 #, c-format msgid "Tile &Horizontally" -msgstr "ˮƽ\xB2\xA2\xC5\xC5(&H)" +msgstr "ˮƽƽ\xC6\xCC(&H)" #: Merge.rc:170 #: Merge.rc:284 #: Merge.rc:469 #, c-format msgid "Tile &Vertically" -msgstr "\xB4\xB9ֱ\xB2\xA2\xC5\xC5(&V)" +msgstr "\xB4\xB9ֱƽ\xC6\xCC(&V)" #: Merge.rc:171 #: Merge.rc:285 #: Merge.rc:470 #, c-format msgid "&Cascade" -msgstr "\xD6ص\xFE(&C)" +msgstr "\xB2\xE3\xB5\xFE(&C)" #: Merge.rc:173 #: Merge.rc:287 @@ -390,28 +390,28 @@ #: Merge.rc:474 #, c-format msgid "&WinMerge Help\tF1" -msgstr "" +msgstr "&WinMerge\xB0\xEF\xD6\xFA\tF1" #: Merge.rc:177 #: Merge.rc:291 #: Merge.rc:476 #, c-format msgid "R&elease Notes" -msgstr "" +msgstr "\xB7\xA2\xD0\xD0˵\xC3\xF7(&E)" #: Merge.rc:178 #: Merge.rc:292 #: Merge.rc:477 #, c-format msgid "&Translations" -msgstr "" +msgstr "\xB7\xAD\xD2\xEB(&T)" #: Merge.rc:179 #: Merge.rc:293 #: Merge.rc:478 #, c-format msgid "C&onfiguration" -msgstr "" +msgstr "\xC5\xE4\xD6\xC3(&O)" #: Merge.rc:180 #: Merge.rc:294 @@ -425,7 +425,7 @@ #: Merge.rc:481 #, c-format msgid "&GNU General Public License" -msgstr "" +msgstr "&GNU General Public License" #: Merge.rc:183 #: Merge.rc:297 @@ -485,7 +485,7 @@ #: Merge.rc:217 #, c-format msgid "S&how Binary Files" -msgstr "\xCF\xD4ʾ\xB6\xFE\xBD\xF8\xD6\xC6\xCF\xEEĿ(&H)" +msgstr "\xCF\xD4ʾ\xB6\xFE\xBD\xF8\xD6\xC6\xCEļ\xFE(&H)" #: Merge.rc:219 #, c-format @@ -547,7 +547,7 @@ #: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" -msgstr "\xD7\xEE\xBA\xF3һ\xB4\xA6\xB2\xBBͬ(&D)\tAlt+End" +msgstr "\xD7\xEE\xBA\xF3һ\xB4\xA6\xB2\xBBͬ(&L)\tAlt+End" #: Merge.rc:250 #: Merge.rc:427 @@ -559,7 +559,7 @@ #: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" -msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&L)\tAlt+Left" +msgstr "\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&E)\tAlt+Left" #: Merge.rc:253 #, c-format @@ -618,7 +618,7 @@ #: Merge.rc:325 #, c-format msgid "Print Previe&w" -msgstr "\xB4\xF2ӡԤ\xC0\xC0" +msgstr "\xB4\xF2ӡԤ\xC0\xC0(&W)" #: Merge.rc:330 #, c-format @@ -628,27 +628,27 @@ #: Merge.rc:332 #, c-format msgid "&Windows (CRLF)" -msgstr "" +msgstr "&Windows (CRLF)" #: Merge.rc:333 #, c-format msgid "&Unix (LF)" -msgstr "" +msgstr "&Unix (LF)" #: Merge.rc:334 #, c-format msgid "&Mac (CR)" -msgstr "" +msgstr "&Mac (CR)" #: Merge.rc:337 #, c-format msgid "&Merge Mode\tF9" -msgstr "\xBAϲ\xA2ģʽ\tF9" +msgstr "\xBAϲ\xA2ģʽ(&M)\tF9" #: Merge.rc:339 #, c-format msgid "&File Encoding..." -msgstr "" +msgstr "\xCEļ\xFE\xB1\xE0\xC2\xEB(&F)..." #: Merge.rc:345 #, c-format @@ -663,7 +663,7 @@ #: Merge.rc:348 #, c-format msgid "Cu&t\tCtrl+X" -msgstr "\xBC\xF4\xC7\xD0(&U)\tCtrl+X" +msgstr "\xBC\xF4\xC7\xD0(&T)\tCtrl+X" #: Merge.rc:349 #, c-format @@ -678,7 +678,7 @@ #: Merge.rc:352 #, c-format msgid "Select Line &Difference\tF4" -msgstr "ѡ\xD6\xD0\xD0\xD0\xD6в\xBBͬ(&D)\tF4" +msgstr "ѡ\xD6\xD0\xD0\xD0\xC4ڲ\xBBͬ(&D)\tF4" #: Merge.rc:355 #, c-format @@ -724,7 +724,7 @@ #: Merge.rc:371 #, c-format msgid "&Next Bookmark\tF2" -msgstr "\xCF\xC2һ\xB8\xF6(&N\tF2" +msgstr "\xCF\xC2һ\xB8\xF6(&N)\tF2" #: Merge.rc:372 #, c-format @@ -744,23 +744,23 @@ #: Merge.rc:383 #, c-format msgid "&Zoom" -msgstr "" +msgstr "\xCB\xF5\xB7\xC5(&Z)" #: Merge.rc:385 #, c-format msgid "Zoom &In\tCtrl++" -msgstr "" +msgstr "\xB7Ŵ\xF3(&I)\tCtrl++" #: Merge.rc:386 #, c-format msgid "Zoom &Out\tCtrl+-" -msgstr "" +msgstr "\xCB\xF5С(&O)\tCtrl+-" #. Zoom to normal #: Merge.rc:387 #, c-format msgid "&Normal\tCtrl+*" -msgstr "" +msgstr "\xD5\xFD\xB3\xA3\xB4\xF3С(&N)\tCtrl+*" #: Merge.rc:389 #, c-format @@ -770,7 +770,7 @@ #: Merge.rc:394 #, c-format msgid "&Lock Panes" -msgstr "" +msgstr "\xCB\xB8\xF1(&L)" #: Merge.rc:395 #, c-format @@ -780,7 +780,7 @@ #: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" -msgstr "\xCF\xD4ʾ\xD0\xD0\xD6в\xBBͬ(&W)" +msgstr "\xCF\xD4ʾ\xD0\xD0\xC4ڲ\xBBͬ(&W)" #: Merge.rc:397 #, c-format @@ -830,7 +830,7 @@ #: Merge.rc:434 #, c-format msgid "Cop&y All to Left" -msgstr "ȫ\xB2\xBF\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&E)" +msgstr "ȫ\xB2\xBF\xB8\xB4\xD6Ƶ\xBD\xD7\xF3\xB2\xE0(&Y)" #: Merge.rc:449 #, c-format @@ -845,12 +845,12 @@ #: Merge.rc:491 #, c-format msgid "Co&mpare Special" -msgstr "" +msgstr "\xCC\xD8\xCA\xE2\xB6Ա\xC8(&M)" #: Merge.rc:493 #, c-format msgid "&XML" -msgstr "" +msgstr "&XML" #: Merge.rc:498 #, c-format @@ -959,7 +959,7 @@ #: Merge.rc:538 #, c-format msgid "&Zip" -msgstr "" +msgstr "&Zip" #: Merge.rc:540 #, c-format @@ -1039,7 +1039,7 @@ #: Merge.rc:656 #, c-format msgid "(Private Build)" -msgstr "" +msgstr "(Private Build)" #: Merge.rc:657 #, c-format @@ -1070,7 +1070,7 @@ #: Merge.rc:662 #, c-format msgid "Contributors" -msgstr "" +msgstr "\xB9\xB1\xCF\xD7\xD5\xDF" #: Merge.rc:669 #, c-format @@ -1123,7 +1123,7 @@ #: Merge.rc:689 #, c-format msgid "&Select..." -msgstr "ѡ\xD4\xF1..." +msgstr "ѡ\xD4\xF1(&S)..." #: Merge.rc:690 #: Merge.rc:1598 @@ -1168,7 +1168,7 @@ #: Merge.rc:703 #, c-format msgid "Visual SourceSafe" -msgstr "" +msgstr "Visual SourceSafe" #: Merge.rc:708 #, c-format @@ -1241,7 +1241,7 @@ #: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" -msgstr "ͣ\xD3\xC3\xC6\xF4\xB6\xAF\xC6\xC1Ļ(&D)" +msgstr "ͣ\xD3û\xB6ӭ\xC6\xC1Ļ(&D)" #: Merge.rc:750 #, c-format @@ -1251,22 +1251,22 @@ #: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" -msgstr "\xD4ڡ\xB0\xB4\xB1\xB6Ի\xB0\xBF\xF2\xD6\xD0\xD7Զ\xAF\xD1\xE9֤·\xBE\xB6" +msgstr "\xD4ڡ\xB0\xB4\xB1\xB6Ի\xB0\xBF\xF2\xD6\xD0\xD7Զ\xAF\xD1\xE9֤·\xBE\xB6(&A)" #: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" -msgstr "ֻ\xD4\xCA\xD0\xED\xD4\xCB\xD0\xD0һ\xB8\xF6ʵ\xC0\xFD(&A)" +msgstr "ֻ\xD4\xCA\xD0\xED\xD4\xCB\xD0\xD0һ\xB8\xF6ʵ\xC0\xFD(&O)" #: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" -msgstr "" +msgstr "\xB5\xB1\xB9رն\xE0\xB8\xDAʱѯ\xCE\xCA\xCE\xD2(&K)" #: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" -msgstr "" +msgstr "\xB6Ա\xC8ʱ\xB1\xA3\xB3\xD6\xCEļ\xFEʱ\xBC䲻\xB1\xE4(&P)" #: Merge.rc:762 #, c-format @@ -1342,7 +1342,7 @@ #: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" -msgstr "\xB5\xBD\xCEļ\xFEβ\xBA\xF3\xB2\xBB\xD4ٴ\xD3ͷ\xB2\xE9\xD5\xD2(&O)" +msgstr "\xD6\xC1\xCEļ\xFEĩβ\xB2\xBB\xD4ٴ\xD3ͷ\xCB\xD1\xCB\xF7(&O)" #: Merge.rc:808 #, c-format @@ -1409,7 +1409,7 @@ #: Merge.rc:2134 #, c-format msgid "Rational ClearCase" -msgstr "" +msgstr "Rational ClearCase" #: Merge.rc:855 #, c-format @@ -1420,12 +1420,12 @@ #: Merge.rc:1172 #, c-format msgid "Comments" -msgstr "\xC5\xFAע" +msgstr "\xB1\xB8ע" #: Merge.rc:863 #, c-format msgid "CheckIn after checkout" -msgstr "" +msgstr "ǩ\xB3\xF6\xBA\xF3\xC1\xA2\xBC\xB4ǩ\xC8\xEB" #: Merge.rc:869 #, c-format @@ -1514,12 +1514,12 @@ #: Merge.rc:946 #, c-format msgid "Word Difference:" -msgstr "\xB4\xCA\xD3ﲻͬ:" +msgstr "\xB5\xA5\xB4ʲ\xBBͬ:" #: Merge.rc:953 #, c-format msgid "Selected Word Diff:" -msgstr "ѡ\xD6еĴ\xCA\xD3ﲻͬ:" +msgstr "ѡ\xD6еĵ\xA5\xB4ʲ\xBBͬ:" #: Merge.rc:960 #: Merge.rc:1046 @@ -1535,7 +1535,7 @@ #: Merge.rc:1551 #, c-format msgid "Dialog" -msgstr "" +msgstr "\xB6Ի\xB0\xBF\xF2" #: Merge.rc:976 #: Merge.rc:1905 @@ -1581,22 +1581,22 @@ #: Merge.rc:993 #, c-format msgid "B&rowse..." -msgstr "" +msgstr "\xE4\xAF\xC0\xC0(&R)..." #: Merge.rc:994 #, c-format msgid "Temporary files folder" -msgstr "" +msgstr "\xC1\xD9ʱ\xCEļ\xFE\xBC\xD0" #: Merge.rc:995 #, c-format msgid "S&ystem's temp folder" -msgstr "" +msgstr "ϵͳ\xC1\xD9ʱ\xCEļ\xFE\xBC\xD0(&Y)" #: Merge.rc:997 #, c-format msgid "C&ustom folder:" -msgstr "" +msgstr "\xD7Զ\xA8\xD2\xE5\xCEļ\xFE\xBC\xD0(&U):" #: Merge.rc:1000 #: Merge.rc:1016 @@ -1607,7 +1607,7 @@ #: Merge.rc:1006 #, c-format msgid "Patch Generator" -msgstr "Patch\xC9\xFA\xB3\xC9\xC6\xF7" +msgstr "\xB2\xB9\xB6\xA1\xC9\xFA\xB3\xC9\xC6\xF7" #: Merge.rc:1009 #, c-format @@ -1662,12 +1662,12 @@ #: Merge.rc:1034 #, c-format msgid "I&gnore changes" -msgstr "\xBA\xF6\xC2Ա仯(G)" +msgstr "\xBA\xF6\xC2Կհ\xCD\xD6Ʊ\xED\xB7\xFB\xB8\xFC\xB8\xC4(G)" #: Merge.rc:1036 #, c-format msgid "Ig&nore all" -msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3\xD0(&N)" +msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3пհ\xCD\xD6Ʊ\xED\xB7\xFB(&N)" #: Merge.rc:1038 #, c-format @@ -1697,12 +1697,12 @@ #: Merge.rc:1072 #, c-format msgid "Move &Up" -msgstr "" +msgstr "\xC9\xCF\xD2\xC6(&U)" #: Merge.rc:1073 #, c-format msgid "Move &Down" -msgstr "" +msgstr "\xCF\xC2\xD2\xC6(&D)" #: Merge.rc:1083 #, c-format @@ -1804,17 +1804,17 @@ #: Merge.rc:1147 #, c-format msgid "&Compare" -msgstr "\xB6Աȿհ\xCD\xD6Ʊ\xED\xB7\xFB(&W)" +msgstr "\xB6Աȿհ\xCD\xD6Ʊ\xED\xB7\xFB(&C)" #: Merge.rc:1149 #, c-format msgid "&Ignore change" -msgstr "\xBA\xF6\xC2Կհ\xCD\xD6Ʊ\xED\xB7\xFB\xB8\xFC\xB8\xC4(&H)" +msgstr "\xBA\xF6\xC2Կհ\xCD\xD6Ʊ\xED\xB7\xFB\xB8\xFC\xB8\xC4(&I)" #: Merge.rc:1151 #, c-format msgid "I&gnore all" -msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3пհ\xCD\xD6Ʊ\xED\xB7\xFB(&A)" +msgstr "\xBA\xF6\xC2\xD4\xCB\xF9\xD3пհ\xCD\xD6Ʊ\xED\xB7\xFB(&G)" #: Merge.rc:1153 #, c-format @@ -1824,12 +1824,12 @@ #: Merge.rc:1155 #, c-format msgid "Ignore &case" -msgstr "\xBA\xF6\xC2Դ\xF3Сд(&E)" +msgstr "\xBA\xF6\xC2Դ\xF3Сд(&C)" #: Merge.rc:1157 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" -msgstr "" +msgstr "\xBA\xF6\xC2Ի\xBB\xD0з\xFB\xB2\xEE\xD2\xEC(Windows/Unix/Mac)(&R)" #: Merge.rc:1160 #, c-format @@ -1844,7 +1844,7 @@ #: Merge.rc:1164 #, c-format msgid "Ign&ore time differences less than 3 seconds" -msgstr "\xBA\xF6\xC2Բ\xBB\xD7\xE33\xC3\xEB\xB5\xC4ʱ\xBC\xE4\xB2\xEE\xB1\xF0" +msgstr "\xBA\xF6\xC2Բ\xBB\xD7\xE33\xC3\xEB\xB5\xC4ʱ\xBC\xE4\xB2\xEE\xB1\xF0(&O)" #: Merge.rc:1167 #, c-format @@ -1875,12 +1875,12 @@ #: Merge.rc:1185 #, c-format msgid "&Automatic rescan" -msgstr "\xD7Զ\xAF\xD6\xD8\xD0\xC2ɨ\xC3\xE8(&R)" +msgstr "\xD7Զ\xAF\xD6\xD8\xD0\xC2ɨ\xC3\xE8(&A)" #: Merge.rc:1187 #, c-format msgid "&Preserve original EOL chars" -msgstr "\xB1\xA3\xB3\xD6ԭʼ\xB5Ļ\xBB\xD0з\xFB(&P)" +msgstr "\xB1\xA3\xB3ֻ\xBB\xD0з\xFB\xB2\xBB\xB1\xE4(&P)" #: Merge.rc:1189 #, c-format @@ -1895,22 +1895,22 @@ #: Merge.rc:1193 #, c-format msgid "&Insert Tabs" -msgstr "\xB2\xE5\xC8\xEB\xD6Ʊ\xED\xB7\xFB(&T)" +msgstr "\xB2\xE5\xC8\xEB\xD6Ʊ\xED\xB7\xFB(&I)" #: Merge.rc:1195 #, c-format msgid "Insert &Spaces" -msgstr "\xB2\xE5\xC8\xEB\xBFո\xF1(&N)" +msgstr "\xB2\xE5\xC8\xEB\xBFո\xF1(&S)" #: Merge.rc:1197 #, c-format msgid "Line Difference Coloring" -msgstr "\xD0\xD0\xD6жԱ\xC8" +msgstr "\xD0\xD0\xC4ڶԱ\xC8" #: Merge.rc:1199 #, c-format msgid "View line differences" -msgstr "\xCF\xD4ʾ\xD0\xD0\xD6в\xBBͬ" +msgstr "\xCF\xD4ʾ\xD0\xD0\xC4ڲ\xBBͬ" #: Merge.rc:1201 #, c-format @@ -2092,7 +2092,7 @@ #: Merge.rc:1299 #, c-format msgid "Merge7z000U.dll" -msgstr "" +msgstr "Merge7z000U.dll" #: Merge.rc:1302 #, c-format @@ -2128,7 +2128,7 @@ #: Merge.rc:1313 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" -msgstr "" +msgstr "\xB2\xBB\xD4\xD9\xCF\xD4ʾ\xB4\xCB\xCF\xFBϢ(&M)\xA1\xA3\n(\xC4\xFA\xBF\xC9\xD2\xD4\xD4ڰ\xEF\xD6\xFA\xB2˵\xA5\xC0\xEF\xB5\xF7\xB3\xF6\xB4\xCB\xCF\xFBϢ\xA1\xA3)" #: Merge.rc:1317 #, c-format @@ -2295,7 +2295,7 @@ #: Merge.rc:1455 #, c-format msgid "&Detect archive type from file signature" -msgstr "\xD2\xC0\xBE\xDD\xCA\xF0\xC3\xFB\xBC\xEC\xB2\xE2\xCEļ\xFE\xC0\xE0\xD0\xCD(&D)" +msgstr "\xB8\xF9\xBE\xDD\xC4\xDA\xC8ݼ\xEC\xB2\xE2\xCEļ\xFE\xC0\xE0\xD0\xCD(&D)" #: Merge.rc:1463 #, c-format @@ -2369,7 +2369,7 @@ #: Merge.rc:1515 #, c-format msgid "(Affects)" -msgstr "" +msgstr "(Ӱ\xCF\xEC)" #: Merge.rc:1516 #, c-format @@ -2385,7 +2385,7 @@ #: Merge.rc:1522 #, c-format msgid "..." -msgstr "" +msgstr "..." #: Merge.rc:1520 #, c-format @@ -2512,7 +2512,7 @@ #: Merge.rc:1615 #, c-format msgid "&Original file's folder" -msgstr "ԭʼ\xCEļ\xFE\xCB\xF9\xD4\xDA\xCEļ\xFE\xBC\xD0(&O)" +msgstr "ԭ\xCEļ\xFE\xCB\xF9\xD4\xDA\xCEļ\xFE\xBC\xD0(&O)" #: Merge.rc:1617 #, c-format @@ -2584,32 +2584,32 @@ #: Merge.rc:1706 #, c-format msgid "EXT" -msgstr "" +msgstr "EXT" #: Merge.rc:1707 #, c-format msgid "CAP" -msgstr "" +msgstr "CAP" #: Merge.rc:1708 #, c-format msgid "NUM" -msgstr "" +msgstr "NUM" #: Merge.rc:1709 #, c-format msgid "SCRL" -msgstr "" +msgstr "SCRL" #: Merge.rc:1710 #, c-format msgid "OVR" -msgstr "" +msgstr "OVR" #: Merge.rc:1711 #, c-format msgid "REC" -msgstr "" +msgstr "REC" #: Merge.rc:1717 #, c-format @@ -2653,7 +2653,7 @@ "Save the active document with a new name\n" "Save As" msgstr "" -"\xD2\xD4һ\xB8\xF6\xD0\xC2\xC3\xFB\xB3Ʊ\xA3\xB4浱ǰ\xD6\xD0\xCEļ\xFE\n" +"\xD2\xD4һ\xB8\xF6\xD0\xC2\xC3\xFB\xB3Ʊ\xA3\xB4浱ǰ\xB5\xC4\xCEļ\xFE\n" "\xC1\xED\xB4\xE6Ϊ" #: Merge.rc:1722 @@ -2801,7 +2801,9 @@ msgid "" "Arrange windows so they overlap\n" "Cascade Windows" -msgstr "\xC5\xC5\xC1д\xB0\xBF\xDA\xC8\xC3\xCB\xFC\xC3DZ˴˸\xB2\xB8\xC7n\xD6ص\xFE\xB4\xB0\xBF\xDA" +msgstr "" +"\xC5\xC5\xC1д\xB0\xBF\xDA\xC8\xC3\xCB\xFC\xC3DZ˴˸\xB2\xB8\xC7\n" +"\xB2\xE3\xB5\xFE\xB4\xB0\xBF\xDA" #: Merge.rc:1782 #, fuzzy, c-format @@ -2809,8 +2811,8 @@ "Arrange windows as non-overlapping tiles horizontally\n" "Tile Windows Horizontally" msgstr "" -"\xB7Ǹ\xB2\xB8ǵ\xC4\xC5\xC5\xC1д\xB0\xBF\xDA\n" -"\xB2\xA2\xC1д\xB0\xBF\xDA" +"\xBD\xAB\xB4\xB0\xBFں\xE1\xCF\xF2ƽ\xC6\xCC\xCF\xD4ʾ\n" +"\xBA\xE1\xCF\xF2ƽ\xC6̴\xB0\xBF\xDA" #: Merge.rc:1783 #, fuzzy, c-format @@ -2818,8 +2820,8 @@ "Arrange windows as non-overlapping tiles vertically\n" "Tile Windows Vertically" msgstr "" -"\xB7Ǹ\xB2\xB8ǵ\xC4\xC5\xC5\xC1д\xB0\xBF\xDA\n" -"\xB2\xA2\xC1д\xB0\xBF\xDA" +"\xBD\xAB\xB4\xB0\xBF\xDA\xD7\xDD\xCF\xF2ƽ\xC6\xCC\xCF\xD4ʾ\n" +"\xD7\xDD\xCF\xF2ƽ\xC6̴\xB0\xBF\xDA" #: Merge.rc:1789 #, c-format @@ -2932,7 +2934,7 @@ #: Merge.rc:1806 #, c-format msgid "Automatically resize panes\nLock Panes" -msgstr "" +msgstr "\xD7Զ\xAF\xB5\xF7\xD5\xFB\xB4\xB0\xB8\xF1\xB4\xF3С\n\xCB\xB8\xF1" #: Merge.rc:1812 #, c-format @@ -2977,7 +2979,7 @@ #: Merge.rc:1824 #, c-format msgid "Activate Task List" -msgstr "\xC6\xF4\xD3ù\xA4\xD7\xF7\xC7嵥" +msgstr "\xC6\xF4\xD3\xC3\xC8\xCE\xCE\xF1\xC7嵥" #: Merge.rc:1825 #, c-format @@ -2996,17 +2998,17 @@ #: Merge.rc:1838 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" -msgstr "" +msgstr "\nnFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge \xCEļ\xFE\xB6Ա\xC8" #: Merge.rc:1839 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" -msgstr "" +msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" #: Merge.rc:1846 #, c-format msgid "Preserve original EOL chars" -msgstr "\xB1\xA3\xC1\xF4ԭʼ\xB5Ļ\xBB\xD0з\xFB" +msgstr "\xB1\xA3\xB3ֻ\xBB\xD0з\xFB\xB2\xBB\xB1\xE4" #: Merge.rc:1853 #, c-format @@ -3022,12 +3024,12 @@ #: Merge.rc:1866 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -msgstr "" +msgstr "\xBF\xAA\xB7\xA2\xC8\xCBԱ:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" #: Merge.rc:1867 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." -msgstr "" +msgstr "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." #: Merge.rc:1873 #, c-format @@ -3147,7 +3149,7 @@ #: Merge.rc:1927 #, c-format msgid "Unicode" -msgstr "" +msgstr "Unicode" #: Merge.rc:1933 #, c-format @@ -3234,22 +3236,22 @@ #: Merge.rc:1965 #, c-format msgid "UTF-8" -msgstr "" +msgstr "UTF-8" #: Merge.rc:1966 #, c-format msgid "UTF-8 (B)" -msgstr "" +msgstr "UTF-8 (B)" #: Merge.rc:1967 #, c-format msgid "UCS-2 LE" -msgstr "" +msgstr "UCS-2 LE" #: Merge.rc:1968 #, c-format msgid "UCS-2 BE" -msgstr "" +msgstr "UCS-2 BE" #: Merge.rc:1974 #, c-format @@ -3294,7 +3296,7 @@ #: Merge.rc:1987 #, c-format msgid "[F] " -msgstr "" +msgstr "[F] " #: Merge.rc:1988 #, c-format @@ -3419,12 +3421,12 @@ #: Merge.rc:2026 #, c-format msgid "Theirs File" -msgstr "" +msgstr "\xCB\xFB\xC3ǵ\xC4\xCEļ\xFE" #: Merge.rc:2027 #, c-format msgid "Mine File" -msgstr "" +msgstr "\xCEҵ\xC4\xCEļ\xFE" #: Merge.rc:2033 #, c-format @@ -3593,12 +3595,12 @@ #: Merge.rc:2084 #, c-format msgid "Failed to parse conflict file." -msgstr "" +msgstr "\xBD\xE2\xCE\xF6\xB3\xE5ͻ\xCEļ\xFEʱʧ\xB0\xDC" #: Merge.rc:2085 #, c-format msgid "The file\n%1\nis not a conflict file." -msgstr "" +msgstr "\xCEļ\xFE\n%1\n\xB2\xBB\xCA\xC7һ\xB8\xF6\xB3\xE5ͻ\xCEļ\xFE" #: Merge.rc:2091 #, c-format @@ -3633,7 +3635,7 @@ "\n" "Continue anyway?" msgstr "" -"\xCE\xA8\xB1\xB8\xB7\xDDԭʼ\xCEļ\xFE:\n" +"\xCE\xA8\xB1\xB8\xB7\xDDԭ\xCEļ\xFE:\n" "%1\n" "\n" "\xC8\xD4Ȼ\xBC\xCC\xD0\xF8\xC2\xF0\xA3\xBF" @@ -3666,7 +3668,7 @@ msgstr "" "\xB2\xE5\xBC\xFE '%2' \xCE\xA8\xBD\xAB\xC4\xFA\xB6\xD4\xD7\xF3\xB2\xE0\xCEļ\xFE\xB5\xC4\xD0Ĵ\xF2\xB0\xFC\xB5\xBD '%1' \xD6С\xA3\n" "\n" -"ԭʼ\xCEļ\xFE\xB2\xBB\xBB\xE1\xB8ı䡣\n" +"ԭ\xCEļ\xFE\xB2\xBB\xBB\xE1\xB8ı䡣\n" "\n" "\xC4\xFAҪ\xBD\xABδ\xB4\xF2\xB0\xFC\xB5İ汾\xB1\xA3\xB4\xE6Ϊ\xC6\xE4\xCB\xFC\xCEļ\xFE\xC2\xF0\xA3\xBF" @@ -3681,7 +3683,7 @@ msgstr "" "\xB2\xE5\xBC\xFE '%2' \xCE\xA8\xBD\xAB\xC4\xFA\xB6\xD4\xD3Ҳ\xE0\xCEļ\xFE\xB5\xC4\xD0Ĵ\xF2\xB0\xFC\xB5\xBD '%1' \xD6С\xA3\n" "\n" -"ԭʼ\xCEļ\xFE\xB2\xBB\xBB\xE1\xB8ı䡣\n" +"ԭ\xCEļ\xFE\xB2\xBB\xBB\xE1\xB8ı䡣\n" "\n" "\xC4\xFAҪ\xBD\xABδ\xB4\xF2\xB0\xFC\xB5İ汾\xB1\xA3\xB4\xE6Ϊ\xC6\xE4\xCB\xFC\xCEļ\xFE\xC2\xF0\xA3\xBF" @@ -4502,7 +4504,7 @@ "\n" "\xC4\xFAҪ\xD4ڴ˴ζԱ\xC8\xD6к\xF6\xC2Ի\xBB\xD0з\xFB\xB5IJ\xEE\xB1\xF0\xC2\xF0\xA3\xBF\n" "\n" -"\xCC\xE1ʾ\xA3\xBA\xC8\xE7\xB9\xFB\xC4\xFA\xD7\xDC\xCAǺ\xF6\xC2Ի\xBB\xD0з\xFB\xB5IJ\xBBͬ\xA3\xAC\xC7\xEB\xD4ڡ\xB0\xB1༭/ѡ\xCF\xB5ġ\xB0\xB6Աȡ\xB1ҳ\xD6й\xB4ѡ\xA1\xB0\xBA\xF6\xC2Ի\xBB\xD0з\xFB\xB2\xEE\xB1𡱡\xA3" +"\xCC\xE1ʾ\xA3\xBA\xC8\xE7\xB9\xFB\xC4\xFA\xD7\xDC\xCAǺ\xF6\xC2Ի\xBB\xD0з\xFB\xB5IJ\xBBͬ\xA3\xAC\xC7\xEB\xD4ڡ\xB0\xB1༭/ѡ\xCF\xB5ġ\xB0\xB6Աȡ\xB1ҳ\xD6й\xB4ѡ\xA1\xB0\xBA\xF6\xC2Ի\xBB\xD0з\xFB\xB2\xEE\xD2족\xA1\xA3" #: Merge.rc:2350 #, c-format @@ -4527,7 +4529,7 @@ #: Merge.rc:2354 #, 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 "" +msgstr "\xD5\xE2\xB8\xF6\xCEļ\xFE\xBC\xD0ֻ\xB4\xE6\xD4\xDA\xD3\xDAһ\xB2\xE0\xCB\xF9\xD2\xD4\xCE\xA8\xB4\xA3\n\n\xCAǷ\xF1Ҫ\xD4\xDA\xC1\xEDһ\xB2ഴ\xBD\xA8һ\xB8\xF6\xB6\xD4Ӧ\xB5\xC4\xCEļ\xFE\xBCУ\xBA\n%1\n\xB2\xA2\xC7Ҵ\xF2\xBF\xAA\xD5\xE2\xC1\xBD\xB8\xF6\xCEļ\xFE\xBCУ\xBF" #: Merge.rc:2360 #, c-format @@ -4752,7 +4754,7 @@ "You are about to close several compare windows.\n" "\n" "Do you want to continue?" -msgstr "" +msgstr "\xC4\xFA\xD5\xFDҪ\xB9رն\xE0\xB8\xF6\xB6Աȴ\xB0\xBFڡ\xA3\n\xCAǷ\xF1\xBC\xCC\xD0\xF8\xA3\xBF" #: Merge.rc:2433 #, c-format @@ -4822,7 +4824,7 @@ #: Merge.rc:2446 #, c-format msgid "Invalid preceding regular expression" -msgstr "" +msgstr "\xCE\xDEЧ\xB5\xC4ǰ\xD6\xC3\xD5\xFD\xD4\xF2\xB1\xED\xB4\xEFʽ" #: Merge.rc:2447 #, c-format @@ -4868,257 +4870,257 @@ #: Merge.rc:2474 #, c-format msgid "Not applicable" -msgstr "\xC6\xE4\xCB\xFC" +msgstr "û\xD3\xD0\xCA\xCA\xD3õ\xC4" #: Merge.rc:2470 #, c-format msgid "MS-Windows" -msgstr "" +msgstr "MS-Windows \xC8\xED\xCAӴ\xB0" #: Merge.rc:2471 #, c-format msgid "MS-DOS" -msgstr "" +msgstr "MS-DOS \xC8\xEDDOS" #: Merge.rc:2472 #, c-format msgid "Macintosh" -msgstr "" +msgstr "Macintosh ƻ\xB9\xFBϵͳ" #: Merge.rc:2473 #, c-format msgid "IBM" -msgstr "" +msgstr "IBM" #: Merge.rc:2480 #, c-format msgid "EBCDIC" -msgstr "" +msgstr "EBCDIC" #: Merge.rc:2481 #, c-format msgid "IBM EBCDIC Cyrillic" -msgstr "" +msgstr "IBM EBCDIC \xCE\xF7\xC0\xEF\xB6\xFB\xCE\xC4" #: Merge.rc:2487 #, c-format msgid "MS-DOS Latin US" -msgstr "" +msgstr "MS-DOS \xC3\xC0\xB9\xFA\xC0\xAD\xB6\xA1\xCE\xC4" #: Merge.rc:2488 #, c-format msgid "MS-DOS Arabic" -msgstr "" +msgstr "MS-DOS \xB0\xA2\xC0\xAD\xB2\xAE\xCE\xC4" #: Merge.rc:2489 #, c-format msgid "MS-DOS Greek" -msgstr "" +msgstr "MS-DOS ϣ\xC0\xB0\xCE\xC4" #: Merge.rc:2490 #, c-format msgid "MS-DOS Baltic Rim" -msgstr "" +msgstr "MS-DOS \xB2\xA8\xC2\xC4\xD3\xEFϵ" #: Merge.rc:2491 #, c-format msgid "MS-DOS Latin 1" -msgstr "" +msgstr "MS-DOS \xC0\xAD\xB6\xA1\xCE\xC4 1" #: Merge.rc:2492 #, c-format msgid "MS-DOS Greek 1" -msgstr "" +msgstr "MS-DOS ϣ\xC0\xB0\xCE\xC4 1" #: Merge.rc:2493 #, c-format msgid "MS-DOS Latin 2" -msgstr "" +msgstr "MS-DOS \xC0\xAD\xB6\xA1\xCE\xC4 2" #: Merge.rc:2494 #, c-format msgid "MS-DOS Cyrillic" -msgstr "" +msgstr "MS-DOS \xCE\xF7\xC0\xEF\xB6\xFB\xCE\xC4" #: Merge.rc:2495 #, c-format msgid "MS-DOS Turkish" -msgstr "" +msgstr "MS-DOS \xCD\xC1\xB6\xFA\xC6\xE4\xD3\xEF" #: Merge.rc:2496 #, c-format msgid "MS-DOS Portuguese" -msgstr "" +msgstr "MS-DOS \xC6\xCF\xCC\xD1\xD1\xC0\xD3\xEF" #: Merge.rc:2502 #, c-format msgid "MS-DOS Icelandic" -msgstr "" +msgstr "MS-DOS \xB1\xF9\xB5\xBA\xD3\xEF" #: Merge.rc:2503 #, c-format msgid "MS-DOS Hebrew" -msgstr "" +msgstr "MS-DOS ϣ\xB2\xAE\xC0\xB4\xCE\xC4" #: Merge.rc:2504 #, c-format msgid "MS-DOS French Canada" -msgstr "" +msgstr "MS-DOS \xBC\xD3\xC4ô\xF3\xB7\xA8\xD3\xEF\xC7\xF8" #: Merge.rc:2505 #, c-format msgid "MS-DOS Nordic" -msgstr "" +msgstr "MS-DOS \xB1\xB1\xBC\xAB" #: Merge.rc:2506 #, c-format msgid "MS-DOS Cyrillic CIS 1" -msgstr "" +msgstr "MS-DOS \xCE\xF7\xC0\xEF\xB6\xFB\xCE\xC4 CIS 1" #: Merge.rc:2507 #, c-format msgid "MS-DOS Greek 2" -msgstr "" +msgstr "MS-DOS ϣ\xC0\xB0\xCE\xC4 2" #: Merge.rc:2513 #, c-format msgid "Windows Thai" -msgstr "" +msgstr "Windows ̩\xCE\xC4" #: Merge.rc:2514 #, c-format msgid "Windows Japanese" -msgstr "" +msgstr "Windows \xC8\xD5\xCE\xC4" #: Merge.rc:2515 #, c-format msgid "Windows Simplified Chinese" -msgstr "" +msgstr "Windows \xBC\xF2\xCC\xE5\xD6\xD0\xCE\xC4" #: Merge.rc:2516 #, c-format msgid "Windows Korean" -msgstr "" +msgstr "Windows \xBA\xAB\xCE\xC4" #: Merge.rc:2517 #, c-format msgid "Windows Traditional Chinese" -msgstr "" +msgstr "Windows \xB7\xB1\xCC\xE5\xD6\xD0\xCE\xC4" #: Merge.rc:2518 #, c-format msgid "Windows Latin 2" -msgstr "" +msgstr "Windows \xC0\xAD\xB6\xA1\xCE\xC4 2" #: Merge.rc:2519 #, c-format msgid "Windows Cyrillic (Slavic)" -msgstr "" +msgstr "Windows \xCE\xF7\xC0\xEF\xCE\xC4(˹\xC0\xAD\xB7\xF2\xD3\xEF)" #: Merge.rc:2520 #, c-format msgid "Windows Latin 1" -msgstr "" +msgstr "Windows \xC0\xAD\xB6\xA1\xCE\xC4 1" #: Merge.rc:2521 #, c-format msgid "Windows Greek" -msgstr "" +msgstr "Windows ϣ\xC0\xB0\xCE\xC4" #: Merge.rc:2522 #, c-format msgid "Windows Latin 5 (Turkish)" -msgstr "" +msgstr "Windows \xC0\xAD\xB6\xA1\xCE\xC4 5 (\xCD\xC1\xB6\xFA\xC6\xE4\xD3\xEF)" #: Merge.rc:2523 #, c-format msgid "Windows Hebrew" -msgstr "" +msgstr "Windows ϣ\xB2\xAE\xC0\xB4\xCE\xC4" #: Merge.rc:2524 #, c-format msgid "Windows Arabic" -msgstr "" +msgstr "Windows \xB0\xA2\xC0\xAD\xB2\xAE\xCE\xC4" #: Merge.rc:2525 #, c-format msgid "Windows Baltic Rim" -msgstr "" +msgstr "Windows \xB2\xA8\xC2\xC4\xD3\xEFϵ" #: Merge.rc:2526 #, c-format msgid "Windows Vietnamese" -msgstr "" +msgstr "Windows Խ\xC4\xCF" #: Merge.rc:2532 #, c-format msgid "Macintosh Roman" -msgstr "" +msgstr "Macintosh \xC2\xDE\xC2\xED" #: Merge.rc:2533 #, c-format msgid "Macintosh Greek" -msgstr "" +msgstr "Macintosh ϣ\xC0\xB0\xCE\xC4" #: Merge.rc:2534 #, c-format msgid "Macintosh Cyrillic" -msgstr "" +msgstr "Macintosh \xCE\xF7\xC0\xEF\xB6\xFB\xCE\xC4" #: Merge.rc:2535 #, c-format msgid "Macintosh " -msgstr "" +msgstr "Macintosh " #: Merge.rc:2536 #, c-format msgid "Macintosh Central Europe" -msgstr "" +msgstr "Macintosh \xD6\xD0ŷ" #: Merge.rc:2537 #, c-format msgid "Macintosh Turkish" -msgstr "" +msgstr "Macintosh \xCD\xC1\xB6\xFA\xC6\xE4\xD3\xEF" #: Merge.rc:2546 #, c-format msgid "Approximates ISO-8859-2" -msgstr "" +msgstr "\xBDӽ\xFC ISO-8859-2" #: Merge.rc:2549 #, c-format msgid "Approximates ISO-8859-1" -msgstr "" +msgstr "\xBDӽ\xFC ISO-8859-1" #: Merge.rc:2550 #, c-format msgid "Approximates ISO-8859-7" -msgstr "" +msgstr "\xBDӽ\xFC ISO-8859-7" #: Merge.rc:2551 #, c-format msgid "Approximates ISO-8859-9" -msgstr "" +msgstr "\xBDӽ\xFC ISO-8859-9" #: Merge.rc:2552 #, c-format msgid "Approximates ISO-8859-8" -msgstr "" +msgstr "\xBDӽ\xFC ISO-8859-8" #: Merge.rc:2558 #, c-format msgid "Win" -msgstr "" +msgstr "Win" #: Merge.rc:2559 #, c-format msgid "Mac" -msgstr "" +msgstr "Mac" #: Merge.rc:2560 #, c-format msgid "Unix" -msgstr "" +msgstr "Unix" #: Merge.rc:2561 #, c-format @@ -5128,47 +5130,47 @@ #: Merge.rc:2563 #, c-format msgid "LF" -msgstr "" +msgstr "LF" #: Merge.rc:2564 #, c-format msgid "CR" -msgstr "" +msgstr "CR" #: Merge.rc:2565 #, c-format msgid "CRLF" -msgstr "" +msgstr "CRLF" #: Merge.rc:2572 #, c-format msgid " B" -msgstr "" +msgstr " \xD7ֽ\xDA" #: Merge.rc:2573 #, c-format msgid " KB" -msgstr "" +msgstr " KB" #: Merge.rc:2574 #, c-format msgid " MB" -msgstr "" +msgstr " MB" #: Merge.rc:2575 #, c-format msgid " GB" -msgstr "" +msgstr " GB" #: Merge.rc:2576 #, c-format msgid " TB" -msgstr "" +msgstr " TB" #: Merge.rc:2577 #, c-format msgid " PB" -msgstr "" +msgstr " PB" #: Merge.rc:2584 #, c-format @@ -5203,17 +5205,17 @@ #: Merge.rc:2590 #, c-format msgid "Convert EOL to Windows mode" -msgstr "" +msgstr "\xBD\xAB\xBB\xBB\xD0з\xFBת\xBB\xBBΪWindowsģʽ" #: Merge.rc:2591 #, c-format msgid "Convert EOL to Unix mode" -msgstr "" +msgstr "\xBD\xAB\xBB\xBB\xD0з\xFBת\xBB\xBBΪUnixģʽ" #: Merge.rc:2592 #, c-format msgid "Convert EOL to Mac mode" -msgstr "" +msgstr "\xBD\xAB\xBB\xBB\xD0з\xFBת\xBB\xBBΪMacģʽ" #: Merge.rc:2593 #, c-format @@ -5232,7 +5234,7 @@ #: Merge.rc:2595 #, c-format msgid "Open and resolve conflict file" -msgstr "" +msgstr "\xB4\xA2\xBD\xE2\xCE\xF6\xB3\xE5ͻ\xCEļ\xFE" #: Merge.rc:2601 #, c-format @@ -5240,8 +5242,8 @@ "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -"ѡ\xD6е\xB1ǰ\xD0\xD0\xD6в\xBBͬ\xB5IJ\xBF\xB7\xD6\n" -"\xB5\xB1ǰ\xD0\xD0\xD6в\xBBͬ" +"ѡ\xD6е\xB1ǰ\xD0\xD0\xC4ڲ\xBBͬ\xB5IJ\xBF\xB7\xD6\n" +"\xB5\xB1ǰ\xD0\xD0\xC4ڲ\xBBͬ" #: Merge.rc:2602 #, c-format @@ -5395,12 +5397,12 @@ #: Merge.rc:2633 #, c-format msgid "Select the current user interface language\nLanguage" -msgstr "" +msgstr "ѡ\xD4\xF1\xB5\xB1ǰ\xD3û\xA7\xBD\xE7\xC3\xE6\xB5\xC4\xD3\xEF\xD1\xD4\n\xD3\xEF\xD1\xD4" #: Merge.rc:2634 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" -msgstr "" +msgstr "\xD2Բ\xBBͬ\xD1\xD5ɫ\xCF\xD4ʾ\xD0\xD0\xC4ڵIJ\xBBͬ\n\xCF\xD4ʾ\xD0\xD0\xC4ڲ\xBBͬ" #: Merge.rc:2635 #, c-format @@ -5437,42 +5439,42 @@ #: Merge.rc:2639 #, c-format msgid "Increase text size" -msgstr "" +msgstr "\xD4\xF6\xB4\xF3\xCE\xC4\xD7ֳߴ\xE7" #: Merge.rc:2640 #, c-format msgid "Decrease text size" -msgstr "" +msgstr "\xBC\xF5С\xCE\xC4\xD7ֳߴ\xE7" #: Merge.rc:2641 #, c-format msgid "Reset text zoom to default size" -msgstr "" +msgstr "\xB0\xD1\xCE\xC4\xD7ֳߴ\xE7\xBBָ\xB4\xB5\xBDĬ\xC8ϴ\xF3С" #: Merge.rc:2647 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" -msgstr "" +msgstr "\xB9\xBD\xC9\xCFһ\xB4\xA6\xB2\xBBͬ\n\xC9\xCFһ\xB4\xA6\xB2\xBBͬ(Alt+Up)" #: Merge.rc:2648 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" -msgstr "" +msgstr "\xB9\xBD\xCF\xC2һ\xB4\xA6\xB2\xBBͬ\n\xCF\xC2һ\xB4\xA6\xB2\xBBͬ(Alt+Down)" #: Merge.rc:2649 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" -msgstr "" +msgstr "\xB9\xBD\xB5\xDAһ\xB4\xA6\xB2\xBBͬ\n\xB5\xDAһ\xB4\xA6\xB2\xBBͬ(Alt+Home)" #: Merge.rc:2650 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" -msgstr "" +msgstr "\xB9\xBD\xB5\xB1ǰ\xB2\xBBͬ\xB4\xA6\n\xB5\xB1ǰ\xB2\xBBͬ(Alt+Enter)" #: Merge.rc:2651 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" -msgstr "" +msgstr "\xB9\xBD\xD7\xEE\xBA\xF3һ\xB4\xA6\xB2\xBBͬ\n\xD7\xEE\xBA\xF3һ\xB4\xA6\xB2\xBBͬ(Alt+End)" #: Merge.rc:2652 #, c-format @@ -5596,7 +5598,7 @@ #: Merge.rc:2686 #, c-format msgid "Activates next visible file\nActivate next File" -msgstr "" +msgstr "\xC7л\xBB\xBD\xB9\xB5㵽\xCF\xC2һ\xB8\xF6\xBFɼ\xFB\xB5\xC4\xCEļ\xFE\n\xC7л\xBB\xB5\xBD\xCF\xC2һ\xCEļ\xFE" #: Merge.rc:2687 #, c-format @@ -5606,7 +5608,7 @@ #: Merge.rc:2693 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" -msgstr "" +msgstr "\xB4\xF2\xBF\xAAWinMerge\xB5İ\xEF\xD6\xFA\nWinMerge\xB0\xEF\xD6\xFA" #: Merge.rc:2694 #, c-format @@ -5616,22 +5618,22 @@ #: Merge.rc:2695 #, c-format msgid "Display the GNU General Public License" -msgstr "" +msgstr "\xCF\xD4ʾGNU General Public License" #: Merge.rc:2696 #, c-format msgid "Private Build: %1" -msgstr "" +msgstr "Private Build: %1" #: Merge.rc:2697 #, c-format msgid "Opens the release notes document\nRelease Notes" -msgstr "" +msgstr "\xB4\xA2\xD0\xD0\xCEĵ\xB5\n\xB7\xA2\xD0\xD0\xCEĵ\xB5" #: Merge.rc:2698 #, c-format msgid "Opens the translations website\nTranslations" -msgstr "" +msgstr "\xB4\xAD\xD2\xEB\xCD\xF8վ\n\xB7\xAD\xD2\xEB" #: Merge.rc:2704 #, c-format @@ -5686,7 +5688,7 @@ #: Merge.rc:2725 #, c-format msgid "Display all moved blocks" -msgstr "" +msgstr "\xCF\xD4ʾ\xCB\xF9\xD3\xD0\xD2ƶ\xAF\xC7\xF8\xBF\xE9" #: Merge.rc:2726 #, c-format @@ -5726,157 +5728,157 @@ #: Merge.rc:2744 #, c-format msgid "ASP" -msgstr "" +msgstr "ASP" #: Merge.rc:2745 #, c-format msgid "Basic" -msgstr "" +msgstr "Basic" #: Merge.rc:2746 #, c-format msgid "Batch" -msgstr "" +msgstr "\xC5\xFA\xB4\xA6\xC0\xED" #: Merge.rc:2747 #, c-format msgid "C/C++" -msgstr "" +msgstr "C/C++" #: Merge.rc:2748 #, c-format msgid "C#" -msgstr "" +msgstr "C#" #: Merge.rc:2749 #, c-format msgid "CSS" -msgstr "" +msgstr "CSS" #: Merge.rc:2750 #, c-format msgid "DCL" -msgstr "" +msgstr "DCL" #: Merge.rc:2751 #, c-format msgid "Fortran" -msgstr "" +msgstr "Fortran" #: Merge.rc:2752 #, c-format msgid "HTML" -msgstr "" +msgstr "HTML" #: Merge.rc:2753 #, c-format msgid "INI" -msgstr "" +msgstr "INI" #: Merge.rc:2754 #, c-format msgid "InnoSetup" -msgstr "" +msgstr "InnoSetup" #: Merge.rc:2755 #, c-format msgid "InstallShield" -msgstr "" +msgstr "InstallShield" #: Merge.rc:2756 #, c-format msgid "Java" -msgstr "" +msgstr "Java" #: Merge.rc:2757 #, c-format msgid "AutoLISP" -msgstr "" +msgstr "AutoLISP" #: Merge.rc:2758 #, c-format msgid "NSIS" -msgstr "" +msgstr "NSIS" #: Merge.rc:2759 #, c-format msgid "Pascal" -msgstr "" +msgstr "Pascal" #: Merge.rc:2760 #, c-format msgid "Perl" -msgstr "" +msgstr "Perl" #: Merge.rc:2761 #, c-format msgid "PHP" -msgstr "" +msgstr "PHP" #: Merge.rc:2762 #, c-format msgid "Portable Object" -msgstr "" +msgstr "Portable Object" #: Merge.rc:2763 #, c-format msgid "PowerShell" -msgstr "" +msgstr "PowerShell" #: Merge.rc:2764 #, c-format msgid "Python" -msgstr "" +msgstr "Python" #: Merge.rc:2765 #, c-format msgid "REXX" -msgstr "" +msgstr "REXX" #: Merge.rc:2766 #, c-format msgid "Resources" -msgstr "" +msgstr "\xD7\xCAԴ\xCEļ\xFE" #: Merge.rc:2767 #, c-format msgid "Ruby" -msgstr "" +msgstr "Ruby" #: Merge.rc:2768 #, c-format msgid "SGML" -msgstr "" +msgstr "SGML" #: Merge.rc:2769 #, c-format msgid "Shell" -msgstr "" +msgstr "Shell" #: Merge.rc:2770 #, c-format msgid "SIOD" -msgstr "" +msgstr "SIOD" #: Merge.rc:2771 #, c-format msgid "SQL" -msgstr "" +msgstr "SQL" #: Merge.rc:2772 #, c-format msgid "TCL" -msgstr "" +msgstr "TCL" #: Merge.rc:2773 #, c-format msgid "TEX" -msgstr "" +msgstr "TEX" #: Merge.rc:2774 #, c-format msgid "XML" -msgstr "" +msgstr "XML" #: Merge.rc:2779 #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |