Thread: [Winmerge-svn] SF.net SVN: winmerge:[5639] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-07-19 11:07:53
|
Revision: 5639 http://winmerge.svn.sourceforge.net/winmerge/?rev=5639&view=rev Author: kimmov Date: 2008-07-19 11:07:44 +0000 (Sat, 19 Jul 2008) Log Message: ----------- PATCH: [ 2021722 ] Add dialog listing available plugins Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DirView.cpp trunk/Src/DirView.h trunk/Src/Languages/English.pot trunk/Src/MainFrm.cpp trunk/Src/MainFrm.h trunk/Src/Merge.rc trunk/Src/Merge.vcproj trunk/Src/MergeEditView.cpp trunk/Src/MergeEditView.h trunk/Src/PropGeneral.cpp trunk/Src/PropGeneral.h trunk/Src/resource.h Added Paths: ----------- trunk/Src/PluginsListDlg.cpp trunk/Src/PluginsListDlg.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-19 09:32:18 UTC (rev 5638) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-19 11:07:44 UTC (rev 5639) @@ -5,6 +5,7 @@ WinMerge 2.11.1.2 Refresh compare after changing filter (#2017426) + Add dialog listing available plugins (#2021722) BugFix: Failed to compare UTF-8 files plugins disabled (#2018287) WinMerge 2.11.1.1 - 2008-07-11 (r5609) Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2008-07-19 09:32:18 UTC (rev 5638) +++ trunk/Src/DirView.cpp 2008-07-19 11:07:44 UTC (rev 5639) @@ -47,6 +47,7 @@ #include "DirCmpReport.h" #include "DirCompProgressDlg.h" #include "CompareStatisticsDlg.h" +#include "PluginsListDlg.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -222,6 +223,7 @@ ON_COMMAND(ID_EDIT_PASTE, OnEditPaste) ON_COMMAND(ID_EDIT_UNDO, OnEditUndo) ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo) + ON_COMMAND(ID_PLUGINS_LIST, &CDirView::OnPluginsList) //}}AFX_MSG_MAP ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick) ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) @@ -3210,3 +3212,12 @@ pCmdUI->Enable(FALSE); } } + +/** + * @brief Show the plugins list dialog. + */ +void CDirView::OnPluginsList() +{ + PluginsListDlg dlg; + dlg.DoModal(); +} Modified: trunk/Src/DirView.h =================================================================== --- trunk/Src/DirView.h 2008-07-19 09:32:18 UTC (rev 5638) +++ trunk/Src/DirView.h 2008-07-19 11:07:44 UTC (rev 5639) @@ -373,13 +373,14 @@ afx_msg void OnEditPaste(); afx_msg void OnEditUndo(); afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI); + afx_msg void OnItemChanged(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnPluginsList(); //}}AFX_MSG DECLARE_MESSAGE_MAP() BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult); BOOL OnHeaderEndDrag(LPNMHEADER hdr, LRESULT* pResult); - afx_msg void OnItemChanged(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); private: void OpenSelection(PackingInfo * infoUnpacker = NULL); Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-07-19 09:32:18 UTC (rev 5638) +++ trunk/Src/Languages/English.pot 2008-07-19 11:07:44 UTC (rev 5639) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-07-15 20:32+0000\n" +"POT-Creation-Date: 2008-07-19 14:03+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -68,7 +68,7 @@ #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:502 #, c-format msgid "&Copy" msgstr "" @@ -80,7 +80,7 @@ msgstr "" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:583 #, c-format msgid "&Goto..." msgstr "" @@ -91,43 +91,43 @@ msgstr "" #: Merge.rc:88 -#: Merge.rc:519 #: Merge.rc:525 +#: Merge.rc:531 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:520 #: Merge.rc:526 +#: Merge.rc:532 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:521 #: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "" @@ -138,15 +138,15 @@ msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -157,5320 +157,5361 @@ msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "" #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "" #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:226 +#: Merge.rc:407 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:228 +#: Merge.rc:409 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:229 +#: Merge.rc:410 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:230 +#: Merge.rc:411 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:232 +#: Merge.rc:413 #, c-format msgid "&Status Bar" msgstr "" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:233 +#: Merge.rc:414 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:236 +#: Merge.rc:418 #, c-format msgid "&Language..." msgstr "" #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:257 +#: Merge.rc:440 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:260 +#: Merge.rc:442 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:261 +#: Merge.rc:443 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:264 +#: Merge.rc:446 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:266 +#: Merge.rc:448 #, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:268 +#: Merge.rc:450 +#, c-format msgid "&Manual Unpacking" msgstr "" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:269 +#: Merge.rc:451 #, c-format msgid "&Automatic Unpacking" msgstr "" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:271 +#: Merge.rc:453 #, c-format msgid "&Edit with Unpacker" msgstr "" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:273 +#: Merge.rc:460 #, c-format msgid "&Reload plugins" msgstr "" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:275 +#: Merge.rc:462 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:277 +#: Merge.rc:464 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:278 +#: Merge.rc:465 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:280 +#: Merge.rc:467 #, c-format msgid "&Window" msgstr "" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:282 +#: Merge.rc:469 #, c-format msgid "Cl&ose" msgstr "" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:283 +#: Merge.rc:470 #, c-format msgid "Clo&se All" msgstr "" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:285 +#: Merge.rc:472 #, c-format msgid "Change &Pane\tF6" msgstr "" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:287 +#: Merge.rc:474 #, c-format msgid "Tile &Horizontally" msgstr "" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:288 +#: Merge.rc:475 #, c-format msgid "Tile &Vertically" msgstr "" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:289 +#: Merge.rc:476 #, c-format msgid "&Cascade" msgstr "" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1893 +#: Merge.rc:175 +#: Merge.rc:291 +#: Merge.rc:478 +#: Merge.rc:1911 #, c-format msgid "&Help" msgstr "" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:293 +#: Merge.rc:480 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:295 +#: Merge.rc:482 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:296 +#: Merge.rc:483 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:484 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:485 #, c-format msgid "A&rchive Support disabled..." msgstr "" -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:487 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:488 #, c-format msgid "&About WinMerge..." msgstr "" -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "" -#: Merge.rc:200 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "" -#: Merge.rc:212 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:219 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:232 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:238 +#: Merge.rc:420 #, c-format msgid "Refre&sh\tF5" msgstr "" -#: Merge.rc:237 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:241 +#: Merge.rc:422 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:241 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:245 +#: Merge.rc:424 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:246 +#: Merge.rc:425 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:248 +#: Merge.rc:427 #, c-format msgid "&First Difference\tAlt+Home" msgstr "" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:249 +#: Merge.rc:428 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:250 +#: Merge.rc:429 #, c-format msgid "&Last Difference\tAlt+End" msgstr "" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:252 +#: Merge.rc:431 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:253 +#: Merge.rc:432 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:253 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:259 +#: Merge.rc:556 #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:262 +#: Merge.rc:444 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:311 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "" -#: Merge.rc:312 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "" -#: Merge.rc:317 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:323 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:324 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:330 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:332 +#: Merge.rc:336 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:337 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:338 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:339 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "" -#: Merge.rc:346 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "" -#: Merge.rc:348 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:349 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "" -#: Merge.rc:350 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "" -#: Merge.rc:352 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:355 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "" -#: Merge.rc:356 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "" -#: Merge.rc:358 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:360 -#: Merge.rc:2715 +#: Merge.rc:364 +#: Merge.rc:2744 #, c-format msgid "< Empty >" msgstr "" -#: Merge.rc:363 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:365 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:368 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:370 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:371 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:372 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:375 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:383 +#: Merge.rc:387 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:389 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:390 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:391 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:393 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:394 +#: Merge.rc:398 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:399 #, c-format msgid "&View Whitespace" msgstr "" -#: Merge.rc:396 +#: Merge.rc:400 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:397 +#: Merge.rc:401 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:398 +#: Merge.rc:402 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:403 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:401 +#: Merge.rc:405 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:411 +#: Merge.rc:415 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:412 +#: Merge.rc:416 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:430 +#: Merge.rc:434 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "" -#: Merge.rc:431 +#: Merge.rc:435 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "" -#: Merge.rc:433 +#: Merge.rc:437 #, c-format msgid "Copy &All to Right" msgstr "" -#: Merge.rc:434 +#: Merge.rc:438 #, c-format msgid "Cop&y All to Left" msgstr "" -#: Merge.rc:449 +#: Merge.rc:455 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:490 +#: Merge.rc:496 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:491 +#: Merge.rc:497 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:499 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:504 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:499 +#: Merge.rc:505 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:500 +#: Merge.rc:506 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:501 +#: Merge.rc:507 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:503 +#: Merge.rc:509 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:505 +#: Merge.rc:511 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:506 +#: Merge.rc:512 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:508 +#: Merge.rc:514 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:510 -#: Merge.rc:1130 -#: Merge.rc:1512 +#: Merge.rc:516 +#: Merge.rc:1134 +#: Merge.rc:1516 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:511 -#: Merge.rc:1132 -#: Merge.rc:1515 +#: Merge.rc:517 +#: Merge.rc:1136 +#: Merge.rc:1519 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:512 +#: Merge.rc:518 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:514 +#: Merge.rc:520 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:515 +#: Merge.rc:521 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:517 +#: Merge.rc:523 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:530 +#: Merge.rc:536 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:532 +#: Merge.rc:538 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:533 +#: Merge.rc:539 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:534 +#: Merge.rc:540 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:536 +#: Merge.rc:542 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:538 +#: Merge.rc:544 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:546 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:541 +#: Merge.rc:547 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:542 +#: Merge.rc:548 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:543 +#: Merge.rc:549 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:546 +#: Merge.rc:552 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:558 +#: Merge.rc:564 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:559 +#: Merge.rc:565 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:565 +#: Merge.rc:571 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:567 +#: Merge.rc:573 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:568 +#: Merge.rc:574 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:576 +#: Merge.rc:582 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:579 +#: Merge.rc:585 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:580 +#: Merge.rc:586 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:581 +#: Merge.rc:587 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:650 +#: Merge.rc:656 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:663 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:658 +#: Merge.rc:664 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:785 -#: Merge.rc:971 -#: Merge.rc:1049 -#: Merge.rc:1078 -#: Merge.rc:1088 -#: Merge.rc:1254 -#: Merge.rc:1318 -#: Merge.rc:1331 -#: Merge.rc:1423 -#: Merge.rc:1438 +#: Merge.rc:667 +#: Merge.rc:699 +#: Merge.rc:789 +#: Merge.rc:975 +#: Merge.rc:1053 +#: Merge.rc:1082 +#: Merge.rc:1092 +#: Merge.rc:1258 +#: Merge.rc:1322 +#: Merge.rc:1335 +#: Merge.rc:1427 +#: Merge.rc:1442 +#: Merge.rc:1664 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:668 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:675 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:672 -#: Merge.rc:1589 +#: Merge.rc:678 +#: Merge.rc:1593 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:992 -#: Merge.rc:1014 +#: Merge.rc:682 +#: Merge.rc:743 +#: Merge.rc:996 +#: Merge.rc:1018 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:677 -#: Merge.rc:1593 +#: Merge.rc:683 +#: Merge.rc:1597 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:681 -#: Merge.rc:1025 +#: Merge.rc:687 +#: Merge.rc:1029 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:682 -#: Merge.rc:1597 +#: Merge.rc:688 +#: Merge.rc:1601 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:685 -#: Merge.rc:1599 +#: Merge.rc:691 +#: Merge.rc:1603 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:686 +#: Merge.rc:692 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:689 +#: Merge.rc:695 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:690 -#: Merge.rc:1600 +#: Merge.rc:696 +#: Merge.rc:1604 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:692 +#: Merge.rc:698 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:786 -#: Merge.rc:816 -#: Merge.rc:848 -#: Merge.rc:858 -#: Merge.rc:1050 -#: Merge.rc:1079 -#: Merge.rc:1089 -#: Merge.rc:1140 -#: Merge.rc:1255 -#: Merge.rc:1332 -#: Merge.rc:1424 -#: Merge.rc:1439 +#: Merge.rc:700 +#: Merge.rc:730 +#: Merge.rc:790 +#: Merge.rc:820 +#: Merge.rc:852 +#: Merge.rc:862 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1093 +#: Merge.rc:1144 +#: Merge.rc:1259 +#: Merge.rc:1336 +#: Merge.rc:1428 +#: Merge.rc:1443 +#: Merge.rc:1665 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1333 +#: Merge.rc:701 +#: Merge.rc:1337 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:702 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:703 +#: Merge.rc:709 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:714 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:717 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:714 +#: Merge.rc:720 #, c-format msgid "User:" msgstr "" -#: Merge.rc:716 +#: Merge.rc:722 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:718 +#: Merge.rc:724 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:720 -#: Merge.rc:863 +#: Merge.rc:726 +#: Merge.rc:867 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:722 +#: Merge.rc:728 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:859 +#: Merge.rc:729 +#: Merge.rc:863 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:729 +#: Merge.rc:735 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:732 +#: Merge.rc:738 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:735 +#: Merge.rc:741 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:742 -#: Merge.rc:1901 +#: Merge.rc:748 +#: Merge.rc:1919 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:751 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:748 +#: Merge.rc:754 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:750 +#: Merge.rc:756 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:752 +#: Merge.rc:758 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:755 +#: Merge.rc:761 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:757 +#: Merge.rc:763 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:765 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:768 #, c-format -msgid "E&nable plugins" -msgstr "" - -#: Merge.rc:764 -#, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:767 +#: Merge.rc:771 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:773 +#: Merge.rc:1616 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:771 -#: Merge.rc:1614 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:773 +#: Merge.rc:777 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:775 +#: Merge.rc:779 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:782 +#: Merge.rc:786 #, c-format msgid "Language" msgstr "" -#: Merge.rc:789 +#: Merge.rc:793 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:795 +#: Merge.rc:799 #, c-format msgid "Find" msgstr "" -#: Merge.rc:798 -#: Merge.rc:825 +#: Merge.rc:802 +#: Merge.rc:829 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:805 +#: Merge.rc:835 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:805 -#: Merge.rc:835 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:807 +#: Merge.rc:811 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:810 +#: Merge.rc:814 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:811 +#: Merge.rc:815 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:813 +#: Merge.rc:817 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:815 -#: Merge.rc:845 +#: Merge.rc:819 +#: Merge.rc:849 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:822 +#: Merge.rc:826 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:828 +#: Merge.rc:832 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:837 +#: Merge.rc:841 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:840 +#: Merge.rc:844 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:841 +#: Merge.rc:845 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:843 +#: Merge.rc:847 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:846 +#: Merge.rc:850 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:847 +#: Merge.rc:851 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:854 -#: Merge.rc:2142 +#: Merge.rc:858 +#: Merge.rc:2160 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:857 +#: Merge.rc:861 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:862 -#: Merge.rc:1174 +#: Merge.rc:866 +#: Merge.rc:1178 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:865 +#: Merge.rc:869 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:871 +#: Merge.rc:875 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:874 +#: Merge.rc:878 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:877 +#: Merge.rc:881 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:884 +#: Merge.rc:888 #, c-format msgid "Save" msgstr "" -#: Merge.rc:885 +#: Merge.rc:889 #, c-format msgid "New" msgstr "" -#: Merge.rc:886 +#: Merge.rc:890 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:887 +#: Merge.rc:891 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:892 -#: Merge.rc:1904 +#: Merge.rc:896 +#: Merge.rc:1922 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:895 +#: Merge.rc:899 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:899 +#: Merge.rc:903 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:903 -#: Merge.rc:1564 +#: Merge.rc:907 +#: Merge.rc:1568 #, c-format msgid "Background" msgstr "" -#: Merge.rc:904 +#: Merge.rc:908 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:917 -#: Merge.rc:1359 -#: Merge.rc:1565 +#: Merge.rc:921 +#: Merge.rc:1363 +#: Merge.rc:1569 #, c-format msgid "Text" msgstr "" -#: Merge.rc:921 +#: Merge.rc:925 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:931 +#: Merge.rc:935 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:941 +#: Merge.rc:945 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:948 +#: Merge.rc:952 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:955 +#: Merge.rc:959 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:962 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1177 -#: Merge.rc:1405 +#: Merge.rc:966 +#: Merge.rc:1052 +#: Merge.rc:1081 +#: Merge.rc:1181 +#: Merge.rc:1409 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:968 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:972 +#: Merge.rc:1351 +#: Merge.rc:1557 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:978 -#: Merge.rc:1907 +#: Merge.rc:982 +#: Merge.rc:1925 #, c-format msgid "System" msgstr "" -#: Merge.rc:981 +#: Merge.rc:985 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:983 +#: Merge.rc:987 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:984 +#: Merge.rc:988 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:986 +#: Merge.rc:990 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:988 +#: Merge.rc:992 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:990 +#: Merge.rc:994 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:993 +#: Merge.rc:997 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:995 +#: Merge.rc:999 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:996 +#: Merge.rc:1000 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1001 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:999 +#: Merge.rc:1003 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1002 -#: Merge.rc:1018 +#: Merge.rc:1006 +#: Merge.rc:1022 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1008 +#: Merge.rc:1012 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1011 +#: Merge.rc:1015 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1015 +#: Merge.rc:1019 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1019 +#: Merge.rc:1023 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1020 +#: Merge.rc:1024 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1022 +#: Merge.rc:1026 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1026 +#: Merge.rc:1030 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1027 +#: Merge.rc:1031 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1030 +#: Merge.rc:1034 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1033 +#: Merge.rc:1037 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1038 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1036 +#: Merge.rc:1040 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1042 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1040 +#: Merge.rc:1044 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1042 +#: Merge.rc:1046 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1044 +#: Merge.rc:1048 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1046 +#: Merge.rc:1050 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1068 +#: Merge.rc:1072 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1074 +#: Merge.rc:1078 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1075 +#: Merge.rc:1079 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1085 +#: Merge.rc:1089 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1090 +#: Merge.rc:1094 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1093 +#: Merge.rc:1097 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1096 +#: Merge.rc:1100 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1097 +#: Merge.rc:1101 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1108 +#: Merge.rc:1112 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1111 -#: Merge.rc:1854 +#: Merge.rc:1115 +#: Merge.rc:1872 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1120 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1117 +#: Merge.rc:1121 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1118 +#: Merge.rc:1122 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1124 +#: Merge.rc:1128 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1127 +#: Merge.rc:1131 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1129 +#: Merge.rc:1133 #, c-format msgid "File" msgstr "" -#: Merge.rc:1134 +#: Merge.rc:1138 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1135 +#: Merge.rc:1139 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1137 +#: Merge.rc:1141 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1139 +#: Merge.rc:1143 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1145 -#: Merge.rc:1902 +#: Merge.rc:1149 +#: Merge.rc:1920 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1148 +#: Merge.rc:1152 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1149 +#: Merge.rc:1153 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1151 +#: Merge.rc:1155 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1157 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1155 +#: Merge.rc:1159 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1161 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1159 +#: Merge.rc:1163 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1162 +#: Merge.rc:1166 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1168 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1166 +#: Merge.rc:1170 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1169 +#: Merge.rc:1173 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1172 +#: Merge.rc:1176 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1175 +#: Merge.rc:1179 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1182 -#: Merge.rc:1903 +#: Merge.rc:1186 +#: Merge.rc:1921 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1185 +#: Merge.rc:1189 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1187 +#: Merge.rc:1191 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1193 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1195 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1192 +#: Merge.rc:1196 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1195 +#: Merge.rc:1199 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1197 +#: Merge.rc:1201 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1203 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1205 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1207 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1205 +#: Merge.rc:1209 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1220 +#: Merge.rc:1224 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1230 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1227 +#: Merge.rc:1231 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1228 +#: Merge.rc:1232 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1229 +#: Merge.rc:1233 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1230 +#: Merge.rc:1234 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1236 +#: Merge.rc:1240 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1239 +#: Merge.rc:1243 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1242 +#: Merge.rc:1246 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1244 +#: Merge.rc:1248 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1246 +#: Merge.rc:1250 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1249 +#: Merge.rc:1253 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1255 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1253 +#: Merge.rc:1257 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1260 -#: Merge.rc:1508 -#: Merge.rc:1909 +#: Merge.rc:1264 +#: Merge.rc:1512 +#: Merge.rc:1927 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1263 +#: Merge.rc:1267 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1264 +#: Merge.rc:1268 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1266 +#: Merge.rc:1270 #, c-format msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1269 +#: Merge.rc:1273 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1271 +#: Merge.rc:1275 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1273 +#: Merge.rc:1277 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1285 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1284 +#: Merge.rc:1288 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1287 +#: Merge.rc:1291 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1293 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1295 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1297 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1299 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1301 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1300 -#: Merge.rc:1303 +#: Merge.rc:1304 +#: Merge.rc:1307 #, c-format msgid "present" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1305 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1304 +#: Merge.rc:1308 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1306 -#: Merge.rc:1311 +#: Merge.rc:1310 +#: Merge.rc:1315 #, c-format msgid "none" msgstr "" -#: Merge.rc:1308 +#: Merge.rc:1312 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1309 +#: Merge.rc:1313 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1317 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1314 +#: Merge.rc:1318 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1315 +#: Merge.rc:1319 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1319 +#: Merge.rc:1323 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1328 +#: Merge.rc:1332 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1343 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1341 +#: Merge.rc:1345 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1342 +#: Merge.rc:1346 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1354 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1351 +#: Merge.rc:1355 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1352 +#: Merge.rc:1356 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1353 +#: Merge.rc:1357 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1358 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1359 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1360 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1357 +#: Merge.rc:1361 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1358 +#: Merge.rc:1362 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1363 -#: Merge.rc:1368 -#: Merge.rc:1373 -#: Merge.rc:1378 -#: Merge.rc:1383 -#: Merge.rc:1388 -#: Merge.rc:1393 -#: Merge.rc:1398 -#: Merge.rc:1403 +#: Merge.rc:1367 +#: Merge.rc:1372 +#: Merge.rc:1377 +#: Merge.rc:1382 +#: Merge.rc:1387 +#: Merge.rc:1392 +#: Merge.rc:1397 +#: Merge.rc:1402 +#: Merge.rc:1407 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1411 +#: Merge.rc:1415 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1414 +#: Merge.rc:1418 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1417 -#: Merge.rc:1591 +#: Merge.rc:1421 #: Merge.rc:1595 -#: Merge.rc:1622 +#: Merge.rc:1599 +#: Merge.rc:1626 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1418 +#: Merge.rc:1422 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1425 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1429 +#: Merge.rc:1433 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1432 +#: Merge.rc:1436 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1434 +#: Merge.rc:1438 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1436 +#: Merge.rc:1440 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1444 -#: Merge.rc:1910 +#: Merge.rc:1448 +#: Merge.rc:1928 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1447 +#: Merge.rc:1451 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1449 +#: Merge.rc:1453 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1454 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1456 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1459 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1461 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1469 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1468 +#: Merge.rc:1472 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1473 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1470 -#: Merge.rc:2284 +#: Merge.rc:1474 +#: Merge.rc:2302 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1475 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1474 -#: Merge.rc:1493 +#: Merge.rc:1478 +#: Merge.rc:1497 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1481 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1478 +#: Merge.rc:1482 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1483 +#: Merge.rc:1487 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1488 -#: Merge.rc:2279 +#: Merge.rc:1492 +#: Merge.rc:2297 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1497 +#: Merge.rc:1501 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1502 +#: Merge.rc:1506 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1511 +#: Merge.rc:1515 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1514 -#: Merge.rc:1517 +#: Merge.rc:1518 +#: Merge.rc:1521 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1518 +#: Merge.rc:1522 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1519 +#: Merge.rc:1523 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1521 -#: Merge.rc:1524 +#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "..." msgstr "" -#: Merge.rc:1522 +#: Merge.rc:1526 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1529 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1528 +#: Merge.rc:1532 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1529 -#: Merge.rc:1876 +#: Merge.rc:1533 +#: Merge.rc:1894 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1534 +#: Merge.rc:1538 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1537 +#: Merge.rc:1541 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1543 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1545 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1543 +#: Merge.rc:1547 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1551 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1548 +#: Merge.rc:1552 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1556 +#: Merge.rc:1560 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1559 +#: Merge.rc:1563 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1565 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1562 +#: Merge.rc:1566 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1563 +#: Merge.rc:1567 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1586 +#: Merge.rc:1590 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1592 +#: Merge.rc:1596 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1596 +#: Merge.rc:1600 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1602 +#: Merge.rc:1606 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1603 +#: Merge.rc:1607 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1608 -#: Merge.rc:1911 +#: Merge.rc:1612 +#: Merge.rc:1929 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1615 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1616 +#: Merge.rc:1620 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1621 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1619 +#: Merge.rc:1623 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1623 +#: Merge.rc:1627 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1628 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1626 +#: Merge.rc:1630 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1637 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1641 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1639 +#: Merge.rc:1643 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1642 +#: Merge.rc:1646 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1645 +#: Merge.rc:1649 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1646 +#: Merge.rc:1650 #, c-format msgid "No" msgstr "" +#: Merge.rc:1656 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1659 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1671 +#: Merge.rc:1689 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1687 +#: Merge.rc:1705 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1702 +#: Merge.rc:1720 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1726 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1727 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1728 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1729 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1712 +#: Merge.rc:1730 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1713 +#: Merge.rc:1731 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1719 +#: Merge.rc:1737 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1720 +#: Merge.rc:1738 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1721 +#: Merge.rc:1739 #, c-format msgid "Close the active document\nClose" msgstr "" -#: Merge.rc:1722 +#: Merge.rc:1740 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1723 +#: Merge.rc:1741 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "" -#: Merge.rc:1724 +#: Merge.rc:1742 #, c-format msgid "Change the printing options\nPage Setup" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1743 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "" -#: Merge.rc:1726 +#: Merge.rc:1744 #, c-format msgid "Print the active document\nPrint" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1745 #, c-format msgid "Display full pages\nPrint Preview" msgstr "" -#: Merge.rc:1732 +#: Merge.rc:1750 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1756 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1757 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1758 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1759 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1760 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1743 +#: Merge.rc:1761 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1744 +#: Merge.rc:1762 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "" -#: Merge.rc:1749 +#: Merge.rc:1767 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "" -#: Merge.rc:1750 +#: Merge.rc:1768 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "" -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 -#: Merge.rc:1770 -#: Merge.rc:1771 +#: Merge.rc:1774 +#: Merge.rc:1775 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:1776 +#: Merge.rc:1794 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "" -#: Merge.rc:1777 +#: Merge.rc:1795 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1801 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "" -#: Merge.rc:1784 +#: Merge.rc:1802 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "" -#: Merge.rc:1785 +#: Merge.rc:1803 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "" -#: Merge.rc:1791 +#: Merge.rc:1809 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "" -#: Merge.rc:1792 +#: Merge.rc:1810 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "" -#: Merge.rc:1793 +#: Merge.rc:1811 #, c-format msgid "Find the specified text\nFind" msgstr "" -#: Merge.rc:1794 +#: Merge.rc:1812 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "" -#: Merge.rc:1795 +#: Merge.rc:1813 #, c-format msgid "Repeat the last action\nRepeat" msgstr "" -#: Merge.rc:1796 +#: Merge.rc:1814 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "" -#: Merge.rc:1797 +#: Merge.rc:1815 #, c-format msgid "Select the entire document\nSelect All" msgstr "" -#: Merge.rc:1798 +#: Merge.rc:1816 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1799 +#: Merge.rc:1817 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:1805 +#: Merge.rc:1823 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1824 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "" -#: Merge.rc:1807 +#: Merge.rc:1825 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:1808 +#: Merge.rc:1826 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1814 +#: Merge.rc:1832 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:1815 +#: Merge.rc:1833 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:1816 +#: Merge.rc:1834 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1835 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:1818 +#: Merge.rc:1836 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:1819 +#: Merge.rc:1837 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:1820 +#: Merge.rc:1838 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:1825 +#: Merge.rc:1843 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:1826 +#: Merge.rc:1844 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1827 +#: Merge.rc:1845 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1833 +#: Merge.rc:1851 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1858 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1841 +#: Merge.rc:1859 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1848 +#: Merge.rc:1866 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1855 +#: Merge.rc:1873 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1861 -#: Merge.rc:1862 +#: Merge.rc:1879 +#: Merge.rc:1880 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1868 +#: Merge.rc:1886 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1869 +#: Merge.rc:1887 #, 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 "" -#: Merge.rc:1875 +#: Merge.rc:1893 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1895 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1896 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1897 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1898 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1881 +#: Merge.rc:1899 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1887 +#: Merge.rc:1905 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:1906 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1907 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:1908 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1891 +#: Merge.rc:1909 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1892 +#: Merge.rc:1910 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1894 +#: Merge.rc:1912 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1895 +#: Merge.rc:1913 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1923 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1924 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1908 +#: Merge.rc:1926 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1936 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1937 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1938 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1921 +#: Merge.rc:1939 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1922 +#: Merge.rc:1940 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1928 +#: Merge.rc:1946 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1929 +#: Merge.rc:1947 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1935 +#: Merge.rc:1953 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:1936 +#: Merge.rc:1954 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1937 +#: Merge.rc:1955 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "" -#: Merge.rc:1938 +#: Merge.rc:1956 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1958 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:1942 +#: Merge.rc:1960 #, c-format msgid "Are you sure you want to reset all WinMerg... [truncated message content] |
From: <ki...@us...> - 2008-07-19 17:16:27
|
Revision: 5640 http://winmerge.svn.sourceforge.net/winmerge/?rev=5640&view=rev Author: kimmov Date: 2008-07-19 17:14:25 +0000 (Sat, 19 Jul 2008) Log Message: ----------- BUG: [ 2010463 ] False warning: about to close several compare windows Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MainFrm.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-19 11:07:44 UTC (rev 5639) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-19 17:14:25 UTC (rev 5640) @@ -7,6 +7,8 @@ Refresh compare after changing filter (#2017426) Add dialog listing available plugins (#2021722) BugFix: Failed to compare UTF-8 files plugins disabled (#2018287) + Bugfix: Don't warn about closing multiple windows when only one + window is open (#2010463) WinMerge 2.11.1.1 - 2008-07-11 (r5609) Manual: Introduction update (#2011365) Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2008-07-19 11:07:44 UTC (rev 5639) +++ trunk/Src/MainFrm.cpp 2008-07-19 17:14:25 UTC (rev 5640) @@ -3377,6 +3377,14 @@ const int count = dirdocs.GetCount() + mergedocs.GetCount(); if (count > 1) { + // Check that we don't have one empty dirdoc + mergedoc situation. + // That happens since we open "hidden" dirdoc for every file compare. + if (dirdocs.GetCount() == 1) + { + CDirDoc *pDoc = dirdocs.GetHead(); + if (!pDoc->HasDiffs()) + return true; + } ret = LangMessageBox(IDS_CLOSEALL_WINDOWS, MB_YESNO | MB_ICONWARNING); } return (ret == IDYES); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2008-07-22 14:37:43
|
Revision: 5655 http://winmerge.svn.sourceforge.net/winmerge/?rev=5655&view=rev Author: sdottaka Date: 2008-07-22 14:37:39 +0000 (Tue, 22 Jul 2008) Log Message: ----------- PATCH: [ 2018836 ] RFE:987590 hierarchical directory comparison result view Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DirDoc.cpp trunk/Src/DirView.cpp trunk/Src/DirView.h trunk/Src/DirViewColHandler.cpp trunk/Src/Languages/English.pot trunk/Src/Merge.rc trunk/Src/Merge2.rc trunk/Src/OptionsDef.h trunk/Src/OptionsInit.cpp trunk/Src/resource.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-22 14:27:09 UTC (rev 5654) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-22 14:37:39 UTC (rev 5655) @@ -6,6 +6,7 @@ WinMerge 2.11.1.2 Refresh compare after changing filter (#2017426) Add dialog listing available plugins (#2021722) + Hierarchical directory comparison result view (#2018836) BugFix: Failed to compare UTF-8 files plugins disabled (#2018287) Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) Modified: trunk/Src/DirDoc.cpp =================================================================== --- trunk/Src/DirDoc.cpp 2008-07-22 14:27:09 UTC (rev 5654) +++ trunk/Src/DirDoc.cpp 2008-07-22 14:37:39 UTC (rev 5655) @@ -381,6 +381,9 @@ */ BOOL CDirDoc::IsShowable(const DIFFITEM & di) { + if (di.customFlags1 & ViewCustomFlags::HIDDEN) + return 0; + if (di.diffcode.isResultFiltered()) { // Treat SKIPPED as a 'super'-flag. If item is skipped and user Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2008-07-22 14:27:09 UTC (rev 5654) +++ trunk/Src/DirView.cpp 2008-07-22 14:37:39 UTC (rev 5655) @@ -107,12 +107,14 @@ , m_nHiddenItems(0) , m_pCmpProgressDlg(NULL) , m_compareStart(0) +, m_bTreeMode(false) { m_dwDefaultStyle &= ~LVS_TYPEMASK; // Show selection all the time, so user can see current item even when // focus is elsewhere (ie, on file edit window) m_dwDefaultStyle |= LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS; + m_bTreeMode = GetOptionsMgr()->GetBool(OPT_TREE_MODE); m_bEscCloses = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC); } @@ -159,6 +161,7 @@ ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_BROWSE, OnUpdateCtxtDirCopyRightTo) ON_WM_DESTROY() ON_WM_CHAR() + ON_WM_KEYDOWN() ON_COMMAND(ID_FIRSTDIFF, OnFirstdiff) ON_UPDATE_COMMAND_UI(ID_FIRSTDIFF, OnUpdateFirstdiff) ON_COMMAND(ID_LASTDIFF, OnLastdiff) @@ -214,6 +217,12 @@ ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE, OnUpdateMergeCompare) ON_COMMAND(ID_MERGE_COMPARE_XML, OnMergeCompareXML) ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_XML, OnUpdateMergeCompare) + ON_COMMAND(ID_VIEW_TREEMODE, OnViewTreeMode) + ON_UPDATE_COMMAND_UI(ID_VIEW_TREEMODE, OnUpdateViewTreeMode) + ON_COMMAND(ID_VIEW_EXPAND_ALLSUBDIRS, OnViewExpandAllSubdirs) + ON_UPDATE_COMMAND_UI(ID_VIEW_EXPAND_ALLSUBDIRS, OnUpdateViewExpandAllSubdirs) + ON_COMMAND(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnViewCollapseAllSubdirs) + ON_UPDATE_COMMAND_UI(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnUpdateViewCollapseAllSubdirs) ON_COMMAND(ID_VIEW_DIR_STATISTICS, OnViewCompareStatistics) ON_COMMAND(ID_FILE_ENCODING, OnFileEncoding) ON_UPDATE_COMMAND_UI(ID_FILE_ENCODING, OnUpdateFileEncoding) @@ -229,6 +238,7 @@ ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) ON_NOTIFY_REFLECT(LVN_BEGINLABELEDIT, OnBeginLabelEdit) ON_NOTIFY_REFLECT(LVN_ENDLABELEDIT, OnEndLabelEdit) + ON_NOTIFY_REFLECT(NM_CLICK, OnClick) END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// @@ -284,6 +294,9 @@ VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_COMPARE_ABORTED))); m_pList->SetImageList (&m_imageList, LVSIL_SMALL); + // Load the icons used for the list view (expanded/collapsed state icons) + VERIFY(m_imageState.Create(IDB_TREE_STATE, 16, 1, RGB(255, 0, 255))); + // Restore column orders as they had them last time they ran LoadColumnOrders(); @@ -362,8 +375,14 @@ */ void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point) { - WaitStatusCursor waitstatus(IDS_STATUS_OPENING_SELECTION); - OpenSelection(); + LVHITTESTINFO lvhti; + lvhti.pt = point; + m_pList->SubItemHitTest(&lvhti); + if (lvhti.flags != LVHT_ONITEMSTATEICON) + { + WaitStatusCursor waitstatus(IDS_STATUS_OPENING_SELECTION); + OpenSelection(); + } CListView::OnLButtonDblClk(nFlags, point); } @@ -380,6 +399,55 @@ } /** + * @brief Redisplay items in subfolder + * @param [in] diffpos First item position in subfolder. + * @param [in] level Indent level + * @param [in,out] index Index of the item to be inserted. + * @param [in,out] alldiffs Number of different items + */ +void CDirView::RedisplayChildren(POSITION diffpos, int level, UINT &index, int &alldiffs) +{ + CDirDoc *pDoc = GetDocument(); + const CDiffContext &ctxt = pDoc->GetDiffContext(); + while (diffpos) + { + POSITION curdiffpos = diffpos; + const DIFFITEM &di = ctxt.GetNextSiblingDiffPosition(diffpos); + + if (!di.diffcode.isResultSame()) + ++alldiffs; + + BOOL bShowable = pDoc->IsShowable(di); + if (bShowable) + { + if (m_bTreeMode) + { + AddNewItem(index, curdiffpos, I_IMAGECALLBACK, level); + index++; + if (di.HasChildren()) + { + m_pList->SetItemState(index - 1, INDEXTOSTATEIMAGEMASK((di.customFlags1 & ViewCustomFlags::COLLAPSED) ? 1 : 2), LVIS_STATEIMAGEMASK); + if (!(di.customFlags1 & ViewCustomFlags::COLLAPSED)) + RedisplayChildren(ctxt.GetFirstChildDiffPosition(curdiffpos), level + 1, index, alldiffs); + } + } + else + { + if (!pDoc->GetRecursive() || !di.diffcode.isDirectory() || di.diffcode.isSideLeftOnly() || di.diffcode.isSideRightOnly()) + { + AddNewItem(index, curdiffpos, I_IMAGECALLBACK, 0); + index++; + } + if (di.HasChildren()) + { + RedisplayChildren(ctxt.GetFirstChildDiffPosition(curdiffpos), level + 1, index, alldiffs); + } + } + } + } +} + +/** * @brief Redisplay folder compare view. * This function clears folder compare view and then adds * items from current compare to it. @@ -395,6 +463,8 @@ DeleteAllDisplayItems(); + m_pList->SetImageList(m_bTreeMode ? &m_imageState : NULL, LVSIL_STATE); + // If non-recursive compare, add special item(s) String leftParent, rightParent; if (!pDoc->GetRecursive() || @@ -404,25 +474,9 @@ } int alldiffs = 0; + int level = 0; POSITION diffpos = ctxt.GetFirstDiffPosition(); - while (diffpos) - { - POSITION curdiffpos = diffpos; - const DIFFITEM &di = ctxt.GetNextDiffPosition(diffpos); - - // If item has hidden flag, don't add it - if (di.customFlags1 & ViewCustomFlags::HIDDEN) - continue; - - if (!di.diffcode.isResultSame()) - ++alldiffs; - - if (pDoc->IsShowable(di) && (!pDoc->GetRecursive() || !di.diffcode.isDirectory() || di.diffcode.isSideLeftOnly() || di.diffcode.isSideRightOnly())) - { - AddNewItem(cnt, curdiffpos, I_IMAGECALLBACK); - cnt++; - } - } + RedisplayChildren(diffpos, 0, cnt, alldiffs); theApp.SetLastCompareResult(alldiffs); SortColumnsAppropriately(); SetRedraw(TRUE); @@ -866,6 +920,98 @@ } /** + * @brief Expand/collapse subfolder when user presses right/left arrow key. + */ +void CDirView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) +{ + int sel = GetFocusedItem(); + switch (nChar) + { + case VK_LEFT: + CollapseSubdir(sel); + return; + case VK_RIGHT: + ExpandSubdir(sel); + return; + } + CListView::OnKeyDown(nChar, nRepCnt, nFlags); +} + +/** + * @brief Expand/collapse subfolder when "+/-" icon is clicked. + */ +void CDirView::OnClick(NMHDR* pNMHDR, LRESULT* pResult) +{ + LPNMITEMACTIVATE pNM = (LPNMITEMACTIVATE)pNMHDR; + LVHITTESTINFO lvhti; + lvhti.pt = pNM->ptAction; + m_pList->SubItemHitTest(&lvhti); + if (lvhti.flags == LVHT_ONITEMSTATEICON) + { + const DIFFITEM &di = GetItemAt(pNM->iItem); + if (di.customFlags1 & ViewCustomFlags::COLLAPSED) + ExpandSubdir(pNM->iItem); + else + CollapseSubdir(pNM->iItem); + } + + *pResult = 0; +} + +/** + * @brief Collapse subfolder + * @param [in] sel Folder item index in listview. + */ +void CDirView::CollapseSubdir(int sel) +{ + DIFFITEM& dip = this->GetDiffItemRef(sel); + if (!m_bTreeMode || (dip.customFlags1 & ViewCustomFlags::COLLAPSED) || !dip.HasChildren()) + return; + + m_pList->SetRedraw(FALSE); // Turn off updating (better performance) + + dip.customFlags1 |= ViewCustomFlags::COLLAPSED; + m_pList->SetItemState(sel, INDEXTOSTATEIMAGEMASK(1), LVIS_STATEIMAGEMASK); + + int count = m_pList->GetItemCount(); + for (int i = sel + 1; i < count; i++) + { + const DIFFITEM& di = GetDiffItem(i); + if (!di.IsAncestor(&dip)) + break; + m_pList->DeleteItem(i--); + count--; + } + + m_pList->SetRedraw(TRUE); // Turn updating back on +} + +/** + * @brief Expand subfolder + * @param [in] sel Folder item index in listview. + */ +void CDirView::ExpandSubdir(int sel) +{ + DIFFITEM& dip = GetDiffItemRef(sel); + if (!m_bTreeMode || !(dip.customFlags1 & ViewCustomFlags::COLLAPSED) || !dip.HasChildren()) + return; + + m_pList->SetRedraw(FALSE); // Turn off updating (better performance) + + dip.customFlags1 &= ~ViewCustomFlags::COLLAPSED; + m_pList->SetItemState(sel, INDEXTOSTATEIMAGEMASK(2), LVIS_STATEIMAGEMASK); + + CDirDoc *pDoc = GetDocument(); + const CDiffContext &ctxt = pDoc->GetDiffContext(); + POSITION diffpos = ctxt.GetFirstChildDiffPosition(GetItemKey(sel)); + UINT indext = sel + 1; + int alldiffs; + RedisplayChildren(diffpos, dip.GetDepth() + 1, indext, alldiffs); + + m_pList->SetRedraw(TRUE); // Turn updating back on +} + +/** * @brief Open parent folder if possible. */ void CDirView::OpenParentDirectory() @@ -2536,7 +2682,7 @@ */ void CDirView::AddParentFolderItem(BOOL bEnable) { - AddNewItem(0, SPECIAL_ITEM_POS, bEnable ? DIFFIMG_DIRUP : DIFFIMG_DIRUP_DISABLE); + AddNewItem(0, SPECIAL_ITEM_POS, bEnable ? DIFFIMG_DIRUP : DIFFIMG_DIRUP_DISABLE, 0); } /** @@ -2854,6 +3000,19 @@ if (pos == (POSITION) SPECIAL_ITEM_POS) continue; pDoc->SetItemViewFlag(pos, ViewCustomFlags::HIDDEN, ViewCustomFlags::VISIBILITY); + const DIFFITEM &di = GetDiffItem(sel); + if (m_bTreeMode && di.diffcode.isDirectory()) + { + int count = m_pList->GetItemCount(); + for (int i = sel + 1; i < count; i++) + { + const DIFFITEM &dic = GetDiffItem(i); + if (!dic.IsAncestor(&di)) + break; + m_pList->DeleteItem(i--); + count--; + } + } m_pList->DeleteItem(sel--); m_nHiddenItems++; } @@ -3083,6 +3242,73 @@ pCmdUI->Enable(m_nHiddenItems > 0); } +/** + * @brief Toggle Tree Mode + */ +void CDirView::OnViewTreeMode() +{ + m_bTreeMode = !m_bTreeMode; + GetOptionsMgr()->SaveOption(OPT_TREE_MODE, m_bTreeMode); // reverse + Redisplay(); +} + +/** + * @brief Check/Uncheck 'Tree Mode' menuitem. + */ +void CDirView::OnUpdateViewTreeMode(CCmdUI* pCmdUI) +{ + pCmdUI->SetCheck(m_bTreeMode); + pCmdUI->Enable(TRUE); +} + +/** + * @brief Expand all subfolders + */ +void CDirView::OnViewExpandAllSubdirs() +{ + CDirDoc *pDoc = GetDocument(); + CDiffContext &ctxt = (CDiffContext &)pDoc->GetDiffContext(); + POSITION diffpos = ctxt.GetFirstDiffPosition(); + while (diffpos) + { + DIFFITEM &di = ctxt.GetNextDiffRefPosition(diffpos); + di.customFlags1 &= ~ViewCustomFlags::COLLAPSED; + } + Redisplay(); +} + +/** + * @brief Update "Expand All Subfolders" item + */ +void CDirView::OnUpdateViewExpandAllSubdirs(CCmdUI* pCmdUI) +{ + pCmdUI->Enable(m_bTreeMode); +} + +/** + * @brief Collapse all subfolders + */ +void CDirView::OnViewCollapseAllSubdirs() +{ + CDirDoc *pDoc = GetDocument(); + CDiffContext &ctxt = (CDiffContext &)pDoc->GetDiffContext(); + POSITION diffpos = ctxt.GetFirstDiffPosition(); + while (diffpos) + { + DIFFITEM &di = ctxt.GetNextDiffRefPosition(diffpos); + di.customFlags1 |= ViewCustomFlags::COLLAPSED; + } + Redisplay(); +} + +/** + * @brief Update "Collapse All Subfolders" item + */ +void CDirView::OnUpdateViewCollapseAllSubdirs(CCmdUI* pCmdUI) +{ + pCmdUI->Enable(m_bTreeMode); +} + void CDirView::OnMergeCompare() { WaitStatusCursor waitstatus(IDS_STATUS_OPENING_SELECTION); Modified: trunk/Src/DirView.h =================================================================== --- trunk/Src/DirView.h 2008-07-22 14:27:09 UTC (rev 5654) +++ trunk/Src/DirView.h 2008-07-22 14:37:39 UTC (rev 5655) @@ -60,7 +60,7 @@ // to make debugging easier // These can always be packed down in the future INVALID_CODE=0, - VISIBILITY=0x3, VISIBLE=0x1, HIDDEN=0x2, + VISIBILITY=0x3, VISIBLE=0x1, HIDDEN=0x2, COLLAPSED=0x4 }; }; @@ -104,6 +104,7 @@ void StartCompare(CompareStats *pCompareStats); void Redisplay(); + void RedisplayChildren(POSITION diffpos, int level, UINT &index, int &alldiffs); void UpdateResources(); void LoadColumnHeaderItems(); POSITION GetItemKey(int idx) const; @@ -194,7 +195,7 @@ private: void InitiateSort(); void NameColumn(int id, int subitem); - int AddNewItem(int i, POSITION diffpos, int iImage); + int AddNewItem(int i, POSITION diffpos, int iImage, int iIndent); bool IsDefaultSortAscending(int col) const; int ColPhysToLog(int i) const { return m_invcolorder[i]; } int ColLogToPhys(int i) const { return m_colorder[i]; } /**< -1 if not displayed */ @@ -257,6 +258,7 @@ CString GenerateReport(); CSortHeaderCtrl m_ctlSortHeader; CImageList m_imageList; + CImageList m_imageState; CListCtrl * m_pList; int m_numcols; int m_dispcols; @@ -265,6 +267,7 @@ BOOL m_bEscCloses; /**< Cached value for option for ESC closing window */ CFont m_font; /**< User-selected font */ UINT m_nHiddenItems; /**< Count of items we have hidden */ + BOOL m_bTreeMode; /**< TRUE if tree mode is on*/ DirCompProgressDlg * m_pCmpProgressDlg; clock_t m_compareStart; /**< Starting process time of the compare */ BOOL m_bUserCancelEdit; /**< TRUE if the user cancels rename */ @@ -306,6 +309,8 @@ afx_msg void OnUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI); afx_msg void OnDestroy(); afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); + afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); + afx_msg void OnClick(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnFirstdiff(); afx_msg void OnUpdateFirstdiff(CCmdUI* pCmdUI); afx_msg void OnLastdiff(); @@ -361,6 +366,12 @@ afx_msg void OnUpdateStatusNum(CCmdUI* pCmdUI); afx_msg void OnViewShowHiddenItems(); afx_msg void OnUpdateViewShowHiddenItems(CCmdUI* pCmdUI); + afx_msg void OnViewTreeMode(); + afx_msg void OnUpdateViewTreeMode(CCmdUI* pCmdUI); + afx_msg void OnViewExpandAllSubdirs(); + afx_msg void OnUpdateViewExpandAllSubdirs(CCmdUI* pCmdUI); + afx_msg void OnViewCollapseAllSubdirs(); + afx_msg void OnUpdateViewCollapseAllSubdirs(CCmdUI* pCmdUI); afx_msg void OnMergeCompare(); afx_msg void OnMergeCompareXML(); afx_msg void OnUpdateMergeCompare(CCmdUI *pCmdUI); @@ -418,6 +429,8 @@ void ResetColumnWidths(); BOOL IsLabelEdit(); BOOL IsItemSelectedSpecial(); + void CollapseSubdir(int sel); + void ExpandSubdir(int sel); }; Modified: trunk/Src/DirViewColHandler.cpp =================================================================== --- trunk/Src/DirViewColHandler.cpp 2008-07-22 14:27:09 UTC (rev 5654) +++ trunk/Src/DirViewColHandler.cpp 2008-07-22 14:37:39 UTC (rev 5655) @@ -75,8 +75,36 @@ return 0; } SIZE_T offset = pColInfo->offset; - const void * arg1 = reinterpret_cast<const char *>(&ldi) + offset; - const void * arg2 = reinterpret_cast<const char *>(&rdi) + offset; + const void * arg1; + const void * arg2; + if (m_bTreeMode) + { + int lLevel = ldi.GetDepth(); + int rLevel = rdi.GetDepth(); + const DIFFITEM *lcur = &ldi, *rcur = &rdi; + if (lLevel < rLevel) + { + for (; lLevel != rLevel; rLevel--) + rcur = rcur->parent; + } + else if (rLevel < lLevel) + { + for (; lLevel != rLevel; lLevel--) + lcur = lcur->parent; + } + while (lcur->parent != rcur->parent) + { + lcur = lcur->parent; + rcur = rcur->parent; + } + arg1 = reinterpret_cast<const char *>(lcur) + offset; + arg2 = reinterpret_cast<const char *>(rcur) + offset; + } + else + { + arg1 = reinterpret_cast<const char *>(&ldi) + offset; + arg2 = reinterpret_cast<const char *>(&rdi) + offset; + } if (ColSortFncPtrType fnc = pColInfo->sortfnc) { return (*fnc)(pCtxt, arg1, arg2); @@ -172,11 +200,12 @@ } /// Add new item to list view -int CDirView::AddNewItem(int i, POSITION diffpos, int iImage) +int CDirView::AddNewItem(int i, POSITION diffpos, int iImage, int iIndent) { LV_ITEM lvItem; - lvItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; + lvItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE | LVIF_INDENT; lvItem.iItem = i; + lvItem.iIndent = iIndent; lvItem.iSubItem = 0; lvItem.pszText = LPSTR_TEXTCALLBACK; lvItem.lParam = (LPARAM)diffpos; Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-07-22 14:27:09 UTC (rev 5654) +++ trunk/Src/Languages/English.pot 2008-07-22 14:37:39 UTC (rev 5655) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-07-21 14:20+0000\n" +"POT-Creation-Date: 2008-07-22 23:21+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -68,7 +68,7 @@ #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:502 +#: Merge.rc:506 #, c-format msgid "&Copy" msgstr "" @@ -80,7 +80,7 @@ msgstr "" #: Merge.rc:84 -#: Merge.rc:583 +#: Merge.rc:587 #, c-format msgid "&Goto..." msgstr "" @@ -91,43 +91,43 @@ msgstr "" #: Merge.rc:88 -#: Merge.rc:525 -#: Merge.rc:531 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:526 -#: Merge.rc:532 +#: Merge.rc:530 +#: Merge.rc:536 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:527 -#: Merge.rc:533 +#: Merge.rc:531 +#: Merge.rc:537 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 #: Merge.rc:191 -#: Merge.rc:307 +#: Merge.rc:311 #, c-format msgid "&File" msgstr "" #: Merge.rc:112 #: Merge.rc:193 -#: Merge.rc:309 +#: Merge.rc:313 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:113 #: Merge.rc:194 -#: Merge.rc:310 +#: Merge.rc:314 #, c-format msgid "&Open...\tCtrl+O" msgstr "" @@ -139,14 +139,14 @@ #: Merge.rc:116 #: Merge.rc:196 -#: Merge.rc:312 +#: Merge.rc:316 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:117 #: Merge.rc:197 -#: Merge.rc:313 +#: Merge.rc:317 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -158,293 +158,293 @@ #: Merge.rc:121 #: Merge.rc:204 -#: Merge.rc:345 +#: Merge.rc:349 #, c-format msgid "E&xit" msgstr "" #: Merge.rc:123 #: Merge.rc:206 -#: Merge.rc:347 +#: Merge.rc:351 #, c-format msgid "&Edit" msgstr "" #: Merge.rc:125 #: Merge.rc:210 -#: Merge.rc:381 +#: Merge.rc:385 #, c-format msgid "&Options..." msgstr "" #: Merge.rc:127 #: Merge.rc:212 -#: Merge.rc:383 +#: Merge.rc:387 #, c-format msgid "&View" msgstr "" #: Merge.rc:129 -#: Merge.rc:223 -#: Merge.rc:385 +#: Merge.rc:227 +#: Merge.rc:389 #, c-format msgid "Select &Font..." msgstr "" #: Merge.rc:130 -#: Merge.rc:224 -#: Merge.rc:386 +#: Merge.rc:228 +#: Merge.rc:390 #, c-format msgid "Use Default F&ont" msgstr "" #: Merge.rc:132 -#: Merge.rc:226 -#: Merge.rc:407 +#: Merge.rc:230 +#: Merge.rc:411 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:228 -#: Merge.rc:409 +#: Merge.rc:232 +#: Merge.rc:413 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:229 -#: Merge.rc:410 +#: Merge.rc:233 +#: Merge.rc:414 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:230 -#: Merge.rc:411 +#: Merge.rc:234 +#: Merge.rc:415 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:232 -#: Merge.rc:413 +#: Merge.rc:236 +#: Merge.rc:417 #, c-format msgid "&Status Bar" msgstr "" #: Merge.rc:139 -#: Merge.rc:233 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:418 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:236 -#: Merge.rc:418 +#: Merge.rc:240 +#: Merge.rc:422 #, c-format msgid "&Language..." msgstr "" #: Merge.rc:143 -#: Merge.rc:257 -#: Merge.rc:440 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:260 -#: Merge.rc:442 +#: Merge.rc:264 +#: Merge.rc:446 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:261 -#: Merge.rc:443 +#: Merge.rc:265 +#: Merge.rc:447 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:264 -#: Merge.rc:446 +#: Merge.rc:268 +#: Merge.rc:450 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:266 -#: Merge.rc:448 +#: Merge.rc:270 +#: Merge.rc:452 #, c-format msgid "&List..." msgstr "" #: Merge.rc:152 -#: Merge.rc:268 -#: Merge.rc:450 +#: Merge.rc:272 +#: Merge.rc:454 #, c-format msgid "&Manual Unpacking" msgstr "" #: Merge.rc:153 -#: Merge.rc:269 -#: Merge.rc:451 +#: Merge.rc:273 +#: Merge.rc:455 #, c-format msgid "&Automatic Unpacking" msgstr "" #: Merge.rc:155 -#: Merge.rc:271 -#: Merge.rc:453 +#: Merge.rc:275 +#: Merge.rc:457 #, c-format msgid "&Edit with Unpacker" msgstr "" #: Merge.rc:157 -#: Merge.rc:273 -#: Merge.rc:460 +#: Merge.rc:277 +#: Merge.rc:464 #, c-format msgid "&Reload plugins" msgstr "" #: Merge.rc:159 -#: Merge.rc:275 -#: Merge.rc:462 +#: Merge.rc:279 +#: Merge.rc:466 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:161 -#: Merge.rc:277 -#: Merge.rc:464 +#: Merge.rc:281 +#: Merge.rc:468 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:162 -#: Merge.rc:278 -#: Merge.rc:465 +#: Merge.rc:282 +#: Merge.rc:469 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:164 -#: Merge.rc:280 -#: Merge.rc:467 +#: Merge.rc:284 +#: Merge.rc:471 #, c-format msgid "&Window" msgstr "" #: Merge.rc:166 -#: Merge.rc:282 -#: Merge.rc:469 +#: Merge.rc:286 +#: Merge.rc:473 #, c-format msgid "Cl&ose" msgstr "" #: Merge.rc:167 -#: Merge.rc:283 -#: Merge.rc:470 +#: Merge.rc:287 +#: Merge.rc:474 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:169 -#: Merge.rc:285 -#: Merge.rc:472 +#: Merge.rc:289 +#: Merge.rc:476 #, c-format msgid "Change &Pane\tF6" msgstr "" #: Merge.rc:171 -#: Merge.rc:287 -#: Merge.rc:474 +#: Merge.rc:291 +#: Merge.rc:478 #, c-format msgid "Tile &Horizontally" msgstr "" #: Merge.rc:172 -#: Merge.rc:288 -#: Merge.rc:475 +#: Merge.rc:292 +#: Merge.rc:479 #, c-format msgid "Tile &Vertically" msgstr "" #: Merge.rc:173 -#: Merge.rc:289 -#: Merge.rc:476 +#: Merge.rc:293 +#: Merge.rc:480 #, c-format msgid "&Cascade" msgstr "" #: Merge.rc:175 -#: Merge.rc:291 -#: Merge.rc:478 -#: Merge.rc:1911 +#: Merge.rc:295 +#: Merge.rc:482 +#: Merge.rc:1918 #, c-format msgid "&Help" msgstr "" #: Merge.rc:177 -#: Merge.rc:293 -#: Merge.rc:480 +#: Merge.rc:297 +#: Merge.rc:484 #, c-format msgid "&WinMerge Help\tF1" msgstr "" #: Merge.rc:179 -#: Merge.rc:295 -#: Merge.rc:482 +#: Merge.rc:299 +#: Merge.rc:486 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:296 -#: Merge.rc:483 +#: Merge.rc:300 +#: Merge.rc:487 #, c-format msgid "&Translations" msgstr "" #: Merge.rc:181 -#: Merge.rc:297 -#: Merge.rc:484 +#: Merge.rc:301 +#: Merge.rc:488 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:182 -#: Merge.rc:298 -#: Merge.rc:485 +#: Merge.rc:302 +#: Merge.rc:489 #, c-format msgid "A&rchive Support disabled..." msgstr "" #: Merge.rc:184 -#: Merge.rc:300 -#: Merge.rc:487 +#: Merge.rc:304 +#: Merge.rc:491 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:185 -#: Merge.rc:301 -#: Merge.rc:488 +#: Merge.rc:305 +#: Merge.rc:492 #, c-format msgid "&About WinMerge..." msgstr "" #: Merge.rc:199 -#: Merge.rc:331 +#: Merge.rc:335 #, c-format msgid "L&eft Read-only" msgstr "" #: Merge.rc:200 -#: Merge.rc:332 +#: Merge.rc:336 #, c-format msgid "Ri&ght Read-only" msgstr "" @@ -455,7 +455,7 @@ msgstr "" #: Merge.rc:208 -#: Merge.rc:357 +#: Merge.rc:361 #, c-format msgid "Select &All\tCtrl+A" msgstr "" @@ -495,2225 +495,2248 @@ msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:234 +#: Merge.rc:223 #, c-format -msgid "Compa&re Statistics" +msgid "Tree &Mode" msgstr "" +#: Merge.rc:224 +#, c-format +msgid "E&xpand All Subfolders" +msgstr "" + +#: Merge.rc:225 +#, c-format +msgid "&Collapse All Subfolders" +msgstr "" + #: Merge.rc:238 -#: Merge.rc:420 #, c-format +msgid "Compa&re Statistics" +msgstr "" + +#: Merge.rc:242 +#: Merge.rc:424 +#, c-format msgid "Refre&sh\tF5" msgstr "" -#: Merge.rc:239 +#: Merge.rc:243 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:241 -#: Merge.rc:422 +#: Merge.rc:245 +#: Merge.rc:426 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:243 +#: Merge.rc:247 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:245 -#: Merge.rc:424 +#: Merge.rc:249 +#: Merge.rc:428 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "" -#: Merge.rc:246 -#: Merge.rc:425 +#: Merge.rc:250 +#: Merge.rc:429 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "" -#: Merge.rc:248 -#: Merge.rc:427 +#: Merge.rc:252 +#: Merge.rc:431 #, c-format msgid "&First Difference\tAlt+Home" msgstr "" -#: Merge.rc:249 -#: Merge.rc:428 +#: Merge.rc:253 +#: Merge.rc:432 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "" -#: Merge.rc:250 -#: Merge.rc:429 +#: Merge.rc:254 +#: Merge.rc:433 #, c-format msgid "&Last Difference\tAlt+End" msgstr "" -#: Merge.rc:252 -#: Merge.rc:431 +#: Merge.rc:256 +#: Merge.rc:435 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:253 -#: Merge.rc:432 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:255 +#: Merge.rc:259 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:259 -#: Merge.rc:556 +#: Merge.rc:263 +#: Merge.rc:560 #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:262 -#: Merge.rc:444 +#: Merge.rc:266 +#: Merge.rc:448 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:315 +#: Merge.rc:319 #, c-format msgid "&Save\tCtrl+S" msgstr "" -#: Merge.rc:316 +#: Merge.rc:320 #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:318 -#: Merge.rc:323 +#: Merge.rc:322 +#: Merge.rc:327 #, c-format msgid "&Save" msgstr "" -#: Merge.rc:319 -#: Merge.rc:324 +#: Merge.rc:323 +#: Merge.rc:328 #, c-format msgid "Save &As..." msgstr "" -#: Merge.rc:321 +#: Merge.rc:325 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:327 +#: Merge.rc:331 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:328 +#: Merge.rc:332 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:329 +#: Merge.rc:333 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:334 +#: Merge.rc:338 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:336 +#: Merge.rc:340 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:341 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:338 +#: Merge.rc:342 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:341 +#: Merge.rc:345 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:343 +#: Merge.rc:347 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:349 +#: Merge.rc:353 #, c-format msgid "&Undo\tCtrl+Z" msgstr "" -#: Merge.rc:350 +#: Merge.rc:354 #, c-format msgid "&Redo\tCtrl+Y" msgstr "" -#: Merge.rc:352 +#: Merge.rc:356 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:353 +#: Merge.rc:357 #, c-format msgid "&Copy\tCtrl+C" msgstr "" -#: Merge.rc:354 +#: Merge.rc:358 #, c-format msgid "&Paste\tCtrl+V" msgstr "" -#: Merge.rc:356 +#: Merge.rc:360 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:359 +#: Merge.rc:363 #, c-format msgid "F&ind...\tCtrl+F" msgstr "" -#: Merge.rc:360 +#: Merge.rc:364 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "" -#: Merge.rc:362 +#: Merge.rc:366 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:364 -#: Merge.rc:2744 +#: Merge.rc:368 +#: Merge.rc:2751 #, c-format msgid "< Empty >" msgstr "" -#: Merge.rc:367 +#: Merge.rc:371 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:369 +#: Merge.rc:373 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:372 +#: Merge.rc:376 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:374 +#: Merge.rc:378 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:375 +#: Merge.rc:379 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:376 +#: Merge.rc:380 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:377 +#: Merge.rc:381 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:379 +#: Merge.rc:383 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:387 +#: Merge.rc:391 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:389 +#: Merge.rc:393 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:390 +#: Merge.rc:394 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:391 +#: Merge.rc:395 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:393 +#: Merge.rc:397 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:398 +#: Merge.rc:402 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:399 +#: Merge.rc:403 #, c-format msgid "&View Whitespace" msgstr "" -#: Merge.rc:400 +#: Merge.rc:404 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:401 +#: Merge.rc:405 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:402 +#: Merge.rc:406 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:403 +#: Merge.rc:407 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:405 +#: Merge.rc:409 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:415 +#: Merge.rc:419 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:416 +#: Merge.rc:420 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:434 +#: Merge.rc:438 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "" -#: Merge.rc:435 +#: Merge.rc:439 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "" -#: Merge.rc:437 +#: Merge.rc:441 #, c-format msgid "Copy &All to Right" msgstr "" -#: Merge.rc:438 +#: Merge.rc:442 #, c-format msgid "Cop&y All to Left" msgstr "" -#: Merge.rc:455 +#: Merge.rc:459 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:496 +#: Merge.rc:500 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:497 +#: Merge.rc:501 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:499 +#: Merge.rc:503 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:504 +#: Merge.rc:508 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:505 +#: Merge.rc:509 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:506 +#: Merge.rc:510 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:507 +#: Merge.rc:511 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:509 +#: Merge.rc:513 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:511 +#: Merge.rc:515 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:512 +#: Merge.rc:516 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:514 +#: Merge.rc:518 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:516 -#: Merge.rc:1134 -#: Merge.rc:1516 +#: Merge.rc:520 +#: Merge.rc:1138 +#: Merge.rc:1520 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:517 -#: Merge.rc:1136 -#: Merge.rc:1519 +#: Merge.rc:521 +#: Merge.rc:1140 +#: Merge.rc:1523 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:518 +#: Merge.rc:522 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:520 +#: Merge.rc:524 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:521 +#: Merge.rc:525 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:523 +#: Merge.rc:527 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:529 +#: Merge.rc:533 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:536 +#: Merge.rc:540 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:538 +#: Merge.rc:542 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:539 +#: Merge.rc:543 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:540 +#: Merge.rc:544 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:542 +#: Merge.rc:546 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:544 +#: Merge.rc:548 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:546 +#: Merge.rc:550 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:547 +#: Merge.rc:551 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:548 +#: Merge.rc:552 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:549 +#: Merge.rc:553 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:552 +#: Merge.rc:556 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:564 +#: Merge.rc:568 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:565 +#: Merge.rc:569 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:571 +#: Merge.rc:575 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:573 +#: Merge.rc:577 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:574 +#: Merge.rc:578 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:582 +#: Merge.rc:586 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:585 +#: Merge.rc:589 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:586 +#: Merge.rc:590 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:587 +#: Merge.rc:591 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:656 +#: Merge.rc:660 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:662 +#: Merge.rc:666 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:663 +#: Merge.rc:667 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:664 +#: Merge.rc:668 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:667 -#: Merge.rc:699 -#: Merge.rc:789 -#: Merge.rc:975 -#: Merge.rc:1053 -#: Merge.rc:1082 -#: Merge.rc:1092 -#: Merge.rc:1258 -#: Merge.rc:1322 -#: Merge.rc:1335 -#: Merge.rc:1427 -#: Merge.rc:1442 -#: Merge.rc:1664 +#: Merge.rc:671 +#: Merge.rc:703 +#: Merge.rc:793 +#: Merge.rc:979 +#: Merge.rc:1057 +#: Merge.rc:1086 +#: Merge.rc:1096 +#: Merge.rc:1262 +#: Merge.rc:1326 +#: Merge.rc:1339 +#: Merge.rc:1431 +#: Merge.rc:1446 +#: Merge.rc:1668 #, c-format msgid "OK" msgstr "" -#: Merge.rc:668 +#: Merge.rc:672 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:675 +#: Merge.rc:679 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:678 -#: Merge.rc:1593 +#: Merge.rc:682 +#: Merge.rc:1597 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:682 -#: Merge.rc:743 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:686 +#: Merge.rc:747 +#: Merge.rc:1000 +#: Merge.rc:1022 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:683 -#: Merge.rc:1597 +#: Merge.rc:687 +#: Merge.rc:1601 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:687 -#: Merge.rc:1029 +#: Merge.rc:691 +#: Merge.rc:1033 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:688 -#: Merge.rc:1601 +#: Merge.rc:692 +#: Merge.rc:1605 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:1603 +#: Merge.rc:695 +#: Merge.rc:1607 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:692 +#: Merge.rc:696 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:695 +#: Merge.rc:699 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:696 -#: Merge.rc:1604 +#: Merge.rc:700 +#: Merge.rc:1608 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:698 +#: Merge.rc:702 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:700 -#: Merge.rc:730 -#: Merge.rc:790 -#: Merge.rc:820 -#: Merge.rc:852 -#: Merge.rc:862 -#: Merge.rc:1054 -#: Merge.rc:1083 -#: Merge.rc:1093 -#: Merge.rc:1144 -#: Merge.rc:1259 -#: Merge.rc:1336 -#: Merge.rc:1428 -#: Merge.rc:1443 -#: Merge.rc:1665 +#: Merge.rc:704 +#: Merge.rc:734 +#: Merge.rc:794 +#: Merge.rc:824 +#: Merge.rc:856 +#: Merge.rc:866 +#: Merge.rc:1058 +#: Merge.rc:1087 +#: Merge.rc:1097 +#: Merge.rc:1148 +#: Merge.rc:1263 +#: Merge.rc:1340 +#: Merge.rc:1432 +#: Merge.rc:1447 +#: Merge.rc:1669 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:701 -#: Merge.rc:1337 +#: Merge.rc:705 +#: Merge.rc:1341 #, c-format msgid "Help" msgstr "" -#: Merge.rc:702 +#: Merge.rc:706 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:709 +#: Merge.rc:713 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:714 +#: Merge.rc:718 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:717 +#: Merge.rc:721 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:720 +#: Merge.rc:724 #, c-format msgid "User:" msgstr "" -#: Merge.rc:722 +#: Merge.rc:726 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:724 +#: Merge.rc:728 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:726 -#: Merge.rc:867 +#: Merge.rc:730 +#: Merge.rc:871 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:728 +#: Merge.rc:732 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:729 -#: Merge.rc:863 +#: Merge.rc:733 +#: Merge.rc:867 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:735 +#: Merge.rc:739 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:738 +#: Merge.rc:742 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:741 +#: Merge.rc:745 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:748 -#: Merge.rc:1919 +#: Merge.rc:752 +#: Merge.rc:1926 #, c-format msgid "General" msgstr "" -#: Merge.rc:751 +#: Merge.rc:755 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:754 +#: Merge.rc:758 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:756 +#: Merge.rc:760 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:758 +#: Merge.rc:762 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:761 +#: Merge.rc:765 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:763 +#: Merge.rc:767 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:765 +#: Merge.rc:769 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:768 +#: Merge.rc:772 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:771 +#: Merge.rc:775 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:773 -#: Merge.rc:1616 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:775 -#: Merge.rc:1618 +#: Merge.rc:779 +#: Merge.rc:1622 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:777 +#: Merge.rc:781 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:779 +#: Merge.rc:783 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:786 +#: Merge.rc:790 #, c-format msgid "Language" msgstr "" -#: Merge.rc:793 +#: Merge.rc:797 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:799 +#: Merge.rc:803 #, c-format msgid "Find" msgstr "" -#: Merge.rc:802 -#: Merge.rc:829 +#: Merge.rc:806 +#: Merge.rc:833 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:805 -#: Merge.rc:835 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:807 -#: Merge.rc:837 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:809 -#: Merge.rc:839 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:811 +#: Merge.rc:815 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:814 +#: Merge.rc:818 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:815 +#: Merge.rc:819 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:817 +#: Merge.rc:821 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:819 -#: Merge.rc:849 +#: Merge.rc:823 +#: Merge.rc:853 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:826 +#: Merge.rc:830 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:832 +#: Merge.rc:836 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:841 +#: Merge.rc:845 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:844 +#: Merge.rc:848 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:845 +#: Merge.rc:849 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:847 +#: Merge.rc:851 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:850 +#: Merge.rc:854 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:851 +#: Merge.rc:855 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:858 -#: Merge.rc:2160 +#: Merge.rc:862 +#: Merge.rc:2167 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:861 +#: Merge.rc:865 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:866 -#: Merge.rc:1178 +#: Merge.rc:870 +#: Merge.rc:1182 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:869 +#: Merge.rc:873 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:875 +#: Merge.rc:879 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:878 +#: Merge.rc:882 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:881 +#: Merge.rc:885 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:888 +#: Merge.rc:892 #, c-format msgid "Save" msgstr "" -#: Merge.rc:889 +#: Merge.rc:893 #, c-format msgid "New" msgstr "" -#: Merge.rc:890 +#: Merge.rc:894 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:891 +#: Merge.rc:895 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:896 -#: Merge.rc:1922 +#: Merge.rc:900 +#: Merge.rc:1929 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:899 +#: Merge.rc:903 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:903 +#: Merge.rc:907 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:907 -#: Merge.rc:1568 +#: Merge.rc:911 +#: Merge.rc:1572 #, c-format msgid "Background" msgstr "" -#: Merge.rc:908 +#: Merge.rc:912 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:921 -#: Merge.rc:1363 -#: Merge.rc:1569 +#: Merge.rc:925 +#: Merge.rc:1367 +#: Merge.rc:1573 #, c-format msgid "Text" msgstr "" -#: Merge.rc:925 +#: Merge.rc:929 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:935 +#: Merge.rc:939 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:945 +#: Merge.rc:949 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:952 +#: Merge.rc:956 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:959 +#: Merge.rc:963 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:966 -#: Merge.rc:1052 -#: Merge.rc:1081 -#: Merge.rc:1181 -#: Merge.rc:1409 +#: Merge.rc:970 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1185 +#: Merge.rc:1413 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:972 -#: Merge.rc:1351 -#: Merge.rc:1557 +#: Merge.rc:976 +#: Merge.rc:1355 +#: Merge.rc:1561 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:982 -#: Merge.rc:1925 +#: Merge.rc:986 +#: Merge.rc:1932 #, c-format msgid "System" msgstr "" -#: Merge.rc:985 +#: Merge.rc:989 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:987 +#: Merge.rc:991 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:988 +#: Merge.rc:992 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:990 +#: Merge.rc:994 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:992 +#: Merge.rc:996 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:994 +#: Merge.rc:998 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1001 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:999 +#: Merge.rc:1003 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:1000 +#: Merge.rc:1004 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1001 +#: Merge.rc:1005 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1003 +#: Merge.rc:1007 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1022 +#: Merge.rc:1010 +#: Merge.rc:1026 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1012 +#: Merge.rc:1016 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1015 +#: Merge.rc:1019 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1019 +#: Merge.rc:1023 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1023 +#: Merge.rc:1027 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1028 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1026 +#: Merge.rc:1030 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1030 +#: Merge.rc:1034 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1035 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1038 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1037 +#: Merge.rc:1041 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1042 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1040 +#: Merge.rc:1044 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1042 +#: Merge.rc:1046 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1044 +#: Merge.rc:1048 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1046 +#: Merge.rc:1050 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1048 +#: Merge.rc:1052 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1050 +#: Merge.rc:1054 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1072 +#: Merge.rc:1076 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1078 +#: Merge.rc:1082 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1079 +#: Merge.rc:1083 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1089 +#: Merge.rc:1093 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1094 +#: Merge.rc:1098 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1097 +#: Merge.rc:1101 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1100 +#: Merge.rc:1104 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1101 +#: Merge.rc:1105 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1112 +#: Merge.rc:1116 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1115 -#: Merge.rc:1872 +#: Merge.rc:1119 +#: Merge.rc:1879 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1120 +#: Merge.rc:1124 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1121 +#: Merge.rc:1125 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1126 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1128 +#: Merge.rc:1132 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1131 +#: Merge.rc:1135 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1133 +#: Merge.rc:1137 #, c-format msgid "File" msgstr "" -#: Merge.rc:1138 +#: Merge.rc:1142 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1139 +#: Merge.rc:1143 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1141 +#: Merge.rc:1145 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1143 +#: Merge.rc:1147 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1149 -#: Merge.rc:1920 +#: Merge.rc:1153 +#: Merge.rc:1927 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1156 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1157 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1155 +#: Merge.rc:1159 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1161 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1159 +#: Merge.rc:1163 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1161 +#: Merge.rc:1165 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1167 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1166 +#: Merge.rc:1170 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1168 +#: Merge.rc:1172 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1170 +#: Merge.rc:1174 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1177 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1176 +#: Merge.rc:1180 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1179 +#: Merge.rc:1183 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1186 -#: Merge.rc:1921 +#: Merge.rc:1190 +#: Merge.rc:1928 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1193 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1195 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1197 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1195 +#: Merge.rc:1199 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1196 +#: Merge.rc:1200 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1203 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1205 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1207 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1205 +#: Merge.rc:1209 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1207 +#: Merge.rc:1211 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1209 +#: Merge.rc:1213 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1228 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1230 +#: Merge.rc:1234 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1231 +#: Merge.rc:1235 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1232 +#: Merge.rc:1236 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1233 +#: Merge.rc:1237 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1238 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1240 +#: Merge.rc:1244 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1243 +#: Merge.rc:1247 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1246 +#: Merge.rc:1250 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1248 +#: Merge.rc:1252 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1250 +#: Merge.rc:1254 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1253 +#: Merge.rc:1257 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1255 +#: Merge.rc:1259 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1257 +#: Merge.rc:1261 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1264 -#: Merge.rc:1512 -#: Merge.rc:1927 +#: Merge.rc:1268 +#: Merge.rc:1516 +#: Merge.rc:1934 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1267 +#: Merge.rc:1271 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1268 +#: Merge.rc:1272 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1270 +#: Merge.rc:1274 #, c-format msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1273 +#: Merge.rc:1277 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1279 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1281 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1289 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1288 +#: Merge.rc:1292 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1295 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1297 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1299 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1301 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1303 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1305 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1304 -#: Merge.rc:1307 +#: Merge.rc:1308 +#: Merge.rc:1311 #, c-format msgid "present" msgstr "" -#: Merge.rc:1305 +#: Merge.rc:1309 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1308 +#: Merge.rc:1312 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1310 -#: Merge.rc:1315 +#: Merge.rc:1314 +#: Merge.rc:1319 #, c-format msgid "none" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1316 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1317 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1321 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1318 +#: Merge.rc:1322 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1319 +#: Merge.rc:1323 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1323 +#: Merge.rc:1327 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1332 +#: Merge.rc:1336 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1343 +#: Merge.rc:1347 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1349 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1350 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1358 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1359 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1360 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1357 +#: Merge.rc:1361 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1358 +#: Merge.rc:1362 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1359 +#: Merge.rc:1363 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1360 +#: Merge.rc:1364 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1361 +#: Merge.rc:1365 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1362 +#: Merge.rc:1366 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1367 -#: Merge.rc:1372 -#: Merge.rc:1377 -#: Merge.rc:1382 -#: Merge.rc:1387 -#: Merge.rc:1392 -#: Merge.rc:1397 -#: Merge.rc:1402 -#: Merge.rc:1407 +#: Merge.rc:1371 +#: Merge.rc:1376 +#: Merge.rc:1381 +#: Merge.rc:1386 +#: Merge.rc:1391 +#: Merge.rc:1396 +#: Merge.rc:1401 +#: Merge.rc:1406 +#: Merge.rc:1411 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1415 +#: Merge.rc:1419 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1418 +#: Merge.rc:1422 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1421 -#: Merge.rc:1595 +#: Merge.rc:1425 #: Merge.rc:1599 -#: Merge.rc:1626 +#: Merge.rc:1603 +#: Merge.rc:1630 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1426 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1425 +#: Merge.rc:1429 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1433 +#: Merge.rc:1437 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1436 +#: Merge.rc:1440 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1442 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1444 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1448 -#: Merge.rc:1928 +#: Merge.rc:1452 +#: Merge.rc:1935 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1451 +#: Merge.rc:1455 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1457 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1458 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1460 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1459 +#: Merge.rc:1463 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1461 +#: Merge.rc:1465 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1473 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1472 +#: Merge.rc:1476 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1473 +#: Merge.rc:1477 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1474 -#: Merge.rc:2302 +#: Merge.rc:1478 +#: Merge.rc:2309 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1479 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1478 -#: Merge.rc:1497 +#: Merge.rc:1482 +#: Merge.rc:1501 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1485 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1486 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1487 +#: Merge.rc:1491 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1492 -#: Merge.rc:2297 +#: Merge.rc:1496 +#: Merge.rc:2304 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1501 +#: Merge.rc:1505 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1510 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1515 +#: Merge.rc:1519 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1518 -#: Merge.rc:1521 +#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1522 +#: Merge.rc:1526 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1527 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1525 -#: Merge.rc:1528 +#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "..." msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1530 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1533 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1532 +#: Merge.rc:1536 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1533 -#: Merge.rc:1894 +#: Merge.rc:1537 +#: Merge.rc:1901 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1538 +#: Merge.rc:1542 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1545 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1543 +#: Merge.rc:1547 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1549 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1551 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1555 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1552 +#: Merge.rc:1556 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1564... [truncated message content] |
From: <ki...@us...> - 2008-07-23 17:35:07
|
Revision: 5665 http://winmerge.svn.sourceforge.net/winmerge/?rev=5665&view=rev Author: kimmov Date: 2008-07-23 17:35:05 +0000 (Wed, 23 Jul 2008) Log Message: ----------- BUG: [ 2023734 ] Errors Moving Files - v.2.4.8.0 Unicode Disable moving protected items. Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DirView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-23 14:25:22 UTC (rev 5664) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-23 17:35:05 UTC (rev 5665) @@ -10,6 +10,7 @@ BugFix: Failed to compare UTF-8 files plugins disabled (#2018287) Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) + BugFix: Moving was allowed for protected items (#2023734) WinMerge 2.11.1.1 - 2008-07-11 (r5609) Manual: Introduction update (#2011365) Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2008-07-23 14:25:22 UTC (rev 5664) +++ trunk/Src/DirView.cpp 2008-07-23 17:35:05 UTC (rev 5665) @@ -3044,7 +3044,14 @@ */ void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI) { - DoUpdateCtxtDirMoveRightTo(pCmdUI); + // Because move deletes original item, origin side + // cannot be read-only + if (GetDocument()->GetReadOnly(FALSE)) + pCmdUI->Enable(FALSE); + else + { + DoUpdateCtxtDirMoveRightTo(pCmdUI); + } } /** @@ -3052,7 +3059,14 @@ */ void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI) { - DoUpdateCtxtDirMoveLeftTo(pCmdUI); + // Because move deletes original item, origin side + // cannot be read-only + if (GetDocument()->GetReadOnly(TRUE)) + pCmdUI->Enable(FALSE); + else + { + DoUpdateCtxtDirMoveLeftTo(pCmdUI); + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-23 17:39:26
|
Revision: 5666 http://winmerge.svn.sourceforge.net/winmerge/?rev=5666&view=rev Author: kimmov Date: 2008-07-23 17:39:22 +0000 (Wed, 23 Jul 2008) Log Message: ----------- PATCH: [ 2025781 ] Disable changing EOL for protected file Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MergeEditView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-23 17:35:05 UTC (rev 5665) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-23 17:39:22 UTC (rev 5666) @@ -11,6 +11,7 @@ Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) BugFix: Moving was allowed for protected items (#2023734) + BugFix: Could change EOL style for protected file (#2025781) WinMerge 2.11.1.1 - 2008-07-11 (r5609) Manual: Introduction update (#2011365) Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2008-07-23 17:35:05 UTC (rev 5665) +++ trunk/Src/MergeEditView.cpp 2008-07-23 17:39:22 UTC (rev 5666) @@ -2150,6 +2150,10 @@ nStyle != m_pTextBuffer->GetCRLFMode()) { pCmdUI->SetRadio(FALSE); + + // Don't allow selecting other EOL style for protected pane + if (IsReadOnly(m_nThisPane)) + pCmdUI->Enable(FALSE); } else pCmdUI->SetRadio(TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-23 17:45:13
|
Revision: 5667 http://winmerge.svn.sourceforge.net/winmerge/?rev=5667&view=rev Author: kimmov Date: 2008-07-23 17:45:10 +0000 (Wed, 23 Jul 2008) Log Message: ----------- PATCH: [ 2025472 ] Add Conflict Open to all menus Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Languages/English.pot trunk/Src/Merge.rc Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-23 17:39:22 UTC (rev 5666) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-23 17:45:10 UTC (rev 5667) @@ -7,6 +7,7 @@ Refresh compare after changing filter (#2017426) Add dialog listing available plugins (#2021722) Hierarchical directory comparison result view (#2018836) + Add "Open Conflict" for file/folder compare menus (#2025472) BugFix: Failed to compare UTF-8 files plugins disabled (#2018287) Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-07-23 17:39:22 UTC (rev 5666) +++ trunk/Src/Languages/English.pot 2008-07-23 17:45:10 UTC (rev 5667) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-07-22 23:21+0000\n" +"POT-Creation-Date: 2008-07-23 20:43+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -68,7 +68,7 @@ #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:506 +#: Merge.rc:508 #, c-format msgid "&Copy" msgstr "" @@ -80,7 +80,7 @@ msgstr "" #: Merge.rc:84 -#: Merge.rc:587 +#: Merge.rc:589 #, c-format msgid "&Goto..." msgstr "" @@ -91,62 +91,64 @@ msgstr "" #: Merge.rc:88 -#: Merge.rc:529 -#: Merge.rc:535 +#: Merge.rc:531 +#: Merge.rc:537 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:530 -#: Merge.rc:536 +#: Merge.rc:532 +#: Merge.rc:538 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:531 -#: Merge.rc:537 +#: Merge.rc:533 +#: Merge.rc:539 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 #: Merge.rc:191 -#: Merge.rc:311 +#: Merge.rc:312 #, c-format msgid "&File" msgstr "" #: Merge.rc:112 #: Merge.rc:193 -#: Merge.rc:313 +#: Merge.rc:314 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:113 #: Merge.rc:194 -#: Merge.rc:314 +#: Merge.rc:315 #, c-format msgid "&Open...\tCtrl+O" msgstr "" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:316 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:196 -#: Merge.rc:316 +#: Merge.rc:197 +#: Merge.rc:318 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:197 -#: Merge.rc:317 +#: Merge.rc:198 +#: Merge.rc:319 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -157,2588 +159,2586 @@ msgstr "" #: Merge.rc:121 -#: Merge.rc:204 -#: Merge.rc:349 +#: Merge.rc:205 +#: Merge.rc:351 #, c-format msgid "E&xit" msgstr "" #: Merge.rc:123 -#: Merge.rc:206 -#: Merge.rc:351 +#: Merge.rc:207 +#: Merge.rc:353 #, c-format msgid "&Edit" msgstr "" #: Merge.rc:125 -#: Merge.rc:210 -#: Merge.rc:385 +#: Merge.rc:211 +#: Merge.rc:387 #, c-format msgid "&Options..." msgstr "" #: Merge.rc:127 -#: Merge.rc:212 -#: Merge.rc:387 +#: Merge.rc:213 +#: Merge.rc:389 #, c-format msgid "&View" msgstr "" #: Merge.rc:129 -#: Merge.rc:227 -#: Merge.rc:389 +#: Merge.rc:228 +#: Merge.rc:391 #, c-format msgid "Select &Font..." msgstr "" #: Merge.rc:130 -#: Merge.rc:228 -#: Merge.rc:390 +#: Merge.rc:229 +#: Merge.rc:392 #, c-format msgid "Use Default F&ont" msgstr "" #: Merge.rc:132 -#: Merge.rc:230 -#: Merge.rc:411 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:232 -#: Merge.rc:413 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:233 -#: Merge.rc:414 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:234 -#: Merge.rc:415 +#: Merge.rc:235 +#: Merge.rc:417 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:236 -#: Merge.rc:417 +#: Merge.rc:237 +#: Merge.rc:419 #, c-format msgid "&Status Bar" msgstr "" #: Merge.rc:139 -#: Merge.rc:237 -#: Merge.rc:418 +#: Merge.rc:238 +#: Merge.rc:420 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:240 -#: Merge.rc:422 +#: Merge.rc:241 +#: Merge.rc:424 #, c-format msgid "&Language..." msgstr "" #: Merge.rc:143 -#: Merge.rc:261 -#: Merge.rc:444 +#: Merge.rc:262 +#: Merge.rc:446 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:264 -#: Merge.rc:446 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:265 -#: Merge.rc:447 +#: Merge.rc:266 +#: Merge.rc:449 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:268 -#: Merge.rc:450 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&List..." msgstr "" #: Merge.rc:152 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Manual Unpacking" msgstr "" #: Merge.rc:153 -#: Merge.rc:273 -#: Merge.rc:455 +#: Merge.rc:274 +#: Merge.rc:457 #, c-format msgid "&Automatic Unpacking" msgstr "" #: Merge.rc:155 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Edit with Unpacker" msgstr "" #: Merge.rc:157 -#: Merge.rc:277 -#: Merge.rc:464 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Reload plugins" msgstr "" #: Merge.rc:159 -#: Merge.rc:279 -#: Merge.rc:466 +#: Merge.rc:280 +#: Merge.rc:468 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:161 -#: Merge.rc:281 -#: Merge.rc:468 +#: Merge.rc:282 +#: Merge.rc:470 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:162 -#: Merge.rc:282 -#: Merge.rc:469 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:164 -#: Merge.rc:284 -#: Merge.rc:471 +#: Merge.rc:285 +#: Merge.rc:473 #, c-format msgid "&Window" msgstr "" #: Merge.rc:166 -#: Merge.rc:286 -#: Merge.rc:473 +#: Merge.rc:287 +#: Merge.rc:475 #, c-format msgid "Cl&ose" msgstr "" #: Merge.rc:167 -#: Merge.rc:287 -#: Merge.rc:474 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:169 -#: Merge.rc:289 -#: Merge.rc:476 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "Change &Pane\tF6" msgstr "" #: Merge.rc:171 -#: Merge.rc:291 -#: Merge.rc:478 +#: Merge.rc:292 +#: Merge.rc:480 #, c-format msgid "Tile &Horizontally" msgstr "" #: Merge.rc:172 -#: Merge.rc:292 -#: Merge.rc:479 +#: Merge.rc:293 +#: Merge.rc:481 #, c-format msgid "Tile &Vertically" msgstr "" #: Merge.rc:173 -#: Merge.rc:293 -#: Merge.rc:480 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&Cascade" msgstr "" #: Merge.rc:175 -#: Merge.rc:295 -#: Merge.rc:482 -#: Merge.rc:1918 +#: Merge.rc:296 +#: Merge.rc:484 +#: Merge.rc:1920 #, c-format msgid "&Help" msgstr "" #: Merge.rc:177 -#: Merge.rc:297 -#: Merge.rc:484 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "&WinMerge Help\tF1" msgstr "" #: Merge.rc:179 -#: Merge.rc:299 -#: Merge.rc:486 +#: Merge.rc:300 +#: Merge.rc:488 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:300 -#: Merge.rc:487 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&Translations" msgstr "" #: Merge.rc:181 -#: Merge.rc:301 -#: Merge.rc:488 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:182 -#: Merge.rc:302 -#: Merge.rc:489 +#: Merge.rc:303 +#: Merge.rc:491 #, c-format msgid "A&rchive Support disabled..." msgstr "" #: Merge.rc:184 -#: Merge.rc:304 -#: Merge.rc:491 +#: Merge.rc:305 +#: Merge.rc:493 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:185 -#: Merge.rc:305 -#: Merge.rc:492 +#: Merge.rc:306 +#: Merge.rc:494 #, c-format msgid "&About WinMerge..." msgstr "" -#: Merge.rc:199 -#: Merge.rc:335 +#: Merge.rc:200 +#: Merge.rc:337 #, c-format msgid "L&eft Read-only" msgstr "" -#: Merge.rc:200 -#: Merge.rc:336 +#: Merge.rc:201 +#: Merge.rc:338 #, c-format msgid "Ri&ght Read-only" msgstr "" -#: Merge.rc:202 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:208 -#: Merge.rc:361 +#: Merge.rc:209 +#: Merge.rc:363 #, c-format msgid "Select &All\tCtrl+A" msgstr "" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:219 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:221 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:223 +#: Merge.rc:224 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:224 +#: Merge.rc:225 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:225 +#: Merge.rc:226 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:242 -#: Merge.rc:424 +#: Merge.rc:243 +#: Merge.rc:426 #, c-format msgid "Refre&sh\tF5" msgstr "" -#: Merge.rc:243 +#: Merge.rc:244 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:245 -#: Merge.rc:426 +#: Merge.rc:246 +#: Merge.rc:428 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:247 +#: Merge.rc:248 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:249 -#: Merge.rc:428 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "" -#: Merge.rc:250 -#: Merge.rc:429 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "" -#: Merge.rc:252 -#: Merge.rc:431 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "&First Difference\tAlt+Home" msgstr "" -#: Merge.rc:253 -#: Merge.rc:432 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "" -#: Merge.rc:254 -#: Merge.rc:433 +#: Merge.rc:255 +#: Merge.rc:435 #, c-format msgid "&Last Difference\tAlt+End" msgstr "" -#: Merge.rc:256 -#: Merge.rc:435 +#: Merge.rc:257 +#: Merge.rc:437 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:257 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:438 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:259 +#: Merge.rc:260 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:263 -#: Merge.rc:560 +#: Merge.rc:264 +#: Merge.rc:562 #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:266 -#: Merge.rc:448 +#: Merge.rc:267 +#: Merge.rc:450 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "&Save\tCtrl+S" msgstr "" -#: Merge.rc:320 +#: Merge.rc:322 #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:322 -#: Merge.rc:327 +#: Merge.rc:324 +#: Merge.rc:329 #, c-format msgid "&Save" msgstr "" -#: Merge.rc:323 -#: Merge.rc:328 +#: Merge.rc:325 +#: Merge.rc:330 #, c-format msgid "Save &As..." msgstr "" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:331 +#: Merge.rc:333 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:333 +#: Merge.rc:335 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:338 +#: Merge.rc:340 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:340 +#: Merge.rc:342 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:342 +#: Merge.rc:344 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:345 +#: Merge.rc:347 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:353 +#: Merge.rc:355 #, c-format msgid "&Undo\tCtrl+Z" msgstr "" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "&Redo\tCtrl+Y" msgstr "" -#: Merge.rc:356 +#: Merge.rc:358 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "&Copy\tCtrl+C" msgstr "" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "&Paste\tCtrl+V" msgstr "" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:363 +#: Merge.rc:365 #, c-format msgid "F&ind...\tCtrl+F" msgstr "" -#: Merge.rc:364 +#: Merge.rc:366 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "" -#: Merge.rc:366 +#: Merge.rc:368 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:368 -#: Merge.rc:2751 +#: Merge.rc:370 +#: Merge.rc:2753 #, c-format msgid "< Empty >" msgstr "" -#: Merge.rc:371 +#: Merge.rc:373 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:376 +#: Merge.rc:378 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:378 +#: Merge.rc:380 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:379 +#: Merge.rc:381 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:380 +#: Merge.rc:382 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:381 +#: Merge.rc:383 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:383 +#: Merge.rc:385 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:391 +#: Merge.rc:393 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:402 +#: Merge.rc:404 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:403 +#: Merge.rc:405 #, c-format msgid "&View Whitespace" msgstr "" -#: Merge.rc:404 +#: Merge.rc:406 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:405 +#: Merge.rc:407 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:406 +#: Merge.rc:408 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:407 +#: Merge.rc:409 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:419 +#: Merge.rc:421 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:420 +#: Merge.rc:422 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:438 +#: Merge.rc:440 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "" -#: Merge.rc:439 +#: Merge.rc:441 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "" -#: Merge.rc:441 +#: Merge.rc:443 #, c-format msgid "Copy &All to Right" msgstr "" -#: Merge.rc:442 +#: Merge.rc:444 #, c-format msgid "Cop&y All to Left" msgstr "" -#: Merge.rc:459 +#: Merge.rc:461 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:500 +#: Merge.rc:502 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:501 +#: Merge.rc:503 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:503 +#: Merge.rc:505 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:508 +#: Merge.rc:510 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:509 +#: Merge.rc:511 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:510 +#: Merge.rc:512 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:511 +#: Merge.rc:513 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:513 +#: Merge.rc:515 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:515 +#: Merge.rc:517 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:516 +#: Merge.rc:518 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:518 +#: Merge.rc:520 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:520 -#: Merge.rc:1138 -#: Merge.rc:1520 +#: Merge.rc:522 +#: Merge.rc:1140 +#: Merge.rc:1522 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:521 -#: Merge.rc:1140 -#: Merge.rc:1523 +#: Merge.rc:523 +#: Merge.rc:1142 +#: Merge.rc:1525 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:522 +#: Merge.rc:524 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:524 +#: Merge.rc:526 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:525 +#: Merge.rc:527 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:527 +#: Merge.rc:529 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:533 +#: Merge.rc:535 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:540 +#: Merge.rc:542 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:542 +#: Merge.rc:544 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:543 +#: Merge.rc:545 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:544 +#: Merge.rc:546 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:546 +#: Merge.rc:548 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:548 +#: Merge.rc:550 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:550 +#: Merge.rc:552 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:551 +#: Merge.rc:553 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:552 +#: Merge.rc:554 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:553 +#: Merge.rc:555 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:556 +#: Merge.rc:558 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:568 +#: Merge.rc:570 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:569 +#: Merge.rc:571 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:575 +#: Merge.rc:577 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:577 +#: Merge.rc:579 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:578 +#: Merge.rc:580 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:586 +#: Merge.rc:588 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:589 +#: Merge.rc:591 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:590 +#: Merge.rc:592 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:591 +#: Merge.rc:593 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:660 +#: Merge.rc:662 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:666 +#: Merge.rc:668 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:667 +#: Merge.rc:669 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:668 +#: Merge.rc:670 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:671 -#: Merge.rc:703 -#: Merge.rc:793 -#: Merge.rc:979 -#: Merge.rc:1057 -#: Merge.rc:1086 -#: Merge.rc:1096 -#: Merge.rc:1262 -#: Merge.rc:1326 -#: Merge.rc:1339 -#: Merge.rc:1431 -#: Merge.rc:1446 -#: Merge.rc:1668 +#: Merge.rc:673 +#: Merge.rc:705 +#: Merge.rc:795 +#: Merge.rc:981 +#: Merge.rc:1059 +#: Merge.rc:1088 +#: Merge.rc:1098 +#: Merge.rc:1264 +#: Merge.rc:1328 +#: Merge.rc:1341 +#: Merge.rc:1433 +#: Merge.rc:1448 +#: Merge.rc:1670 #, c-format msgid "OK" msgstr "" -#: Merge.rc:672 +#: Merge.rc:674 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:679 +#: Merge.rc:681 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:682 -#: Merge.rc:1597 +#: Merge.rc:684 +#: Merge.rc:1599 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:686 -#: Merge.rc:747 -#: Merge.rc:1000 -#: Merge.rc:1022 +#: Merge.rc:688 +#: Merge.rc:749 +#: Merge.rc:1002 +#: Merge.rc:1024 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:687 -#: Merge.rc:1601 +#: Merge.rc:689 +#: Merge.rc:1603 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:1033 +#: Merge.rc:693 +#: Merge.rc:1035 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:692 -#: Merge.rc:1605 +#: Merge.rc:694 +#: Merge.rc:1607 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1607 +#: Merge.rc:697 +#: Merge.rc:1609 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:696 +#: Merge.rc:698 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:699 +#: Merge.rc:701 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:700 -#: Merge.rc:1608 +#: Merge.rc:702 +#: Merge.rc:1610 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:702 +#: Merge.rc:704 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:704 -#: Merge.rc:734 -#: Merge.rc:794 -#: Merge.rc:824 -#: Merge.rc:856 -#: Merge.rc:866 -#: Merge.rc:1058 -#: Merge.rc:1087 -#: Merge.rc:1097 -#: Merge.rc:1148 -#: Merge.rc:1263 -#: Merge.rc:1340 -#: Merge.rc:1432 -#: Merge.rc:1447 -#: Merge.rc:1669 +#: Merge.rc:706 +#: Merge.rc:736 +#: Merge.rc:796 +#: Merge.rc:826 +#: Merge.rc:858 +#: Merge.rc:868 +#: Merge.rc:1060 +#: Merge.rc:1089 +#: Merge.rc:1099 +#: Merge.rc:1150 +#: Merge.rc:1265 +#: Merge.rc:1342 +#: Merge.rc:1434 +#: Merge.rc:1449 +#: Merge.rc:1671 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:705 -#: Merge.rc:1341 +#: Merge.rc:707 +#: Merge.rc:1343 #, c-format msgid "Help" msgstr "" -#: Merge.rc:706 +#: Merge.rc:708 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:713 +#: Merge.rc:715 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:718 +#: Merge.rc:720 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:721 +#: Merge.rc:723 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:724 +#: Merge.rc:726 #, c-format msgid "User:" msgstr "" -#: Merge.rc:726 +#: Merge.rc:728 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:728 +#: Merge.rc:730 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:730 -#: Merge.rc:871 +#: Merge.rc:732 +#: Merge.rc:873 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:732 +#: Merge.rc:734 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:733 -#: Merge.rc:867 +#: Merge.rc:735 +#: Merge.rc:869 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:739 +#: Merge.rc:741 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:742 +#: Merge.rc:744 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:745 +#: Merge.rc:747 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:752 -#: Merge.rc:1926 +#: Merge.rc:754 +#: Merge.rc:1928 #, c-format msgid "General" msgstr "" -#: Merge.rc:755 +#: Merge.rc:757 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:758 +#: Merge.rc:760 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:760 +#: Merge.rc:762 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:762 +#: Merge.rc:764 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:765 +#: Merge.rc:767 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:767 +#: Merge.rc:769 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:769 +#: Merge.rc:771 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:772 +#: Merge.rc:774 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:775 +#: Merge.rc:777 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:777 -#: Merge.rc:1620 +#: Merge.rc:779 +#: Merge.rc:1622 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:779 -#: Merge.rc:1622 +#: Merge.rc:781 +#: Merge.rc:1624 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:781 +#: Merge.rc:783 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:783 +#: Merge.rc:785 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:790 +#: Merge.rc:792 #, c-format msgid "Language" msgstr "" -#: Merge.rc:797 +#: Merge.rc:799 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:803 +#: Merge.rc:805 #, c-format msgid "Find" msgstr "" -#: Merge.rc:806 -#: Merge.rc:833 +#: Merge.rc:808 +#: Merge.rc:835 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:809 -#: Merge.rc:839 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:811 -#: Merge.rc:841 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:815 +#: Merge.rc:845 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:815 +#: Merge.rc:817 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:818 +#: Merge.rc:820 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:819 +#: Merge.rc:821 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:821 +#: Merge.rc:823 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:823 -#: Merge.rc:853 +#: Merge.rc:825 +#: Merge.rc:855 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:830 +#: Merge.rc:832 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:836 +#: Merge.rc:838 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:845 +#: Merge.rc:847 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:848 +#: Merge.rc:850 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:849 +#: Merge.rc:851 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:851 +#: Merge.rc:853 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:854 +#: Merge.rc:856 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:855 +#: Merge.rc:857 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:862 -#: Merge.rc:2167 +#: Merge.rc:864 +#: Merge.rc:2169 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:865 +#: Merge.rc:867 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:870 -#: Merge.rc:1182 +#: Merge.rc:872 +#: Merge.rc:1184 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:873 +#: Merge.rc:875 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:879 +#: Merge.rc:881 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:882 +#: Merge.rc:884 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:885 +#: Merge.rc:887 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:892 +#: Merge.rc:894 #, c-format msgid "Save" msgstr "" -#: Merge.rc:893 +#: Merge.rc:895 #, c-format msgid "New" msgstr "" -#: Merge.rc:894 +#: Merge.rc:896 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:895 +#: Merge.rc:897 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:900 -#: Merge.rc:1929 +#: Merge.rc:902 +#: Merge.rc:1931 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:903 +#: Merge.rc:905 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:907 +#: Merge.rc:909 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:911 -#: Merge.rc:1572 +#: Merge.rc:913 +#: Merge.rc:1574 #, c-format msgid "Background" msgstr "" -#: Merge.rc:912 +#: Merge.rc:914 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:925 -#: Merge.rc:1367 -#: Merge.rc:1573 +#: Merge.rc:927 +#: Merge.rc:1369 +#: Merge.rc:1575 #, c-format msgid "Text" msgstr "" -#: Merge.rc:929 +#: Merge.rc:931 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:939 +#: Merge.rc:941 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:949 +#: Merge.rc:951 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:956 +#: Merge.rc:958 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:963 +#: Merge.rc:965 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:970 -#: Merge.rc:1056 -#: Merge.rc:1085 -#: Merge.rc:1185 -#: Merge.rc:1413 +#: Merge.rc:972 +#: Merge.rc:1058 +#: Merge.rc:1087 +#: Merge.rc:1187 +#: Merge.rc:1415 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1355 -#: Merge.rc:1561 +#: Merge.rc:978 +#: Merge.rc:1357 +#: Merge.rc:1563 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:986 -#: Merge.rc:1932 +#: Merge.rc:988 +#: Merge.rc:1934 #, c-format msgid "System" msgstr "" -#: Merge.rc:989 +#: Merge.rc:991 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:991 +#: Merge.rc:993 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:992 +#: Merge.rc:994 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:994 +#: Merge.rc:996 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:996 +#: Merge.rc:998 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:998 +#: Merge.rc:1000 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:1001 +#: Merge.rc:1003 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:1003 +#: Merge.rc:1005 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:1004 +#: Merge.rc:1006 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:1007 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1007 +#: Merge.rc:1009 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1010 -#: Merge.rc:1026 +#: Merge.rc:1012 +#: Merge.rc:1028 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1016 +#: Merge.rc:1018 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1019 +#: Merge.rc:1021 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1023 +#: Merge.rc:1025 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1027 +#: Merge.rc:1029 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1028 +#: Merge.rc:1030 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1030 +#: Merge.rc:1032 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1036 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1035 +#: Merge.rc:1037 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1040 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1041 +#: Merge.rc:1043 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1042 +#: Merge.rc:1044 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1044 +#: Merge.rc:1046 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1046 +#: Merge.rc:1048 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1048 +#: Merge.rc:1050 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1050 +#: Merge.rc:1052 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1052 +#: Merge.rc:1054 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1054 +#: Merge.rc:1056 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1078 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1082 +#: Merge.rc:1084 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1085 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1093 +#: Merge.rc:1095 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1098 +#: Merge.rc:1100 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1101 +#: Merge.rc:1103 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1104 +#: Merge.rc:1106 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1105 +#: Merge.rc:1107 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1118 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1119 -#: Merge.rc:1879 +#: Merge.rc:1121 +#: Merge.rc:1881 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1124 +#: Merge.rc:1126 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1127 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1126 +#: Merge.rc:1128 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1134 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1135 +#: Merge.rc:1137 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1137 +#: Merge.rc:1139 #, c-format msgid "File" msgstr "" -#: Merge.rc:1142 +#: Merge.rc:1144 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1143 +#: Merge.rc:1145 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1145 +#: Merge.rc:1147 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1147 +#: Merge.rc:1149 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1153 -#: Merge.rc:1927 +#: Merge.rc:1155 +#: Merge.rc:1929 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1156 +#: Merge.rc:1158 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1159 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1159 +#: Merge.rc:1161 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1161 +#: Merge.rc:1163 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1165 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1165 +#: Merge.rc:1167 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1169 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1170 +#: Merge.rc:1172 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1172 +#: Merge.rc:1174 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1174 +#: Merge.rc:1176 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:1179 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1180 +#: Merge.rc:1182 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1185 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1190 -#: Merge.rc:1928 +#: Merge.rc:1192 +#: Merge.rc:1930 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1195 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1195 +#: Merge.rc:1197 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1197 +#: Merge.rc:1199 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1201 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1200 +#: Merge.rc:1202 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1205 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1205 +#: Merge.rc:1207 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1207 +#: Merge.rc:1209 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1209 +#: Merge.rc:1211 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1211 +#: Merge.rc:1213 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1213 +#: Merge.rc:1215 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1228 +#: Merge.rc:1230 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1236 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1235 +#: Merge.rc:1237 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1236 +#: Merge.rc:1238 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1237 +#: Merge.rc:1239 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1238 +#: Merge.rc:1240 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1244 +#: Merge.rc:1246 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1247 +#: Merge.rc:1249 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1250 +#: Merge.rc:1252 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1252 +#: Merge.rc:1254 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:1256 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1257 +#: Merge.rc:1259 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1259 +#: Merge.rc:1261 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1263 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1268 -#: Merge.rc:1516 -#: Merge.rc:1934 +#: Merge.rc:1270 +#: Merge.rc:1518 +#: Merge.rc:1936 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1271 +#: Merge.rc:1273 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1272 +#: Merge.rc:1274 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1274 +#: Merge.rc:1276 #, c-format msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1279 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1281 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1283 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1291 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1294 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1297 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1299 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1301 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1303 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1303 +#: Merge.rc:1305 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "" -#: Merge.rc:1305 +#: Merge.rc:1307 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1308 -#: Merge.rc:1311 +#: Merge.rc:1310 +#: Merge.rc:1313 #, c-format msgid "present" msgstr "" -#: Merge.rc:1309 +#: Merge.rc:1311 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1314 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1314 -#: Merge.rc:1319 +#: Merge.rc:1316 +#: Merge.rc:1321 #, c-format msgid "none" msgstr "" -#: Merge.rc:1316 +#: Merge.rc:1318 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1319 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1321 +#: Merge.rc:1323 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1322 +#: Merge.rc:1324 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1323 +#: Merge.rc:1325 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1327 +#: Merge.rc:1329 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1336 +#: Merge.rc:1338 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1347 +#: Merge.rc:1349 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1349 +#: Merge.rc:1351 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1352 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1358 +#: Merge.rc:1360 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1359 +#: Merge.rc:1361 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1360 +#: Merge.rc:1362 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1361 +#: Merge.rc:1363 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1362 +#: Merge.rc:1364 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1363 +#: Merge.rc:1365 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1364 +#: Merge.rc:1366 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1365 +#: Merge.rc:1367 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1366 +#: Merge.rc:1368 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 -#: Merge.rc:1406 -#: Merge.rc:1411 +#: Merge.rc:1373 +#: Merge.rc:1378 +#: Merge.rc:1383 +#: Merge.rc:1388 +#: Merge.rc:1393 +#: Merge.rc:1398 +#: Merge.rc:1403 +#: Merge.rc:1408 +#: Merge.rc:1413 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:1421 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1424 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1425 -#: Merge.rc:1599 -#: Merge.rc:1603 -#: Merge.rc:1630 +#: Merge.rc:1427 +#: Merge.rc:1601 +#: Merge.rc:1605 +#: Merge.rc:1632 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1426 +#: Merge.rc:1428 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1429 +#: Merge.rc:1431 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1439 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1442 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1442 +#: Merge.rc:1444 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1444 +#: Merge.rc:1446 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1452 -#: Merge.rc:1935 +#: Merge.rc:1454 +#: Merge.rc:1937 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1457 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1459 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1458 +#: Merge.rc:1460 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1460 +#: Merge.rc:1462 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1463 +#: Merge.rc:1465 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1467 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1473 +#: Merge.rc:1475 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1478 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1479 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1478 -#: Merge.rc:2309 +#: Merge.rc:1480 +#: Merge.rc:2311 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:1481 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1482 -#: Merge.rc:1501 +#: Merge.rc:1484 +#: Merge.rc:1503 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1485 +#: Merge.rc:1487 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1486 +#: Merge.rc:1488 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1491 +#: Merge.rc:1493 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1496 -#: Merge.rc:2304 +#: Merge.rc:1498 +#: Merge.rc:2306 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1505 +#: Merge.rc:1507 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1512 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1519 +#: Merge.rc:1521 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1522 -#: Merge.rc:1525 +#: Merge.rc:1524 +#: Merge.rc:1527 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1528 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1529 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1529 -#: Merge.rc:1532 +#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "..." msgstr "" -#: Merge.rc:1530 +#: Merge.rc:1532 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1533 +#: Merge.rc:1535 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1538 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1537 -#: Merge.rc:1901 +#: Merge.rc:1539 +#: Merge.rc:1903 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1542 +#: Merge.rc:1544 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1547 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1549 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:1551 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1553 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1555 +#: Merge.rc:1557 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1556 +#: Merge.rc:1558 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1564 +#: Merge.rc:1566 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1567 +#: Merge.rc:1569 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1569 +#: Merge.rc:1571 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1570 +#: Merge.rc:1572 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1571 +#: Merge.rc:1573 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1594 +#: Merge.rc:1596 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1602 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1606 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1610 +#: Merge.rc:1612 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1613 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1616 -#: Merge.rc:1936 +#: Merge.rc:1618 +#: Merge.rc:1938 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1619 +#: Merge.rc:1621 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1626 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1627 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1629 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1633 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1632 +#: Merge.rc:1634 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1636 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1641 +#: Merge.rc:1643 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1645 +#: Merge.rc:1647 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1647 +#: Merge.rc:1649 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1650 +#: Merge.rc:1652 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1653 +#: Merge.rc:1655 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1654 +#: Merge.rc:1656 #, c-format msgid "No" msgstr "" -#: Merge.rc:1660 +#: Merge.rc:1662 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1663 +#: Merge.rc:1665 #, c-format msgid "&Enable plugins" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1693 +#: Merge.rc:1695 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1709 +#: Merge.rc:1711 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1724 +#: Merge.rc:1726 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1732 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1733 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1732 +#: Merge.rc:1734 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1733 +#: Merge.rc:1735 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1734 +#: Merge.rc:1736 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1735 +#: Merge.rc:1737 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1743 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1744 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1743 +#: Merge.rc:1745 #, c-format msgid "Close the active document\nClose" msgstr "" -#: Merge.rc:1744 +#: Merge.rc:1746 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1745 +#: Merge.rc:1747 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "" -#: Merge.rc:1746 +#: Merge.rc:1748 #, c-format msgid "Change the printing options\nPage Setup" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1749 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "" -#: Merge.rc:1748 +#: Merge.rc:1750 #, c-format msgid "Print the active document\nPrint" msgstr "" -#: Merge.rc:1749 +#: Merge.rc:1751 #, c-format msgid "Display full pages\nPrint Preview" msgstr "" -#: Merge.rc:1754 +#: Merge.rc:1756 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1755 +#: Merge.rc:1757 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:1756 +#: Merge.rc:1758 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:1757 +#: Merge.rc:1759 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:1763 +#: Merge.rc:1765 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "" -#: Merge.rc:1764 +#: Merge.rc:1766 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1765 +#: Merge.rc:1767 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1766 +#: Merge.rc:1768 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1767 +#: Merge.rc:1769 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1768 +#: Merge.rc:1770 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1769 +#: Merge.rc:1771 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "" -#: Merge.rc:1774 +#: Merge.rc:1776 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "" -#: Merge.rc:1775 +#: Merge.rc:1777 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "" -#: Merge.rc:1781 -#: Merge.rc:1782 #: Merge.rc:1783 #: Merge.rc:1784 #: Merge.rc:1785 @@ -2753,2795 +2753,2797 @@ #: Merge.rc:1794 #: Merge.rc:1795 #: Merge.rc:1796 +#: Merge.rc:1797 +#: Merge.rc:1798 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:1801 +#: Merge.rc:1803 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "" -#: Merge.rc:1802 +#: Merge.rc:1804 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "" -#: Merge.rc:1808 +#: Merge.rc:1810 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "" -#: Merge.rc:1809 +#: Merge.rc:1811 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "" -#: Merge.rc:1810 +#: Merge.rc:1812 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "" -#: Merge.rc:1816 +#: Merge.rc:1818 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1819 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "" -#: Merge.rc:1818 +#: Merge.rc:1820 #, c-format msgid "Find the specified text\nFind" msgstr "" -#: Merge.rc:1819 +#: Merge.rc:1821 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "" -#: Merge.rc:1820 +#: Merge.rc:1822 #, c-format msgid "Repeat the last action\nRepeat" msgstr "" -#: Merge.rc:1821 +#: Merge.rc:1823 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "" -#: Merge.rc:1822 +#: Merge.rc:1824 #, c-format msgid "Select the entire document\nSelect All" msgstr "" -#: Merge.rc:1823 +#: Merge.rc:1825 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1826 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:1830 +#: Merge.rc:1832 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "" -#: Merge.rc:1831 +#: Merge.rc:1833 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "" -#: Merge.rc:1832 +#: Merge.rc:1834 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:1833 +#: Merge.rc:1835 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1841 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1842 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:1841 +#: Merge.rc:1843 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:1842 +#: Merge.rc:1844 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:1843 +#: Merge.rc:1845 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1846 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1847 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:1850 +#: Merge.rc:1852 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:1851 +#: Merge.rc:1853 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1852 +#: Merge.rc:1854 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1858 +#: Merge.rc:1860 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1867 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1868 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1875 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1882 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1886 -#: Merge.rc:1887 +#: Merge.rc:1888 +#: Merge.rc:1889 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1893 +#: Merge.rc:1895 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1894 +#: Merge.rc:1896 #, 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 "" -#: Merge.rc:1900 +#: Merge.rc:1902 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1904 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1905 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1904 +#: Merge.rc:1906 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1907 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1908 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1914 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1915 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:1916 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1915 +#: Merge.rc:1917 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1916 +#: Merge.rc:1918 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1919 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1921 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1922 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1930 +#: Merge.rc:1932 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1931 +#: Merge.rc:1933 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1935 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1943 +#: Merge.rc:1945 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1944 +#: Merge.rc:1946 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1945 +#: Merge.rc:1947 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1948 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1949 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1953 +#: Merge.rc:1955 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1954 +#: Merge.rc:1956 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1960 +#: Merge.rc:1962 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:1961 +#: Merge.rc:1963 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1964 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "" -#: Merge.rc:1963 +#: Merge.rc:1965 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1967 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1969 #, c-format msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1973 +#: Merge.rc:1975 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1976 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1977 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1978 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1980 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:1986 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1987 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:1988 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:1994 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1995 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1994 +#: Merge.rc:1996 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1995 +#: Merge.rc:1997 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2003 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:2002 +#: Merge.rc:2004 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2005 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:2004 +#: Merge.rc:2006 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:2005 +#: Merge.rc:2007 #, c-format msgid "Size" msgstr "" -#: Merge.rc:2011 -#: Merge.rc:2615 +#: Merge.rc:2013 +#: Merge.rc:2617 #, c-format msgid "Name" msgstr "" -#: Merge.rc:2012 +#: Merge.rc:2014 #, c-format msgid "Location" msgstr "" -#: Merge.rc:2013 +#: Merge.rc:2015 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:2014 +#: Merge.rc:2016 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2015 -#: Merge.rc:2617 +#: Merge.rc:2017... [truncated message content] |
From: <ki...@us...> - 2008-07-23 18:59:25
|
Revision: 5668 http://winmerge.svn.sourceforge.net/winmerge/?rev=5668&view=rev Author: kimmov Date: 2008-07-23 18:59:22 +0000 (Wed, 23 Jul 2008) Log Message: ----------- PATCH: [ 2025478 ] Enable folder compare tree-mode by default Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/OptionsInit.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-23 17:45:10 UTC (rev 5667) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-23 18:59:22 UTC (rev 5668) @@ -8,6 +8,7 @@ Add dialog listing available plugins (#2021722) Hierarchical directory comparison result view (#2018836) Add "Open Conflict" for file/folder compare menus (#2025472) + Enable hierarchial folder compare view by default (#2025478) BugFix: Failed to compare UTF-8 files plugins disabled (#2018287) Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) Modified: trunk/Src/OptionsInit.cpp =================================================================== --- trunk/Src/OptionsInit.cpp 2008-07-23 17:45:10 UTC (rev 5667) +++ trunk/Src/OptionsInit.cpp 2008-07-23 18:59:22 UTC (rev 5668) @@ -93,7 +93,7 @@ m_pOptions->InitOption(OPT_IGNORE_SMALL_FILETIME, false); m_pOptions->InitOption(OPT_ASK_MULTIWINDOW_CLOSE, false); m_pOptions->InitOption(OPT_PRESERVE_FILETIMES, false); - m_pOptions->InitOption(OPT_TREE_MODE, false); + m_pOptions->InitOption(OPT_TREE_MODE, true); m_pOptions->InitOption(OPT_CMP_IGNORE_WHITESPACE, (int)0); m_pOptions->InitOption(OPT_CMP_IGNORE_BLANKLINES, false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-24 08:12:13
|
Revision: 5670 http://winmerge.svn.sourceforge.net/winmerge/?rev=5670&view=rev Author: kimmov Date: 2008-07-24 08:12:11 +0000 (Thu, 24 Jul 2008) Log Message: ----------- PATCH: [ 2026508 ] Add confirmation dialog for move operation Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/ConfirmFolderCopyDlg.cpp trunk/Src/ConfirmFolderCopyDlg.h trunk/Src/DirActions.cpp trunk/Src/Merge.rc trunk/Src/resource.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-24 08:05:59 UTC (rev 5669) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-24 08:12:11 UTC (rev 5670) @@ -9,6 +9,7 @@ Hierarchical directory comparison result view (#2018836) Add "Open Conflict" for file/folder compare menus (#2025472) Enable hierarchial folder compare view by default (#2025478) + Confirmation dialog for move operations (#2026508) BugFix: Failed to compare UTF-8 files plugins disabled (#2018287) Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) Modified: trunk/Src/ConfirmFolderCopyDlg.cpp =================================================================== --- trunk/Src/ConfirmFolderCopyDlg.cpp 2008-07-24 08:05:59 UTC (rev 5669) +++ trunk/Src/ConfirmFolderCopyDlg.cpp 2008-07-24 08:12:11 UTC (rev 5670) @@ -81,6 +81,9 @@ CStatic * pIcon = (CStatic *) GetDlgItem(IDC_FLDCONFIRM_ICON); pIcon->SetIcon(icon); + if (!m_caption.IsEmpty()) + SetWindowText(m_caption); + // setup handler for resizing this dialog m_constraint.InitializeCurrentSize(this); // configure how individual controls adjust when dialog resizes Modified: trunk/Src/ConfirmFolderCopyDlg.h =================================================================== --- trunk/Src/ConfirmFolderCopyDlg.h 2008-07-24 08:05:59 UTC (rev 5669) +++ trunk/Src/ConfirmFolderCopyDlg.h 2008-07-24 08:12:11 UTC (rev 5670) @@ -22,6 +22,9 @@ // ID line follows -- this is updated by SVN // $Id$ +#ifndef _CONFIRM_FOLDER_COPY_DLG_H_ +#define _CONFIRM_FOLDER_COPY_DLG_H_ + #include "CMoveConstraint.h" /** @@ -50,9 +53,12 @@ CString m_fromPath; CString m_toText; CString m_toPath; + CString m_caption; afx_msg void OnBnClickedNo(); afx_msg void OnBnClickedYes(); private: prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */ }; + +#endif // _CONFIRM_FOLDER_COPY_DLG_H_ Modified: trunk/Src/DirActions.cpp =================================================================== --- trunk/Src/DirActions.cpp 2008-07-24 08:05:59 UTC (rev 5669) +++ trunk/Src/DirActions.cpp 2008-07-24 08:12:11 UTC (rev 5670) @@ -53,6 +53,11 @@ static BOOL ConfirmCopy(int origin, int destination, int count, LPCTSTR src, LPCTSTR dest, BOOL destIsSide); +static BOOL ConfirmMove(int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide); +static BOOL ConfirmDialog(const String &caption, const String &question, + int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide); static BOOL CheckPathsExist(LPCTSTR orig, LPCTSTR dest, int allowOrig, int allowDest, CString & failedPath); @@ -69,19 +74,69 @@ * @param [in] src Source path. * @param [in] dest Destination path. * @param [in] destIsSide Is destination path either of compare sides? - * @return IDYES if copy should proceed, IDNO if aborted. + * @return TRUE if copy should proceed, FALSE if aborted. */ static BOOL ConfirmCopy(int origin, int destination, int count, LPCTSTR src, LPCTSTR dest, BOOL destIsSide) { + CString strQuestion; + String caption = LoadResString(IDS_CONFIRM_COPY_CAPTION); + UINT id = count == 1 ? IDS_CONFIRM_SINGLE_COPY : IDS_CONFIRM_MULTIPLE_COPY; + strQuestion.Format(theApp.LoadString(id).c_str(), count); + + BOOL ret = ConfirmDialog(caption, (LPCTSTR)strQuestion, origin, + destination, count, src, dest, destIsSide); + return ret; +} + +/** + * @brief Ask user a confirmation for moving item(s). + * Shows a confirmation dialog for move operation. Depending ont item count + * dialog shows full paths to items (single item) or base paths of compare + * (multiple items). + * @param [in] origin Origin side of the item(s). + * @param [in] destination Destination side of the item(s). + * @param [in] count Number of items. + * @param [in] src Source path. + * @param [in] dest Destination path. + * @param [in] destIsSide Is destination path either of compare sides? + * @return TRUE if copy should proceed, FALSE if aborted. + */ +static BOOL ConfirmMove(int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide) +{ + CString strQuestion; + String caption = LoadResString(IDS_CONFIRM_MOVE_CAPTION); + UINT id = count == 1 ? IDS_CONFIRM_SINGLE_MOVE : IDS_CONFIRM_MULTIPLE_MOVE; + strQuestion.Format(theApp.LoadString(id).c_str(), count); + + BOOL ret = ConfirmDialog(caption, (LPCTSTR)strQuestion, origin, + destination, count, src, dest, destIsSide); + return ret; +} + +/** + * @brief Show a (copy/move) confirmation dialog. + * @param [in] caption Caption of the dialog. + * @param [in] question Guestion to ask from user. + * @param [in] origin Origin side of the item(s). + * @param [in] destination Destination side of the item(s). + * @param [in] count Number of items. + * @param [in] src Source path. + * @param [in] dest Destination path. + * @param [in] destIsSide Is destination path either of compare sides? + * @return TRUE if copy should proceed, FALSE if aborted. + */ +static BOOL ConfirmDialog(const String &caption, const String &question, + int origin, int destination, int count, + LPCTSTR src, LPCTSTR dest, BOOL destIsSide) +{ ConfirmFolderCopyDlg dlg; - CString strQuestion; String sOrig; String sDest; - - UINT id = count == 1 ? IDS_CONFIRM_SINGLE_COPY : IDS_CONFIRM_MULTIPLE_COPY; - strQuestion.Format(theApp.LoadString(id).c_str(), count); + dlg.m_caption = caption.c_str(); + if (origin == FileActionItem::UI_LEFT) sOrig = theApp.LoadString(IDS_FROM_LEFT); else @@ -114,7 +169,7 @@ strDest += _T("\\"); } - dlg.m_question = strQuestion; + dlg.m_question = question.c_str(); dlg.m_fromText = sOrig.c_str(); dlg.m_toText = sDest.c_str(); dlg.m_fromPath = strSrc.c_str(); @@ -677,6 +732,7 @@ FileActionItem act; CString sFullDest(destPath); sFullDest += _T("\\"); + actionScript.m_destBase = sFullDest; if (GetDocument()->GetRecursive()) { if (!di.left.path.empty()) @@ -744,6 +800,7 @@ FileActionItem act; CString sFullDest(destPath); sFullDest += _T("\\"); + actionScript.m_destBase = sFullDest; if (GetDocument()->GetRecursive()) { if (!di.right.path.empty()) @@ -809,7 +866,7 @@ if (actionList.GetActionItemCount() == 1) { if (!ConfirmCopy(item.UIOrigin, item.UIDestination, - actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(), + actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(), bDestIsSide)) { return FALSE; @@ -837,8 +894,7 @@ if (!actionList.m_destBase.empty()) dst = actionList.m_destBase; else - item.dest; - + dst = item.dest; } if (!ConfirmCopy(item.UIOrigin, item.UIDestination, @@ -851,8 +907,40 @@ // Deleting does not need confirmation, CShellFileOp takes care of it case FileAction::ACT_DEL: - // Moving does not need confirmation, CShellFileOp takes care of it + break; + case FileAction::ACT_MOVE: + bDestIsSide = FALSE; + if (actionList.GetActionItemCount() == 1) + { + if (!ConfirmMove(item.UIOrigin, item.UIDestination, + actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(), + bDestIsSide)) + { + return FALSE; + } + } + else + { + String src; + String dst; + + if (item.UIOrigin == FileActionItem::UI_LEFT) + src = GetDocument()->GetLeftBasePath(); + else + src = GetDocument()->GetRightBasePath(); + + if (!actionList.m_destBase.empty()) + dst = actionList.m_destBase; + else + dst = item.dest; + + if (!ConfirmMove(item.UIOrigin, item.UIDestination, + actionList.GetActionItemCount(), src.c_str(), dst.c_str(), bDestIsSide)) + { + return FALSE; + } + } break; // Invalid operation Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2008-07-24 08:05:59 UTC (rev 5669) +++ trunk/Src/Merge.rc 2008-07-24 08:12:11 UTC (rev 5670) @@ -2220,6 +2220,10 @@ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:" IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:" IDS_DIRCMP_NOTSYNC "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." + IDS_CONFIRM_SINGLE_MOVE "Are you sure you want to move:" + IDS_CONFIRM_MULTIPLE_MOVE "Are you sure you want to move %d items:" + IDS_CONFIRM_COPY_CAPTION "Confirm Copy" + IDS_CONFIRM_MOVE_CAPTION "Confirm Move" END // DIRECTORY DIFFING : OPEN FILE Modified: trunk/Src/resource.h =================================================================== --- trunk/Src/resource.h 2008-07-24 08:05:59 UTC (rev 5669) +++ trunk/Src/resource.h 2008-07-24 08:12:11 UTC (rev 5670) @@ -618,6 +618,10 @@ #define IDS_CONFIRM_SINGLE_COPY 17639 #define IDS_CONFIRM_MULTIPLE_COPY 17640 #define IDS_DIRCMP_NOTSYNC 17641 +#define IDS_CONFIRM_SINGLE_MOVE 17642 +#define IDS_CONFIRM_MULTIPLE_MOVE 17643 +#define IDS_CONFIRM_COPY_CAPTION 17644 +#define IDS_CONFIRM_MOVE_CAPTION 17645 #define ID_DIR_OPEN_LEFT 17648 #define ID_DIR_OPEN_LEFT_WITHEDITOR 17649 #define ID_DIR_OPEN_LEFT_WITH 17650 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-07-25 22:38:28
|
Revision: 5682 http://winmerge.svn.sourceforge.net/winmerge/?rev=5682&view=rev Author: gerundt Date: 2008-07-25 22:38:23 +0000 (Fri, 25 Jul 2008) Log Message: ----------- PATCH: [ 2027300 ] Rename color scheme menu item "None" and add separator Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Languages/English.pot trunk/Src/Merge.rc trunk/Src/MergeEditView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-25 22:16:28 UTC (rev 5681) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-25 22:38:23 UTC (rev 5682) @@ -3,6 +3,9 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] +WinMerge 2.11.1.3 + Rename color scheme menu item "None" and add separator (#2027300) + WinMerge 2.11.1.2 - 2008-07-24 (r5673) Refresh compare after changing filter (#2017426) Add dialog listing available plugins (#2021722) Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-07-25 22:16:28 UTC (rev 5681) +++ trunk/Src/Languages/English.pot 2008-07-25 22:38:23 UTC (rev 5682) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-07-24 11:21+0000\n" +"POT-Creation-Date: 2008-07-25 00:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -3586,7 +3586,6 @@ #: Merge.rc:2166 #: Merge.rc:2605 -#: Merge.rc:2793 #, c-format msgid "None" msgstr "" @@ -5394,6 +5393,11 @@ msgid "From MRU list" msgstr "" +#: Merge.rc:2793 +#, c-format +msgid "No Highlighting" +msgstr "" + #: Merge.rc:2794 #, c-format msgid "ASP" Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2008-07-25 22:16:28 UTC (rev 5681) +++ trunk/Src/Merge.rc 2008-07-25 22:38:23 UTC (rev 5682) @@ -2790,7 +2790,7 @@ // COLOR SCHEMES STRINGTABLE BEGIN - IDS_COLORSCHEME_PLAIN "None" + IDS_COLORSCHEME_PLAIN "No Highlighting" IDS_COLORSCHEME_ASP "ASP" IDS_COLORSCHEME_BASIC "Basic" IDS_COLORSCHEME_BATCH "Batch" Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2008-07-25 22:16:28 UTC (rev 5681) +++ trunk/Src/MergeEditView.cpp 2008-07-25 22:38:23 UTC (rev 5682) @@ -3189,9 +3189,13 @@ const HMENU hSubMenu = pCmdUI->m_pSubMenu->m_hMenu; - for (int i = ID_COLORSCHEME_FIRST; i <= ID_COLORSCHEME_LAST; ++i) + String name = theApp.LoadString(ID_COLORSCHEME_FIRST); + DoAppendMenu(hSubMenu, MF_STRING, ID_COLORSCHEME_FIRST, name.c_str()); + DoAppendMenu(hSubMenu, MF_SEPARATOR, 0, NULL); + + for (int i = ID_COLORSCHEME_FIRST + 1; i <= ID_COLORSCHEME_LAST; ++i) { - String name = theApp.LoadString(i); + name = theApp.LoadString(i); DoAppendMenu(hSubMenu, MF_STRING, i, name.c_str()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-28 14:31:29
|
Revision: 5685 http://winmerge.svn.sourceforge.net/winmerge/?rev=5685&view=rev Author: kimmov Date: 2008-07-28 14:31:26 +0000 (Mon, 28 Jul 2008) Log Message: ----------- PATCH: [ 2029275 ] Allow giving -u cmdline param instead of -ub Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/WinMergeCmdLineParser.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-28 12:30:02 UTC (rev 5684) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-28 14:31:26 UTC (rev 5685) @@ -5,6 +5,7 @@ WinMerge 2.11.1.3 Rename color scheme menu item "None" and add separator (#2027300) + Add -u commandline parameter as alternative to -ub (#2029275) WinMerge 2.11.1.2 - 2008-07-24 (r5673) Refresh compare after changing filter (#2017426) Modified: trunk/Src/WinMergeCmdLineParser.cpp =================================================================== --- trunk/Src/WinMergeCmdLineParser.cpp 2008-07-28 12:30:02 UTC (rev 5684) +++ trunk/Src/WinMergeCmdLineParser.cpp 2008-07-28 14:31:26 UTC (rev 5685) @@ -143,9 +143,9 @@ // -ur to not add right path to MRU m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU; } - else if (!lstrcmpi(pszParam, _T("ub"))) + else if (!lstrcmpi(pszParam, _T("u")) || !lstrcmpi(pszParam, _T("ub"))) { - // -ub to add neither right nor left path to MRU + // -u or -ub (deprecated) to add neither right nor left path to MRU m_cmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU; m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-28 14:55:16
|
Revision: 5687 http://winmerge.svn.sourceforge.net/winmerge/?rev=5687&view=rev Author: kimmov Date: 2008-07-28 14:55:12 +0000 (Mon, 28 Jul 2008) Log Message: ----------- PATCH: [ 2029457 ] Remove RCLocalizationHelper plugin dll Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt Removed Paths: ------------- trunk/Plugins/dlls/RCLocalizationHelper.dll trunk/Plugins/dlls/RCLocalizationHelper.ini trunk/Plugins/dlls/RCLocalizationHelperU.dll trunk/Plugins/dlls/RCLocalizationHelperU.ini Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-28 14:33:16 UTC (rev 5686) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-28 14:55:12 UTC (rev 5687) @@ -6,6 +6,7 @@ WinMerge 2.11.1.3 Rename color scheme menu item "None" and add separator (#2027300) Add -u commandline parameter as alternative to -ub (#2029275) + Remove RCLocalizationHelper plugin (#2029457) WinMerge 2.11.1.2 - 2008-07-24 (r5673) Refresh compare after changing filter (#2017426) Deleted: trunk/Plugins/dlls/RCLocalizationHelper.ini =================================================================== --- trunk/Plugins/dlls/RCLocalizationHelper.ini 2008-07-28 14:33:16 UTC (rev 5686) +++ trunk/Plugins/dlls/RCLocalizationHelper.ini 2008-07-28 14:55:12 UTC (rev 5687) @@ -1,22 +0,0 @@ -[MetaData] -Version=1.2 -Date=2006-02-05 - -[IgnoreLines] -count=7 -line.1=\$Id.*\$ -line.2=^// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.3=^#endif[ ]+// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.4=^#if !defined\(AFX_RESOURCE_DLL\) \|\| defined\(AFX_TARG_...\) -line.5=^LANGUAGE LANG_ -line.6=VALUE "Translation", -line.7=^#pragma code_page\([0-9]+\) - -[Substitutions] -count=1 -source.1=[0-9]+ -dest.1=, - -[Options] -IgnoreQuotes=1 -PluginName=RCLocalizationHelperU Deleted: trunk/Plugins/dlls/RCLocalizationHelperU.ini =================================================================== --- trunk/Plugins/dlls/RCLocalizationHelperU.ini 2008-07-28 14:33:16 UTC (rev 5686) +++ trunk/Plugins/dlls/RCLocalizationHelperU.ini 2008-07-28 14:55:12 UTC (rev 5687) @@ -1,22 +0,0 @@ -[MetaData] -Version=1.2 -Date=2006-02-05 - -[IgnoreLines] -count=7 -line.1=\$Id.*\$ -line.2=^// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.3=^#endif[ ]+// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.4=^#if !defined\(AFX_RESOURCE_DLL\) \|\| defined\(AFX_TARG_...\) -line.5=^LANGUAGE LANG_ -line.6=VALUE "Translation", -line.7=^#pragma code_page\([0-9]+\) - -[Substitutions] -count=1 -source.1=[0-9]+ -dest.1=, - -[Options] -IgnoreQuotes=1 -PluginName=RCLocalizationHelperU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-29 13:35:01
|
Revision: 5699 http://winmerge.svn.sourceforge.net/winmerge/?rev=5699&view=rev Author: kimmov Date: 2008-07-29 13:34:59 +0000 (Tue, 29 Jul 2008) Log Message: ----------- PATCH: [ 2027325 ] "Syntax Highlight" menu item enabled, if option disabled Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MergeDoc.cpp trunk/Src/MergeEditView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-29 13:15:29 UTC (rev 5698) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-29 13:34:59 UTC (rev 5699) @@ -8,6 +8,8 @@ Add -u commandline parameter as alternative to -ub (#2029275, #2030359) Remove RCLocalizationHelper plugin (#2029457) Clarify Supercopier caused hang in release notes (#2030040) + BugFix: Could change syntax highlight mode when highlighting was + disabled from options (#2027325) WinMerge 2.11.1.2 - 2008-07-24 (r5673) Refresh compare after changing filter (#2017426) Modified: trunk/Src/MergeDoc.cpp =================================================================== --- trunk/Src/MergeDoc.cpp 2008-07-29 13:15:29 UTC (rev 5698) +++ trunk/Src/MergeDoc.cpp 2008-07-29 13:34:59 UTC (rev 5699) @@ -2242,10 +2242,18 @@ sextL = GetFileExt(sLeftFile.c_str(), m_strDesc[0].c_str()); sextR = GetFileExt(sRightFile.c_str(), m_strDesc[1].c_str()); } - BOOL bLeftTyped = pLeft->SetTextType(sextL.c_str()); - pLeftDetail->SetTextType(sextL.c_str()); - BOOL bRightTyped = pRight->SetTextType(sextR.c_str()); - pRightDetail->SetTextType(sextR.c_str()); + + BOOL syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT); + BOOL bLeftTyped = FALSE; + BOOL bRightTyped = FALSE; + + if (syntaxHLEnabled) + { + bLeftTyped = pLeft->SetTextType(sextL.c_str()); + pLeftDetail->SetTextType(sextL.c_str()); + bRightTyped = pRight->SetTextType(sextR.c_str()); + pRightDetail->SetTextType(sextR.c_str()); + } // If other side didn't have recognized texttype, apply recognized // type to unrecognized one. (comparing file.cpp and file.bak applies Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2008-07-29 13:15:29 UTC (rev 5698) +++ trunk/Src/MergeEditView.cpp 2008-07-29 13:34:59 UTC (rev 5699) @@ -2316,6 +2316,9 @@ SetSelectionMargin(GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN)); + if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT)) + SetTextType(CCrystalTextView::TextType::SRC_PLAIN); + SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP)); SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS)); m_cachedColors.clrDiff = GetOptionsMgr()->GetInt(OPT_CLR_DIFF); @@ -3235,7 +3238,11 @@ const bool bIsCurrentScheme = (m_CurSourceDef->type == (pCmdUI->m_nID - ID_COLORSCHEME_FIRST)); pCmdUI->SetRadio(bIsCurrentScheme); - pCmdUI->Enable(TRUE); + BOOL syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT); + if (syntaxHLEnabled) + pCmdUI->Enable(TRUE); + else + pCmdUI->Enable(FALSE); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2008-07-30 19:34:11
|
Revision: 5708 http://winmerge.svn.sourceforge.net/winmerge/?rev=5708&view=rev Author: sdottaka Date: 2008-07-30 19:33:52 +0000 (Wed, 30 Jul 2008) Log Message: ----------- PATCH: [ 2018836 ] RFE:987590 hierarchical directory comparison result view (3) - Display whether folders are different or not. - Add icons (equalfolder.ico, notequlfolder.ico). These are temporary icons. I'm glad if someone could make better icons. - Disables Tree Mode menu item when doing non-recursive compare. - Disables Backspace key when doing reursive compare or using Tree Mode. - Changes the initial folder state to 'collapsed' state. - Didn't move to different folder item when pressing Alt+Up/Down. Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DiffItem.h trunk/Src/DiffThread.cpp trunk/Src/DirScan.cpp trunk/Src/DirScan.h trunk/Src/DirView.cpp trunk/Src/DirView.h trunk/Src/DirViewColHandler.cpp trunk/Src/DirViewColItems.cpp trunk/Src/Languages/English.pot trunk/Src/Merge.rc trunk/Src/Merge2.rc trunk/Src/resource.h Added Paths: ----------- trunk/Src/res/equalfolder.ico trunk/Src/res/notequalfolder.ico Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-30 19:33:52 UTC (rev 5708) @@ -8,6 +8,7 @@ Add -u commandline parameter as alternative to -ub (#2029275, #2030359) Remove RCLocalizationHelper plugin (#2029457) Clarify Supercopier caused hang in release notes (#2030040) + Improve tree mode in folder compare (#2018836) BugFix: Could change syntax highlight mode when highlighting was disabled from options (#2027325) Modified: trunk/Src/DiffItem.h =================================================================== --- trunk/Src/DiffItem.h 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DiffItem.h 2008-07-30 19:33:52 UTC (rev 5708) @@ -95,7 +95,7 @@ void setSideNone() { SetSide(0); } // compare result bool isResultSame() const { return CheckCompare(diffcode, DIFFCODE::SAME); } - bool isResultDiff() const { return (!isResultSame() && !isResultFiltered() && !isResultError() && + bool isResultDiff() const { return (CheckCompare(diffcode, DIFFCODE::DIFF) && !isResultFiltered() && !isSideLeftOnly() && !isSideRightOnly()); } static bool isResultError(UINT code) { return CheckCompare(code, DIFFCODE::CMPERR); } bool isResultError() const { return isResultError(diffcode); } Modified: trunk/Src/DiffThread.cpp =================================================================== --- trunk/Src/DiffThread.cpp 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DiffThread.cpp 2008-07-30 19:33:52 UTC (rev 5708) @@ -257,9 +257,9 @@ // Now do all pending file comparisons if (myStruct->bOnlyRequested) - DirScan_CompareRequestedItems(myStruct); + DirScan_CompareRequestedItems(myStruct, NULL); else - DirScan_CompareItems(myStruct); + DirScan_CompareItems(myStruct, NULL); myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE); Modified: trunk/Src/DirScan.cpp =================================================================== --- trunk/Src/DirScan.cpp 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DirScan.cpp 2008-07-30 19:33:52 UTC (rev 5708) @@ -234,14 +234,16 @@ * * @param list [in] List of items to compare * @param pCtxt [in,out] Compare context: contains list where results are added. - * @return 1 if compare finished, -1 if compare was aborted + * @param parentdiffpos [in] Position of parent diff item + * @return >= 0 number of diff items, -1 if compare was aborted */ -int DirScan_CompareItems(DiffFuncStruct *myStruct) +int DirScan_CompareItems(DiffFuncStruct *myStruct, POSITION parentdiffpos) { CDiffContext *pCtxt = myStruct->context; - int res = 1; - WaitForSingleObject(myStruct->hSemaphore, INFINITE); - POSITION pos = pCtxt->GetFirstDiffPosition(); + int res = 0; + if (!parentdiffpos) + WaitForSingleObject(myStruct->hSemaphore, INFINITE); + POSITION pos = pCtxt->GetFirstChildDiffPosition(parentdiffpos); while (pos) { if (pCtxt->ShouldAbort()) @@ -250,8 +252,31 @@ break; } WaitForSingleObject(myStruct->hSemaphore, INFINITE); - DIFFITEM &di = pCtxt->GetNextDiffRefPosition(pos); - CompareDiffItem(di, pCtxt); + POSITION curpos = pos; + DIFFITEM &di = pCtxt->GetNextSiblingDiffRefPosition(pos); + if (di.diffcode.isDirectory() && di.diffcode.isSideBoth() && myStruct->bRecursive) + { + di.diffcode.diffcode &= ~(DIFFCODE::DIFF | DIFFCODE::SAME); + int ndiff = DirScan_CompareItems(myStruct, curpos); + if (ndiff > 0) + { + di.diffcode.diffcode |= DIFFCODE::DIFF; + res += ndiff; + } + else if (ndiff == 0) + { + di.diffcode.diffcode |= DIFFCODE::SAME; + } + } + else + { + CompareDiffItem(di, pCtxt); + if (di.diffcode.isResultDiff() || + (!di.diffcode.isSideBoth() && !di.diffcode.isResultFiltered())) + res++; + } + pos = curpos; + pCtxt->GetNextSiblingDiffRefPosition(pos); } return res; } @@ -260,13 +285,14 @@ * @brief Compare DiffItems in context marked for rescan. * * @param pCtxt [in,out] Compare context: contains list of items. - * @return 1 if compare finished, -1 if compare was aborted + * @param parentdiffpos [in] Position of parent diff item + * @return >= 0 number of diff items, -1 if compare was aborted */ -int DirScan_CompareRequestedItems(DiffFuncStruct *myStruct) +int DirScan_CompareRequestedItems(DiffFuncStruct *myStruct, POSITION parentdiffpos) { CDiffContext *pCtxt = myStruct->context; - int res = 1; - POSITION pos = pCtxt->GetFirstDiffPosition(); + int res = 0; + POSITION pos = pCtxt->GetFirstChildDiffPosition(parentdiffpos); while (pos != NULL) { @@ -276,15 +302,37 @@ break; } - POSITION oldPos = pos; - DIFFITEM &di = pCtxt->GetNextDiffRefPosition(pos); - if (di.diffcode.isScanNeeded()) + POSITION curpos = pos; + DIFFITEM &di = pCtxt->GetNextSiblingDiffRefPosition(pos); + if (di.diffcode.isDirectory() && di.diffcode.isSideBoth() && myStruct->bRecursive) { - BOOL bItemsExist = TRUE; - UpdateDiffItem(di, bItemsExist, pCtxt); - if (bItemsExist) - CompareDiffItem(di, pCtxt); + di.diffcode.diffcode &= ~(DIFFCODE::DIFF | DIFFCODE::SAME); + int ndiff = DirScan_CompareRequestedItems(myStruct, curpos); + if (ndiff > 0) + { + di.diffcode.diffcode |= DIFFCODE::DIFF; + res += ndiff; + } + else if (ndiff == 0) + { + di.diffcode.diffcode |= DIFFCODE::SAME; + } } + else + { + if (di.diffcode.isScanNeeded()) + { + BOOL bItemsExist = TRUE; + UpdateDiffItem(di, bItemsExist, pCtxt); + if (bItemsExist) + { + CompareDiffItem(di, pCtxt); + } + } + if (di.diffcode.isResultDiff() || + (!di.diffcode.isSideBoth() && !di.diffcode.isResultFiltered())) + res++; + } } return res; } Modified: trunk/Src/DirScan.h =================================================================== --- trunk/Src/DirScan.h 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DirScan.h 2008-07-30 19:33:52 UTC (rev 5708) @@ -19,8 +19,8 @@ int DirScan_GetItems(const PathContext &paths, const String &leftsubdir, const String &rightsubdir, DiffFuncStruct *myStruct, bool casesensitive, int depth, DIFFITEM *parent); -int DirScan_CompareItems(DiffFuncStruct *); -int DirScan_CompareRequestedItems(DiffFuncStruct *); +int DirScan_CompareItems(DiffFuncStruct *, POSITION parentdiffpos); +int DirScan_CompareRequestedItems(DiffFuncStruct *, POSITION parentdiffpos); void DirScan_InitializeDefaultCodepage(); Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DirView.cpp 2008-07-30 19:33:52 UTC (rev 5708) @@ -85,6 +85,8 @@ DIFFIMG_RDIRUNIQUE, DIFFIMG_SKIP, DIFFIMG_DIRSKIP, + DIFFIMG_DIRDIFF, + DIFFIMG_DIRSAME, DIFFIMG_DIR, DIFFIMG_ERROR, DIFFIMG_DIRUP, @@ -287,6 +289,8 @@ VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFOLDER))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_FILESKIP))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_FOLDERSKIP))); + VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFOLDER))); + VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALFOLDER))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_FOLDER))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_COMPARE_ERROR))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_FOLDERUP))); @@ -332,11 +336,21 @@ if (di.diffcode.isSideRightOnly()) return (di.diffcode.isDirectory() ? DIFFIMG_RDIRUNIQUE : DIFFIMG_RUNIQUE); if (di.diffcode.isResultSame()) - return (di.diffcode.isBin() ? DIFFIMG_BINSAME : DIFFIMG_SAME); - if (di.diffcode.isDirectory()) - return DIFFIMG_DIR; + { + if (di.diffcode.isDirectory()) + return DIFFIMG_DIRSAME; + else + return (di.diffcode.isBin() ? DIFFIMG_BINSAME : DIFFIMG_SAME); + } // diff - return (di.diffcode.isBin() ? DIFFIMG_BINDIFF : DIFFIMG_DIFF); + if (di.diffcode.isResultDiff()) + { + if (di.diffcode.isDirectory()) + return DIFFIMG_DIRDIFF; + else + return (di.diffcode.isBin() ? DIFFIMG_BINDIFF : DIFFIMG_DIFF); + } + return DIFFIMG_DIR; } /** @@ -383,10 +397,10 @@ const DIFFITEM& di = GetDiffItem(lvhti.iItem); if (m_bTreeMode && GetDocument()->GetRecursive() && di.diffcode.isDirectory()) { - if (di.customFlags1 & ViewCustomFlags::COLLAPSED) + if (di.customFlags1 & ViewCustomFlags::EXPANDED) + CollapseSubdir(lvhti.iItem); + else ExpandSubdir(lvhti.iItem); - else - CollapseSubdir(lvhti.iItem); } else { @@ -437,8 +451,8 @@ index++; if (di.HasChildren()) { - m_pList->SetItemState(index - 1, INDEXTOSTATEIMAGEMASK((di.customFlags1 & ViewCustomFlags::COLLAPSED) ? 1 : 2), LVIS_STATEIMAGEMASK); - if (!(di.customFlags1 & ViewCustomFlags::COLLAPSED)) + m_pList->SetItemState(index - 1, INDEXTOSTATEIMAGEMASK((di.customFlags1 & ViewCustomFlags::EXPANDED) ? 2 : 1), LVIS_STATEIMAGEMASK); + if (di.customFlags1 & ViewCustomFlags::EXPANDED) RedisplayChildren(ctxt.GetFirstChildDiffPosition(curdiffpos), level + 1, index, alldiffs); } } @@ -930,10 +944,10 @@ const DIFFITEM& di = GetDiffItem(sel); if (m_bTreeMode && GetDocument()->GetRecursive() && di.diffcode.isDirectory()) { - if (di.customFlags1 & ViewCustomFlags::COLLAPSED) + if (di.customFlags1 & ViewCustomFlags::EXPANDED) + CollapseSubdir(sel); + else ExpandSubdir(sel); - else - CollapseSubdir(sel); } else { @@ -975,10 +989,10 @@ if (lvhti.flags == LVHT_ONITEMSTATEICON) { const DIFFITEM &di = GetItemAt(pNM->iItem); - if (di.customFlags1 & ViewCustomFlags::COLLAPSED) + if (di.customFlags1 & ViewCustomFlags::EXPANDED) + CollapseSubdir(pNM->iItem); + else ExpandSubdir(pNM->iItem); - else - CollapseSubdir(pNM->iItem); } *pResult = 0; @@ -991,12 +1005,12 @@ void CDirView::CollapseSubdir(int sel) { DIFFITEM& dip = this->GetDiffItemRef(sel); - if (!m_bTreeMode || (dip.customFlags1 & ViewCustomFlags::COLLAPSED) || !dip.HasChildren()) + if (!m_bTreeMode || !(dip.customFlags1 & ViewCustomFlags::EXPANDED) || !dip.HasChildren()) return; m_pList->SetRedraw(FALSE); // Turn off updating (better performance) - dip.customFlags1 |= ViewCustomFlags::COLLAPSED; + dip.customFlags1 &= ~ViewCustomFlags::EXPANDED; m_pList->SetItemState(sel, INDEXTOSTATEIMAGEMASK(1), LVIS_STATEIMAGEMASK); int count = m_pList->GetItemCount(); @@ -1019,12 +1033,12 @@ void CDirView::ExpandSubdir(int sel) { DIFFITEM& dip = GetDiffItemRef(sel); - if (!m_bTreeMode || !(dip.customFlags1 & ViewCustomFlags::COLLAPSED) || !dip.HasChildren()) + if (!m_bTreeMode || (dip.customFlags1 & ViewCustomFlags::EXPANDED) || !dip.HasChildren()) return; m_pList->SetRedraw(FALSE); // Turn off updating (better performance) - dip.customFlags1 &= ~ViewCustomFlags::COLLAPSED; + dip.customFlags1 |= ViewCustomFlags::EXPANDED; m_pList->SetItemState(sel, INDEXTOSTATEIMAGEMASK(2), LVIS_STATEIMAGEMASK); CDirDoc *pDoc = GetDocument(); @@ -2213,12 +2227,9 @@ return false; if (di.diffcode.isResultFiltered() || di.diffcode.isResultError()) return false; - // Skip identical directories - if (di.diffcode.isDirectory() && !di.diffcode.isSideLeftOnly() && + if (!di.diffcode.isResultDiff() && !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly()) return false; - if (di.diffcode.isResultSame()) - return false; return true; } @@ -2287,8 +2298,11 @@ // Check if we got 'Backspace pressed' -message if (pMsg->wParam == VK_BACK) { - OpenParentDirectory(); - return FALSE; + if (!GetDocument()->GetRecursive()) + { + OpenParentDirectory(); + return FALSE; + } } } else @@ -3300,7 +3314,7 @@ void CDirView::OnUpdateViewTreeMode(CCmdUI* pCmdUI) { pCmdUI->SetCheck(m_bTreeMode); - pCmdUI->Enable(TRUE); + pCmdUI->Enable(GetDocument()->GetRecursive()); } /** @@ -3314,7 +3328,7 @@ while (diffpos) { DIFFITEM &di = ctxt.GetNextDiffRefPosition(diffpos); - di.customFlags1 &= ~ViewCustomFlags::COLLAPSED; + di.customFlags1 |= ViewCustomFlags::EXPANDED; } Redisplay(); } @@ -3324,7 +3338,7 @@ */ void CDirView::OnUpdateViewExpandAllSubdirs(CCmdUI* pCmdUI) { - pCmdUI->Enable(m_bTreeMode); + pCmdUI->Enable(m_bTreeMode && GetDocument()->GetRecursive()); } /** @@ -3338,7 +3352,7 @@ while (diffpos) { DIFFITEM &di = ctxt.GetNextDiffRefPosition(diffpos); - di.customFlags1 |= ViewCustomFlags::COLLAPSED; + di.customFlags1 &= ~ViewCustomFlags::EXPANDED; } Redisplay(); } @@ -3348,7 +3362,7 @@ */ void CDirView::OnUpdateViewCollapseAllSubdirs(CCmdUI* pCmdUI) { - pCmdUI->Enable(m_bTreeMode); + pCmdUI->Enable(m_bTreeMode && GetDocument()->GetRecursive()); } void CDirView::OnMergeCompare() Modified: trunk/Src/DirView.h =================================================================== --- trunk/Src/DirView.h 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DirView.h 2008-07-30 19:33:52 UTC (rev 5708) @@ -60,7 +60,7 @@ // to make debugging easier // These can always be packed down in the future INVALID_CODE=0, - VISIBILITY=0x3, VISIBLE=0x1, HIDDEN=0x2, COLLAPSED=0x4 + VISIBILITY=0x3, VISIBLE=0x1, HIDDEN=0x2, EXPANDED=0x4 }; }; Modified: trunk/Src/DirViewColHandler.cpp =================================================================== --- trunk/Src/DirViewColHandler.cpp 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DirViewColHandler.cpp 2008-07-30 19:33:52 UTC (rev 5708) @@ -273,13 +273,6 @@ s.insert(0, _T("* ")); } } - // Don't show result for folderitems appearing both sides - if ((IsColStatus(i) || IsColStatusAbbr(i)) && - di.diffcode.isDirectory() && !di.diffcode.isSideLeftOnly() && - !di.diffcode.isSideRightOnly()) - { - s.erase(); - } pParam->item.pszText = AllocDispinfoText(s); } if (pParam->item.mask & LVIF_IMAGE) Modified: trunk/Src/DirViewColItems.cpp =================================================================== --- trunk/Src/DirViewColItems.cpp 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/DirViewColItems.cpp 2008-07-30 19:33:52 UTC (rev 5708) @@ -278,10 +278,12 @@ else s = theApp.LoadString(IDS_IDENTICAL); } - else // diff + else if (di.diffcode.isResultDiff()) // diff { if (di.diffcode.isBin()) s = theApp.LoadString(IDS_BIN_FILES_DIFF); + else if (di.diffcode.isDirectory()) + s = theApp.LoadString(IDS_FOLDERS_ARE_DIFFERENT); else s = theApp.LoadString(IDS_FILES_ARE_DIFFERENT); } @@ -439,7 +441,7 @@ static String ColStatusAbbrGet(const CDiffContext *, const void *p) { const DIFFITEM &di = *static_cast<const DIFFITEM *>(p); - int id; + int id = 0; // Note that order of items does matter. We must check for // skipped items before unique items, for example, so that @@ -471,12 +473,12 @@ { id = IDS_IDENTICAL; } - else // diff + else if (di.diffcode.isResultDiff()) { id = IDS_DIFFERENT; } - return theApp.LoadString(id); + return id ? theApp.LoadString(id) : _T(""); } /** Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/Languages/English.pot 2008-07-30 19:33:52 UTC (rev 5708) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-07-29 08:44+0000\n" +"POT-Creation-Date: 2008-07-30 21:25+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -716,7 +716,7 @@ msgstr "" #: Merge.rc:370 -#: Merge.rc:2757 +#: Merge.rc:2758 #, c-format msgid "< Empty >" msgstr "" @@ -2321,7 +2321,7 @@ msgstr "" #: Merge.rc:1480 -#: Merge.rc:2315 +#: Merge.rc:2316 #, c-format msgid "Different" msgstr "" @@ -3177,7 +3177,7 @@ msgstr "" #: Merge.rc:2013 -#: Merge.rc:2621 +#: Merge.rc:2622 #, c-format msgid "Name" msgstr "" @@ -3198,7 +3198,7 @@ msgstr "" #: Merge.rc:2017 -#: Merge.rc:2623 +#: Merge.rc:2624 #, c-format msgid "Description" msgstr "" @@ -3585,7 +3585,7 @@ msgstr "" #: Merge.rc:2166 -#: Merge.rc:2605 +#: Merge.rc:2606 #, c-format msgid "None" msgstr "" @@ -3997,7 +3997,7 @@ msgstr "" #: Merge.rc:2297 -#: Merge.rc:2601 +#: Merge.rc:2602 #, c-format msgid "Binary" msgstr "" @@ -4049,1521 +4049,1526 @@ #: Merge.rc:2313 #, c-format -msgid "Left Only" +msgid "Folders are different" msgstr "" #: Merge.rc:2314 #, c-format +msgid "Left Only" +msgstr "" + +#: Merge.rc:2315 +#, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2317 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2323 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2324 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2325 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2331 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2332 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2333 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2334 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2335 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2336 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2336 +#: Merge.rc:2337 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2338 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2339 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2340 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2346 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2347 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2348 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2349 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2349 +#: Merge.rc:2350 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2351 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2351 +#: Merge.rc:2352 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2353 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2354 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2355 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2360 +#: Merge.rc:2361 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2362 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2363 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2364 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2365 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2371 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2372 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2373 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2373 +#: Merge.rc:2374 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2375 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2376 +#: Merge.rc:2377 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2378 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2379 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2385 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2386 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2387 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2388 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2389 #, c-format msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2390 #, 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 "" -#: Merge.rc:2390 +#: Merge.rc:2391 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "" -#: Merge.rc:2391 +#: Merge.rc:2392 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2393 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2394 #, 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 "" -#: Merge.rc:2399 +#: Merge.rc:2400 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2401 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2401 +#: Merge.rc:2402 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2403 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2404 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2410 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2411 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2417 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2418 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2424 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2425 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2431 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2432 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2438 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2439 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2440 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2441 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2442 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2443 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2444 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2445 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2446 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2447 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2448 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2449 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2450 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2451 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2452 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2457 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2458 #, c-format msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2458 +#: Merge.rc:2459 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2460 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2461 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2462 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2463 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2464 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2465 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2466 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2467 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2473 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2474 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2475 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2476 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2477 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2478 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2479 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2480 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2481 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2482 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2482 +#: Merge.rc:2483 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2483 +#: Merge.rc:2484 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2485 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2486 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2487 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2488 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2493 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2499 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2500 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2501 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2502 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2503 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2503 -#: Merge.rc:2513 +#: Merge.rc:2504 +#: Merge.rc:2514 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2509 +#: Merge.rc:2510 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2510 +#: Merge.rc:2511 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2511 +#: Merge.rc:2512 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2513 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2520 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2521 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2531 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2532 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2533 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2534 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2535 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2542 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2543 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2544 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2545 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2546 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2547 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2553 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2554 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2555 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2556 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2557 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2558 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2559 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2560 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2561 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2562 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2563 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2564 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2565 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2566 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2571 +#: Merge.rc:2572 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2573 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2574 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2575 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2576 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2577 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2589 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2590 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2591 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2592 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:2598 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:2599 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2600 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2601 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2603 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2604 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2605 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2612 #, c-format msgid " B" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2613 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2614 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2615 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2616 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2617 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2623 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2625 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2626 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2627 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2634 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2635 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2636 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2637 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2638 #, c-format msgid "Change left side file/folder read-only status" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2639 #, c-format msgid "Change right side file/folder read-only status" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2640 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2641 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2642 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2643 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2644 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2645 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2651 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2652 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2653 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2654 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2655 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2656 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2657 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2658 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2659 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2660 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2666 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2667 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:2668 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:2669 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2670 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2671 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2677 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2678 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2679 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2680 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2681 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2682 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2683 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2684 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2685 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2686 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2687 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2688 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2689 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2690 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2691 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2697 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2698 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2699 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2700 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2701 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2702 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2703 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2704 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2705 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2706 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2707 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2707 +#: Merge.rc:2708 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2709 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2714 +#: Merge.rc:2715 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2715 +#: Merge.rc:2716 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2717 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2718 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2723 +#: Merge.rc:2724 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2725 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2726 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2727 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2728 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2729 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2729 +#: Merge.rc:2730 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2731 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2737 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2738 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2744 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2745 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2746 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2747 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2748 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2749 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2755 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2756 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2757 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2759 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2760 #, c-format msgid "<None>" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2761 #, c-format msgid "<Automatic>" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2767 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2768 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2769 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2775 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2775 +#: Merge.rc:2776 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2776 +#: Merge.rc:2777 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2777 +#: Merge.rc:2778 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2778 +#: Merge.rc:2779 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2780 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2786 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2787 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2787 +#: Merge.rc:2788 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2794 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2795 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2796 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2797 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2797 +#: Merge.rc:2798 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2799 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2800 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2801 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2802 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2803 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2804 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2805 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2806 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2807 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2807 +#: Merge.rc:2808 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2809 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2810 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2811 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2812 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2813 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2813 +#: Merge.rc:2814 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2814 +#: Merge.rc:2815 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2815 +#: Merge.rc:2816 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2816 +#: Merge.rc:2817 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2817 +#: Merge.rc:2818 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2818 +#: Merge.rc:2819 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2819 +#: Merge.rc:2820 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2820 +#: Merge.rc:2821 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2822 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2822 +#: Merge.rc:2823 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2823 +#: Merge.rc:2824 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2824 +#: Merge.rc:2825 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2829 +#: Merge.rc:2830 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2830 +#: Merge.rc:2831 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2831 +#: Merge.rc:2832 #, c-format msgid "Show big toolbar" msgstr "" Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/Merge.rc 2008-07-30 19:33:52 UTC (rev 5708) @@ -2310,6 +2310,7 @@ IDS_IDENTICAL "Identical" IDS_BIN_FILES_DIFF "Binary files are different" IDS_FILES_ARE_DIFFERENT "Files are different" + IDS_FOLDERS_ARE_DIFFERENT "Folders are different" IDS_LEFTONLY "Left Only" IDS_RIGHTONLY "Right Only" IDS_DIFFERENT "Different" Modified: trunk/Src/Merge2.rc =================================================================== --- trunk/Src/Merge2.rc 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/Merge2.rc 2008-07-30 19:33:52 UTC (rev 5708) @@ -29,6 +29,8 @@ IDI_LFOLDER ICON "res\\lfolder.ico" IDI_RFOLDER ICON "res\\rfolder.ico" IDI_FOLDERSKIP ICON "res\\folderskip.ico" +IDI_EQUALFOLDER ICON "res\\equalfolder.ico" +IDI_NOTEQUALFOLDER ICON "res\\notequalfolder.ico" IDI_EQUALFILE ICON "res\\equalfile.ico" IDI_NOTEQUALFILE ICON "res\\notequalfile.ico" IDI_EQUALBINARY ICON "res\\equalbinary.ico" Property changes on: trunk/Src/res/equalfolder.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/Src/res/notequalfolder.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/Src/resource.h =================================================================== --- trunk/Src/resource.h 2008-07-30 19:24:23 UTC (rev 5707) +++ trunk/Src/resource.h 2008-07-30 19:33:52 UTC (rev 5708) @@ -119,6 +119,8 @@ #define IDI_COMPARE_ABORTED 515 #define IDI_FILEFILTER 516 #define IDI_LINEFILTER 517 +#define IDI_EQUALFOLDER 518 +#define IDI_NOTEQUALFOLDER 519 #define IDC_LEFT_EDIT 1000 #define IDC_FILE_EDIT 1000 #define IDC_LEFT_BUTTON 1001 @@ -674,6 +676,7 @@ #define IDS_DIFFERENT 17739 #define IDS_ABORTED_ITEM 17740 #define IDS_CMPRES_ERROR 17741 +#define IDS_FOLDERS_ARE_DIFFERENT 17742 #define IDS_ELAPSED_TIME 17744 #define IDS_STATUS_SELITEM1 17745 #define IDS_STATUS_SELITEMS 17746 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-07-31 11:39:08
|
Revision: 5710 http://winmerge.svn.sourceforge.net/winmerge/?rev=5710&view=rev Author: kimmov Date: 2008-07-31 11:39:05 +0000 (Thu, 31 Jul 2008) Log Message: ----------- BUG: [ 2025130 ] Line Filters behave wonky Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/LineFiltersDlg.cpp trunk/Src/LineFiltersDlg.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-31 11:25:54 UTC (rev 5709) +++ trunk/Docs/Users/ChangeLog.txt 2008-07-31 11:39:05 UTC (rev 5710) @@ -11,6 +11,7 @@ Improve tree mode in folder compare (#2018836) BugFix: Could change syntax highlight mode when highlighting was disabled from options (#2027325) + BugFix: Editing line filters updated wrong filter (#2025130) WinMerge 2.11.1.2 - 2008-07-24 (r5673) Refresh compare after changing filter (#2017426) Modified: trunk/Src/LineFiltersDlg.cpp =================================================================== --- trunk/Src/LineFiltersDlg.cpp 2008-07-31 11:25:54 UTC (rev 5709) +++ trunk/Src/LineFiltersDlg.cpp 2008-07-31 11:39:05 UTC (rev 5710) @@ -34,6 +34,7 @@ : CPropertyPage(LineFiltersDlg::IDD) , m_pList(NULL) , m_bEditing(FALSE) +, m_editedIndex(-1) { //{{AFX_DATA_INIT(LineFiltersDlg) m_bIgnoreRegExp = FALSE; @@ -168,12 +169,6 @@ sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED); if (sel > -1) { -/* CEdit * pEdit = m_filtersList.EditLabel(sel); - if (pEdit) - { - pEdit->SetFocus(); - } -*/ CString text = m_filtersList.GetItemText(sel, 0); m_editRegexp.SetWindowText(text); m_editRegexp.SetReadOnly(FALSE); @@ -181,6 +176,7 @@ m_editRegexp.SetFocus(); m_editRegexp.SetSel(0, -1); m_bEditing = TRUE; + m_editedIndex = sel; } } @@ -308,17 +304,13 @@ { if (m_bEditing) { - int sel =- 1; - sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED); - if (sel != -1) - { - CString text; - m_editRegexp.GetWindowText(text); - m_filtersList.SetItemText(sel, 0, text); - } + CString text; + m_editRegexp.GetWindowText(text); + m_filtersList.SetItemText(m_editedIndex, 0, text); m_bEditing = FALSE; m_editRegexp.SetReadOnly(TRUE); m_saveRegexp.EnableWindow(FALSE); + m_editedIndex = -1; } } Modified: trunk/Src/LineFiltersDlg.h =================================================================== --- trunk/Src/LineFiltersDlg.h 2008-07-31 11:25:54 UTC (rev 5709) +++ trunk/Src/LineFiltersDlg.h 2008-07-31 11:39:05 UTC (rev 5710) @@ -71,6 +71,7 @@ LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */ BOOL m_bEditing; /**< Are we editing a filter string? */ + int m_editedIndex; /**< Index of the item being edited. */ }; //{{AFX_INSERT_LOCATION}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-08-01 06:44:03
|
Revision: 5712 http://winmerge.svn.sourceforge.net/winmerge/?rev=5712&view=rev Author: kimmov Date: 2008-08-01 06:44:00 +0000 (Fri, 01 Aug 2008) Log Message: ----------- PATCH: [ 2033754 ] Unlimited undo Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DiffTextBuffer.cpp trunk/Src/editlib/ccrystaltextbuffer.cpp trunk/Src/editlib/ccrystaltextbuffer.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-07-31 19:35:03 UTC (rev 5711) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-01 06:44:00 UTC (rev 5712) @@ -9,6 +9,7 @@ Remove RCLocalizationHelper plugin (#2029457) Clarify Supercopier caused hang in release notes (#2030040) Improve tree mode in folder compare (#2018836) + Unlimited undo (#2033754) BugFix: Could change syntax highlight mode when highlighting was disabled from options (#2027325) BugFix: Editing line filters updated wrong filter (#2025130) Modified: trunk/Src/DiffTextBuffer.cpp =================================================================== --- trunk/Src/DiffTextBuffer.cpp 2008-07-31 19:35:03 UTC (rev 5711) +++ trunk/Src/DiffTextBuffer.cpp 2008-08-01 06:44:00 UTC (rev 5712) @@ -460,7 +460,6 @@ m_bInit = TRUE; m_bModified = FALSE; m_bUndoGroup = m_bUndoBeginGroup = FALSE; - m_nUndoBufSize = 1024; // crystaltextbuffer.cpp - UNDO_BUF_SIZE; m_nSyncPosition = m_nUndoPosition = 0; ASSERT(m_aUndoBuf.GetSize() == 0); m_ptLastChange.x = m_ptLastChange.y = -1; Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextbuffer.cpp 2008-07-31 19:35:03 UTC (rev 5711) +++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2008-08-01 06:44:00 UTC (rev 5712) @@ -79,8 +79,6 @@ #define CHAR_ALIGN 16 #define ALIGN_BUF_SIZE(size) ((size) / CHAR_ALIGN) * CHAR_ALIGN + CHAR_ALIGN; -#define UNDO_BUF_SIZE 1024 - const TCHAR crlf[] = _T ("\r\n"); #ifdef _DEBUG @@ -402,7 +400,6 @@ m_nTabSize = 4; m_nSyncPosition = m_nUndoPosition = 0; m_bUndoGroup = m_bUndoBeginGroup = FALSE; - m_nUndoBufSize = UNDO_BUF_SIZE; ASSERT (m_aUndoBuf.GetSize () == 0); UpdateViews (NULL, NULL, UPDATE_RESET); //BEGIN SW @@ -1605,45 +1602,6 @@ m_aUndoBuf.SetSize (m_nUndoPosition); } - // If undo buffer size is close to critical, remove the oldest records - ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize); - nBufSize = (int) m_aUndoBuf.GetSize (); - if (nBufSize >= m_nUndoBufSize) - { - int nIndex = 0; - for (;;) - { - nIndex++; - if (nIndex == nBufSize || (m_aUndoBuf[nIndex].m_dwFlags & UNDO_BEGINGROUP) != 0) - break; - } - m_aUndoBuf.RemoveAt (0, nIndex); - -//<jtuc 2003-06-28> -//- Keep m_nSyncPosition in sync. -//- Ensure first undo record is flagged UNDO_BEGINGROUP since part of the code -// relies on this condition. - if (m_nSyncPosition >= 0) - { - m_nSyncPosition -= nIndex; // \xE7\xE0 c'est bien...mais non, test inutile ? Ou Apres ! - } - if (nIndex < nBufSize) - { - // Not really necessary as long as groups are discarded as a whole. - // Just in case some day the loop above should be changed to limit - // the number of discarded undo records to some reasonable value... - m_aUndoBuf[0].m_dwFlags |= UNDO_BEGINGROUP; // \xE7\xE0 c'est sale - } - else - { - // No undo records left - begin a new group: - m_bUndoBeginGroup = TRUE; - } -//</jtuc> - - } - ASSERT (m_aUndoBuf.GetSize () < m_nUndoBufSize); - // Add new record SUndoRecord ur; ur.m_dwFlags = bInsert ? UNDO_INSERT : 0; @@ -1660,8 +1618,6 @@ m_aUndoBuf.Add (ur); m_nUndoPosition = (int) m_aUndoBuf.GetSize (); - - ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize); } LPCTSTR CCrystalTextBuffer::GetStringEol(CRLFSTYLE nCRLFMode) Modified: trunk/Src/editlib/ccrystaltextbuffer.h =================================================================== --- trunk/Src/editlib/ccrystaltextbuffer.h 2008-07-31 19:35:03 UTC (rev 5711) +++ trunk/Src/editlib/ccrystaltextbuffer.h 2008-08-01 06:44:00 UTC (rev 5712) @@ -118,7 +118,6 @@ CRLFSTYLE m_nCRLFMode; BOOL m_IgnoreEol; BOOL m_bCreateBackupFile; - int m_nUndoBufSize; BOOL m_bInsertTabs; int m_nTabSize; int FindLineWithFlag (DWORD dwFlag); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-08-01 06:55:17
|
Revision: 5714 http://winmerge.svn.sourceforge.net/winmerge/?rev=5714&view=rev Author: kimmov Date: 2008-08-01 06:55:15 +0000 (Fri, 01 Aug 2008) Log Message: ----------- BUG: [ 2000996 ] Syntax coloring boldface not working in most fonts Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/editlib/ccrystaltextview.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-01 06:53:39 UTC (rev 5713) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-01 06:55:15 UTC (rev 5714) @@ -13,6 +13,7 @@ BugFix: Could change syntax highlight mode when highlighting was disabled from options (#2027325) BugFix: Editing line filters updated wrong filter (#2025130) + BugFix: Boldfacing did work only for Courier font (#2000996) WinMerge 2.11.1.2 - 2008-07-24 (r5673) Refresh compare after changing filter (#2017426) Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2008-08-01 06:53:39 UTC (rev 5713) +++ trunk/Src/editlib/ccrystaltextview.cpp 2008-08-01 06:55:15 UTC (rev 5714) @@ -2296,15 +2296,14 @@ CClientDC dc (GetDesktopWindow ()); m_lfBaseFont.lfHeight = -MulDiv (11, dc.GetDeviceCaps (LOGPIXELSY), 72); } - m_lfBaseFont.lfWeight = bBold && !_tcsnicmp (m_lfBaseFont.lfFaceName, _T ("Courier"), 7) ? FW_BOLD : FW_NORMAL; - m_lfBaseFont.lfItalic = (BYTE) (bItalic && !_tcsnicmp (m_lfBaseFont.lfFaceName, _T ("Courier"), 7)); + m_lfBaseFont.lfWeight = bBold ? FW_BOLD : FW_NORMAL; + m_lfBaseFont.lfItalic = (BYTE) bItalic; if (!m_apFonts[nIndex]->CreateFontIndirect (&m_lfBaseFont)) { delete m_apFonts[nIndex]; m_apFonts[nIndex] = NULL; return CView::GetFont (); } - } return m_apFonts[nIndex]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-08-04 10:53:34
|
Revision: 5728 http://winmerge.svn.sourceforge.net/winmerge/?rev=5728&view=rev Author: kimmov Date: 2008-08-04 10:53:30 +0000 (Mon, 04 Aug 2008) Log Message: ----------- BUG: [ 1153696 ] Backspace doesn't work if Shift pressed down Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/editlib/editres.rc Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-03 19:28:15 UTC (rev 5727) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-04 10:53:30 UTC (rev 5728) @@ -14,6 +14,7 @@ disabled from options (#2027325) BugFix: Editing line filters updated wrong filter (#2025130) BugFix: Boldfacing did work only for Courier font (#2000996) + BugFix: Shift+Backspace didn't work in editor (#1153696) WinMerge 2.11.1.2 - 2008-07-24 (r5673) Refresh compare after changing filter (#2017426) Modified: trunk/Src/editlib/editres.rc =================================================================== --- trunk/Src/editlib/editres.rc 2008-08-03 19:28:15 UTC (rev 5727) +++ trunk/Src/editlib/editres.rc 2008-08-04 10:53:30 UTC (rev 5728) @@ -58,6 +58,7 @@ VK_BACK, ID_EDIT_DELETE_BACK, VIRTKEY, NOINVERT VK_BACK, ID_EDIT_DELETE_WORD_BACK, VIRTKEY, CONTROL, NOINVERT VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT + VK_BACK, ID_EDIT_DELETE_BACK, VIRTKEY, SHIFT, NOINVERT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT VK_DELETE, ID_EDIT_DELETE_WORD, VIRTKEY, CONTROL, NOINVERT VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-08-05 21:27:44
|
Revision: 5739 http://winmerge.svn.sourceforge.net/winmerge/?rev=5739&view=rev Author: kimmov Date: 2008-08-05 21:27:38 +0000 (Tue, 05 Aug 2008) Log Message: ----------- BUG: [ 2037862 ] Not possible to use command line options for external editor Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Common/coretools.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-05 20:30:02 UTC (rev 5738) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-05 21:27:38 UTC (rev 5739) @@ -3,6 +3,9 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] +WinMerge 2.11.1.4 + BugFix: External editor command line switches did not work (#2037862) + WinMerge 2.11.1.3 - 2008-08-04 (r5733) Rename color scheme menu item "None" and add separator (#2027300) Add -u commandline parameter as alternative to -ub (#2029275, #2030359) Modified: trunk/Src/Common/coretools.cpp =================================================================== --- trunk/Src/Common/coretools.cpp 2008-08-05 20:30:02 UTC (rev 5738) +++ trunk/Src/Common/coretools.cpp 2008-08-05 21:27:38 UTC (rev 5739) @@ -1170,7 +1170,7 @@ sCmdLine.erase(clpos, clpos - sCmdLine.length()); std::string::size_type pos = sCmdLine.find(_T(" ")); - if (pos > -1) + if (pos != std::string.npos) { // First space was before switch, we don't need "s // (executable path didn't contain spaces) @@ -1190,7 +1190,7 @@ prevPos = pos; pos = sCmdLine.find(_T(" "), prevPos + 1); - if (pos > -1) + if (pos != std::string.npos) { if (sCmdLine[pos + 1] == '/' || sCmdLine[pos + 1] == '-') { @@ -1205,7 +1205,7 @@ if (addQuote) { - if (pos > -1) + if (pos != std::string.npos) { sExecutable = sCmdLine.substr(0, pos); sDecoratedCmdLine += sExecutable; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2008-08-06 15:33:18
|
Revision: 5740 http://winmerge.svn.sourceforge.net/winmerge/?rev=5740&view=rev Author: sdottaka Date: 2008-08-06 15:33:15 +0000 (Wed, 06 Aug 2008) Log Message: ----------- BUG: [ 2025833 ] Deleting/Moving file crashes WinMerge in debugger Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DirActions.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-05 21:27:38 UTC (rev 5739) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-06 15:33:15 UTC (rev 5740) @@ -5,6 +5,7 @@ WinMerge 2.11.1.4 BugFix: External editor command line switches did not work (#2037862) + BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) WinMerge 2.11.1.3 - 2008-08-04 (r5733) Rename color scheme menu item "None" and add separator (#2027300) @@ -507,4 +508,4 @@ WinMerge 2.7.4 and earlier (also 2.6.x stable releases) have more detailed -changelogs in Changes.txt files in /Src and other folders. +changelogs in Changes.txt files in /Src and other folders. \ No newline at end of file Modified: trunk/Src/DirActions.cpp =================================================================== --- trunk/Src/DirActions.cpp 2008-08-05 21:27:38 UTC (rev 5739) +++ trunk/Src/DirActions.cpp 2008-08-06 15:33:15 UTC (rev 5740) @@ -994,7 +994,7 @@ // doesn't invalidate our item indexes. FileActionItem act = actionList.RemoveTailActionItem(); POSITION diffpos = GetItemKey(act.context); - const DIFFITEM & di = pDoc->GetDiffByKey(diffpos); + DIFFCODE diffcode = pDoc->GetDiffByKey(diffpos).diffcode; BOOL bUpdateLeft = FALSE; BOOL bUpdateRight = FALSE; @@ -1021,7 +1021,7 @@ break; case FileActionItem::UI_DEL_LEFT: - if (di.diffcode.isSideLeftOnly()) + if (diffcode.isSideLeftOnly()) { m_pList->DeleteItem(act.context); bItemsRemoved = TRUE; @@ -1033,7 +1033,7 @@ break; case FileActionItem::UI_DEL_RIGHT: - if (di.diffcode.isSideRightOnly()) + if (diffcode.isSideRightOnly()) { m_pList->DeleteItem(act.context); bItemsRemoved = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-08-06 16:39:42
|
Revision: 5742 http://winmerge.svn.sourceforge.net/winmerge/?rev=5742&view=rev Author: kimmov Date: 2008-08-06 16:39:38 +0000 (Wed, 06 Aug 2008) Log Message: ----------- PATCH: [ 2039228 ] Add wait-cursor and statusbar message for undo and redo Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Languages/English.pot trunk/Src/Merge.rc trunk/Src/MergeEditView.cpp trunk/Src/resource.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-06 15:35:39 UTC (rev 5741) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-06 16:39:38 UTC (rev 5742) @@ -4,6 +4,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.11.1.4 + Add wait cursor for undo and redo (#2039228) BugFix: External editor command line switches did not work (#2037862) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-08-06 15:35:39 UTC (rev 5741) +++ trunk/Src/Languages/English.pot 2008-08-06 16:39:38 UTC (rev 5742) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-07-30 21:25+0000\n" +"POT-Creation-Date: 2008-08-06 19:35+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -716,7 +716,7 @@ msgstr "" #: Merge.rc:370 -#: Merge.rc:2758 +#: Merge.rc:2760 #, c-format msgid "< Empty >" msgstr "" @@ -1428,7 +1428,7 @@ msgstr "" #: Merge.rc:864 -#: Merge.rc:2169 +#: Merge.rc:2171 #, c-format msgid "Rational ClearCase" msgstr "" @@ -2321,7 +2321,7 @@ msgstr "" #: Merge.rc:1480 -#: Merge.rc:2316 +#: Merge.rc:2318 #, c-format msgid "Different" msgstr "" @@ -2353,7 +2353,7 @@ msgstr "" #: Merge.rc:1498 -#: Merge.rc:2310 +#: Merge.rc:2312 #, c-format msgid "Identical" msgstr "" @@ -2543,7 +2543,7 @@ msgstr "" #: Merge.rc:1643 -#: Merge.rc:2225 +#: Merge.rc:2227 #, c-format msgid "Confirm Copy" msgstr "" @@ -3177,7 +3177,7 @@ msgstr "" #: Merge.rc:2013 -#: Merge.rc:2622 +#: Merge.rc:2624 #, c-format msgid "Name" msgstr "" @@ -3198,7 +3198,7 @@ msgstr "" #: Merge.rc:2017 -#: Merge.rc:2624 +#: Merge.rc:2626 #, c-format msgid "Description" msgstr "" @@ -3348,2227 +3348,2237 @@ msgid "Creating the report..." msgstr "" -#: Merge.rc:2083 +#: Merge.rc:2078 #, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2079 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2085 +#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2086 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2087 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2086 +#: Merge.rc:2088 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2087 +#: Merge.rc:2089 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2088 +#: Merge.rc:2090 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:2091 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2090 +#: Merge.rc:2092 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2096 +#: Merge.rc:2098 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2097 +#: Merge.rc:2099 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2105 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2106 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2107 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2106 +#: Merge.rc:2108 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2107 +#: Merge.rc:2109 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2108 +#: Merge.rc:2110 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2109 +#: Merge.rc:2111 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2110 +#: Merge.rc:2112 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2116 +#: Merge.rc:2118 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2119 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2120 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2121 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2122 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2126 +#: Merge.rc:2128 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2127 +#: Merge.rc:2129 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2128 +#: Merge.rc:2130 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2129 +#: Merge.rc:2131 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2130 +#: Merge.rc:2132 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2135 #, c-format msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2134 +#: Merge.rc:2136 #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2137 #, c-format msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2138 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2139 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2138 +#: Merge.rc:2140 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again." msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2141 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2140 +#: Merge.rc:2142 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2148 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2154 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2155 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2156 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2157 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2156 +#: Merge.rc:2158 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2157 +#: Merge.rc:2159 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2158 +#: Merge.rc:2160 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2159 +#: Merge.rc:2161 #, c-format msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?" msgstr "" -#: Merge.rc:2160 +#: Merge.rc:2162 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "" -#: Merge.rc:2166 -#: Merge.rc:2606 +#: Merge.rc:2168 +#: Merge.rc:2608 #, c-format msgid "None" msgstr "" -#: Merge.rc:2167 +#: Merge.rc:2169 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2170 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2172 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2171 +#: Merge.rc:2173 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2177 #: Merge.rc:2179 +#: Merge.rc:2181 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2178 #: Merge.rc:2180 +#: Merge.rc:2182 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2181 +#: Merge.rc:2183 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2182 +#: Merge.rc:2184 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2183 +#: Merge.rc:2185 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2186 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2187 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2188 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2189 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2188 +#: Merge.rc:2190 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2191 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2190 -#: Merge.rc:2206 +#: Merge.rc:2192 +#: Merge.rc:2208 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2191 -#: Merge.rc:2207 +#: Merge.rc:2193 +#: Merge.rc:2209 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2192 -#: Merge.rc:2208 +#: Merge.rc:2194 +#: Merge.rc:2210 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2193 -#: Merge.rc:2209 +#: Merge.rc:2195 +#: Merge.rc:2211 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2201 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2202 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2203 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2204 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2205 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2206 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2207 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2212 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2213 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2212 +#: Merge.rc:2214 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2213 +#: Merge.rc:2215 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2219 +#: Merge.rc:2221 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2220 +#: Merge.rc:2222 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2221 +#: Merge.rc:2223 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2224 #, c-format msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2225 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2226 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2228 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2234 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2235 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2234 +#: Merge.rc:2236 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2235 +#: Merge.rc:2237 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2238 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2237 +#: Merge.rc:2239 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2240 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2241 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2242 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2241 +#: Merge.rc:2243 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:2244 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2243 +#: Merge.rc:2245 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2251 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2250 +#: Merge.rc:2252 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2253 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2254 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2255 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2257 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2259 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2265 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2266 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2265 +#: Merge.rc:2267 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2268 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2269 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2268 +#: Merge.rc:2270 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2271 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2272 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2271 +#: Merge.rc:2273 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2272 +#: Merge.rc:2274 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2280 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2281 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2282 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2281 +#: Merge.rc:2283 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2282 +#: Merge.rc:2284 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2285 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2286 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2285 +#: Merge.rc:2287 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2286 +#: Merge.rc:2288 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2287 +#: Merge.rc:2289 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2295 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2296 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2295 +#: Merge.rc:2297 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2296 +#: Merge.rc:2298 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2297 -#: Merge.rc:2602 +#: Merge.rc:2299 +#: Merge.rc:2604 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:2305 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:2306 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:2307 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2308 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2309 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2308 +#: Merge.rc:2310 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2311 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2313 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2314 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2315 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2316 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2317 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2319 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2325 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2326 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2327 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2333 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2334 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2335 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2336 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2337 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2336 +#: Merge.rc:2338 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2339 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2340 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2341 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2342 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2348 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2349 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2350 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2349 +#: Merge.rc:2351 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2352 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2351 +#: Merge.rc:2353 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2354 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2355 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2356 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2357 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2363 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2364 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2365 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2366 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2367 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2373 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2374 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2373 +#: Merge.rc:2375 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2376 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2375 +#: Merge.rc:2377 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2379 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2380 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2381 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2387 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2388 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2389 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2390 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2391 #, c-format msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2392 #, 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 "" -#: Merge.rc:2391 +#: Merge.rc:2393 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2394 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2395 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2394 +#: Merge.rc:2396 #, 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 "" -#: Merge.rc:2400 +#: Merge.rc:2402 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2401 +#: Merge.rc:2403 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2404 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2405 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2406 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2412 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2413 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2419 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2420 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2426 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2427 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2433 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2434 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2440 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2441 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2442 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2443 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2444 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2445 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2446 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2447 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2448 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2449 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2450 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2451 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2452 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2453 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2454 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2459 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2458 +#: Merge.rc:2460 #, c-format msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2461 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2462 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2463 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2464 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2465 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2466 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2467 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2468 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2469 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2475 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2476 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2477 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2478 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2479 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2480 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2481 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2482 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2483 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2482 +#: Merge.rc:2484 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2483 +#: Merge.rc:2485 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2486 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2487 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2488 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2489 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2490 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2495 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2501 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2502 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2505 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2504 -#: Merge.rc:2514 +#: Merge.rc:2506 +#: Merge.rc:2516 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2510 +#: Merge.rc:2512 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2511 +#: Merge.rc:2513 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2514 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2515 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2522 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2523 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2531 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2532 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2533 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2534 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2535 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2538 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2544 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2545 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2546 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2547 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2548 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2549 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2555 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2556 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2557 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2558 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2559 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2560 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2561 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2562 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2563 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2564 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2565 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2566 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2567 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2568 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2574 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2575 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2576 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2577 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2578 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2579 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2588 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2591 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2592 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2593 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2594 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:2600 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2601 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2602 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2603 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2605 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2606 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2607 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2614 #, c-format msgid " B" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2615 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2616 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2617 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2618 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2619 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2625 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2627 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2628 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2629 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2636 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2637 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2638 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2639 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2640 #, c-format msgid "Change left side file/folder read-only status" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2641 #, c-format msgid "Change right side file/folder read-only status" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2642 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2643 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2644 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2645 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2646 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2647 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2653 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2654 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2655 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2656 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2657 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2658 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2659 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2660 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2661 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2662 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2668 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:2669 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:2670 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2671 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2672 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2673 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2679 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2680 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2681 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2682 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2683 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2684 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2685 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2686 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2687 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2688 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2689 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2690 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2691 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2692 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2693 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2699 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2700 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2701 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2702 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2703 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2704 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2705 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2706 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2707 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2708 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2707 +#: Merge.rc:2709 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2710 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2711 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2715 +#: Merge.rc:2717 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2718 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2719 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2720 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2726 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2727 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2728 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2729 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2730 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2729 +#: Merge.rc:2731 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2732 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2733 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2739 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2740 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2746 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2747 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2748 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2749 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2750 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2751 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2757 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2758 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2759 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2761 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2762 #, c-format msgid "<None>" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2763 #, c-format msgid "<Automatic>" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2769 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2770 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2771 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2775 +#: Merge.rc:2777 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2776 +#: Merge.rc:2778 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2777 +#: Merge.rc:2779 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2778 +#: Merge.rc:2780 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2781 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2782 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2788 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2787 +#: Merge.rc:2789 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2788 +#: Merge.rc:2790 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2796 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2797 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2798 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2797 +#: Merge.rc:2799 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2800 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2801 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2802 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2803 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2804 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2805 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2806 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2807 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2808 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2807 +#: Merge.rc:2809 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2810 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2811 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2812 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2813 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2814 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2813 +#: Merge.rc:2815 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2814 +#: Merge.rc:2816 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2815 +#: Merge.rc:2817 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2816 +#: Merge.rc:2818 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2817 +#: Merge.rc:2819 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2818 +#: Merge.rc:2820 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2819 +#: Merge.rc:2821 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2820 +#: Merge.rc:2822 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2823 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2822 +#: Merge.rc:2824 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2823 +#: Merge.rc:2825 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2824 +#: Merge.rc:2826 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2825 +#: Merge.rc:2827 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2830 +#: Merge.rc:2832 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2831 +#: Merge.rc:2833 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2832 +#: Merge.rc:2834 #, c-format msgid "Show big toolbar" msgstr "" Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2008-08-06 15:35:39 UTC (rev 5741) +++ trunk/Src/Merge.rc 2008-08-06 16:39:38 UTC (rev 5742) @@ -2075,6 +2075,8 @@ IDS_STATUS_DELETEFILES "Deleting files..." IDS_STATUS_MOVEFILES "Moving files..." IDS_STATUS_CREATEREPORT "Creating the report..." + IDS_STATUS_UNDO "Undoing the last operation..." + IDS_STATUS_REDO "Redoing the previous operation..." END // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR) Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2008-08-06 15:35:39 UTC (rev 5741) +++ trunk/Src/MergeEditView.cpp 2008-08-06 16:39:38 UTC (rev 5742) @@ -794,6 +794,7 @@ */ void CMergeEditView::OnEditUndo() { + WaitStatusCursor waitstatus(IDS_STATUS_UNDO); CMergeDoc* pDoc = GetDocument(); CMergeEditView *tgt = *(pDoc->curUndo-1); if(tgt==this) @@ -1415,6 +1416,7 @@ */ void CMergeEditView::OnEditRedo() { + WaitStatusCursor waitstatus(IDS_STATUS_REDO); CMergeDoc* pDoc = GetDocument(); CMergeEditView *tgt = *(pDoc->curUndo); if(tgt==this) Modified: trunk/Src/resource.h =================================================================== --- trunk/Src/resource.h 2008-08-06 15:35:39 UTC (rev 5741) +++ trunk/Src/resource.h 2008-08-06 16:39:38 UTC (rev 5742) @@ -541,6 +541,8 @@ #define IDS_STATUS_DELETEFILES 16823 #define IDS_STATUS_MOVEFILES 16824 #define IDS_STATUS_CREATEREPORT 16825 +#define IDS_STATUS_UNDO 16826 +#define IDS_STATUS_REDO 16827 #define IDS_LINE_STATUS_INFO_EOL 16832 #define IDS_EMPTY_LINE_STATUS_INFO 16833 #define IDS_LINE_STATUS_INFO 16834 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-08-08 15:06:59
|
Revision: 5765 http://winmerge.svn.sourceforge.net/winmerge/?rev=5765&view=rev Author: kimmov Date: 2008-08-08 15:06:54 +0000 (Fri, 08 Aug 2008) Log Message: ----------- PATCH: [ 2039929 ] update ChineseTraditional.po from revision 5739 Submitted by wck3 Revision Links: -------------- http://winmerge.svn.sourceforge.net/winmerge/?rev=5739&view=rev Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Languages/ChineseTraditional.po Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-08 12:59:16 UTC (rev 5764) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-08 15:06:54 UTC (rev 5765) @@ -7,6 +7,8 @@ Add wait cursor for undo and redo (#2039228) BugFix: External editor command line switches did not work (#2037862) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) + Translation updates: + - Chinese Traditional (#2039929) WinMerge 2.11.1.3 - 2008-08-04 (r5733) Rename color scheme menu item "None" and add separator (#2027300) Modified: trunk/Src/Languages/ChineseTraditional.po =================================================================== --- trunk/Src/Languages/ChineseTraditional.po 2008-08-08 12:59:16 UTC (rev 5764) +++ trunk/Src/Languages/ChineseTraditional.po 2008-08-08 15:06:54 UTC (rev 5765) @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-03-04 18:02+0000\n" -"PO-Revision-Date: 2008-03-28 07:39+0800\n" +"POT-Creation-Date: 2008-07-30 21:25+0000\n" +"PO-Revision-Date: 2008-08-06 17:00+0800\n" "Last-Translator: \xC5Ǻ\xFB\xA5\xBF <wc...@pc...>\n" "Language-Team: ChineseTraditional <win...@li...>\n" "MIME-Version: 1.0\n" @@ -286,7 +286,7 @@ #: Merge.rc:454 #, c-format msgid "&List..." -msgstr "" +msgstr "\xA6C\xA5X(&L)..." # "\xA4\xE2\xB0ʸ\xD1\xC0\xA3\xC1Y(&M)" #: Merge.rc:152 @@ -304,7 +304,7 @@ msgid "&Automatic Unpacking" msgstr "\xA6۰ʸѶ}\xABD\xAF¤\xE5\xA6r\xC0\xC9(&A)" -# Is this message correct? Because the unpacker here is not a editor. +# Is this message correct? Because the unpacker here is not a editor. Perhaps "Edit After Unpacking"? #: Merge.rc:155 #: Merge.rc:276 #: Merge.rc:459 @@ -507,17 +507,17 @@ #: Merge.rc:224 #, c-format msgid "Tree &Mode" -msgstr "" +msgstr "\xBE𪬼Ҧ\xA1(&M)" #: Merge.rc:225 #, c-format msgid "E&xpand All Subfolders" -msgstr "" +msgstr "\xAEi\xB6}\xA9Ҧ\xB3\xA4l\xB8\xEA\xAEƧ\xA8(&X)" #: Merge.rc:226 #, c-format msgid "&Collapse All Subfolders" -msgstr "" +msgstr "\xA6\xAC\xA6X\xA9Ҧ\xB3\xA4l\xB8\xEA\xAEƧ\xA8(&C)" #: Merge.rc:239 #, c-format @@ -829,15 +829,19 @@ msgid "Sw&ap Panes" msgstr "\xB5\xA1\xAE洫\xA6\xEC(&A)" +# I would suggest "Microview Pane" +# \xAEt\xB2\xA7\xB5\xA1\xAE\xE6(&P) #: Merge.rc:421 #, c-format msgid "Diff &Pane" -msgstr "\xAEt\xB2\xA7\xB5\xA1\xAE\xE6(&P)" +msgstr "\xAA\xF1\xB9\xAE\xE6(&P)" +# I would suggest "Macroview Pane". +# \xA6\xEC\xB8m\xB5\xA1\xAE\xE6 #: Merge.rc:422 #, c-format msgid "Lo&cation Pane" -msgstr "\xA6\xEC\xB8m\xB5\xA1\xAE\xE6(&P)" +msgstr "\xBB\xB7\xB1浡\xAE\xE6(&P)" #: Merge.rc:440 #, c-format @@ -1292,7 +1296,8 @@ msgid "As&k when closing multiple windows" msgstr "\xC3\x{1B3B26}h\xAD\xAB\xB5\xF8\xB5\xA1\xAEɥ\xFD\xB8߰\xDD(&K)" -# "\xA4\xF1\xB8\xFB\xAEɫO\xAFd\xC0ɮɶ\xA1(&P)" +# "\xA4\xF1\xB8\xFB\xAEɭp\xA4J\xC0ɮɶ\xA1(&P)" +# Do you want with it to say "Include file time difference in comparing" or "Do not change file time in comparing"? #: Merge.rc:771 #, c-format msgid "&Preserve file time in file compare" @@ -2096,11 +2101,13 @@ "\xB0\xA3\xABD\xA6\xB3\xA7\xF3\xB7s\xAA\xA9\xA5i\xA5ΡA\xAB\xD8ij\xA8ϥΤU\xAD\xB1\xAA\xBA\n" "7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xAA\xA9\xA5\xBB\xA1C" +# I suggest "7-Zip Version" instead. #: Merge.rc:1303 #, c-format msgid "Version" msgstr "7-Zip \xAA\xA9\xA5\xBB" +# I suggest "Required Interface-Plugin" instead. #: Merge.rc:1305 #, c-format msgid "" @@ -2142,6 +2149,7 @@ msgid "missing" msgstr "\xA4\xA3\xA6s\xA6b" +# I suggest "7-Zip components only for WinMerge:" instead. #: Merge.rc:1319 #, c-format msgid "7-Zip components for standalone operation:" @@ -2152,6 +2160,7 @@ msgid "outdated" msgstr "\xA4w\xC2\xC2" +# I suggest "Interface-Plugin on path:" instead. #: Merge.rc:1324 #, c-format msgid "Plugins on path:" @@ -2166,6 +2175,7 @@ "\xA4ŦA\xC5\xE3\xA5ܦ\xB9\xB0T\xAE\xA7\xA1C(&M)\n" "(\xA4\xB4\xA5i\xA5ѻ\xA1\xA9\xFA\xBF\xEF\xB3椤\xA5s\xA5X\xA5\xA6)" +# I suggest Interface-Plugin Download" instead. #: Merge.rc:1329 #, c-format msgid "Plugin Download" @@ -2303,12 +2313,14 @@ msgid "Archive Support" msgstr "\xA4䴩\xC0\xA3\xC1Y" -# \xA1u\xA5H shared installation \xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xA4~\xA6\xB3\xA4䴩\xC0\xA3\xC1Y\xA4\xA7\xB1\xF8\xA5\xF3\xA1G\xA1v\xA1u\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G\xA1vI suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead. +# \xA1u\xA5H shared installation \xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xA4~\xA6\xB3\xA4䴩\xC0\xA3\xC1Y\xA4\xA7\xB1\xF8\xA5\xF3\xA1G\xA1v\xA1u\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G\xA1v +# I suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead. #: Merge.rc:1457 #, c-format msgid "Archive support requires 7-Zip plugin installed:" -msgstr "\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G" +msgstr "\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1A\xA9\xB3\xA4U\xBFﶵ\xA4~\xA5i\xA6\xE6\xA1G" +# I suggest "Download 7-Zip Interface-Plugin" instead. #: Merge.rc:1459 #, c-format msgid "Download 7-zip Plugin" @@ -2319,11 +2331,14 @@ msgid "&Enable archive file support" msgstr "\xC0\xA3\xC1Y\xC0ɤ䴩(&E)" +# I suggest "Use installed 7-Zip software" instead. #: Merge.rc:1462 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "\xA8ϥοW\xA5ߪ\xBA 7-Zip \xB3n\xC5\xE9(&U)" +# \xA8ϥΥH sp in + st op \xBFﶵ\xA6w\xB8˪\xBA\xA5[\xB1\xBE\xC0\xC9(\xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xAE\xC9)(&S) +# I suggest "U&se WinMerge-dependent 7-Zip" or "U&se 7-Zip components installed by WinMerge Plugin-installer" instead. #: Merge.rc:1465 #, c-format msgid "U&se local 7-Zip from WinMerge folder" @@ -2605,12 +2620,12 @@ #: Merge.rc:1662 #, c-format msgid "Plugins" -msgstr "" +msgstr "\xA5~\xB1\xBE" #: Merge.rc:1665 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "\xB1ҥΥ~\xB1\xBE(&E)" #. StringFileInfo.Block #: Merge.rc:1695 @@ -2748,17 +2763,17 @@ #: Merge.rc:1757 #, c-format msgid "Toggle tree mode" -msgstr "" +msgstr "\xA4\xC1\xB4\xAB\xBE𪬼Ҧ\xA1" #: Merge.rc:1758 #, c-format msgid "Expand all subfolders" -msgstr "" +msgstr "\xAEi\xB6}\xA9Ҧ\xB3\xA4l\xB8\xEA\xAEƧ\xA8" #: Merge.rc:1759 #, c-format msgid "Collapse all subfolders" -msgstr "" +msgstr "\xA6\xAC\xA6X\xA9Ҧ\xB3\xA4l\xB8\xEA\xAEƧ\xA8" #: Merge.rc:1765 #, c-format @@ -2809,7 +2824,7 @@ "Display program information, version number and copyright\n" "About" msgstr "" -"\xC5\xE3\xA5ܵ{\xA6\xA1\xB8\xEA\xB0T\xA1A\xAA\xA9\xA5\xBB\xB8\xB9\xBDX\xA9M\xAA\xA9\xC5v\n" +"\xC5\xE3\xA5ܵ{\xA6\xA1\xB8\xEA\xB0T\xA1A\xAA\xA9\xA5\xBB\xB8\xB9\xBDX\xA9M\xB5ۧ@\xC5v\n" "\xC3\xF6\xA9\xF3" #: Merge.rc:1777 @@ -3118,9 +3133,12 @@ #: Merge.rc:1895 #, c-format -msgid "Developers:\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 "" -"\xAC\xE3\xB5o\xAA̡G\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +"\xAC\xE3\xB5o\xAA̡G\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" #: Merge.rc:1896 #, c-format @@ -3401,6 +3419,7 @@ msgid "Description" msgstr "\xB4y\xADz" +# I suggest "Add new filter filename" instead. For it must not select a name, rather give one. #: Merge.rc:2018 #, c-format msgid "Select filename for new filter" @@ -3489,9 +3508,16 @@ #: Merge.rc:2044 #, 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 "" +"\xBFz\xBFᄍ\xA7\xF3\xB7s\xB9L\xA1C\xB7Q\xAD\xAB\xBE\xE3\xA9Ҧ\xB3\xB6i\xA6椤\xAA\xBA\xB8\xEA\xAEƧ\xA8\xA4\xF1\xB8\xFB\xB6ܡH\n" +"\n" +"\xA6p\xA4\xA3\xB7Q\xB2{\xA6b\xAD\xAB\xBE\xE3\xA1A\xBF\xEF\xA1u\xA7_\xA1v\xA1A\xA5H\xAB\xE1\xA6A\xAD\xAB\xBE\xE3\xA1C" +# \xA4\xA3\xBDT\xA9w #: Merge.rc:2050 #, c-format msgid "&Path to cleartool.exe :" @@ -4114,17 +4140,17 @@ #: Merge.rc:2223 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "\xBDT\xA9w\xADn\xB2\xBE\xB0\xA3\xA1G" #: Merge.rc:2224 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "\xBDT\xA9w\xADn\xB2\xBE\xB0\xA3 %d \xB6\xB5\xA5ءG" #: Merge.rc:2226 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "\xBDT\xBB{\xB2\xBE\xB0\xA3" #: Merge.rc:2232 #, c-format @@ -4395,7 +4421,7 @@ #: Merge.rc:2313 #, c-format msgid "Folders are different" -msgstr "" +msgstr "\xA8\xE2\xB8\xEA\xAEƧ\xA8\xA4\xA3\xA6P" #: Merge.rc:2314 #, c-format @@ -4733,15 +4759,19 @@ msgid "Copy Filename" msgstr "\xBDƻs\xC0ɦW" +# also refer to line 5584 +# \xA6\xEC\xB8m\xB5\xA1\xAE\xE6 #: Merge.rc:2431 #, c-format msgid "Location Pane" -msgstr "\xA6\xEC\xB8m\xB5\xA1\xAE\xE6" +msgstr "\xBB\xB7\xB1浡\xAE\xE6" +# also refer to line 5578 +# \xAEt\xB2\xA7\xB5\xA1\xAE\xE6 #: Merge.rc:2432 #, c-format msgid "Diff Pane" -msgstr "\xAEt\xB2\xA7\xB5\xA1\xAE\xE6" +msgstr "\xAA\xF1\xB9\xAE\xE6" #: Merge.rc:2438 #, c-format @@ -5319,22 +5349,23 @@ #: Merge.rc:2623 #, c-format msgid "Type" -msgstr "" +msgstr "\xC3\xFE\xAB\xAC" #: Merge.rc:2625 #, c-format msgid "Unpacker" -msgstr "" +msgstr "\xB8ѥ]\xBE\xB9" #: Merge.rc:2626 #, c-format msgid "Prediffer" -msgstr "" +msgstr "\xA5\xFD\xA6\xE6\xB3B\xB2z\xBE\xB9" +# What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"? #: Merge.rc:2627 #, c-format msgid "Editor script" -msgstr "" +msgstr "\xBDs\xBF边\xC0HĶ\xA7Y\xA6\xE6\xBDX" #: Merge.rc:2634 #, c-format @@ -5359,12 +5390,12 @@ #: Merge.rc:2638 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "\xC5ܧ\xF3\xA5\xAA\xC3\xE4\xC0ɮ\xD7/\xB8\xEA\xAEƧ\xA8\xB0\xDFŪ\xAA\xAC\xBAA" #: Merge.rc:2639 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "\xC5ܧ\xF3\xA5k\xC3\xE4\xC0ɮ\xD7/\xB8\xEA\xAEƧ\xA8\xB0\xDFŪ\xAA\xAC\xBAA" #: Merge.rc:2640 #, c-format @@ -5543,15 +5574,18 @@ msgid "Shows whitespace characters" msgstr "\xC5\xE3\xA5ܪťթM\xB8\xF5\xAE\xE6\xA6r\xA4\xB8" +# I would suggest "Toggle Microview Pane" instead. +# "\xB6}\xC3\xF6\xAEt\xB2\xA7\xB5\xA1\xAE\xE6" #: Merge.rc:2680 #, c-format msgid "Toggle Diff Pane" -msgstr "\xB6}\xC3\xF6\xAEt\xB2\xA7\xB5\xA1\xAE\xE6" +msgstr "\xB6}\xC3\xF6\xAA\xF1\xB9\xAE\xE6" +# \xA6\xEC\xB8m\xB5\xA1\xAE\xE6\xC5\xE3\xA5\xDC\xC0ɮץ\xFE\xB9\xB3 #: Merge.rc:2681 #, c-format msgid "Location pane shows overall picture from files" -msgstr "\xA6\xEC\xB8m\xB5\xA1\xAE\xE6\xC5\xE3\xA5\xDC\xC0ɮץ\xFE\xB9\xB3" +msgstr "\xBB\xB7\xB1浡\xAE\xE6\xC5\xE3\xA5\xDC\xC0ɮץ\xFE\xB9\xB3" #: Merge.rc:2682 #, c-format @@ -5755,9 +5789,10 @@ #: Merge.rc:2724 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "\xA6C\xA5X\xA5i\xA5Ϊ\xBA\xA5~\xB1\xBE" -# Instead of "The user selects the unpacker (no unpacking when comparing dir)" I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)". +# "\xA8ϥΪ̿\xEF\xA8\xFA\xB8\xD1\xC0\xA3\xBE\xB9(\xA4\xF1\xB8\xFB\xB8\xEA\xAEƧ\xA8\xAEɤ\xA3\xB8\xD1\xC0\xA3) +# " I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)" instead. #: Merge.rc:2725 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" @@ -5794,6 +5829,7 @@ msgid "Unload all plugins and reload them (for developers)" msgstr "\xA8\xF8\xB8\xFC\xA9Ҧ\xB3\xA5~\xB1\xBE\xA6A\xAD\xAB\xB7s\xB8\xFC\xA4J (\xBEA\xA5εo\xAEi\xAA\xCC)" +# The original text is strange because the next file seems to be always visible. The correct one is "Activate next file" or "Change the focus to next file", etc. #: Merge.rc:2737 #, c-format msgid "" @@ -5943,7 +5979,7 @@ #: Merge.rc:2794 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "\xB5L\xB0\xAA\xABG\xAB\xD7\xC5\xE3\xA5\xDC" #: Merge.rc:2795 #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-08-12 06:19:37
|
Revision: 5789 http://winmerge.svn.sourceforge.net/winmerge/?rev=5789&view=rev Author: kimmov Date: 2008-08-12 06:19:33 +0000 (Tue, 12 Aug 2008) Log Message: ----------- PATCH: [ 2046002 ] Fix losing focus after folder compare operations Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Common/CShellFileOp.cpp trunk/Src/DirActions.cpp trunk/Src/MainFrm.cpp trunk/Src/Merge.cpp trunk/Src/Merge.h Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-11 21:17:49 UTC (rev 5788) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-12 06:19:33 UTC (rev 5789) @@ -7,6 +7,7 @@ Add wait cursor for undo and redo (#2039228) BugFix: External editor command line switches did not work (#2037862) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) + Bugfix: Lost focus after folder compare operations (#2046002) Translation updates: - Chinese Traditional (#2039929) Modified: trunk/Src/Common/CShellFileOp.cpp =================================================================== --- trunk/Src/Common/CShellFileOp.cpp 2008-08-11 21:17:49 UTC (rev 5788) +++ trunk/Src/Common/CShellFileOp.cpp 2008-08-12 06:19:33 UTC (rev 5789) @@ -540,9 +540,7 @@ } // drum roll please.... - ((CFrameWnd *)AfxGetMainWnd())->BeginModalState(); nAPIRet = SHFileOperation ( &m_rFOS ); // tah-dah! - ((CFrameWnd *)AfxGetMainWnd())->EndModalState(); // Save the return value from the API. if ( NULL != lpnAPIReturn ) { Modified: trunk/Src/DirActions.cpp =================================================================== --- trunk/Src/DirActions.cpp 2008-08-11 21:17:49 UTC (rev 5788) +++ trunk/Src/DirActions.cpp 2008-08-12 06:19:33 UTC (rev 5789) @@ -973,8 +973,10 @@ actionScript.SetParentWindow(this->GetSafeHwnd()); + theApp.AddOperation(); if (actionScript.Run()) UpdateAfterFileScript(actionScript); + theApp.RemoveOperation(); } /** Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2008-08-11 21:17:49 UTC (rev 5788) +++ trunk/Src/MainFrm.cpp 2008-08-12 06:19:33 UTC (rev 5789) @@ -1764,6 +1764,9 @@ */ void CMainFrame::OnClose() { + if (theApp.GetActiveOperations()) + return; + // Check if there are multiple windows open and ask for closing them BOOL bAskClosing = GetOptionsMgr()->GetBool(OPT_ASK_MULTIWINDOW_CLOSE); if (bAskClosing) Modified: trunk/Src/Merge.cpp =================================================================== --- trunk/Src/Merge.cpp 2008-08-11 21:17:49 UTC (rev 5788) +++ trunk/Src/Merge.cpp 2008-08-12 06:19:33 UTC (rev 5789) @@ -141,6 +141,7 @@ , m_bNonInteractive(false) , m_pOptions(NULL) , m_pLog(NULL) +, m_nActiveOperations(0) { // add construction code here, // Place all significant initialization in InitInstance Modified: trunk/Src/Merge.h =================================================================== --- trunk/Src/Merge.h 2008-08-11 21:17:49 UTC (rev 5788) +++ trunk/Src/Merge.h 2008-08-12 06:19:33 UTC (rev 5789) @@ -114,6 +114,31 @@ void ReloadMenu(); + //@{ + /** + * @name Active operations counter. + * These functions implement counter for active operations. We need to + * track active operations during whose user cannot exit the application. + * E.g. copying files in folder compare is such an operation. + */ + /** + * Increment the active operation counter. + */ + void AddOperation() { InterlockedIncrement(&m_nActiveOperations); } + /** + * Decrement the active operation counter. + */ + void RemoveOperation() + { + ASSERT(m_nActiveOperations > 0); + InterlockedDecrement( &m_nActiveOperations); + } + /** + * Get the active operations count. + */ + LONG GetActiveOperations() const { return m_nActiveOperations; } + //@} + //{{AFX_MSG(CMergeApp) afx_msg BOOL OnOpenRecentFile(UINT nID); afx_msg void OnAppAbout(); @@ -128,6 +153,7 @@ CLogFile * m_pLog; int m_nLastCompareResult; bool m_bNonInteractive; + LONG m_nActiveOperations; /**< Active operations count. */ }; extern CMergeApp theApp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2008-08-12 15:59:11
|
Revision: 5792 http://winmerge.svn.sourceforge.net/winmerge/?rev=5792&view=rev Author: sdottaka Date: 2008-08-12 15:59:07 +0000 (Tue, 12 Aug 2008) Log Message: ----------- PATCH: [ 2018836 ] RFE:987590 hierarchical directory comparison result view (5) - Fix a bug that some files had folder icons when aborting folder compare. Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DirView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-12 07:02:28 UTC (rev 5791) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-12 15:59:07 UTC (rev 5792) @@ -8,6 +8,7 @@ BugFix: External editor command line switches did not work (#2037862) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) Bugfix: Lost focus after folder compare operations (#2046002) + Bugfix: Some files had folder icons when aborting folder compare (#2018836) Translation updates: - Chinese Traditional (#2039929) Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2008-08-12 07:02:28 UTC (rev 5791) +++ trunk/Src/DirView.cpp 2008-08-12 15:59:07 UTC (rev 5792) @@ -354,7 +354,7 @@ else return (di.diffcode.isBin() ? DIFFIMG_BINDIFF : DIFFIMG_DIFF); } - return DIFFIMG_DIR; + return (di.diffcode.isDirectory() ? DIFFIMG_DIR : DIFFIMG_ABORT); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-08-12 20:03:43
|
Revision: 5793 http://winmerge.svn.sourceforge.net/winmerge/?rev=5793&view=rev Author: gerundt Date: 2008-08-12 20:03:39 +0000 (Tue, 12 Aug 2008) Log Message: ----------- PATCH: [ 2047054 ] Add icon for "Open Conflict File" menu item Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MainFrm.cpp trunk/Src/Merge2.rc trunk/Src/resource.h Added Paths: ----------- trunk/Src/res/open_conflict.bmp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-12 20:03:39 UTC (rev 5793) @@ -5,6 +5,7 @@ WinMerge 2.11.1.4 Add wait cursor for undo and redo (#2039228) + Add icon for "Open Conflict File" menu item (#2047054) BugFix: External editor command line switches did not work (#2037862) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) Bugfix: Lost focus after folder compare operations (#2046002) Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Src/MainFrm.cpp 2008-08-12 20:03:39 UTC (rev 5793) @@ -98,6 +98,7 @@ * @brief A table associating menuitem id, icon and menus to apply. */ const CMainFrame::MENUITEM_ICON CMainFrame::m_MenuIcons[] = { + { ID_FILE_OPENCONFLICT, IDB_FILE_OPENCONFLICT, CMainFrame::MENU_ALL }, { ID_EDIT_COPY, IDB_EDIT_COPY, CMainFrame::MENU_ALL }, { ID_EDIT_CUT, IDB_EDIT_CUT, CMainFrame::MENU_ALL }, { ID_EDIT_PASTE, IDB_EDIT_PASTE, CMainFrame::MENU_ALL }, Modified: trunk/Src/Merge2.rc =================================================================== --- trunk/Src/Merge2.rc 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Src/Merge2.rc 2008-08-12 20:03:39 UTC (rev 5793) @@ -141,6 +141,7 @@ IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp" IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp" IDB_TREE_STATE BITMAP "res\\treestate.bmp" +IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp" ///////////////////////////////////////////////////////////////////////////// Property changes on: trunk/Src/res/open_conflict.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/Src/resource.h =================================================================== --- trunk/Src/resource.h 2008-08-12 15:59:07 UTC (rev 5792) +++ trunk/Src/resource.h 2008-08-12 20:03:39 UTC (rev 5793) @@ -101,6 +101,7 @@ #define IDB_VIEW_ZOOMIN 358 #define IDB_VIEW_ZOOMOUT 359 #define IDB_TREE_STATE 360 +#define IDB_FILE_OPENCONFLICT 361 #define IDI_FOLDER 500 #define IDI_LFOLDER 501 #define IDI_RFOLDER 502 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2008-08-15 04:46:46
|
Revision: 5808 http://winmerge.svn.sourceforge.net/winmerge/?rev=5808&view=rev Author: sdottaka Date: 2008-08-15 04:46:43 +0000 (Fri, 15 Aug 2008) Log Message: ----------- Japanese translation - update Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/Languages/Japanese.po Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-14 19:20:43 UTC (rev 5807) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-15 04:46:43 UTC (rev 5808) @@ -12,6 +12,7 @@ Bugfix: Some files had folder icons when aborting folder compare (#2018836) Translation updates: - Chinese Traditional (#2039929) + - Japanese (r5805) WinMerge 2.11.1.3 - 2008-08-04 (r5733) Rename color scheme menu item "None" and add separator (#2027300) Modified: trunk/Src/Languages/Japanese.po =================================================================== --- trunk/Src/Languages/Japanese.po 2008-08-14 19:20:43 UTC (rev 5807) +++ trunk/Src/Languages/Japanese.po 2008-08-15 04:46:43 UTC (rev 5808) @@ -12,7 +12,7 @@ "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-03-18 06:00+0900\n" +"PO-Revision-Date: 2008-08-15 13:05+0900\n" "Last-Translator: Takashi Sawanaka <sawanaka at d1.dion.ne.jp>\n" "Language-Team: Japanese <win...@li...>\n" "MIME-Version: 1.0\n" @@ -285,7 +285,7 @@ #: Merge.rc:454 #, c-format msgid "&List..." -msgstr "" +msgstr "\x83\x8A\x83X\x83g(&L)..." #: Merge.rc:152 #: Merge.rc:273 @@ -503,17 +503,17 @@ #: Merge.rc:224 #, c-format msgid "Tree &Mode" -msgstr "" +msgstr "\x83c\x83\x8A\x81[\x95\\x8E\xA6(&M)" #: Merge.rc:225 #, c-format msgid "E&xpand All Subfolders" -msgstr "" +msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x93W\x8AJ\x82\xB7\x82\xE9(&X)" #: Merge.rc:226 #, c-format msgid "&Collapse All Subfolders" -msgstr "" +msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x90܂肽\x82\xBD\x82\xDE(&C)" #: Merge.rc:239 #, c-format @@ -719,7 +719,7 @@ msgstr "\x83X\x83N\x83\x8A\x83v\x83g(&S)" #: Merge.rc:370 -#: Merge.rc:2758 +#: Merge.rc:2760 #, c-format msgid "< Empty >" msgstr "< \x82Ȃ\xB5 >" @@ -1431,7 +1431,7 @@ msgstr "\x82\xB7\x82ׂĒu\x8A\xB7(&A)" #: Merge.rc:864 -#: Merge.rc:2169 +#: Merge.rc:2171 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -2342,7 +2342,7 @@ msgstr "\x83t\x83@\x83C\x83\x8B:" #: Merge.rc:1480 -#: Merge.rc:2316 +#: Merge.rc:2318 #, c-format msgid "Different" msgstr "\x8D\xB7\x88\xD9" @@ -2374,7 +2374,7 @@ msgstr "\x89E\x91\xA4:" #: Merge.rc:1498 -#: Merge.rc:2310 +#: Merge.rc:2312 #, c-format msgid "Identical" msgstr "\x93\xAF\x88\xEA" @@ -2564,7 +2564,7 @@ msgstr "\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9(&P)" #: Merge.rc:1643 -#: Merge.rc:2225 +#: Merge.rc:2227 #, c-format msgid "Confirm Copy" msgstr "\x83R\x83s\x81[\x82̊m\x94F" @@ -2597,12 +2597,12 @@ #: Merge.rc:1662 #, c-format msgid "Plugins" -msgstr "" +msgstr "\x83v\x83\x89\x83O\x83C\x83\x93" #: Merge.rc:1665 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "\x83v\x83\x89\x83O\x83C\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&E)" #. StringFileInfo.Block #: Merge.rc:1695 @@ -2740,17 +2740,17 @@ #: Merge.rc:1757 #, c-format msgid "Toggle tree mode" -msgstr "" +msgstr "\x83c\x83\x8A\x81[\x95\\x8E\xA6/\x83t\x83\x89\x83b\x83g\x95\\x8E\xA6\x82\xF0\x90\xE8\x91ւ\xA6\x82܂\xB7" #: Merge.rc:1758 #, c-format msgid "Expand all subfolders" -msgstr "" +msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x93W\x8AJ\x82\xB7\x82\xE9" #: Merge.rc:1759 #, c-format msgid "Collapse all subfolders" -msgstr "" +msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x90܂肽\x82\xBD\x82\xDE" #: Merge.rc:1765 #, c-format @@ -3370,7 +3370,7 @@ msgstr "\x83T\x83C\x83Y" #: Merge.rc:2013 -#: Merge.rc:2622 +#: Merge.rc:2624 #, c-format msgid "Name" msgstr "\x96\xBC\x8F\xCC" @@ -3391,7 +3391,7 @@ msgstr "[F] " #: Merge.rc:2017 -#: Merge.rc:2624 +#: Merge.rc:2626 #, c-format msgid "Description" msgstr "\x90\xE0\x96\xBE" @@ -3482,8 +3482,14 @@ #: Merge.rc:2044 #, 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 "" +"\x83t\x83B\x83\x8B\x83^\x82\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B\x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82邷\x82ׂẴt\x83H\x83\x8B\x83_\x94\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82܂\xB7\x82\xA9?\n" +"\n" +"\x82\xE0\x82\xB5\x81A\x82\xA2\x82܂͂\xB7\x82ׂĂ̔\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82\xBD\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x81A\x82\xA2\x82\xA2\x82\xA6\x82\xF0\x91I\x91\xF0\x82\xB5\x81A\x8C\xE3\x82Ŕ\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" #: Merge.rc:2050 #, c-format @@ -3575,108 +3581,118 @@ msgid "Creating the report..." msgstr "\x83\x8C\x83|\x81[\x83g\x82\xAC\x82\xB5\x82Ă\xA2\x82܂\xB7..." -#: Merge.rc:2083 +#: Merge.rc:2078 #, c-format +msgid "Undoing the last operation..." +msgstr "\x8DŌ\xE3\x82̑\x80\x8D\xEC\x82\xF0\x8C\xB3\x82ɖ߂\xB5\x82Ă\xA2\x82܂\xB7..." + +#: Merge.rc:2079 +#, c-format +msgid "Redoing the previous operation..." +msgstr "\x91O\x82̑\x80\x8D\xEC\x82\xF0\x82\xE2\x82蒼\x82\xB5\x82Ă\xA2\x82܂\xB7..." + +#: Merge.rc:2085 +#, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "\x8Ds: %s \x97\xF1: %d/%d \x95\xB6\x8E\x9A: %d/%d EOL: %s" -#: Merge.rc:2084 +#: Merge.rc:2086 #, c-format msgid "Line: %s" msgstr "\x8Ds: %s" -#: Merge.rc:2085 +#: Merge.rc:2087 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "\x8Ds: %s \x97\xF1: %d/%d \x95\xB6\x8E\x9A: %d/%d" -#: Merge.rc:2086 +#: Merge.rc:2088 #, c-format msgid "Merge" msgstr "\x83}\x81[\x83W" -#: Merge.rc:2087 +#: Merge.rc:2089 #, c-format msgid "Difference %1 of %2" msgstr "\x8D\xB7\x88\xD9 %1/%2" -#: Merge.rc:2088 +#: Merge.rc:2090 #, c-format msgid "%1 Differences Found" msgstr "%1\x8C̍\xB7\x88ق\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB5\x82\xBD" -#: Merge.rc:2089 +#: Merge.rc:2091 #, c-format msgid "1 Difference Found" msgstr "1\x8C̍\xB7\x88ق\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB5\x82\xBD" #. Abbreviation from "Read Only" -#: Merge.rc:2090 +#: Merge.rc:2092 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2096 +#: Merge.rc:2098 #, c-format msgid "Item %1 of %2" msgstr "\x8D\x80\x96\xDA %1/%2" -#: Merge.rc:2097 +#: Merge.rc:2099 #, c-format msgid "Items: %1" msgstr "\x8D\x80\x96\xDA: %1" -#: Merge.rc:2103 +#: Merge.rc:2105 #, c-format msgid "Select two existing folders or files to compare" msgstr "\x91\xB6\x8D݂\xB7\x82\xE9\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82́A\x83t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" -#: Merge.rc:2104 +#: Merge.rc:2106 #, c-format msgid "Folder Selection" msgstr "Folder Selection" -#: Merge.rc:2105 +#: Merge.rc:2107 #, c-format msgid "Select two folders or two files to compare." msgstr "2\x82̃t\x83H\x83\x8B\x83_\x82܂\xBD\x82́A2\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2106 +#: Merge.rc:2108 #, c-format msgid "Left path is invalid!" msgstr "\x8D\xB6\x91\xA4\x82̃p\x83X\x82͕s\x90\xB3\x82ȃp\x83X\x82ł\xB7!" -#: Merge.rc:2107 +#: Merge.rc:2109 #, c-format msgid "Right path is invalid!" msgstr "\x89E\x91\xA4\x82̃p\x83X\x82͕s\x90\xB3\x82ȃp\x83X\x82ł\xB7!" -#: Merge.rc:2108 +#: Merge.rc:2110 #, c-format msgid "Both paths are invalid!" msgstr "\x97\xBC\x91\xA4\x82̃p\x83X\x82͕s\x90\xB3\x82ȃp\x83X\x82ł\xB7!" -#: Merge.rc:2109 +#: Merge.rc:2111 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "\x93W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93\x91I\x91\xF0\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9\x82ɂ̓t\x83@\x83C\x83\x8B\x82\xF0\x93\xF1\x82I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2110 +#: Merge.rc:2112 #, c-format msgid "Cannot compare file and folder!" msgstr "\x83t\x83@\x83C\x83\x8B\x82ƃt\x83H\x83\x8B\x83_\x82͔\xE4\x8Ar\x82ł\xAB\x82܂\xB9\x82\xF1!" -#: Merge.rc:2116 +#: Merge.rc:2118 #, c-format msgid "File not found: %1" msgstr "\x83t\x83@\x83C\x83\x8B\x82\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB9\x82\xF1: %1" -#: Merge.rc:2117 +#: Merge.rc:2119 #, c-format msgid "File not unpacked: %1" msgstr "\x83t\x83@\x83C\x83\x8B\x82\xAA\x93W\x8AJ\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB9\x82\xF1: %1" -#: Merge.rc:2118 +#: Merge.rc:2120 #, c-format msgid "" "Cannot open file\n" @@ -3689,12 +3705,12 @@ "\n" "%2" -#: Merge.rc:2119 +#: Merge.rc:2121 #, c-format msgid "Failed to parse conflict file." msgstr "\x83R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@\x83C\x83\x8B\x82̉\xF0\x90͂Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B" -#: Merge.rc:2120 +#: Merge.rc:2122 #, c-format msgid "" "The file\n" @@ -3705,34 +3721,34 @@ "%1\n" "\x82̓R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@\x83C\x83\x8B\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2126 +#: Merge.rc:2128 #, c-format msgid "Save As" msgstr "\x96\xBC\x91O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6" -#: Merge.rc:2127 +#: Merge.rc:2129 #, c-format msgid "Save changes to %1?" msgstr "" "\x83t\x83@\x83C\x83\x8B %1 \x82̓\xE0\x97e\x82͕ύX\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B\n" "\x95ύX\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2128 +#: Merge.rc:2130 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1\x82͓ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x83t\x83@\x83C\x83\x8B\x82ł\xB7\x81B \x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x83t\x83@\x83C\x83\x8B\x82\xF0\x8F㏑\x82\xAB\x82\xB5\x82܂\xB7\x82\xA9? (\x90V\x82\xB5\x82\xA2\x83t\x83@\x83C\x83\x8B\x96\xBC\x82ł͕ۑ\xB6\x82\xB5\x82܂\xB9\x82\xF1\x81B)" -#: Merge.rc:2129 +#: Merge.rc:2131 #, c-format msgid "Error checking destination writeability" msgstr "\x83t\x83@\x83C\x83\x8B\x8F\x91\x82\xAB\x8D\x9E\x82݉`\x83F\x83b\x83N\x83G\x83\x89\x81[" -#: Merge.rc:2130 +#: Merge.rc:2132 #, c-format msgid "Error backing up file" msgstr "\x83t\x83@\x83C\x83\x8B\x83o\x83b\x83N\x83A\x83b\x83v\x83G\x83\x89\x81[" -#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "" "Unable to backup original file:\n" @@ -3745,7 +3761,7 @@ "\x82\xF0\x83o\x83b\x83N\x83A\x83b\x83v\x82ł\xAB\x82܂\xB9\x82\xF1\x81B\n" "\x96\xB3\x8E\x8B\x82\xB5\x82đ\xB1\x82\xAF\x82܂\xB7\x82\xA9?" -#: Merge.rc:2133 +#: Merge.rc:2135 #, c-format msgid "" "Saving file failed.\n" @@ -3761,7 +3777,7 @@ "\x95ʖ\xBC\x82ŕۑ\xB6\x82\xB7\x82\xE9\x8Fꍇ\x82\xCDOk\x82\xF0\x81A\n" "\x92\x86\x8E~\x82\xB7\x82\xE9\x8Fꍇ\x82́A\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xF0\x89\x9F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" -#: Merge.rc:2134 +#: Merge.rc:2136 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3776,7 +3792,7 @@ "\n" "\x93W\x8AJ\x82\xB3\x82ꂽ\x82\xE0\x82̂\xF0\x95ʃt\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2135 +#: Merge.rc:2137 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3791,7 +3807,7 @@ "\n" "\x93W\x8AJ\x82\xB3\x82ꂽ\x82\xE0\x82̂\xF0\x95ʃt\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2136 +#: Merge.rc:2138 #, c-format msgid "" "Another application has updated file\n" @@ -3803,7 +3819,7 @@ "%1\n" "\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82\xCD WinMerge \x88ȊO\x82̃A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82ŏC\x90\xB3\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B\x8FC\x90\xB3\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82ɏ㏑\x82\xAB\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2137 +#: Merge.rc:2139 #, c-format msgid "" "%1\n" @@ -3812,7 +3828,7 @@ "%1\n" "\x82́A\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x82ł\xB7\x81B \x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x82̍\x80\x96ڂ\xF0\x8F㏑\x82\xAB\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2138 +#: Merge.rc:2140 #, c-format msgid "" "Another application has updated file\n" @@ -3827,17 +3843,17 @@ "\n" "\x83t\x83@\x83C\x83\x8B\x82\xF0\x8DX\x90V\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82́A\x83t\x83@\x83C\x83\x8B\x82\xF0\x8AJ\x82\xAB\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2139 +#: Merge.rc:2141 #, c-format msgid "Save Left File As" msgstr "\x96\xBC\x91O\x82\xF0\x95t\x82\xAF\x82č\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6" -#: Merge.rc:2140 +#: Merge.rc:2142 #, c-format msgid "Save Right File As" msgstr "\x96\xBC\x91O\x82\xF0\x95t\x82\xAF\x82ĉE\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6" -#: Merge.rc:2146 +#: Merge.rc:2148 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3848,42 +3864,42 @@ "\n" "\x91\xB1\x8Ds\x82\xB7\x82\xE9\x91O\x82Ƀh\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0F5\x83L\x81[\x82ōŐV\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2152 +#: Merge.rc:2154 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "\x91\xB1\x8Ds\x82\xB7\x82邽\x82߂ɂ́ASourceSafe\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83p\x83X\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B (\x97\xE1: $/MyProject)" -#: Merge.rc:2153 +#: Merge.rc:2155 #, c-format msgid "Checkout files from VSS..." msgstr "VSS\x82\xA9\x82\xE7\x83t\x83@\x83C\x83\x8B\x82\xF0\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x82Ă\xA2\x82܂\xB7..." -#: Merge.rc:2154 +#: Merge.rc:2156 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "\x83t\x83@\x83C\x83\x8B\x82̃`\x83F\x83b\x83N\x83A\x83E\x83g\x82ŃG\x83\x89\x81[\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82܂\xB5\x82\xBD\x81B \x8Cp\x91\xB1\x82ł\xAB\x82܂\xB9\x82\xF1..." -#: Merge.rc:2155 +#: Merge.rc:2157 #, c-format msgid "Error executing versioning system command." msgstr "\x83o\x81[\x83W\x83\x87\x83\x93\x83V\x83X\x83e\x83\x80\x83R\x83}\x83\x93\x83h\x82̎\xC0\x8Ds\x83G\x83\x89\x81[\x81B" -#: Merge.rc:2156 +#: Merge.rc:2158 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS\x8D\xEC\x8Bƃt\x83H\x83\x8B\x83_\x82ƌ\xBB\x8D݂̃t\x83@\x83C\x83\x8B\x88ʒu\x82͈\xEA\x92v\x82\xB5\x82Ă\xA2\x82܂\xB9\x82\xF1\x81B\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2157 +#: Merge.rc:2159 #, c-format msgid "No VSS database(s) found!" msgstr "VSS\x82̃f\x81[\x83^\x83x\x81[\x83X\x82\xAA\x82݂\xA9\x82\xE8\x82܂\xB9\x82\xF1!" -#: Merge.rc:2158 +#: Merge.rc:2160 #, c-format msgid "Error from VSS:" msgstr "VSS\x82\xA9\x82\xE7\x82̃G\x83\x89\x81[:" -#: Merge.rc:2159 +#: Merge.rc:2161 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3894,7 +3910,7 @@ " \x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x83r\x83\x85\x81[\x82̐ݒ\xE8\x82\xF0\x8Am\x94F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B\n" " \x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2160 +#: Merge.rc:2162 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3903,169 +3919,169 @@ "\x83o\x81[\x83W\x83\x87\x83\x93\x8AǗ\x9D\x83V\x83X\x83e\x83\x80\x82́A\x83t\x83@\x83C\x83\x8B\x82̃`\x83F\x83b\x83N\x83A\x83E\x83g\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x8E\x9E\x82ɃG\x83\x89\x81[\x82\xF0\x95Ԃ\xB5\x82܂\xB5\x82\xBD\x81B\n" " \x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x83r\x83\x85\x81[\x82̐ݒ\xE8\x82\xF0\x8Am\x94F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B " -#: Merge.rc:2166 -#: Merge.rc:2606 +#: Merge.rc:2168 +#: Merge.rc:2608 #, c-format msgid "None" msgstr "\x82Ȃ\xB5" -#: Merge.rc:2167 +#: Merge.rc:2169 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 \x96\xA2\x96\x9E)" -#: Merge.rc:2168 +#: Merge.rc:2170 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 \x88ȏ\xE3)" -#: Merge.rc:2170 +#: Merge.rc:2172 #, c-format msgid "Break at whitespace" msgstr "\x8Bŋ\xE6\x90\xE9" -#: Merge.rc:2171 +#: Merge.rc:2173 #, c-format msgid "Break at whitespace or punctuation" msgstr "\x8B\xA9\x8B\xE5\x93Ǔ_\x82ŋ\xE6\x90\xE9" -#: Merge.rc:2177 #: Merge.rc:2179 +#: Merge.rc:2181 #, c-format msgid "Copy selected item to named directory" msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x8D\x80\x96ڂ\xF0\x8Ew\x92\xE8\x83t\x83H\x83\x8B\x83_\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2178 #: Merge.rc:2180 +#: Merge.rc:2182 #, c-format msgid "Copy selected item to custom directory" msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x8D\x80\x96ڂ\xF0\x91I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83H\x83\x8B\x83_\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2181 +#: Merge.rc:2183 #, c-format msgid "Delete selected item on left" msgstr "\x8D\xB6\x82̑I\x91\xF0\x82\xB3\x82ꂽ\x8D\x80\x96ڂ\xF0\x8D폜\x82\xB5\x82܂\xB7" -#: Merge.rc:2182 +#: Merge.rc:2184 #, c-format msgid "Delete selected item on right" msgstr "\x89E\x82̑I\x91\xF0\x82\xB3\x82ꂽ\x8D\x80\x96ڂ\xF0\x8D폜\x82\xB5\x82܂\xB7" -#: Merge.rc:2183 +#: Merge.rc:2185 #, c-format msgid "Delete selected item(s) on both sides" msgstr "\x97\xBC\x91\xA4\x82̑I\x91\xF0\x82\xB3\x82ꂽ\x8D\x80\x96ڂ\xF0\x8D폜\x82\xB5\x82܂\xB7" -#: Merge.rc:2184 +#: Merge.rc:2186 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x8D\x80\x96ڂ\xF0\x94\xF1\x95\\x8E\xA6\x82ɂ\xB5\x82܂\xB7(\x83I\x83\x93\x83U\x83t\x83\x89\x83C \x83t\x83B\x83\x8B\x83^)" -#: Merge.rc:2185 +#: Merge.rc:2187 #, c-format msgid "Rename selected item on both sides" msgstr "\x97\xBC\x91\xA4\x82̑I\x91\xF0\x82\xB3\x82ꂽ\x8D\x80\x96ڂ̖\xBC\x91O\x82\xF0\x95ύX\x82\xB5\x82܂\xB7" -#: Merge.rc:2186 +#: Merge.rc:2188 #, c-format msgid "Right to Left (%1)" msgstr "\x89E\x82\xA9\x82獶 (%1)" -#: Merge.rc:2187 +#: Merge.rc:2189 #, c-format msgid "Left to Right (%1)" msgstr "\x8D\xB6\x82\xA9\x82\xE7\x89E (%1)" -#: Merge.rc:2188 +#: Merge.rc:2190 #, c-format msgid "Right to Left (%1 of %2)" msgstr "\x89E\x82\xF0\x8D\xB6\x82\xC9 (%1 / %2)" -#: Merge.rc:2189 +#: Merge.rc:2191 #, c-format msgid "Left to Right (%1 of %2)" msgstr "\x8D\xB6\x82\xF0\x89E\x82\xC9 (%1 / %2)" -#: Merge.rc:2190 -#: Merge.rc:2206 +#: Merge.rc:2192 +#: Merge.rc:2208 #, c-format msgid "Left to... (%1)" msgstr "\x8D\xB6\x82\xF0... (%1)" -#: Merge.rc:2191 -#: Merge.rc:2207 +#: Merge.rc:2193 +#: Merge.rc:2209 #, c-format msgid "Right to... (%1)" msgstr "\x89E\x82\xF0... (%1)" -#: Merge.rc:2192 -#: Merge.rc:2208 +#: Merge.rc:2194 +#: Merge.rc:2210 #, c-format msgid "Left to... (%1 of %2)" msgstr "\x8D\xB6\x82\xF0... (%1/%2)" -#: Merge.rc:2193 -#: Merge.rc:2209 +#: Merge.rc:2195 +#: Merge.rc:2211 #, c-format msgid "Right to... (%1 of %2)" msgstr "\x89E\x82\xF0... (%1/%2)" -#: Merge.rc:2199 +#: Merge.rc:2201 #, c-format msgid "Left (%1)" msgstr "\x8D\xB6 (%1)" -#: Merge.rc:2200 +#: Merge.rc:2202 #, c-format msgid "Right (%1)" msgstr "\x89E (%1)" -#: Merge.rc:2201 +#: Merge.rc:2203 #, c-format msgid "Both (%1)" msgstr "\x97\xBC\x91\xA4 (%1)" -#: Merge.rc:2202 +#: Merge.rc:2204 #, c-format msgid "Left (%1 of %2)" msgstr "\x8D\xB6 (%1 / %2)" -#: Merge.rc:2203 +#: Merge.rc:2205 #, c-format msgid "Right (%1 of %2)" msgstr "\x89E (%1 / %2)" -#: Merge.rc:2204 +#: Merge.rc:2206 #, c-format msgid "Both (%1 of %2)" msgstr "\x97\xBC\x91\xA4 (%1 / %2)" -#: Merge.rc:2205 +#: Merge.rc:2207 #, c-format msgid "Select destination folder" msgstr "\x91Ώۃt\x83H\x83\x8B\x83_\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" -#: Merge.rc:2210 +#: Merge.rc:2212 #, c-format msgid "Left side - select destination folder:" msgstr "\x8D\xB6\x91\xA4 - \x83R\x83s\x81[/\x88ړ\xAE\x90\xE6\x83t\x83H\x83\x8B\x83_\x82̎w\x92\xE8:" -#: Merge.rc:2211 +#: Merge.rc:2213 #, c-format msgid "Right side - select destination folder:" msgstr "\x89E\x91\xA4 - \x83R\x83s\x81[/\x88ړ\xAE\x90\xE6\x83t\x83H\x83\x8B\x83_\x82̎w\x92\xE8:" -#: Merge.rc:2212 +#: Merge.rc:2214 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 \x8C̃t\x83@\x83C\x83\x8B\x82ɍ\xEC\x97p)" -#: Merge.rc:2213 +#: Merge.rc:2215 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1/%2 \x8C̃t\x83@\x83C\x83\x8B\x82ɍ\xEC\x97p)" -#: Merge.rc:2219 +#: Merge.rc:2221 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4077,17 +4093,17 @@ "%1\n" "\x82\xF0\x8D폜\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2220 +#: Merge.rc:2222 #, c-format msgid "Are you sure you want to copy:" msgstr "\x96{\x93\x96\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7\x82\xA9?:" -#: Merge.rc:2221 +#: Merge.rc:2223 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "\x96{\x93\x96\x82\xC9%d\x8D\x80\x96ڂ\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7\x82\xA9?:" -#: Merge.rc:2222 +#: Merge.rc:2224 #, c-format msgid "" "Operation aborted!\n" @@ -4106,478 +4122,478 @@ "\n" "\x8Dēx\x94\xE4\x8Ar\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2223 +#: Merge.rc:2225 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "\x8D\x80\x96ڂ\xF0\x88ړ\xAE\x82\xB5\x82܂\xB7\x82\xA9?: " -#: Merge.rc:2224 +#: Merge.rc:2226 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "%d\x8C̍\x80\x96ڂ\xF0\x88ړ\xAE\x82\xB5\x82܂\xB7\x82\xA9?: " -#: Merge.rc:2226 +#: Merge.rc:2228 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "\x88ړ\xAE\x82̊m\x94F" -#: Merge.rc:2232 +#: Merge.rc:2234 #, c-format msgid "Open left file" msgstr "\x8D\xB6\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x8AJ\x82\xAB\x82܂\xB7" -#: Merge.rc:2233 +#: Merge.rc:2235 #, c-format msgid "Open the left file to external editor" msgstr "\x8AO\x95\x94\x83G\x83f\x83B\x83^\x82ō\xB6\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x8AJ\x82\xAB\x82܂\xB7" -#: Merge.rc:2234 +#: Merge.rc:2236 #, c-format msgid "Open left file with ..." msgstr "\x8D\xB6\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82ŊJ\x82\xAB\x82܂\xB7..." -#: Merge.rc:2235 +#: Merge.rc:2237 #, c-format msgid "Open right file" msgstr "\x89E\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x8AJ\x82\xAB\x82܂\xB7" -#: Merge.rc:2236 +#: Merge.rc:2238 #, c-format msgid "Open the right file to external editor" msgstr "\x8AO\x95\x94\x83G\x83f\x83B\x83^\x82ʼnE\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x8AJ\x82\xAB\x82܂\xB7" -#: Merge.rc:2237 +#: Merge.rc:2239 #, c-format msgid "Open right file with..." msgstr "\x89E\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82ŊJ\x82\xAB\x82܂\xB7..." -#: Merge.rc:2238 +#: Merge.rc:2240 #, c-format msgid "Failed to execute external editor: %1" msgstr "\x8AO\x95\x94\x83G\x83f\x83B\x83^\x82̎\xC0\x8Ds\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD: %1" -#: Merge.rc:2239 +#: Merge.rc:2241 #, c-format msgid "Unknown extension on external editor: %1" msgstr "\x8AO\x95\x94\x83G\x83f\x83B\x83^\x82̊g\x92\xA3\x8Eq\x82\xAA\x96\xA2\x92m\x82̊g\x92\xA3\x8Eq\x82ł\xB7: %1" -#: Merge.rc:2240 +#: Merge.rc:2242 #, c-format msgid "Copy filenames to clipboard" msgstr "\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82Ƀt\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2241 +#: Merge.rc:2243 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "\x8D\xB6\x91\xA4\x82̃p\x83X\x96\xBC\x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2242 +#: Merge.rc:2244 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "\x89E\x91\xA4\x82̃p\x83X\x96\xBC\x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2243 +#: Merge.rc:2245 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "\x97\xBC\x91\xA4\x82̃p\x83X\x96\xBC\x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2249 +#: Merge.rc:2251 #, c-format msgid "Unknown archive format" msgstr "\x96\xA2\x92m\x82̃A\x81[\x83J\x83C\x83u\x8C`\x8E\xAE\x82ł\xB7" -#: Merge.rc:2250 +#: Merge.rc:2252 #, c-format msgid "Add items from left side to archive" msgstr "\x83A\x81[\x83J\x83C\x83u\x82ɍ\xB6\x91\xA4\x82̍\x80\x96ڂ\xF0\x92lj\xC1\x82\xB5\x82܂\xB7" -#: Merge.rc:2251 +#: Merge.rc:2253 #, c-format msgid "Add items from right side to archive" msgstr "\x83A\x81[\x83J\x83C\x83u\x82ɉE\x91\xA4\x82̍\x80\x96ڂ\xF0\x92lj\xC1\x82\xB5\x82܂\xB7" -#: Merge.rc:2252 +#: Merge.rc:2254 #, c-format msgid "Add items from both sides to archive" msgstr "\x83A\x81[\x83J\x83C\x83u\x82ɗ\xBC\x91\xA4\x82̍\x80\x96ڂ\xF0\x92lj\xC1\x82\xB5\x82܂\xB7" -#: Merge.rc:2253 +#: Merge.rc:2255 #, c-format msgid "Add different items to archive (both sides)" msgstr "\x83A\x81[\x83J\x83C\x83u\x82ɍ\xB7\x88ق̂\xA0\x82闼\x91\xA4\x82̍\x80\x96ڂ\xF0\x92lj\xC1\x82\xB5\x82܂\xB7" -#: Merge.rc:2255 +#: Merge.rc:2257 #, c-format msgid "Move selected file on left to custom directory" msgstr "\x8D\xB6\x91\xA4\x82̑I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82\xBD\x83t\x83H\x83\x8B\x83_\x82Ɉړ\xAE\x82\xB5\x82܂\xB7" -#: Merge.rc:2257 +#: Merge.rc:2259 #, c-format msgid "Move selected file on right to custom directory" msgstr "\x89E\x91\xA4\x82̑I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82\xBD\x83t\x83H\x83\x8B\x83_\x82Ɉړ\xAE\x82\xB5\x82܂\xB7" -#: Merge.rc:2263 +#: Merge.rc:2265 #, c-format msgid "Filename" msgstr "\x83t\x83@\x83C\x83\x8B\x96\xBC" -#: Merge.rc:2264 +#: Merge.rc:2266 #, c-format msgid "Folder" msgstr "\x83t\x83H\x83\x8B\x83_" -#: Merge.rc:2265 +#: Merge.rc:2267 #, c-format msgid "Comparison result" msgstr "\x94\xE4\x8Ar\x8C\x8B\x89\xCA" -#: Merge.rc:2266 +#: Merge.rc:2268 #, c-format msgid "Left Date" msgstr "\x8D\xB6\x93\xFA\x95t" -#: Merge.rc:2267 +#: Merge.rc:2269 #, c-format msgid "Right Date" msgstr "\x89E\x93\xFA\x95t" -#: Merge.rc:2268 +#: Merge.rc:2270 #, c-format msgid "Extension" msgstr "\x8Ag\x92\xA3\x8Eq" -#: Merge.rc:2269 +#: Merge.rc:2271 #, c-format msgid "Left Size" msgstr "\x8D\xB6\x83T\x83C\x83Y" -#: Merge.rc:2270 +#: Merge.rc:2272 #, c-format msgid "Right Size" msgstr "\x89E\x83T\x83C\x83Y" -#: Merge.rc:2271 +#: Merge.rc:2273 #, c-format msgid "Right Size (Short)" msgstr "\x89E\x83T\x83C\x83Y (\x92Z\x8Fk)" -#: Merge.rc:2272 +#: Merge.rc:2274 #, c-format msgid "Left Size (Short)" msgstr "\x8D\xB6\x83T\x83C\x83Y (\x92Z\x8Fk)" -#: Merge.rc:2278 +#: Merge.rc:2280 #, c-format msgid "Left Creation Time" msgstr "\x8D\xB6\x8D쐬\x93\xFA\x8E\x9E" -#: Merge.rc:2279 +#: Merge.rc:2281 #, c-format msgid "Right Creation Time" msgstr "\x89E\x8D쐬\x93\xFA\x8E\x9E" -#: Merge.rc:2280 +#: Merge.rc:2282 #, c-format msgid "Newer File" msgstr "\x90V\x82\xB5\x82\xA2\x83t\x83@\x83C\x83\x8B" -#: Merge.rc:2281 +#: Merge.rc:2283 #, c-format msgid "Left File Version" msgstr "\x8D\xB6\x83t\x83@\x83C\x83\x8B\x83o\x81[\x83W\x83\x87\x83\x93" -#: Merge.rc:2282 +#: Merge.rc:2284 #, c-format msgid "Right File Version" msgstr "\x89E\x83t\x83@\x83C\x83\x8B\x83o\x81[\x83W\x83\x87\x83\x93" -#: Merge.rc:2283 +#: Merge.rc:2285 #, c-format msgid "Short Result" msgstr "\x8AȈՌ\x8B\x89ʕ\\x8E\xA6" -#: Merge.rc:2284 +#: Merge.rc:2286 #, c-format msgid "Left Attributes" msgstr "\x8D\xB6\x91\xAE\x90\xAB" -#: Merge.rc:2285 +#: Merge.rc:2287 #, c-format msgid "Right Attributes" msgstr "\x89E\x91\xAE\x90\xAB" -#: Merge.rc:2286 +#: Merge.rc:2288 #, c-format msgid "Left EOL" msgstr "\x8D\xB6EOL" -#: Merge.rc:2287 +#: Merge.rc:2289 #, c-format msgid "Right EOL" msgstr "\x89EEOL" -#: Merge.rc:2293 +#: Merge.rc:2295 #, c-format msgid "Left Encoding" msgstr "\x8D\xB6\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O" -#: Merge.rc:2294 +#: Merge.rc:2296 #, c-format msgid "Right Encoding" msgstr "\x89E\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O" -#: Merge.rc:2295 +#: Merge.rc:2297 #, c-format msgid "Ignored Diff." msgstr "\x96\xB3\x8E\x8B\x82\xB3\x82ꂽ\x8D\xB7\x88ِ\x94" -#: Merge.rc:2296 +#: Merge.rc:2298 #, c-format msgid "Differences" msgstr "\x8D\xB7\x88ِ\x94" -#: Merge.rc:2297 -#: Merge.rc:2602 +#: Merge.rc:2299 +#: Merge.rc:2604 #, c-format msgid "Binary" msgstr "\x83o\x83C\x83i\x83\x8A" -#: Merge.rc:2303 +#: Merge.rc:2305 #, c-format msgid "Unable to compare files" msgstr "\x83t\x83@\x83C\x83\x8B\x82\xF0\x94\xE4\x8Ar\x82ł\xAB\x82܂\xB9\x82\xF1" -#: Merge.rc:2304 +#: Merge.rc:2306 #, c-format msgid "Item aborted" msgstr "\x92\x86\x92f\x82\xB3\x82ꂽ\x8D\x80\x96\xDA" -#: Merge.rc:2305 +#: Merge.rc:2307 #, c-format msgid "File skipped" msgstr "\x83X\x83L\x83b\x83v\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B" -#: Merge.rc:2306 +#: Merge.rc:2308 #, c-format msgid "Folder skipped" msgstr "\x83X\x83L\x83b\x83v\x82\xB3\x82ꂽ\x83t\x83H\x83\x8B\x83_" -#: Merge.rc:2307 +#: Merge.rc:2309 #, c-format msgid "Left only: %1" msgstr "\x8D\xB6\x91\xA4\x82̂\xDD: %1" -#: Merge.rc:2308 +#: Merge.rc:2310 #, c-format msgid "Right only: %1" msgstr "\x89E\x91\xA4\x82̂\xDD: %1" -#: Merge.rc:2309 +#: Merge.rc:2311 #, c-format msgid "Binary files are identical" msgstr "\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82͓\xAF\x88\xEA\x82ł\xB7" -#: Merge.rc:2311 +#: Merge.rc:2313 #, c-format msgid "Binary files are different" msgstr "\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82͈قȂ\xC1\x82Ă\xA2\x82܂\xB7" -#: Merge.rc:2312 +#: Merge.rc:2314 #, c-format msgid "Files are different" msgstr "\x83t\x83@\x83C\x83\x8B\x82͈قȂ\xC1\x82Ă\xA2\x82܂\xB7" -#: Merge.rc:2313 +#: Merge.rc:2315 #, c-format msgid "Folders are different" -msgstr "" +msgstr "\x83t\x83H\x83\x8B\x83_\x82͈قȂ\xC1\x82Ă\xA2\x82܂\xB7" -#: Merge.rc:2314 +#: Merge.rc:2316 #, c-format msgid "Left Only" msgstr "\x8D\xB6\x91\xA4\x82̂\xDD" -#: Merge.rc:2315 +#: Merge.rc:2317 #, c-format msgid "Right Only" msgstr "\x89E\x91\xA4\x82̂\xDD" -#: Merge.rc:2317 +#: Merge.rc:2319 #, c-format msgid "Error" msgstr "\x83G\x83\x89\x81[" -#: Merge.rc:2323 +#: Merge.rc:2325 #, c-format msgid "Elapsed time: %ld ms" msgstr "\x8Co\x89ߎ\x9E\x8A\xD4: %ld ms" -#: Merge.rc:2324 +#: Merge.rc:2326 #, c-format msgid "1 item selected" msgstr "1\x8C̍\x80\x96ڂ\xF0\x91I\x91\xF0" -#: Merge.rc:2325 +#: Merge.rc:2327 #, c-format msgid "%1 items selected" msgstr "%1\x8C̍\x80\x96ڂ\xF0\x91I\x91\xF0" -#: Merge.rc:2331 +#: Merge.rc:2333 #, c-format msgid "Filename or folder name." msgstr "\x83t\x83@\x83C\x83\x8B\x96\xBC\x82܂\xBD\x82́A\x83t\x83H\x83\x8B\x83_\x96\xBC" -#: Merge.rc:2332 +#: Merge.rc:2334 #, c-format msgid "Subfolder name when subfolders are included." msgstr "\x83T\x83u\x83t\x83H\x83\x8B\x83_\x82\xAA\x8A܂܂ꂽ\x82Ƃ\xAB\x82̃T\x83u\x83t\x83H\x83\x8B\x83_\x96\xBC" -#: Merge.rc:2333 +#: Merge.rc:2335 #, c-format msgid "Comparison result, long form." msgstr "\x92\xB7\x82\xA2\x8C`\x8E\xAE\x82̔\xE4\x8Ar\x8C\x8B\x89ʕ\\x8E\xA6" -#: Merge.rc:2334 +#: Merge.rc:2336 #, c-format msgid "Left side modification date." msgstr "\x8D\xB6\x91\xA4\x82̍X\x90V\x93\xFA\x95t" -#: Merge.rc:2335 +#: Merge.rc:2337 #, c-format msgid "Right side modification date." msgstr "\x89E\x91\xA4\x82̍X\x90V\x93\xFA\x95t" -#: Merge.rc:2336 +#: Merge.rc:2338 #, c-format msgid "File's extension." msgstr "\x83t\x83@\x83C\x83\x8B\x8Ag\x92\xA3\x8Eq" -#: Merge.rc:2337 +#: Merge.rc:2339 #, c-format msgid "Left file size in bytes." msgstr "\x8D\xB6\x91\xA4\x83t\x83@\x83C\x83\x8B\x82̃o\x83C\x83g\x90\x94" -#: Merge.rc:2338 +#: Merge.rc:2340 #, c-format msgid "Right file size in bytes." msgstr "\x89E\x91\xA4\x83t\x83@\x83C\x83\x8B\x82̃o\x83C\x83g\x90\x94" -#: Merge.rc:2339 +#: Merge.rc:2341 #, c-format msgid "Left file size abbreviated." msgstr "\x8D\xB6\x91\xA4\x83t\x83@\x83C\x83\x8B\x82̃o\x83C\x83g\x90\x94(\x92Z\x8Fk\x8C`)" -#: Merge.rc:2340 +#: Merge.rc:2342 #, c-format msgid "Right file size abbreviated." msgstr "\x89E\x91\xA4\x83t\x83@\x83C\x83\x8B\x82̃o\x83C\x83g\x90\x94(\x92Z\x8Fk\x8C`)" -#: Merge.rc:2346 +#: Merge.rc:2348 #, c-format msgid "Left side creation time." msgstr "\x8D\xB6\x91\xA4\x82̍쐬\x8E\x9E\x8D\x8F" -#: Merge.rc:2347 +#: Merge.rc:2349 #, c-format msgid "Right side creation time." msgstr "\x89E\x91\xA4\x82̍쐬\x8E\x9E\x8D\x8F" -#: Merge.rc:2348 +#: Merge.rc:2350 #, c-format msgid "Tells which side has newer modification date." msgstr "\x82ǂ\xBF\x82炪\x8DŐV\x82̕ύX\x93\xFA\x95t\x82\xA9\x82\xF0\x8E\xA6\x82\xB5\x82܂\xB7\x81B" -#: Merge.rc:2349 +#: Merge.rc:2351 #, c-format msgid "Left side file version, only for some filetypes." msgstr "\x8D\xB6\x91\xA4\x83t\x83@\x83C\x83\x8B\x82̃o\x81[\x83W\x83\x87\x83\x93, \x8C\xC0\x82\xE7\x82ꂽ\x83t\x83@\x83C\x83\x8B\x83^\x83C\x83v\x82̂\xDD" -#: Merge.rc:2350 +#: Merge.rc:2352 #, c-format msgid "Right side file version, only for some filetypes." msgstr "\x89E\x91\xA4\x83t\x83@\x83C\x83\x8B\x82̃o\x81[\x83W\x83\x87\x83\x93, \x8C\xC0\x82\xE7\x82ꂽ\x83t\x83@\x83C\x83\x8B\x83^\x83C\x83v\x82̂\xDD" -#: Merge.rc:2351 +#: Merge.rc:2353 #, c-format msgid "Short comparison result." msgstr "\x92Z\x82\xA2\x8C`\x8E\xAE\x82̔\xE4\x8Ar\x8C\x8B\x89ʕ\\x8E\xA6" -#: Merge.rc:2352 +#: Merge.rc:2354 #, c-format msgid "Left side attributes." msgstr "\x8D\xB6\x91\xA4\x82̑\xAE\x90\xAB" -#: Merge.rc:2353 +#: Merge.rc:2355 #, c-format msgid "Right side attributes." msgstr "\x89E\x91\xA4\x82̑\xAE\x90\xAB" -#: Merge.rc:2354 +#: Merge.rc:2356 #, c-format msgid "Left side file EOL type" msgstr "\x8D\xB6\x91\xA4\x82\xCCEOL\x83^\x83C\x83v" -#: Merge.rc:2355 +#: Merge.rc:2357 #, c-format msgid "Right side file EOL type" msgstr "\x89E\x91\xA4\x82\xCCEOL\x83^\x83C\x83v" -#: Merge.rc:2361 +#: Merge.rc:2363 #, c-format msgid "Left side encoding." msgstr "\x8D\xB6\x91\xA4\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O" -#: Merge.rc:2362 +#: Merge.rc:2364 #, c-format msgid "Right side encoding." msgstr "\x89E\x91\xA4\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O" -#: Merge.rc:2363 +#: Merge.rc:2365 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "\x83t\x83@\x83C\x83\x8B\x93\xE0\x82Ŗ\xB3\x8E\x8B\x82\xB3\x82ꂽ\x8D\xB7\x88ِ\x94\x81B\x82\xB1\x82̍\xB7\x88ق\xCDWinMerge\x82ɂ\xE6\x82\xC1\x82Ė\xB3\x8E\x8B\x82\xB3\x82\xEA\x81A\x83}\x81[\x83W\x82\xB3\x82\xEA\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2364 +#: Merge.rc:2366 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "\x83t\x83@\x83C\x83\x8B\x93\xE0\x8D\xB7\x88ِ\x94\x81B\x82\xB1\x82̍\xB7\x88ِ\x94\x82͖\xB3\x8E\x8B\x82\xB3\x82ꂽ\x8D\xB7\x88ِ\x94\x82\xF0\x8A܂݂܂\xB9\x82\xF1\x81B" -#: Merge.rc:2365 +#: Merge.rc:2367 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "\x82\xE0\x82\xB5\x81A\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82Ȃ\xE7\x83A\x83X\x83^\x83\x8A\x83X\x83N(*)\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\x81B" -#: Merge.rc:2371 +#: Merge.rc:2373 #, c-format msgid "Compare %1 with %2" msgstr "%1 \x82\xC6 %2 \x82̔\xE4\x8Ar" -#: Merge.rc:2372 +#: Merge.rc:2374 #, c-format msgid "Comma-separated list" msgstr "CSV\x8C`\x8E\xAE" -#: Merge.rc:2373 +#: Merge.rc:2375 #, c-format msgid "Tab-separated list" msgstr "TAB\x8B\xE6\x90\xE8\x8C`\x8E\xAE" -#: Merge.rc:2374 +#: Merge.rc:2376 #, c-format msgid "Simple HTML" msgstr "\x83V\x83\x93\x83v\x83\x8BHTML\x8C`\x8E\xAE" -#: Merge.rc:2375 +#: Merge.rc:2377 #, c-format msgid "Simple XML" msgstr "\x83V\x83\x93\x83v\x83\x8BXML\x8C`\x8E\xAE" -#: Merge.rc:2377 +#: Merge.rc:2379 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "\x83\x8C\x83|\x81[\x83g\x83t\x83@\x83C\x83\x8B\x82͊\xF9\x82ɑ\xB6\x8D݂\xB5\x82Ă\xA2\x82܂\xB7\x81B\x91\xB6\x8D݂\xB5\x82Ă\xA2\x82\xE9\x83t\x83@\x83C\x83\x8B\x82\xF0\x8F㏑\x82\xAB\x82\xB5\x82܂\xB7\x82\xAA?" -#: Merge.rc:2378 +#: Merge.rc:2380 #, c-format msgid "" "Error creating the report:\n" @@ -4586,32 +4602,32 @@ "\x83\x8C\x83|\x81[\x83g\x90\xB6\x90\xAC\x83G\x83\x89\x81[:\n" "%1" -#: Merge.rc:2379 +#: Merge.rc:2381 #, c-format msgid "The report has been created successfully." msgstr "\x83\x8C\x83|\x81[\x83g\x90\xB6\x90\xAC\x82ɐ\xAC\x8C\x{1C2D42}܂\xB5\x82\xBD\x81B" -#: Merge.rc:2385 +#: Merge.rc:2387 #, c-format msgid "The same file is opened in both panels." msgstr "\x93\xAF\x82\xB6\x83t\x83@\x83C\x83\x8B\x82\xAA\x97\xBC\x91\xA4\x82̃p\x83l\x83\x8B\x82ŊJ\x82\xA9\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B" -#: Merge.rc:2386 +#: Merge.rc:2388 #, c-format msgid "The selected files are identical." msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82͓\xAF\x88\xEA\x82ł\xB7\x81B" -#: Merge.rc:2387 +#: Merge.rc:2389 #, c-format msgid "An error occurred while comparing the files." msgstr "\x83t\x83@\x83C\x83\x8B\x82̔\xE4\x8Ar\x8E\x9E\x82ɃG\x83\x89\x81[\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82܂\xB5\x82\xBD\x81B" -#: Merge.rc:2388 +#: Merge.rc:2390 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "\x83e\x83\x93\x83|\x83\x89\x83\x8A\x83t\x83@\x83C\x83\x8B\x82\xAA\x8D쐬\x82ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD\x81B\x83e\x83\x93\x83|\x83\x89\x83\x8A\x83p\x83X\x90ݒ\xE8\x82\xF0\x8Am\x94F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2389 +#: Merge.rc:2391 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4628,7 +4644,7 @@ "[\x95ҏW]\x81\xA8[\x90ݒ\xE8]\x81\xA8[\x94\xE4\x8Ar]\x82\xCC'\x89\xFC\x8Ds\x95\xB6\x8E\x9A\x82̈Ⴂ\x82\x8B\x82\xB7\x82\xE9'\x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\n" "\x83Z\x83b\x83g\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2390 +#: Merge.rc:2392 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4639,22 +4655,22 @@ " \x8C\xBB\x8D݂̃I\x83v\x83V\x83\x87\x83\x93\x90ݒ\xE8\x82ł́A\x8E\xE5\x82\xC8EOL\x82ɓ\x9D\x88ꂳ\x82\xEA\x82܂\xB7\x81B\n" " \x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x95ύX\x82\xB5\x82āA\x88قȂ\xE9EOL\x82\xF0\x95ێ\x9D\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2391 +#: Merge.rc:2393 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "\x83v\x83\x89\x83O\x83C\x83\x93'%2'\x82Ńt\x83@\x83C\x83\x8B'%1'\x82̔\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x82̎\xC0\x8Ds\x92\x86\x82ɃG\x83\x89\x81[\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82܂\xB5\x82\xBD\x81B\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x82͈ȍ~\x8Ds\x82Ȃ\xED\x82\xEA\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2392 +#: Merge.rc:2394 #, c-format msgid "The selected folder is invalid." msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83H\x83\x8B\x83_\x82͖\xB3\x8C\xF8\x82ł\xB7\x81B" -#: Merge.rc:2393 +#: Merge.rc:2395 #, c-format msgid "Cannot open a binary file to editor." msgstr "\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82\xF0\x83G\x83f\x83B\x83^\x82ŊJ\x82\xAD\x82\xB1\x82Ƃ͂ł\xAB\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2394 +#: Merge.rc:2396 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4668,7 +4684,7 @@ "\x91\xBC\x95\xFB\x82Ƀ}\x83b\x83`\x82\xB7\x82\xE9\x88ȉ\xBA\x82̃t\x83H\x83\x8B\x83_\x82\xF0\x8D쐬\x82\xB5\x81A\x83t\x83H\x83\x8B\x83_\x82\xF0\x8AJ\x82\xAB\x82܂\xB7\x82\xA9?:\n" "%1" -#: Merge.rc:2400 +#: Merge.rc:2402 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4679,132 +4695,132 @@ "\x8Ae\x81X\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x82\xBB\x82̃R\x81[\x83h\x83y\x81[\x83W\x82ŕ\\x8E\xA6\x82\xB7\x82\xEA\x82A\x90\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82܂\xB7\x82\xAA\x81A\x83}\x81[\x83W\x82\xE2\x83R\x83s\x81[\x82\xAA\x8A댯\x82ɂȂ\xE8\x82܂\xB7\x81B\n" "\x83R\x81[\x83h\x83y\x81[\x83W\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x83R\x81[\x83h\x83y\x81[\x83W\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA2\x82܂\xB7\x82\xAA\x81A\x82\xE6\x82낵\x82\xA2\x82ł\xB7\x82\xA9(\x90\x84\x8F\xA7)?" -#: Merge.rc:2401 +#: Merge.rc:2403 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "\x8Cx\x8D\x90: \x8C݂\xA2\x82ɈقȂ\xC1\x82\xBD\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x82̃t\x83@\x83C\x83\x8B\x82ł\xB7\x81B \x8D\xB6\x91\xA4=%s \x89E\x91\xA4=%s \x83}\x81[\x83W\x82\xB7\x82\xE9\x8Fꍇ\x81A\x8F\xEE\x95\xB8\x82\xED\x82\xEA\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2402 +#: Merge.rc:2404 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x83G\x83\x89\x81[\x82ɂ\xE6\x82\xE8\x8F\xEE\x95\xB8\x82\xED\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B(\x97\xBC\x91\xA4\x82̃t\x83@\x83C\x83\x8B)" -#: Merge.rc:2403 +#: Merge.rc:2405 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x83G\x83\x89\x81[\x82ɂ\xE6\x82\xE8\x8F\xEE\x95\xB8\x82\xED\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B(\x89E\x91\xA4\x82̃t\x83@\x83C\x83\x8B)" -#: Merge.rc:2404 +#: Merge.rc:2406 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x83G\x83\x89\x81[\x82ɂ\xE6\x82\xE8\x8F\xEE\x95\xB8\x82\xED\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B(\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B)" -#: Merge.rc:2410 +#: Merge.rc:2412 #, c-format msgid "No difference" msgstr "\x8D\xB7\x88ق͂\xA0\x82\xE8\x82܂\xB9\x82\xF1" -#: Merge.rc:2411 +#: Merge.rc:2413 #, c-format msgid "Line difference" msgstr "\x8Ds\x82̍\xB7\x88\xD9" -#: Merge.rc:2417 +#: Merge.rc:2419 #, c-format msgid "Replaced %1 string(s)." msgstr "%1\x8C̕\xB6\x8E\x9A\x97\xF1\x82\xF0\x92u\x8A\xB7\x82\xB5\x82܂\xB5\x82\xBD" -#: Merge.rc:2418 +#: Merge.rc:2420 #, c-format msgid "Cannot find string \"%s\"" msgstr "\x95\xB6\x8E\x9A\x97\xF1\"%s\"\x82\xAA\x8C\x9F\x8D\xF5\x82ł\xAB\x82܂\xB9\x82\xF1" -#: Merge.rc:2424 +#: Merge.rc:2426 #, c-format msgid "Copy Full Path" msgstr "\x83t\x83\x8B\x83p\x83X\x82\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2425 +#: Merge.rc:2427 #, c-format msgid "Copy Filename" msgstr "\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7" -#: Merge.rc:2431 +#: Merge.rc:2433 #, c-format msgid "Location Pane" msgstr "Location Pane" -#: Merge.rc:2432 +#: Merge.rc:2434 #, c-format msgid "Diff Pane" msgstr "Diff Pane" -#: Merge.rc:2438 +#: Merge.rc:2440 #, c-format msgid "Patch file successfully written." msgstr "\x83p\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82̏\x91\x82\xAB\x8D\x9E\x82݂ɐ\xAC\x8C\x{1C2D42}܂\xB5\x82\xBD\x81B" -#: Merge.rc:2439 +#: Merge.rc:2441 #, c-format msgid "1. item is not found or is directory!" msgstr "1. \x8D\x80\x96ڂ\xAA\x82݂\xA9\x82\xE7\x82Ȃ\xA2\x82\xA9\x81A\x83t\x83H\x83\x8B\x83_\x82ł\xB7!" -#: Merge.rc:2440 +#: Merge.rc:2442 #, c-format msgid "2. item is not found or is directory!" msgstr "2. \x8D\x80\x96ڂ\xAA\x82݂\xA9\x82\xE7\x82Ȃ\xA2\x82\xA9\x81A\x83t\x83H\x83\x8B\x83_\x82ł\xB7!" -#: Merge.rc:2441 +#: Merge.rc:2443 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "\x8Fo\x97͌\x8B\x89ʃt\x83@\x83C\x83\x8B\x82͊\xF9\x82ɑ\xB6\x8D݂\xB5\x82܂\xB7\x81B \x8F㏑\x82\xAB\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2442 +#: Merge.rc:2444 #, c-format msgid "[%1 files selected]" msgstr "[%1 \x8C̃t\x83@\x83C\x83\x8B\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7]" -#: Merge.rc:2443 +#: Merge.rc:2445 #, c-format msgid "Normal" msgstr "\x83m\x81[\x83}\x83\x8B" -#: Merge.rc:2444 +#: Merge.rc:2446 #, c-format msgid "Context" msgstr "\x83R\x83\x93\x83e\x83L\x83X\x83g" -#: Merge.rc:2445 +#: Merge.rc:2447 #, c-format msgid "Unified" msgstr "\x83\x86\x83j\x83t\x83@\x83C\x83h" -#: Merge.rc:2446 +#: Merge.rc:2448 #, c-format msgid "Could not write to file %1." msgstr "\x83t\x83@\x83C\x83\x8B %1\x82ɏ\x91\x82\xAB\x8D\x9E\x82߂܂\xB9\x82\xF1\x81B" -#: Merge.rc:2447 +#: Merge.rc:2449 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "\x8Ew\x92肵\x82\xBD\x8Fo\x97̓p\x83X\x82́A\x90\xE2\x91p\x83X\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1: %1" -#: Merge.rc:2448 +#: Merge.rc:2450 #, c-format msgid "Specify an output file" msgstr "\x8Fo\x97̓p\x83X\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" -#: Merge.rc:2449 +#: Merge.rc:2451 #, c-format msgid "Cannot create a patch file from binary files." msgstr "\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83p\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82͐\xB6\x90\xAC\x82ł\xAB\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2450 +#: Merge.rc:2452 #, c-format msgid "Cannot create a patch file from directories." msgstr "\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x83p\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82͐\xB6\x90\xAC\x82ł\xAB\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2451 +#: Merge.rc:2453 #, c-format msgid "" "Please save all files first.\n" @@ -4815,17 +4831,17 @@ "\n" "\x83p\x83b\x83`\x90\xB6\x90\xAC\x82ɂ́A\x95ύX\x82\xAA\x91S\x82ĕۑ\xB6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B" -#: Merge.rc:2452 +#: Merge.rc:2454 #, c-format msgid "Folder does not exist." msgstr "\x83t\x83H\x83\x8B\x83_\x82͑\xB6\x8D݂\xB5\x82܂\xB9\x82\xF1\x81B" -#: Merge.rc:2457 +#: Merge.rc:2459 #, c-format msgid "Current directory comparison results will be cleared." msgstr "\x8C\xBB\x8D݂̃t\x83H\x83\x8B\x83_\x94\xE4\x8Ar\x8C\x8B\x89ʂ̓N\x83\x8A\x83A\x82\xB3\x82\xEA\x82܂\xB7\x81B" -#: Merge.rc:2458 +#: Merge.rc:2460 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4836,7 +4852,7 @@ "\x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g\x82ׂ̈ɕK\x97v\x82ȃR\x83\x93\x83|\x81[\x83l\x83\x93\x83g(7-zip \x82\xC6 Merge7z*.dll) \x82\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB9\x82\xF1\x81B\n" "\x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g\x82Ƃ\xBB\x82\xEA\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9\x95\xFB\x96@\x82ɂ\xA2\x82Ă̏\xEE\x95\xF1\x82́A\x83}\x83j\x83\x85\x83A\x83\x8B\x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" -#: Merge.rc:2459 +#: Merge.rc:2461 #, c-format msgid "" "\n" @@ -4845,7 +4861,7 @@ "\n" "\x92\x8D\x88\xD3: 7-Zip \x93\x9D\x8D\x87\x82́AWinMerge\x82̐ݒ\xE8\x82ɂ\xE6\x82薳\x8C\xF8\x82ɂȂ\xC1\x82Ă\xA2\x82܂\xB7\x81B" -#: Merge.rc:2460 +#: Merge.rc:2462 #, c-format msgid "" "\n" @@ -4854,37 +4870,37 @@ "\n" "\x92\x8D\x88\xD3: 7-Zip \x93\x9D\x8D\x87\x82́AWinMerge\x82̐ݒ\xE8\x82ɂ\xE6\x82\xE8\x83X\x83^\x83\x93\x83h\x83A\x83\x8D\x83\x93\x91\x80\x8D\xEC\x82ɐ\xA7\x8C\xC0\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B" -#: Merge.rc:2461 +#: Merge.rc:2463 #, c-format msgid "Select file for export" msgstr "\x83G\x83N\x83X\x83|\x81[\x83g\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" -#: Merge.rc:2462 +#: Merge.rc:2464 #, c-format msgid "Select file for import" msgstr "\x83C\x83\x93\x83|\x81[\x83g\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" -#: Merge.rc:2463 +#: Merge.rc:2465 #, c-format msgid "Options imported from the file." msgstr "\x90ݒ\xE8\x8F\xEE\x95t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83C\x83\x93\x83|\x81[\x83g\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B" -#: Merge.rc:2464 +#: Merge.rc:2466 #, c-format msgid "Options exported to the file." msgstr "\x90ݒ\xE8\x8F\xEE\x95\xF1\x82\xF0\x83t\x83@\x83C\x83\x8B\x82ɃG\x83N\x83X\x83|\x81[\x83g\x82\xB5\x82܂\xB5\x82\xBD\x81B" -#: Merge.rc:2465 +#: Merge.rc:2467 #, c-format msgid "Failed to import options from the file." msgstr "\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x90ݒ\xE8\x8F\xEE\x95\xF1\x82̃C\x83\x93\x83|\x81[\x83g\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B" -#: Merge.rc:2466 +#: Merge.rc:2468 #, c-format msgid "Failed to write options to the file." msgstr "\x83t\x83@\x83C\x83\x8B\x82ւ̐ݒ\xE8\x8F\xEE\x95\xF1\x82̏\x91\x82\xAB\x8D\x9E\x82݂Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B" -#: Merge.rc:2467 +#: Merge.rc:2469 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4895,493 +4911,493 @@ "\n" "\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9?" -#: Merge.rc:2473 +#: Merge.rc:2475 #, c-format msgid "Regular expression error" msgstr "\x90\xB3\x8BK\x95\\x8C\xBB\x83G\x83\x89\x81[" -#: Merge.rc:2474 +#: Merge.rc:2476 #, c-format msgid "No match" msgstr "\x83}\x83b\x83`\x82\xB5\x82܂\xB9\x82\xF1" -#: Merge.rc:2475 +#: Merge.rc:2477 #, c-format msgid "Invalid regular expression" msgstr "\x96\xB3\x8C\xF8\x82Ȑ\xB3\x8BK\x95\\x8C\xBB\x82ł\xB7" -#: Merge.rc:2476 +#: Merge.rc:2478 #, c-format msgid "Invalid collation character" msgstr "\x96\xB3\x8C\xF8\x82ȏƍ\x87\x95\xB6\x8E\x9A\x82ł\xB7" -#: Merge.rc:2477 +#: Merge.rc:2479 #, c-format msgid "Invalid character class name" msgstr "\x96\xB3\x8C\xF8\x82ȃL\x83\x83\x83\x89\x83N\x83^\x83N\x83\x89\x83X\x96\xBC\x82ł\xB7" -#: Merge.rc:2478 +#: Merge.rc:2480 #, c-format msgid "Trailing backslash" msgstr "\\ \x82ŏI\x82\xED\x82\xC1\x82Ă\xA2\x82܂\xB7" -#: Merge.rc:2479 +#: Merge.rc:2481 #, c-format msgid "Invalid back reference" msgstr "\x96\xB3\x8C\xF8\x82Ȍ\xE3\x95\xFB\x8EQ\x8FƉ\x89\x8EZ\x8Eq\x82ł\xB7" -#: Merge.rc:2480 +#: Merge.rc:2482 #, c-format msgid "Unmatched [ or [^" msgstr "[ \x82\xA9 [^ \x82̑Ή\x9E\x82\xAA\x82Ƃ\xEA\x82Ă\xA2\x82܂\xB9\x82\xF1" -#: Merge.rc:2481 +#: Merge.rc:2483 #, c-format msgid "Unmatched ( or \\(" msgstr "( \x82\xA9 \\( \x82̑Ή\x9E\x82\xAA\x82Ƃ\xEA\x82Ă\xA2\x82܂\xB9\x82\xF1" -#: Merge.rc:2482 +#: Merge.rc:2484 #, c-format msgid "Unmatched \\{" msgstr "\\{ \x82̑Ή\x9E\x82\xAA\x82Ƃ\xEA\x82Ă\xA2\x82܂\xB9\x82\xF1" -#: Merge.rc:2483 +#: Merge.rc:2485 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} \x82̓\xE0\x97e\x82\xAA\x96\xB3\x8C\xF8\x82ł\xB7" -#: Merge.rc:2484 +#: Merge.rc:2486 #, c-format msgid "Invalid range end" msgstr "\x96\xB3\x8C\xF8\x82Ȕ͈͂̏I\x97\xB9\x88ʒu\x82ł\xB7" -#: Merge.rc:2485 +#: Merge.rc:2487 #, c-format msgid "Out of memory" msgstr "\x83\x81\x83\x82\x83\x8A\x82\xAA\x95s\x91\xAB\x82\xB5\x82Ă\xA2\x82܂\xB7" -#: Merge.rc:2486 +#: Merge.rc:2488 #, c-format msgid "Invalid preceding regular expression" msgstr "\x8CJ\x82\xE8\x95Ԃ\xB5\x89\x89\x8EZ\x8Eq\x82\xAA\x96\xB3\x8C\xF8\x82Ȉʒu\x82ɂ\xA0\x82\xE8\x82܂\xB7" -#: Merge.rc:2487 +#: Merge.rc:2489 #, c-format msgid "Premature end of regular expression" msgstr "\x90\xB3\x8BK\x95\\x8C\xBB\x82\xAA\x88ُ\xED\x82ł\xB7" -#: Merge.rc:2488 +#: Merge.rc:2490 #, c-format msgid "Regular expression too big" msgstr "\x90\xB3\x8BK\x95\\x8C\xBB\x82\xAA\x91傫\x82\xB7\x82\xAC\x82܂\xB7" -#: Merge.rc:2493 +#: Merge.rc:2495 #, c-format msgid "Unmatched ) or \\)" msgstr ") \x82\xA9 \\) \x82̑Ή\x9E\x82\xAA\x82Ƃ\xEA\x82Ă\xA2\x82܂\xB9\x82\xF1" -#: Merge.rc:2499 +#: Merge.rc:2501 #, c-format msgid "Western European" msgstr "Western European" -#: Merge.rc:2500 +#: Merge.rc:2502 #, c-format msgid "Eastern European" msgstr "Eastern European" -#: Merge.rc:2501 +#: Merge.rc:2503 #, c-format msgid "East Asian" msgstr "East Asian" -#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2503 +#: Merge.rc:2505 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern" -#: Merge.rc:2504 -#: Merge.rc:2514 +#: Merge.rc:2506 +#: Merge.rc:2516 #, c-format msgid "Not applicable" msgstr "Not applicable" -#: Merge.rc:2510 +#: Merge.rc:2512 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2511 +#: Merge.rc:2513 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2512 +#: Merge.rc:2514 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2513 +#: Merge.rc:2515 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2520 +#: Merge.rc:2522 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2521 +#: Merge.rc:2523 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2527 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2528 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2529 +#: Merge.rc:2531 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2530 +#: Merge.rc:2532 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2531 +#: Merge.rc:2533 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2532 +#: Merge.rc:2534 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2533 +#: Merge.rc:2535 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2534 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2535 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2536 +#: Merge.rc:2538 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2542 +#: Merge.rc:2544 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2543 +#: Merge.rc:2545 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2544 +#: Merge.rc:2546 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2545 +#: Merge.rc:2547 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2546 +#: Merge.rc:2548 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2547 +#: Merge.rc:2549 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2553 +#: Merge.rc:2555 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2554 +#: Merge.rc:2556 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2555 +#: Merge.rc:2557 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2556 +#: Merge.rc:2558 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2557 +#: Merge.rc:2559 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2558 +#: Merge.rc:2560 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2559 +#: Merge.rc:2561 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2560 +#: Merge.rc:2562 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2561 +#: Merge.rc:2563 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2562 +#: Merge.rc:2564 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2563 +#: Merge.rc:2565 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2564 +#: Merge.rc:2566 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2565 +#: Merge.rc:2567 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2566 +#: Merge.rc:2568 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2572 +#: Merge.rc:2574 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2573 +#: Merge.rc:2575 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2574 +#: Merge.rc:2576 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2575 +#: Merge.rc:2577 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2576 +#: Merge.rc:2578 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2577 +#: Merge.rc:2579 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2586 +#: Merge.rc:2588 #, c-format msgid "Approximates ISO-8859-2" msgstr "Approximates ISO-8859-2" -#: Merge.rc:2589 +#: Merge.rc:2591 #, c-format msgid "Approximates ISO-8859-1" msgstr "Approximates ISO-8859-1" -#: Merge.rc:2590 +#: Merge.rc:2592 #, c-format msgid "Approximates ISO-8859-7" msgstr "Approximates ISO-8859-7" -#: Merge.rc:2591 +#: Merge.rc:2593 #, c-format msgid "Approximates ISO-8859-9" msgstr "Approximates ISO-8859-9" -#: Merge.rc:2592 +#: Merge.rc:2594 #, c-format msgid "Approximates ISO-8859-8" msgstr "Approximates ISO-8859-8" -#: Merge.rc:2598 +#: Merge.rc:2600 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2599 +#: Merge.rc:2601 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2600 +#: Merge.rc:2602 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2601 +#: Merge.rc:2603 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2603 +#: Merge.rc:2605 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2604 +#: Merge.rc:2606 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2605 +#: Merge.rc:2607 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2612 +#: Merge.rc:2614 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2613 +#: Merge.rc:2615 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2614 +#: Merge.rc:2616 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2615 +#: Merge.rc:2617 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2616 +#: Merge.rc:2618 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2617 +#: Merge.rc:2619 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2623 +#: Merge.rc:2625 #, c-format msgid "Type" -msgstr "" +msgstr "\x83^\x83C\x83v" -#: Merge.rc:2625 +#: Merge.rc:2627 #, c-format msgid "Unpacker" -msgstr "" +msgstr "\x93W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93" -#: Merge.rc:2626 +#: Merge.rc:2628 #, c-format msgid "Prediffer" -msgstr "" +msgstr "\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x83v\x83\x89\x83O\x83C\x83\x93" -#: Merge.rc:2627 +#: Merge.rc:2629 #, c-format msgid "Editor script" -msgstr "" +msgstr "\x83G\x83f\x83B\x83^\x83X\x83N\x83\x8A\x83v\x83g" -#: Merge.rc:2634 +#: Merge.rc:2636 #, c-format msgid "Save the left file" msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7" -#: Merge.rc:2635 +#: Merge.rc:2637 #, c-format msgid "Save the right file" msgstr "\x89E\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7" -#: Merge.rc:2636 +#: Merge.rc:2638 #, c-format msgid "Save the left file with name..." msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82𖼑O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6\x82\xB5\x82܂\xB7..." -#: Merge.rc:2637 +#: Merge.rc:2639 #, c-format msgid "Save the right file with name..." msgstr "\x89E\x82̃t\x83@\x83C\x83\x8B\x82𖼑O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6\x82\xB5\x82܂\xB7..." -#: Merge.rc:2638 +#: Merge.rc:2640 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7" -#: Merge.rc:2639 +#: Merge.rc:2641 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "\x89E\x91\xA4\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7" -#: Merge.rc:2640 +#: Merge.rc:2642 #, c-format msgid "Convert EOL to Windows mode" msgstr "EOL\x82\xF0Windows\x83^\x83C\x83v\x82ɕϊ\xB7\x82\xB5\x82܂\xB7" -#: Merge.rc:2641 +#: Merge.rc:2643 #, c-format msgid "Convert EOL to Unix mode" msgstr "EOL\x82\xF0Unix\x83^\x83C\x83v\x82ɕϊ\xB7\x82\xB5\x82܂\xB7" -#: Merge.rc:2642 +#: Merge.rc:2644 #, c-format msgid "Convert EOL to Mac mode" msgstr "EOL\x82\xF0Mac\x83^\x83C\x83v\x82ɕϊ\xB7\x82\xB5\x82܂\xB7" -#: Merge.rc:2643 +#: Merge.rc:2645 #, c-format msgid "Switch between editing and merging modes" msgstr "\x8C\xBB\x8D݂̃\x82\x81[\x83h\x82\xA9\x82\xE7\x95ҏW\x83\x82\x81[\x83h\x82܂\xBD\x82̓}\x81[\x83W\x83\x82\x81[\x83h\x82\xF0\x90\xE8\x91ւ\xA6\x82܂\xB7" -#: Merge.rc:2644 +#: Merge.rc:2646 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5390,12 +5406,12 @@ "\x83t\x83@\x83C\x83\x8B\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x8F\xEE\x95\xF1\x82̕\\x8E\xA6\x82Ɛݒ\xE8\x82\xF0\x8Ds\x82\xA2\x82܂\xB7\x81B\n" "\x83t\x83@\x83C\x83\x8B\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x83v\x83\x8D\x83p\x83e\x83B" -#: Merge.rc:2645... [truncated message content] |