From 78f54b70106bb3ab9270534bc78aac6d04bbc58c Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 25 Jan 2016 23:58:05 +0900 Subject: [PATCH] Update translations (2) --- Translations/WinMerge/Danish.po | 2090 ++++++++++++++++------------------- Translations/WinMerge/Dutch.po | 2090 ++++++++++++++++------------------- Translations/WinMerge/English.pot | 2092 ++++++++++++++++-------------------- Translations/WinMerge/French.po | 2090 ++++++++++++++++------------------- Translations/WinMerge/Galician.po | 2090 ++++++++++++++++------------------- Translations/WinMerge/German.po | 2090 ++++++++++++++++------------------- Translations/WinMerge/Greek.po | 2090 ++++++++++++++++------------------- Translations/WinMerge/Hungarian.po | 2090 ++++++++++++++++------------------- 8 files changed, 7281 insertions(+), 9441 deletions(-) diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 750f2128c..43630e34b 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -25,1675 +25,1454 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_DANISH, SUBLANG_DEFAULT" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "1252" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "Kopier til &højre" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "Kopier til &venstre" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "&Vælg linjeforskel" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "&Fortryd" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "&Gendan" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "&Klip" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "Ko&pier" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "&Indsæt" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "Gå &til..." -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "Åb&en" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "med det ®istrerede program" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "med en &ekstern editor" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "&med..." -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "&Ingen" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "&Filer" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Åben...\tCtrl+O" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "Åb&en konfliktfil..." -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Åben pro&jekt...\tCtrl+J" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "Gem &projekt..." -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "Seneste Projekt" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "< Tom >" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "&Afslut" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "&Rediger" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "I&ndstillinger..." -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "&Vis" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "&Værktøjslinje" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "&Lille" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "&Stor" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "S&tatuslinje" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "Fa&nelinje" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "Værk&tøjer" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "&Filtre..." -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "&Generer en Patch..." -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "&Plugins" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "Ma&nuel Prediffer" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "A&utomatisk Prediffer" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "&Manuel Udpakning" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk Udpakning" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "&Genindlæs plugins" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "Vind&ue" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "&Luk" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "Luk &alle" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "&Skift panel\tF6" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "&Horisontale vinduer" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "&Vertikale vinduer" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "&Kaskade" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "&Hjælp" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge hjælp\tF1" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "K&onfiguration" -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "V&enstre skrivebeskyttet" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "&Højre skrivebeskyttet" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vælg &alt\tCtrl+A" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "Vis &identiske" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "Vis &forskellige" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "Vis &venstre unikke" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "Vis &højre unikke" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "Vis &oversprungne" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "Vis &binære filer" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "V&is skjulte" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "Vis i et &træ" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "&Udvid alle undermapper" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "Luk &alle undermapper" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "Vælg &skrifttype..." -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "Brug standard s&krifttype" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "By&t vinduer" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "Sammen&ligningsstatistikker" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "&Opdater\tF5" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Op&dater valgte\tCtrl+F5" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "&Flet" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "Sammen&lign\tEnter" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Næste forskel\tAlt+Ned" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskel\tAlt+Op" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&ørste forskel\tAlt+Home" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuelle forskel\tAlt+Enter" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Sidste forskel\tAlt+End" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopier til &højre\tAlt+Højre" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "Sl&et\tDel" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "&Tilpas søjler..." -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "Generer en &rapport..." -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "&Gem\tCtrl+S" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "Gem &venstre" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "Gem &højre" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "&Udskriv..." -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "Side op&sætning" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "Vis udskrif&t" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "&Konverter linjeendelserne til" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "&Flette modus\tF9" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "&Fil Kodning..." -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "&Binær" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Fortryd\tCtrl+Z" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gendan\tCtrl+Y" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klip\tCtrl+X" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pier\tCtrl+C" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "&Indsæt\tCtrl+V" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "Vælg &linjeforskel\tF4" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&øg...\tCtrl+F" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstat...\tCtrl+H" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "Avanceret" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenumre\tCtrl+Shift+C" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "&Bogmærker" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Vis/skjul bogmærke\tCtrl+F2" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Næste bogmærke\tF2" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Forrige bogmærke\tShift+F2" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "&Slet alle bogmærker" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gå til...\tCtrl+G" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zoom &ind\tCtrl++" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zoom &ud\tCtrl+-" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "Fremhæv syntaks" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "&Lås vinduer" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "Vis &mellemrum" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "Vis &linjeforskelle" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "Vis linje&numre" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "Vis &margener" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "O&mbryd linjer" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "H&orisontalt panel" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "V&ertikalt panel" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopier til hø&jre og gå til næste\tAlt+Ctrl+Right" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopier til v&enstre og gå til næste\tAlt+Ctrl+Left" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "Kopier alt &til højre" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "Kopier alt til venst&re" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "Samm&enlign" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "Sa&mmenlign som" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til højre (%1 af %2)" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 af %2)" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "Højre til venstre (%1 af %2)" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "Højre til... (%1 af %2)" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "&Flyt" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "&Slet" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "&Venstre" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "&Højre" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "&Begge" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "Om&døb" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "&Skjul emner" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "&Åben venstre" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "Å&ben højre" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "K&opier stinavne" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 af %2)" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "Højre (%1 af %2)" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 af %2)" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "Ko&pier filnavne" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "&Opdater" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "Venstre Shell menu" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "Højre Shell menu" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "&Kopier det fulde stinavn" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "Kopier &filnavn" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "Prediffer indstillinger" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "&Ingen prediffer" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "&Automatisk prediffer" -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "Gå til &forskel" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "&Ingen flyttede blokke" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "&Alle flyttede blokke" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttede blokke for &denne forskel" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "&Mellemrum" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "S&ammenlign" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "&Ignorer ændringer" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "Ign&orer alle" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "Sammenlign store/sm&å bogstaver" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rer returtegns forskelle (Windows/Unix/Mac)" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "&Inkluder undermapper" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "&Sammenligningsmetode:" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "Alt indhold" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "Hurtigt indhold" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "Ændringsdato" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "Ændringsdato og størrelse" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "Størrelse" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "(Privat Udgave)" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besøg WinMerge hjemmesiden!" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "Deltagere" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "Vælg filer eller mapper..." -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "&Gennemse..." -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "G&ennemse..." -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "G&ennemse..." -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "V&ælg..." -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "&Udpakker:" -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "Væ&lg..." -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "Annuller" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "Hjælp" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller mapper der skal sammenlignes" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "Bruger:" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "Password:" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "Link til Destinations VSS projekt" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "Anvend på alle emner" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "Check ud" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "Gem som..." -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "Versionsstyringssystem" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyringssystem" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sti til cleartool.exe:" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "Generelt" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "Scroll &automatisk til første forskel" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "L&uk vinduer med ESC tasten" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verificer automatisk stinavnene i åben dialogen" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "Til&lad kun et eksempel ad gangen" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "Sp&ørg ved lukning af flere vinduer " -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "Bevar filtid i filsammenligning" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Vis dialogen \"Vælg filer eller mapper...\" ved hver start" -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Å&ben-dialog Auto-fuldførelse:" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "" "WinMerge allows hiding some common messageboxes. Press the Reset button to " @@ -1702,658 +1481,629 @@ msgstr "" "WinMerge kan gemme almene beskedvinduer. Brug Reset knappen for at vise " "disse vinduer igen." -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "Nulstil" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "Søg" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "F&ind hvad:" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "Sammenlign &hele ordet" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "Sammenlign store/små &bogstaver" -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "Regulært &udtryk" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "O&mbryd ikke filendelser" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "&Find næste" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "Erstat" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "Ers&tat med:" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "&Ombryd ikke filendelser" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "Erstat i" -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "&Valgte" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "He&le filen" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "&Erstat" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "Erstat &alt" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "Check ud" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "Check ind lige efter check ud" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "Linjefiltre" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "Aktiver linjefiltre" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulære udtryk (et pr linje):" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "Rediger" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "Fjern" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "Farver" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "Forskelle:" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "Valgte forskelle:" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "Baggrund" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "Slettet" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "Ignoreret forskel:" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "Flyttet:" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "Valgt flyttet:" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "Ordforskel:" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "Valgte ordforskelle:" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "System" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Send slettede filer til skraldespanden" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "&Ekstern editor:" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "&Filter mappe:" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "Mappe til midlertidige filer" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "S&ystemets mappe til midlertidige filer" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "V&algt mappe:" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "Patch Generator" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "Fil&1:" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "&Byt" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "&Tilføj til eksisterende fil" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "Res&ultat:" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "G&ennemse..." -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "Sti&l:" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "&Sammenhæng:" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "Igno&rer blanke linjer" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "Inkluder &kommandolinjen" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "Åben i ekstern e&ditor" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "Vis søjler" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "Flyt &op" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "Flyt &ned" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "Vælg udpakker" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "Fil udpakker:" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Vis all udpakkerer, tjek ikke extension" -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "Extension liste:" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "Beskrivelse:" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "Sammenligner emner..." -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "Emner sammenlignet:" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "Emner ialt:" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "Gå til" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "G&å til:" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "Gå til hvad" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "&Forskel" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "&Gå til" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "Sammenlign" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "Mellemrum" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "&Sammenlign" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "&Ignorer ændringer" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "I&gnorer alle" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer blan&ke linjer" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "Ignorer store/små &bogstaver" -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "&Aktiver detektion af flyttede blokke" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "&Match ens linjer" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "Filter Kommentarer" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "Redigering" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "&Fremhæv syntaksen" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &opdatering" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "&Bevar originale EOL tegn" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "Tabulator" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "&Tabulator størrelse:" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "&Indsæt tabulatorer" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "Indsæt &mellemrum" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "Farver for linjeforskelle" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "Vis linjeforskelle" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "&Karakter niveau" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "&Ord niveau:" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "Filfiltre" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "Installer..." -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "Rediger..." -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "Slet..." -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "Gem ændrede filer?" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "Fil på venstre side" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "&Gem ændringer" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "&Fjern ændringer" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "Fil på højre side" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "G&em ændringer" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "F&jern ændringer" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "Codepage" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "Standard codepage" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" "Vælg den standard codepage der antages når der indlæses filer der ikke er " "unicode:" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2362,692 +2112,679 @@ msgstr "" "Find codepage automatisk for disse filer: .html, .rc, .xml\n" "WinMerge skal genstartes før dette tager effekt" -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "System codepage" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "Samme som WinMerge brugerflade" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "Udvalgt codepage:" -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "Valg" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr " Kategorier" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "Importer..." -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "Eksporter..." -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "Nøgleord:" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "Funktionsnavne:" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "Numre:" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "Operatører:" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "Strenge:" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "Forbereder:" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "Bruger 1:" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "Bruger 2:" -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "Fed" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "Rapport &Fil:" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "Gennemse..." -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "&Stil" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopier til Udklipsholder" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "Delt eller Privat Filter " -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "Hvilken type filter vil du oprette?" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delt Filter (for alle brugere)" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat Filter (kun aktuel bruger)" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "Arkiv Support" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "&Aktiver arkiv fil support" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "Bestem arkivtype udfra fil signatur" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "Sammenlign Statistik" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "Mapper:" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "Forskellige" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "Binær:" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "Venstre:" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "Højre:" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "Identiske" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "Ialt:" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "Luk" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "Påvirker" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "(Påvirker)" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "Vælg codepage til" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "&Fil Indlæsning:" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "Fil &Gemning:" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "&Brug samme codepage for begge" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "&Anvend" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "&Annuller" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "Test Filter" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "Tester filter..." -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "&Indsæt test tekst:" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "&Mappenavn" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "Resultater:" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "&Luk" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "&Brug tilpasset tekstfarve" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "Tilpasset tekstfarve" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "Mellemrum:" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "Almindelig tekst:" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "Udvalgt:" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "Stier" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "&Venstre:" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "S&krivebeskyttet" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "&Højre:" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "Sk&rivebeskyttet" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "Åben..." -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "Gem..." -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "Backup filer" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "Opret backup filer som:" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "&Mappe sammenligning" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "Fil& sammenligning" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "Gem backup filer i:" -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens mappe" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "&Global backup mappe:" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "Backup filnavn:" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr "&Tilføj .bak -extension" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "T&ilføj tidsstempel" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "Bekræft kopi" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Ønsker du virkelig at kopiere XXX emner?" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "Fra venstre" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "Til højre" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "Nej" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "&Aktiver plugins" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "Shell Integration" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "&Aktiver den avancerede menu" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "&Tilføj til kontekstmenu" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "Mappe" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "S&top efter første forskel" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orer tidsforskelle under 3 sekunder" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Grænse for hurtig sammenligning (MB):" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "Binær" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "0x406, 1252" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ukendt fejl ved forsøg på åbning af projekt fil" -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "Ukendt fejl ved forsøg på at gemme projekt fil" -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "Projektfil indlæst succesfuldt" -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "Projekt gemt succesfuldt." -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "" "\n" @@ -3066,7 +2803,7 @@ msgstr "" "WinMerge.FilSammenligning\n" "WinMerge FilSammenligning" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "" "\n" @@ -3085,7 +2822,7 @@ msgstr "" "WinMerge.Mappe sammenligning\n" "WinMerge Mappe sammenligning" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "" "Developers:\n" @@ -3096,7 +2833,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3107,138 +2844,137 @@ msgstr "" "velkommen til at videredistribuere det under visse omstændigheder, jf. GNU " "General Public License. Se Hjælp for yderligere oplysninger." -#: Merge.rc:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "&Fortryd" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "&Prøv igen" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "I&gnorer alle" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "Ja til &alle" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "Nej til a&lle" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "&Fortsæt" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "&Spring over" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "Spring over all&e" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "Vis ikke denne &besked igen." -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "Stil ikke dette sp&ørgsmål igen." -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "Syntaks" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "Versionskontrol" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "Forskelle" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "Til:" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "Fra Venstre:" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "Til Venstre:" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "Fra Højre:" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "Til Højre:" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "Indstillinger (%1)" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle beskeder vises nu igen." -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3249,32 +2985,32 @@ msgstr "" "\n" "Brug værdierne 1 - %1." -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "Åben" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Valg filer (*.ini)|*.ini|Alle filer (*.*)|*.*||" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3283,54 +3019,52 @@ msgstr "" "Tekst Filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle filer (*." "*)|*.*||" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Filer (*.htm,*.html)|*.htm;*.html|Alle filer (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Filer (*.xml)|*.xml|Alle filer (*.*)|*.*||" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "Sti" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "Beskrivelse" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "Vælg filnavn til nyt filter" -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fil Filtre (*.flt)|*.flt|Alle Filer (*.*)|*.*||" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3343,7 +3077,7 @@ msgstr "" "Kopier filen %1 til WinMerge/Filtermappe:\n" "%2." -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3356,7 +3090,7 @@ msgstr "" "\n" "Undersøg om mappen eksisterer og kan ændres." -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3367,7 +3101,7 @@ msgstr "" "\n" "Vælg filter mappe i valg/System." -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3380,12 +3114,12 @@ msgstr "" "\n" "Måske er filen skrivebeskyttet?" -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "Find filter fil til installering" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "" "Installing filter file failed.\n" @@ -3396,17 +3130,17 @@ msgstr "" "\n" "Kunne ikke kopiere filter fil til filter mappe." -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter filen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "Regulært udtryk" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3418,173 +3152,173 @@ msgstr "" "\n" "Hvis du ikke vil opdatere sammenligningerne så vælg Nej og opdater senere." -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "&Sti til SS.EXE:" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "Resultat af sammenligning af mapper" -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "Ikke navngivet venstre" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "Ikke navngivet højre" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "Deres fil" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "Flet" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "Forskel %1 af %2" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "%1 forskelle fundet" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "1 forskel fundet" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "Emne %1 of %2" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "Emner: %1" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vælg to eksisterende mapper eller filer at sammenligne" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "Valgt mappe" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "Vælg to mapper eller to filer at sammenligne." -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "Ventre sti er ugyldig!" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "Højre sti er ugyldig!" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldige!" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vælg to filer for at aktivere udvælgelse af udpakker." -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne en fil og en mappe!" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "Fil ikke fundet: %1" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke udpakket: %1" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "" "Cannot open file\n" @@ -3597,12 +3331,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "Kunne ikke fortolke konfliktfil" -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "" "The file\n" @@ -3613,17 +3347,17 @@ msgstr "" "%1\n" "er ikke en konfliktfil." -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "Gem som" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "Gem ændringer til %1?" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3632,12 +3366,12 @@ msgstr "" "%1 er markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? " "(Nej for at gemme til et andet filnavn.)" -#: Merge.rc:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "Fejl under backup af filen" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "" "Unable to backup original file:\n" @@ -3650,7 +3384,7 @@ msgstr "" "\n" "Fortsæt alligevel?" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, c-format msgid "" "Saving file failed.\n" @@ -3667,7 +3401,7 @@ msgstr "" "\t-bruge et andet filenavn (Tryk Ok)\n" "\t-afbryd aktuel operation (Tryk Annuller)?" -#: Merge.rc:2256 +#: Merge.rc:3895053E #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3683,7 +3417,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2257 +#: Merge.rc:5A0BA2DF #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3699,7 +3433,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2258 +#: Merge.rc:78367A47 #, c-format msgid "" "Another application has updated file\n" @@ -3714,7 +3448,7 @@ msgstr "" "\n" "Vil du overskrive den ændrede fil?" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "" "%1\n" @@ -3724,7 +3458,7 @@ msgstr "" "er markeret som skrivebeskyttet. Vil du overskrive den skrivebeskyttede fil " "alligevel?" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "" "Another application has updated file\n" @@ -3739,22 +3473,22 @@ msgstr "" "\n" "Vil du genindlæse filen?" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "Gem venstre fil som" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "Gem højre fil som" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "" "The file\n" @@ -3765,7 +3499,7 @@ msgstr "" "%1\n" "er forsvundet. Gem en kopi af filen for at fortsætte." -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3776,7 +3510,7 @@ msgstr "" "\n" "Opdater dokumenter før du fortsætter." -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3784,12 +3518,12 @@ msgid "" msgstr "" "Du skal angive en SourceSafe projekt sti for at fortsætte (ie: $/MitProjekt)" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout filer fra VSS..." -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -3798,12 +3532,12 @@ msgstr "" "Versionsstyringssystemet returnerede en fejl under forsøget på at " "kontrollere filen. Kan ikke fortsætte..." -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "Fejl under udførelse af versionsstyringssystem kommando." -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -3812,17 +3546,17 @@ msgstr "" "Arbejdsmappen for VSS og mappen for den aktuelle fil er ikke ens. Vil du " "fortsætte?" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) fundet!" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "Fejl fra VSS:" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3834,7 +3568,7 @@ msgstr "" "Kontroller konfiguration af visning.\n" "Fortryd kontrol operation?" -#: Merge.rc:2284 +#: Merge.rc:1929D7D3 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3845,146 +3579,142 @@ msgstr "" "filkontrol.\n" "Knotroller konfiguration af visning." -#: Merge.rc:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mindre end 5.0)" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og over)" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "Bryd ved mellemrum" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "Bryd ved mellemrum eller tegnsætning" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "Højre til venstre (%1)" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til højre (%1)" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "Højre til... (%1)" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "Højre (%1)" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "Venstre side - vælg destinationsmappen" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "Højre side - vælg destinationsmappen" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påvirket)" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 af %2 filer påvirket)" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3995,17 +3725,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "Er du sikker på du vil kopiere:" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Er du sikker på du vil kopiere %d emner:" -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, c-format msgid "" "Operation aborted!\n" @@ -4024,457 +3754,457 @@ msgstr "" "\n" "Opdater sammenligning." -#: Merge.rc:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "Er du sikker på du vil flytte:" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Er du sikker på du vil flytte: %d emner:" -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "Bekræft flytning" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunne ikke eksekvere ekstern editor: %1" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "Ukendt arkivformat" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "Resultat af sammenligning" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "Højre dato" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "Udvidelse" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "Højre størrelse" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "Højre størrelse (kort)" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "Venstre oprettelsesdato" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "Højre oprettelsesdato" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "Nyeste fil" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "Venstre filversion" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "Højre filversion" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "Højre attributter" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "Venstre EOL" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "Højre EOL" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "Venstre encoding" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "Højre encoding" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "Ignoreret forskel" -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "Emne fortrudt" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "Fil sprunget over" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "Mappe sprunget over" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "Venstre kun: %1" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "Højre kun: %1" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskellige" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "Filer er forskellige" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "Mapper er forskellige" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "Kun venstre" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "Kun højre" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "Fejl" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "Tekstfiler er identiske" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "Tekstfiler er forskellige" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "Tid forløbet: %ld ms" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "Filnavn eller mappenavn." -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkluderet." -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "Resultat af sammenligning, lang form." -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "Venstre side ændringsdato." -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "Højre side ændringsdato." -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "Filens extension." -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i bytes." -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "Højre filstørrelse i bytes." -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "Venstre filstørrelse forkortet." -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "Højre filstørrelse forkortet." -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "Venstre side oprettelsesdato." -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "Højre side oprettelsesdato." -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "Fortæller hvilken side har den nyeste ændringsdato." -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversion, kun for nogle filtyper." -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Højre side filversion, kun for nogle filtyper." -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "Kort resultat af sammenligning." -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "Højre side attributter." -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "Venstre sidefil EOL type" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "Højre sidefil EOL type" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "Venstre side encoding." -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "Højre side encoding." -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4483,50 +4213,50 @@ msgstr "" "Antal ignorerede forskelle i filen. Disse forskelle er ignoreret af WinMerge " "og kan ikke blive flettet." -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "" "Number of differences in file. This number does not include ignored " "differences." msgstr "Antel forskelle i filen. Dette tal omfatter ikke ignorerede forskelle." -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Vis stjerne (*) hvis fil er binær." -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "Sammenlign %1 med %2" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "Komma opdelt liste" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "Tab opdelt liste" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "Simpel HTML" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "Simpel XML" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "Rapportfilen eksisterer allerede. Ønsker du at overskrive eksisterende fil" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "" "Error creating the report:\n" @@ -4535,27 +4265,27 @@ msgstr "" "Fejl ved opretning af rapporten:\n" "%1" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "Rapporten blev oprettet succesfuldt." -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "Den samme fil er åbnet på begge sider." -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "De valgte filer er identiske." -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "Der skete en fejl under sammenligning af filerne." -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4563,7 +4293,7 @@ msgstr "" "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for " "midlertidig (temp) mappe." -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4583,17 +4313,17 @@ msgstr "" "valget 'Ignorer returtegn forskelle ..' i Fanen: Indstillinger -> " "Sammenlign (findes under Redigér)." -#: Merge.rc:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "Den valgte mappe er ugyldig." -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan ikke åbne en binær fil til editor." -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4608,7 +4338,7 @@ msgstr "" "%1\n" "til den anden side og åbne disse mapper?" -#: Merge.rc:2545 +#: Merge.rc:4A700AB0 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4623,152 +4353,152 @@ msgstr "" "Vil du behandle begge filer som værende i standard Windows codepage " "(anbefalet)?" -#: Merge.rc:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Oplysninger tabt, på grund af kodnings fejl: begge filer" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "Ingen forskel" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "Linje forskel" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(e)." -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finde strengen \"%s\"" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "Placerings vindue" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "Forskels vindue" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "Patch fil oprettet med succes." -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "1. element er ikke fundet eller er en mappe!" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element er ikke fundet eller er en mappe!" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Denne patch fil eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "Samlet" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den angivne output sti er ikke en endelig sti: %1" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "Angiv en output fil" -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke lave patch filer fra binære filer." -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke lave patch filer fra mapper." -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "" "Please save all files first.\n" @@ -4779,12 +4509,12 @@ msgstr "" "\n" "Oprettelse af en patch kræver at alle ændringer i filen er gemt." -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "Mappen eksisterer ikke." -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4798,37 +4528,37 @@ msgstr "" "Se manualen for mere information om arkiv support og hvordan man aktivere " "det." -#: Merge.rc:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "Vælg fil til eksport" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "Vælg fil til import" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "Indstillinger importeret fra filen." -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "Indstillinger eksporteret til filen." -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "Kunne ikke importere indstillinger fra filen." -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "Kunne ikke skrive indstillinger til filen." -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4839,117 +4569,117 @@ msgstr "" "\n" "Vil du fortsætte?" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "Udpakker" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "Editor script" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -4958,132 +4688,132 @@ msgstr "" "Udpakkeren bruges på begge filer (kun den ene fil behøves en korrekt " "extension)" -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "Anbefalede plugins" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "Andre plugins" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "Privat Udgave: %1" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "Plugin indstillinger" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke fundet - .sct scripts afbrudt" -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "Deaktiveret" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "Fra filsystem" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "Fra MRU liste" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "Ingen fremhævning" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "Transportabelt Objekt" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "Resourser" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 4e9b743de..94631bf9f 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -26,1675 +26,1454 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_DUTCH, SUBLANG_DUTCH" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "1252" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "Naar &rechts kopiëren" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "Naar &links kopiëren" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "&Selecteer Regelverschil" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "&Ongedaan maken" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "He&rhalen" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "&Knippen" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "Ko&piëren" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "Pl&akken" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "&Ga naar..." -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "Op&enen" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "met ge®istreerde applicatie" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "met &externe editor" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "&met..." -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "&Zoomen" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "Geen" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "&Bestand" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "&Nieuw\tCtrl+N" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Openen...\tCtrl+O" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "Conflictbestand openen..." -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Pro&ject openen...\tCtrl+J" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "Project Op&slaan..." -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "Recente Projecten" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "< Leeg >" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "&Afsluiten" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "Be&werken" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "&Eigenschappen..." -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "B&eeld" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "&Werkbalk" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "Klein" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "Groot" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "&Statusbalk" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "Tab-balk" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "&Tools" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "&Filters..." -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "Patch &genereren..." -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "&Plugins" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "Ma&nuele voorvergelijking" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "A&utomatische voorvergelijking" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "Hand&matig uitpakken" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch uitpakken" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "Plug-ins he&rladen" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "&Venster" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "Sluiten" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "Alles &sluiten" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "&Venster wijzigen\tF6" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "&Horizontaal verdelen" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "&Verticaal verdelen" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "&Trapsgewijs" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "&Help" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Help\tF1" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "C&onfiguratie" -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "I&nfo..." -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "Links all&een-lezen" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "Re&chts alleen-lezen" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Alles selecteren\tCtrl+A" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "Toon &identieke items" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "Toon verschillen&de items" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "Toon linkse unieke items" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "Toon rechtse unieke items" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "Toon overgeslagen items" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "Binaire bestanden weergeven" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "Toon verborgen items" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "Tree-&modus" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "Alle submappen uitklappen" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "Alle submappen inklappen" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "Lettertype kiezen..." -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "Standaard lettertype gebruiken" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "Wissel vensters" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "Ve&rgelijk statistieken" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "Verver&sen\tF5" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Selectie ve&rversen\tCtrl+F5" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "Sa&menvoegen" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "Vergelijken\tEnter" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Volgende verschil\tAlt+Down" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Vor&ige verschil\tAlt+Up" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Eerste verschil\tAlt+Home" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Huidig verschil\tAlt+Enter" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Laatste verschil\tAlt+End" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Naar &rechts kopiëren\tAlt+Right" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Naar &links kopiëren\tAlt+left" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "Wissen\tDel" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "&Kolommen aanpassen..." -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "&Rapport genereren..." -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "Op&slaan\tCtrl+S" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "&Links opslaan" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "&Rechts opslaan" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "&Afdrukken..." -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "Pagina-in&stelling" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "Afdrukvoorbeeld" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "&Converteer regeleindes naar" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "Sa&menvoegmodus\tF9" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "Bestandscodering..." -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "&Binair" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Ongedaan maken\tCtrl+Z" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "He&rhalen\tCtrl+Y" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Knippen\tCtrl+X" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&piëren\tCtrl+C" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "Pl&akken\tCtrl+V" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecteer regelverschillen\tF4" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "Z&oeken...\tCtrl+F" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Vervan&gen...\tCtrl+H" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "Geavanceerd" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Met regelnummers &kopiëren\tCtrl+Shift+C" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "&Bladwijzers" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Bladwijzer aan/uit\tCtrl+F2" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "Volge&nde bladwijzer\tF2" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Vo&rige bladwijzer\tShift+F2" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "Alle bladwijzers wissen" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ga naar...\tCtrl+G" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Inzoomen\tCtrl++" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Uitzoomen\tCtrl+-" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normaal\tCtrl+*" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "Syntaxmarkering" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "Vensters vastzetten" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "Wit&ruimte weergeven" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "Bekijk regelverschillen" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "Bekijk regel&nummers" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "Bekijk &marges" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "Automatische te&rugloop" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "Verschilvenster" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "Location &pane" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Naar rechts k&opiëren en verder gaan\tAlt+Ctrl+Right" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Naar links ko&piëren en verder gaan\tAlt+Ctrl+Left" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "Alles naar rechts kopiëren" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "Alles naar links kopiëren" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "Voorvergelijking" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "Vergelijken" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "Vergelijken als" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "Van links naar rechts (%1 van %2)" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "Van links naar... (%1 van %2)" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "Van rechts naar links (%1 van %2)" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "Van rechts naar... (%1 van %2)" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "&Verplaatsen" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "Ver&wijderen" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "&Naam wijzigen" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "Items verbergen" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "Links &openen" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "Rechts o&penen" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "Padnamen ko&piëren" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 of %2)" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 of %2)" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 of %2)" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "&Bestandsnamen kopiëren" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "&Comprimeren" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "Ve&rnieuwen" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "Linker shellmenu" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "Rechter shellmenu" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "&Volledig pad kopiëren" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "&Bestandsnaam kopiëren" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "Instellingen voorvergelijking verschillen" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "&Geen voorvergelijking" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "Automatische voorvergelijking" -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "G&a naar verschil" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "Gee&n verplaatste blokken" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "&Alle verplaatste blokken" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verplaatste blokken voor huidige vers&chillen" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "Witr&uimte" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "Ver&gelijken" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "Wij&zigingen negeren" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "Alle&s negeren" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "Hoo&fdlettergevoelig" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Negee&r regeleindeteken-verschillen (Windows/Unix/Mac)" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "Ook &in submappen" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "Vergelijkingsmethode:" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "Volledige Inhoud" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "Snelle Inhoud" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "Datum gewijzigd" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "Datum en grootte gewijzigd" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "Grootte" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "Over WinMerge" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "(Private Versie)" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Bezoek deWinMerge HomePage!" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "Medewerkers" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "Bestanden of mappen selecteren" -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "&Zoeken" -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "Bladeren..." -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "Bl&aderen..." -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "Selecteren..." -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "&Uitpakker:" -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "&Selecteren..." -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "Annuleren" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "Help" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "Bestanden of mappen om te vergelijken" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "Project:" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "Gebruiker:" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "Wachtwoord:" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "Link naar VSS doelproject" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "Op alle items toepassen" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "Check-out" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "Opslaan als..." -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "Versiebeheersysteem" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "&Versiebeheersysteem:" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pad naar cleartool.exe:" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "Algemeen" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Automatisch naar eerste verschil gaan" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "Vensters met ESC sl&uiten" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Paden automatisch controleren in het venster Openen" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "Slechts één draaiende toepassing toestaan" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "Vragen bij &sluiten van meerdere vensters" -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "Behoud bestandstijd bij bestandsvergelijking" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Toon \"Bestanden of mappen selecteren\"-dialoog bij Opstarten" -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-aanvullen O&penen-venster:" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "" "WinMerge allows hiding some common messageboxes. Press the Reset button to " @@ -1703,658 +1482,629 @@ msgstr "" "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. " "Druk de Herstellen-knop om alle berichtvensters terug zichtbaar te maken." -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "Herstellen" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "Zoeken" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "Zoeke&n naar:" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "Alleen hele &woorden" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "Hoofdle&ttergevoelig" -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "Reguliere &expressies" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "Bij einde bestand st&oppen" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "&Volgende" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "Vervangen" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "Ver&vangen door:" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "Bij einde bestan&d stoppen" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "Vervangen in" -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "&Selectie" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "&Hele bestand" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "Ve&rvangen" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "&Alles vervangen" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "Check-out" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "Opmerkingen" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "CheckIn na checkout" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "Regelfilters" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "Regelfilters inschakelen" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguliere expressies (één per regel):" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "Nieuw" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "Bewerken" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "Verwijderen" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "Kleuren" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "Verschil:" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "Geselecteerd verschil:" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "Achtergrond" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "Verwijderd" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "Genegeerd verschil:" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "Verplaatst:" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "Geselecteerd verplaatst:" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "Woordverschil:" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "Geselect. woordverschil:" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "Standaard" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "Systeem" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Verwijderde bestanden naar de Prullenbak verplaat&sen" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "&Externe editor:" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "&Filter map:" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "Map met tijdelijke bestanden" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "Tijdelijke map van het systeem" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "Eigen map:" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "Patch generator" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "Bestand&1:" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "Bestand&2:" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "&Wisselen" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "Toevoegen &aan bestaand bestand" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "&Resultaat:" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "Zoe&ken" -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "&Formaat" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "St&ijl:" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "Lege regels o&verslaan" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "Inclusief opdrac&htregel" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "Openen in e&xterne editor" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "Kolommen weergeven" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "Verplaats omhoog" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "Verplaats omlaag" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "Uitpakker kiezen" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "Bestandsuitpakker:" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Alle uitpakkers weergeven zonder extensie te controleren" -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "Lijst extensies:" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "Beschrijving:" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "Stoppen" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "Items vergelijken..." -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "Items vergeleken:" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "Totaal aantal items:" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "Ga naar" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "G&a naar:" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "Bestand" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "Ga naar" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "Re&gel" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "&Verschil" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "&Ga naar" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "Vergelijken" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "Witruimte" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "&Vergelijken" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "&Wijzigingen negeren" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "Alles ne&geren" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "Lege regels negeren" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "N&iet hoofdlettergevoelig" -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "Detectie verplaatste blokken i&nschakelen" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "Laat gelijke lijnen overeenko&men" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "Filter-commentaar" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "&Accentueer syntax" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "&Automatisch opnieuw scannen" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "Be&waar originele regeleindes" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "Tabinstellingen" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "&Tabgrootte:" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "Tabs &invoegen" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "&Spaties invoegen" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "Kleur van regelverschillen" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "Bekijk regelverschillen" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "Tekenniveau" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "&Woordniveau:" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "Bestandsfilters" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "Installeren..." -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "Nieuw..." -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "Bewerken..." -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "Wissen" -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "Gewijzigde bestanden opslaan?" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "Linker bestand" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "Wijzigingen op&slaan" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "Wijzigingen ne&geren" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "Rechter bestand" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "Wijzigingen opsl&aan" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "Wijzigingen nege&ren" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "Tekenset" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "Standaard codetabel" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" "Selecteer de standaard veronderstelde codetabel bij laden van niet-" "Unicodebestanden:" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2363,692 +2113,679 @@ msgstr "" "Tekenset detecteren voor deze bestanden: .html, .rc, .xml \n" "Herstarten sessie noodzakelijk" -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "Tekenset van systeem" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "Volgens WinMerge-gebruikersinterface" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "Aangepaste tekenset:" -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "Opties" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr " Categorieën" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "Importeren..." -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "Exporteren..." -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "Dialoog" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "Sleutelwoorden:" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "Functienamen" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "Opmerkingen:" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "Nummers:" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "Operators:" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "Preprocessor:" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "Gebruiker 1:" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "Gebruiker 2:" -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "Vet" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "Mapvergelijkingsrapport" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "Rapporteer &bestand" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "Bladeren..." -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "&Stijl:" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "Naar klembord kopiëren" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "Gedeelde of persoonlijke filter" -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "Welk type filter wilt u maken?" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Gedeelde filter (voor alle gebruikers op deze pc)" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "Persoonlijke filter (alleen voor huidige gebruiker)" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "Archiefondersteuning" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "Archiefbestand-ondersteuning inschakelen" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "&Detecteer archieftype via bestandssignatuur" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "Vergelijkingsstatistieken" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "Mappen:" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "Bestanden:" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "Verschillend" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "Binair:" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "Uniek" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "Links:" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "Rechts:" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "Identiek" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "Totaal:" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "Sluiten" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "Aanpassingen" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "(Aanpassingen)" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "Selecteer codetabel voor" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "Bestanden laden:" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "Bestanden op&slaan:" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "Gebr&uik dezelfde codetabel voor beide" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "Toepassen" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "Annuleren" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "Filter testen" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "Filter testen..." -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "G&eef tekst op om te testen:" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "Mapnaam" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "Resultaat:" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "Sluiten" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "Aangepaste tekstkleuren gebr&uiken" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "Aangepaste tekstkleuren" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "Witruimte:" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "Gewone tekst:" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "Selectie:" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "Paden" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "All&een-lezen" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "&Alleen-lezen" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "Openen..." -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "Opslaan..." -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "Backupbestanden" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "Maak backupbestanden in:" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "Mappen vergelijken" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "B&estanden vergelijken" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "Maak backupbestanden binnen:" -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "Map van &origineel bestand" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "&Globale backupmap:" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "Bestandsnaam backup:" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr "Voeg .b&ak-extensie toe" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "Voeg tijdstem&pel toe" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "Kopiëren bevestigen" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Bent u zeker dat u XXX items wilt kopiëren?" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "Van links" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "Naar rechts" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "Nee" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "Plugins inschakelen" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "Shell-integratie" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "Verkenner" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "Geavanceerd me&nu inschakelen" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "Toevoegen &aan contextmenu" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "Map" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "S&top na eerste verschil" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Negeer tijdsverschillen kleiner dan 3 sec&onden" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "Limiet snelvergelijking (MB):" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "Binair" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "041304e4" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "0x413, 1252" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "UIT" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "OPN" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "Onbekende fout bij poging tot openen van projectbestand" -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "Onbekende fout bij poging tot opslaan van projectbestand" -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "Projectbestand" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "Projectbestand met succes geladen." -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "Projectbestand met succes opgeslagen." -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "" "\n" @@ -3067,7 +2804,7 @@ msgstr "" "WinMerge.BestandsVergelijking\n" "WinMerge BestandsVergelijking" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "" "\n" @@ -3086,7 +2823,7 @@ msgstr "" "WinMerge.MapVergelijking\n" "WinMerge MapVergelijking" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "" "Developers:\n" @@ -3097,7 +2834,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3108,138 +2845,137 @@ msgstr "" "herverdelen onder bepaalde omstandigheden; zie de GNU General Public License " "in het Help-menu voor details." -#: Merge.rc:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "&Afbreken" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "&Herhalen" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "&Negeren" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "&Alles negeren" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "Ja op &alles" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "&Nee" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "Nee op a&lles" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "&Doorgaan" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "&Overslaan" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "&Alles overslaan" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "Dit bericht niet &meer weergeven." -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "Deze &vraag niet meer stellen." -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "Versiebeheer" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "Verschillen" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "Naar:" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "Van links:" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "Naar links:" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "Van rechts:" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "Naar rechts:" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "Versie %1 - Nederlands" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "Opties (%1)" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle berichtvensters worden terug weergegeven." -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3250,32 +2986,32 @@ msgstr "" "\n" "Gebruik waarden 1 - %1." -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "Openen" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Uitvoerbare bestanden|*.exe;*.bat;*.cmd|Alle bestanden (*.*)|*.*||" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle bestanden (*.*)|*.*||" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projectbestanden (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Optie-bestanden (*.ini)|*.ini|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3284,54 +3020,52 @@ msgstr "" "Tekstbestanden (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle " "Bestanden (*.*)|*.*||" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "Naam" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "Locatie" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "Filters" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "Beschrijving" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "Selecteer bestandsnaam voor nieuwe filter" -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3344,7 +3078,7 @@ msgstr "" "Kopieer bestand %1 naar map WinMerge/Filters:\n" "%2." -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3357,7 +3091,7 @@ msgstr "" "\n" "Ga na of de map bestaat en schrijfbaar is." -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3368,7 +3102,7 @@ msgstr "" "\n" "Selecteer filtermap in Opties/Systeem." -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3381,12 +3115,12 @@ msgstr "" "\n" "Misschien is het bestand alleen-lezen?" -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "Localiseer te installeren filterbestand" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "" "Installing filter file failed.\n" @@ -3397,17 +3131,17 @@ msgstr "" "\n" "Kon nieuwe filter niet kopiëren naar filtermap." -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "Reguliere expressie" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3421,173 +3155,173 @@ msgstr "" "Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen " "later vernieuwen." -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pad naar SS.EXE:" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "Resultaten mapvergelijking" -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "Restultaten bestandsvergelijking" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "Geen titel links" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "Geen titel rechts" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "Hun bestand" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "Mijn bestand" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "Regel: %s" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "Samenvoegen" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "Verschil %1 van %2" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "%1 verschillen gevonden" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "Eén verschil gevonden" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "AL" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "Item %1 van %2" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "Items: %1" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "Selectie van mappen" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecteer twee mappen of bestanden om te vergelijken." -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "Linker pad is ongeldig!" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "Rechter pad is ongeldig!" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "Beide paden zijn ongeldig!" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen." -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "Kan geen bestand met een map vergelijken!" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "Bestand niet gevonden: %1" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "Bestand niet uitgepakt: %1" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "" "Cannot open file\n" @@ -3600,12 +3334,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "Analyseren van conflictbestand mislukt." -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "" "The file\n" @@ -3616,17 +3350,17 @@ msgstr "" "%1\n" "is geen conflictbestand." -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "Opslaan als" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "Wijzigingen opslaan in %1?" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3635,12 +3369,12 @@ msgstr "" "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand " "overschrijven? (Niet opslaan onder nieuwe naam.)" -#: Merge.rc:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "Fout bij het maken van een veiligheidskopie" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "" "Unable to backup original file:\n" @@ -3653,7 +3387,7 @@ msgstr "" "\n" "Toch doorgaan?" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, c-format msgid "" "Saving file failed.\n" @@ -3668,7 +3402,7 @@ msgstr "" "%2\n" "Wilt u het bestand onder een andere naam opslaan?" -#: Merge.rc:2256 +#: Merge.rc:3895053E #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3683,7 +3417,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2257 +#: Merge.rc:5A0BA2DF #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3698,7 +3432,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2258 +#: Merge.rc:78367A47 #, c-format msgid "" "Another application has updated file\n" @@ -3713,7 +3447,7 @@ msgstr "" "\n" "Het gewijzigde bestand overschrijven?" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "" "%1\n" @@ -3722,7 +3456,7 @@ msgstr "" "%1\n" "is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "" "Another application has updated file\n" @@ -3737,22 +3471,22 @@ msgstr "" "\n" "Wilt u het bestand opnieuw laden?" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "Linker bestand opslaan als" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "Rechter bestand opslaan als" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "" "The file\n" @@ -3763,7 +3497,7 @@ msgstr "" "%1\n" "is verdwenen. Sla een kopie van het bestand op om door te gaan." -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3774,7 +3508,7 @@ msgstr "" "\n" "Vernieuw documenten voordat u doorgaat." -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3783,12 +3517,12 @@ msgstr "" "U moet een SourceSafe project path specificeren voordat u verder kunt (bv: " "$/MyProject)" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "Bestanden vanuit VSS uitchecken..." -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -3797,12 +3531,12 @@ msgstr "" "SourceSafe gaf een foutmelding bij de check out van het bestand. Kan niet " "verder gaan..." -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht." -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -3811,17 +3545,17 @@ msgstr "" "De VSS werkmap en de lokatie van het huidige bestand komen niet overeen. " "Doorgaan?" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "Geen VSS database(s) gevonden!" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "Fout uit VSS:" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3832,7 +3566,7 @@ msgstr "" " Controleer configuratie-specificaties van de gebruikte weergave.\n" " Checkout ongedaan maken?" -#: Merge.rc:2284 +#: Merge.rc:1929D7D3 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3843,146 +3577,142 @@ msgstr "" "bestands-checkout.\n" " Controleer configuratie-specificaties van de gebruikte weergave." -#: Merge.rc:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "Geen" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 of lager)" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 en hoger)" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "Afbreken bij witruimte" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "Afbreken bij witruimte of interpunctie" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "Van rechts naar links (%1)" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "Van links naar rechts (%1)" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "Van links naar... (%1)" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "Van rechts naar... (%1)" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "Linkerkant - selecteer doelmap:" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "Rechterkant - selecteer doelmap:" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Bestanden Aangepast)" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 van %2 Bestanden Aangepast)" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3994,17 +3724,17 @@ msgstr "" "%1\n" "wilt verwijderen?" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "Bent u zeker dat u het volgende wilt kopiëren:" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Bent u zeker dat u %d items wilt kopiëren:" -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, c-format msgid "" "Operation aborted!\n" @@ -4023,457 +3753,457 @@ msgstr "" "\n" "Vernieuw a.u.b. de vergelijking." -#: Merge.rc:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "Bent u zeker dat u wilt verplaatsen:" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Bent u zeker dat u %d items wilt verplaatsen:" -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "Bevestig Verplaatsen" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "Uitvoeren externe editor mislukt: %1" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "Onbekend archiefformaat" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "Bestandsnaam" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "Vergelijkingsresultaat" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "Datum links" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "Datum rechts" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "Grootte links" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "Grootte rechts" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "Grootte rechts (Kort)" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "Grootte links (Kort)" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "Aanmaaktijd links" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "Aanmaaktijd rechts" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "Nieuwer bestand" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "Bestandsversie links" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "Bestandsversie rechts" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "Kort resultaat" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "Attributen links" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "Attributen rechts" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "Links regeleinde" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "Rechts regeleinde" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "Tekenset links" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "Tekenset rechts" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "Genegeerde Versch." -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "Kan bestanden niet vergelijken" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "Item afgebroken" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "Bestand overgeslagen" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "Map overgeslagen" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "Alleen links: %1" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "Alleen rechts: %1" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "Binaire bestanden zijn identiek" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "Binaire bestanden zijn niet gelijk" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "Bestanden zijn niet gelijk" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "Mappen zijn verschillend" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "Alleen links" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "Alleen rechts" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "Fout" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "Tekstbestanden zijn identiek" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "Tekstbestanden zijn verschillend" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "Verstreken tijd: %ld ms" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "1 item geselecteerd" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "%1 items geselecteerd" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "Bestandsnaam of mapnaam." -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "Naam van submap als submappen erbij horen." -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "Resultaat van vergelijking, lange vorm." -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "Wijzigingsdatum linker zijde." -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "Wijzigingsdatum rechter zijde." -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "Bestandsextensie." -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "Bestandsgrootte in bytes voor linker zijde." -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "Bestandsgrootte in bytes voor rechter zijde." -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "Linker bestandsgrootte ingekort." -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "Rechter bestandsgrootte ingekort." -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "Aanmaaktijdstip linker zijde." -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "Aanmaaktijdstip rechter zijde." -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "Geeft aan welke zijde het recentst gewijzigd is." -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bestandsversie linker zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Bestandsversie rechter zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "Kort vergelijkingsresultaat." -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "Attributen linker zijde." -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "Attributen rechter zijde." -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "Type regeleinde linker bestand" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "Type regeleinde rechter bestand" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "Tekenset linker zijde." -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "Tekenset rechter zijde." -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4482,7 +4212,7 @@ msgstr "" "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd " "door WinMerge en kunnen niet samengevoegd worden." -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "" "Number of differences in file. This number does not include ignored " @@ -4490,43 +4220,43 @@ msgid "" msgstr "" "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen." -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Toont sterretje (*) als het een binair bestand is." -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "%1 met %2 vergelijken" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "Komma-gescheiden lijst" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "Tab-gescheiden lijst" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "Simpele html" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "Simpele xml" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "Het rapportbestand bestaat reeds. Wilt u het bestaande bestand overschrijven?" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "" "Error creating the report:\n" @@ -4535,27 +4265,27 @@ msgstr "" "Fout bij maken van rapport:\n" "%1" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "Het rapport is met succes opgesteld." -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "Hetzelfde bestand is in beide vensters geopend." -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "De geselecteerde bestanden zijn identiek" -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "Fout opgetreden tijdens het vergelijken van de bestanden" -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4563,7 +4293,7 @@ msgstr "" "Tijdelijke bestanden konden niet aangemaakt worden. Controleer de instelling " "voor het pad van tijdelijke bestanden." -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4584,17 +4314,17 @@ msgstr "" "behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in " "de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)" -#: Merge.rc:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "De geselecteerde map is ongeldig." -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan geen binair bestand openen met de editor." -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4609,7 +4339,7 @@ msgstr "" "%1\n" "maken aan de andere kant en deze mappen openen?" -#: Merge.rc:2545 +#: Merge.rc:4A700AB0 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4625,152 +4355,152 @@ msgstr "" "Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel " "zijn (aangeraden)?" -#: Merge.rc:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "Geen verschil" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "Regelverschil" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 tekenreeks(en) vervangen." -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan tekenreeks \"%s\" niet vinden" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "Locatievenster" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "Verschilvenster" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "Patch-bestand met succes weggeschreven." -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "1ste item niet gevonden! (is het een map?)" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "2de item niet gevonden! (is het een map?)" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Het patch-bestand bestaat al. Wilt u het overschrijven?" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "[%1 bestanden geselecteerd]" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "Normaal" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "Verenigd" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "Kan niet schrijven naar bestand %1." -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "Specifieer een uitvoerbestand" -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan geen patch-bestand maken uit binaire bestanden." -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan geen patch-bestand maken uit mappen." -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "" "Please save all files first.\n" @@ -4782,12 +4512,12 @@ msgstr "" "Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in " "bestanden zijn." -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "Map bestaat niet." -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4801,37 +4531,37 @@ msgstr "" "Zie de handleiding voor meer info over archiefondersteuning en hoe het in te " "schakelen." -#: Merge.rc:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "Selecteer te exporteren bestand" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "Selecteer te importeren bestand" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "Opties geïmporteerd van bestand" -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "Opties geëxporteerd naar bestand." -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "Opties importeren van bestand mislukt." -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "Opties schrijven naar bestand mislukt." -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4843,117 +4573,117 @@ msgstr "" "\n" "Wilt u doorgaan?" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "Gemengd" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "Uitpakker" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "Voorvergelijken" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "Editor-script" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -4962,132 +4692,132 @@ msgstr "" "De overgenomen uitpakker wordt gebruikt voor beide bestanden (een bestand " "hoeft maar de extensie te hebben)" -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "Geen voorvergelijking (normaal)" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "Voorgestelde plug-ins" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "Andere plug-ins" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "Private Versie: %1" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "Plug-in instellingen" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH niet gevonden - .sct scripts uitgeschakeld" -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "G&a naar regel %1" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "Uitgeschakeld" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "Van bestandssysteem" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "Van MRU-lijst" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "Geen Markering" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "Draagbaar Object" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "Bronnen" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 4c0298274..d3f4d863e 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2016-01-17 17:29+0000\n" +"POT-Creation-Date: 2016-01-25 05:37+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -20,4747 +20,4477 @@ msgstr "" "X-Poedit-Basepath: ../../Src/\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "" -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "" -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "" -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "" -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "" -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "" -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "" -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "" -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "" -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "" -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, 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:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, 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." msgstr "" -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, 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:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, 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:2256 +#: Merge.rc:3895053E #, 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:2257 +#: Merge.rc:5A0BA2DF #, 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:2258 +#: Merge.rc:78367A47 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, 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:2284 +#: Merge.rc:1929D7D3 #, 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:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, 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:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, 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:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, 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:2545 +#: Merge.rc:4A700AB0 #, 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:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, 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:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index b98cac823..3c02e278c 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -28,2329 +28,2079 @@ msgstr "" "X-Poedit-Basepath: ../../Src/\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_FRENCH, SUBLANG_FRENCH" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "1252" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "Copier vers la &droite" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "Copier vers la &gauche" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "&Sélectionner la distinction" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "Ann&uler" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "&Rétablir" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "&Couper" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "Co&pier" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "Co&ller" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "&Atteindre..." -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "&Ouvrir" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "avec l'application &désignée" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "avec l'éditeur &externe" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "&avec..." -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "&Aucune" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "&Fichier" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "&Nouveau\tCtrl+N" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Ouvrir...\tCtrl+O" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "Ouvrir le fichier en conflit..." -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Ouvrir un &projet...\tCtrl+J" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "Enregistrer un Pro&jet..." -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "Projets récents" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "< Vide >" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "&Quitter" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "&Edition" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "&Préférences..." -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "&Affichage" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "Barre d'ou&tils" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "&Petite" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "&Grande" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "Barre d'&état" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "Barre d'&onglets" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "&Outils" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "&Filtrer..." -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "&Générer des retouches..." -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "&Plugiciels" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "Pré-comparaison &manuelle" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "Pré-comparaison &automatique" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "Décompression &manuelle" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "Décompression &automatique" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "&Recharger les plugiciels" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "Fe&nêtre" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "&Fermer" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "Fermer &tout" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "Chan&ger de volet\tF6" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "Mosaïque &horizontale" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "Mosaïque &verticale" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "&Cascade" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "A&ide" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Rubriques d'aide WinMerge\tF1" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "&Configuration" -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "&Licence publique générale GNU" -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "&A propos de WinMerge..." -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "Côté gauc&he lecture seulement" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "Côté droi&t lecture seulement" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "Sélectionner &tout\tCtrl+A" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "Fichiers &identiques" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "Fichiers &différents" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "Fichiers uniquement à &gauche" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "Fichiers uniquement à d&roite" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "Fichiers ig&norés" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "Fichiers &binaires" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "A&fficher les éléments cachés" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "Arborescence" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "Dilat&er tous les sous-répertoires" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "&Contracter tous les sous-répertoires" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "Choisir une &police..." -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "&Utiliser la police par défaut" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "&Intervertir les fenêtres" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "Statistiques de comparaison" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "&Actualiser\tF5" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualiser la &sélection\tCtrl+F5" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "Fu&sionner" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparer\tEnter" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Différence &suivante\tAlt+Down" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Différence &précédente\tAlt+Up" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "P&remière différence\tAlt+Home" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Différence &courante\tAlt+Enter" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Dernière différence\tAlt+End" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copier vers la dr&oite\tAlt+Right" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copier vers la ga&uche\tAlt+Left" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "Su&pprimer\tDel" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "&Ajuster les colonnes..." -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "Générer un &rapport..." -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "&Enregistrer\tCtrl+S" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "Enregistrer à &gauche" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "Enregistrer à &droite" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "&Imprimer..." -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "&Mise en page" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "&Aperçu avant impression" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "&Convertir les fins de ligne" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "Mode &Fusion\tF9" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "Encodage de fic&hier" -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "&Binaire" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Ann&uler\tCtrl+Z" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Rétablir\tCtrl+Y" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Couper\tCtrl+X" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "Cop&ier\tCtrl+C" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "Co&ller\tCtrl+V" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "&Sélectionner la distinction\tF4" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "Rec&hercher...\tCtrl+F" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Re&mplacer...\tCtrl+H" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "A&vancé" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copier avec des numéros de ligne\tCtrl+Shift+C" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "Si&gnets" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Placer ou &retirer un signet\tCtrl+F2" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "Signet &suivant\tF2" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Signet &précédent\tShift+F2" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "&Effacer tous les signets" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Atteindre...\tCtrl+G" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zoom a&vant\tCtrl++" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zoom a&rrière\tCtrl+-" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "&Coloration de la syntaxe" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "&Verrouiller les fenêtres" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "Afficher les &espaces" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "Afficher la &granularité des lignes" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "Afficher la &numérotation des lignes" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "Afficher les &marges" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "&Retour à la ligne automatique" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "&Détail des différences" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "Barre de locali&sation" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copier vers la droite et A&vancer\tAlt+Ctrl+Right" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copier vers la gauche et Av&ancer\tAlt+Ctrl+Left" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "Tout cop&ier vers la droite" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "Tout copi&er vers la gauche" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "&Pré-comparer" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "Appli&quer un script" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "Co&mparer" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "Co&mparer comme" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "De gauche à droite (%1 de %2)" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "De gauche vers... (%1 de %2)" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "De droite à gauche (%1 de %2)" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "De droite vers... (%1 de %2)" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "Dé&placer" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "&Supprimer" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "à &gauche" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "à &droite" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "des deu&x côtés" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "Re&nommer" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "D&issimuler l'élément(s)" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "Ouvrir à &gauche" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "Ouvrir à &droite" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "Copier le c&hemin complet" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "À gauche (%1 de %2)" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "À droite (%1 de %2)" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "Des deux côtés (%1 de %2)" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "Copier le nom de &fichier" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "Co&mpresser" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "&Actualiser" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "Menu explorateur gauche" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "Menu explorateur droit" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "Copier le c&hemin complet" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "Copier le nom de &fichier" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "Ajustements de pré-comparaison" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "Au&cun" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "Au&tomatique" -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "Atteindre la différence courante" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "&Ne pas afficher les blocs déplacés" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "&Afficher les blocs déplacés" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "Afficher le bloc déplacé de la différence &courante" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "Caractères d'&espacement" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "C&omparer" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "Ignorer les chan&gements" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "Ignorer &tout" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "Respecter la casse" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Ignorer les différences de &fin de ligne (Windows/Unix/Mac)" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "&Inclure les sous-répertoires" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "&Méthode de comparaison:" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "Contenu complet" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "Contenu rapide" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "Date de modification" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "Date et taille modifiée" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "Taille" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "A propos de WinMerge" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "(Compilation personnalisée)" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Découvrez la page d'accueil de WinMerge !" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "Contributeurs" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "Sélection des fichiers ou des répertoires..." -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "P&arcourir..." -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "Parc&ourir..." -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "P&arcourir..." -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "&Choisir..." -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "Décom&pres." -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "C&hoisir..." -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "Statut:" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "Ann&uler" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "Aide" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "Fichiers ou répertoires à comparer :" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "&Database:" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "&Projet:" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "Usa&ger:" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "&Mot de passe:" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "&Lien vers le projet destination VSS" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "&Appliquer à tous les éléments" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "E&xtraire" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "Enregis. &sous" -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "Contrôle de version" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "&Système utilisé:" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Chemin vers cleartool.exe:" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "Général" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Atteindre automatiquement la première différence" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fermer les fenêtres avec la &touche ESC" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Vérifier automatiquement les chemins de la fenêtre-Ouvrir" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "&Permettre une seule instance en exécution" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "&Confirmer la fermeture de plusieurs fenêtres" -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "Préserver le timbre horaire lors de comparaison de fichier" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Afficher la boîte de dialogue d'ouverture au démarrage" -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Remplissage de la boîte de dialogue d'ouverture:" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permet de dissimuler certaines boîtes de message. Appuyer sur ce bouton pour les rendre visibles à nouveau." -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "Rétablir" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "Rechercher" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "&Rechercher:" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "&Mot entier seulement" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "Respecter la &casse" -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "E&xpressions régulières" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "Pas de retour automatique à la ligne" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "&Suivant" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "Remplacer" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "Rem&placer par:" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "&Ne pas absorber la fin de ligne" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "Portée " -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "La sé&lection" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "Tout le &fichier" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "&Remplacer" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "&Tout Remplacer" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "&Extraire" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "Commentaires" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "Inscrire après extraction" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "Filtre des lignes" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "Activer le fitrage des lignes" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressions régulières (une par ligne)" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "Nouveau" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "Editer" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "Supprimer" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "Couleurs" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "Différence:" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "Différence sélectionnée :" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "Fond" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "Absence" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "Texte" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "Différence ignorée:" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "Déplacé:" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "Sélectionné et déplacé:" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "Mot différent:" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "Mot différent sélectionné:" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "Défauts" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "Système" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Envoyer les fichiers supprimés à la corbeille" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "E&diteur externe:" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "&Répertoire de filtre:" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "Répertoire des fichiers temporaires" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "Répertoire temporaire du système" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "Répertoire à identifier:" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "Générateur de retouche" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "Fichier&1:" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "Fichier&2:" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "&Intervertir" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "A&jouter au fichier existant" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "Ré&sultat:" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "Pa&rcourir..." -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "&Contexte:" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "Inclure la ligne de co&mmande" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "Ouvrir avec l'éditeur e&xterne" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "Affichage des colonnes" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "&Monter" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "&Descendre" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "Sélectionner le décompresseur" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "Décompresseur:" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Afficher tous les décompresseurs, ignorer les extensions" -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "Extensions:" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "Description:" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "Arrêter" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "Comparaison des éléments..." -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "Éléments comparés:" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "Éléments au total:" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "Atteindre" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "A&tteindre:" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "Fichier" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "Atteindre quoi" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "&Ligne" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "Di&fférence" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "&Atteindre" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "Comparaison" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "Caractères d'espacement" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "C&omparer" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "Ignorer les chan&gements" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "Ignorer &tout" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "Ignorer la ca&sse" -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "&Activer la détection des blocs déplacés" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "Assortir les &lignes similaires" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "Filtrer les commentaires" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "Éditeur" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "&Colorer la syntaxe" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "&Actualiser automatiquement" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "&Préserver les caractères de fin de ligne d'origine" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "Tabulations" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "Tai&lle des tabulations:" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "Insérer &tabulation" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "Insérer &espace" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "Colorer les différences de ligne" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "A&fficher les différences" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "Précision au &caractère" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "Précision au &mot" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "Caractères pour distinction de mot:" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "Filtre des fichiers" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "Installer..." -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "&Nouveau..." -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "É&diter..." -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "&Supprimer..." -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "Enregister les fichiers modifiés ?" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "Fichier du côté gauche" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "&Enregister les changements" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "&Ignorer les changements" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "Fichier du côté droit" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "E&nregister les changements" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "I&gnorer les changements" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "Ignorer tout" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "Page de code" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "Page de code par défaut" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Sélectionnez la page de code par défaut qui est assumé lors du chargement des fichiers non-Unicode:" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2359,692 +2109,679 @@ msgstr "" "&Détecter la page de code pour les fichiers : .html, .rc, .xml \n" "nécessite un redémarrage de session" -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "Page de code &système" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "Conformément à l'&interface usager WinMerge" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "Page de code sti&pulée :" -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "Préférences" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr " Catégories" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "Importer..." -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "Exporter..." -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "Dialogue" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "Mots clés:" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "Nom des Fonctions:" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "Commentaires:" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "Nombres:" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "Opérateurs:" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "Chaines:" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "Préprocesseur:" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "Usager 1:" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "Usager 2:" -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "Surbrillance" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "Répertoire du rapport de comparaison" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "Fichier du &rapport:" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "Parc&ourir..." -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "&Style:" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "&Copier au presse-papiers" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "Filtre partagé ou privé" -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "Quel type de filtre voulez-vous créer ?" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtre partagé (pour tous les usagers de l'odinateur)" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtre privé (pour l'usager actuel seulement)" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "Support d'archives" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "&Activer le support d'archives" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "&Détecter le type d'archives avec un fichier de signature" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "Statistiques de comparaison" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "Répertoires:" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "Fichiers:" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "Différent" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "Texte:" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "Binaire:" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "Unique" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "Gauche:" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "Droit:" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "Identique" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "Fermer" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "Affectations" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "(Concernés)" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "Sélectionner le code de page pour" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "&Chargement de fichier:" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "&Enregistrement de fichier:" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "&Utiliser le même pour les deux" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "&Appliquer" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "Ann&uler" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "Filtre de test" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "Tester le filtre ..." -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "&Saisir le texte à tester:" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "&Nom de répertoire" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "&Tester" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "&Fermer" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "&Utiliser les couleurs de texte ajustées" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "Couleurs de texte ajustées" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "Caractère espace:" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "Texte régulier:" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "Sélection:" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "Chemins" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "&Gauche:" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "Lecture seule" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "&Droite:" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "Lecture seule" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "&Filtre:" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "Ouvrir..." -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "Enregistrer..." -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "Fichiers d'archive" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "Créer les fichiers d'archive sous:" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "comparaison de Répert&oires" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "comparaison de &Fichiers" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "Créer les fichiers d'archive dans:" -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "&Répertoire d'&origine du fichier" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "Répertoire d'archive &global:" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "&Nom du fichier d'archive:" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr "Apposer une &extension .bak" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "Apposer une estampille &temporelle" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "Confirmation de copie" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Êtes-vous sûr de vouloir copier XXX éléments ?" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "De la gauche" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "Vers la droite" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "Oui" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "Non" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "Plugiciels" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "&Activer les plugiciels" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "Intégration à l'explorateur" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "Explorateur" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "&Activer le menu avancé" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "&Ajouter au menu contextuel" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "Répertoire" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "&Arrêter à la première différence" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "I&gnorer les différences de temps de moins de 3 secondes" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "&Inclure le contenu des répertoires uniques" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Limite de comparaison rapide (MO):" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "Binaire" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "040c04e4" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "0x40c, 1252" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "MAJ" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erreur indéterminée lors de l'ouverture du projet" -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "Erreur indéterminée lors de l'enregistrement du projet" -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "Fichier de projet" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "Fichiers du projet correctement chargés." -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "Fichiers du projet correctement enregistrés." -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "" "\n" @@ -3063,7 +2800,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "" "\n" @@ -3082,7 +2819,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "" "Developers:\n" @@ -3091,143 +2828,142 @@ msgstr "" "Développeurs:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, 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 "WinMerge est fourni SANS AUCUNE GARANTIE. C'est un logiciel libre et vous êtes invité à le redistribuer sous certaines conditions; Voir la licence publique générale GNU au menu d'aide pour tous les détails." -#: Merge.rc:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "&Avorter" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "&Réessayer" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "Ignorer &tout" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "&Oui" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "Oui pour &tout" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "Non pour t&out" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "&Continuer" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "&Ignorer" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "Ignorer &tout" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "Ne plus afficher ce &message." -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "Ne plus poser cette &question." -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "Syntaxe" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "Contrôle de version" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "Différences" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "Vers:" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "De la gauche:" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "Vers la gauche:" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "De la droite:" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "Vers la droite:" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "Version %1 - Français" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "Préférences (%1)" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "Tous les messages seront réaffichés." -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3237,84 +2973,82 @@ msgstr "La valeur de la taille des tabulations n'entre pas dans la plage accept "\n" "Voici la plage des valeurs acceptées 1 - %1." -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "Ouvrir" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmes|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fichiers d'options (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fichiers texte (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "Emplacement" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "Description" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "Sélectionner un nom de fichier pour le nouveau filtre" -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3327,7 +3061,7 @@ msgstr "" "Veuillez copier le fichier %1 dans WinMerge/Répertoire des filtres:\n" "%2." -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3340,7 +3074,7 @@ msgstr "" "\n" "Veuillez vous assurer de l'existance du répertore et qu'il soit inscriptible." -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3351,7 +3085,7 @@ msgstr "" "\n" "Veuillez le définir sous Préférences/Système." -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3364,12 +3098,12 @@ msgstr "" "\n" "Cause probable: fichier en lecture seule?" -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "Localiser le fichier de filtre à installer" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "" "Installing filter file failed.\n" @@ -3380,17 +3114,17 @@ msgstr "" "\n" "Ne peut copier le nouveau fichier de filtre au répertoire de filtre." -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Le fichier de filtre existe déjà. Écraser le filtre existant?" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "Expression régulière" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3401,173 +3135,173 @@ msgstr "" "\n" "Si vous ne voulez pas actualiser la comparaison. Sélectionnez Non et l'actualisation se fera plus tard." -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "&Chemin vers SS.EXE:" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "Résultats de la comparaison des répertoires" -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "Comparaison de fichiers" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "Sans titre à gauche" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "Sans titre à droite" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "Leur fichier" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "Mon fichier" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "Ligne: %s" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "Fusion" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "Différence %1 de %2" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "%1 Différences trouvées" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "1 Différence trouvée" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "LS" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "Élément %1 de %2" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "Élément: %1" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "Comparez deux fichiers ou deux répertoires !" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "Sélection de répertoire" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "Sélectionner deux répertoires ou deux fichiers à comparer" -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "Le chemin de gauche est invalide !" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "Le chemin de droite est invalide !" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "Les deux chemins sont invalides !" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Choisissez deux fichiers pour activer la sélection du décompresseur." -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "Ne peut comparer un fichier et un répertoire !" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "Fichier %1 non trouvé" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "Fichier non décompressé : %1" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "" "Cannot open file\n" @@ -3580,12 +3314,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "L'analyse du fichier en conflit a échoué." -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "" "The file\n" @@ -3596,27 +3330,27 @@ msgstr "" "%1\n" "n'est pas un fichier en conflit." -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "Enregistrer sous" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "Enregistrer les changements de %1 ?" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, 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 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)" -#: Merge.rc:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "Erreur durant la prise de fichiers d'archive" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "" "Unable to backup original file:\n" @@ -3629,7 +3363,7 @@ msgstr "" "\n" "Continuer quand même ?" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, c-format msgid "" "Saving file failed.\n" @@ -3646,7 +3380,7 @@ msgstr "" "\t-utiliser un nom autre nom de fichier (Ok)\n" "\t-avorter l'opération en cours (Annuler)?" -#: Merge.rc:2256 +#: Merge.rc:3895053E #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3661,7 +3395,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2257 +#: Merge.rc:5A0BA2DF #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3676,7 +3410,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2258 +#: Merge.rc:78367A47 #, c-format msgid "" "Another application has updated file\n" @@ -3691,7 +3425,7 @@ msgstr "" "\n" "Voulez-vous écraser le fichier mis à jour ?" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "" "%1\n" @@ -3700,7 +3434,7 @@ msgstr "" "%1\n" "est en lecture seule. Voulez-vous outrepasser ?" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "" "Another application has updated file\n" @@ -3715,22 +3449,22 @@ msgstr "" "\n" "Voulez-vous actualiser le fichier?" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "Enregistrer le fichier de gauche sous" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "Enregistrer le fichier de droite sous" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "" "The file\n" @@ -3741,7 +3475,7 @@ msgstr "" "%1\n" "a disparu. Veuillez enregistrer une copie du fichier pour continuer." -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3752,42 +3486,42 @@ msgstr "" "\n" "Actualiser les documents avant de poursuivre." -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Vous dever indiquer un chemin d'accès au projet SourceSafe afin de pouvoir continuer (par ex. : $/MonProjet)" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "Extraire les fichiers de VSS..." -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier. Ne peut continuer..." -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "Erreur d'exécution d'une commande du système de contrôle de version." -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Le répertoire de travail de VSS et l'emplacement du fichier courant ne correspondent pas. Continuer ?" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "Aucune base de données de VSS trouvée !" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "Erreur de VSS:" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3798,7 +3532,7 @@ msgstr "" " Veuillez vérifier la configuration.\n" " Annuler l'operation d'extraction?" -#: Merge.rc:2284 +#: Merge.rc:1929D7D3 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3807,146 +3541,142 @@ msgstr "" "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier.\n" " Veuillez vérifier la configuration. " -#: Merge.rc:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "Aucun" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inférieur à 5.0)" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 et supérieur)" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "Distinguer sur espacement" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "Distinguer sur espacement ou ponctuation" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "De droite à gauche (%1)" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "De gauche à droite (%1)" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "De gauche vers... (%1)" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "De droite vers... (%1)" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "À gauche (%1)" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "À droite (%1)" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "Des deux côtés (%1)" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "Côté gauche - choisir répertoire de destination:" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "Côté droit - choisir répertoire de destination:" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Fichiers concernés)" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Fichiers concernés)" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3957,17 +3687,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "Voulez-vous vraiment copier:" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Voulez-vous vraiment copier %d éléments:" -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, c-format msgid "" "Operation aborted!\n" @@ -3986,502 +3716,502 @@ msgstr "" "\n" "Veuillez actualiser la comparaison." -#: Merge.rc:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "Êtes-vous sûr de vouloir déplacer:" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Êtes-vous sûr de vouloir déplacer %d éléments:" -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "Confirmez le déplacement" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "Lancement de l'éditeur externe a échoué: %1" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "Format d'archives inconnu" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "Nom du fichier" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "Résultat de la comparaison" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "Date mod. gauche" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "Date mod. droite" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "Extension" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "Taille gauche" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "Taille droite" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "Taille droite (abrégée)" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "Taille gauche (abrégée)" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "Date cré. gauche" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "Date cré. droit" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "Plus récent" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "Version gauche" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "Version droite" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "Résultat" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "Attributs gauches" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "Attributs droits" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "Fin de ligne gauche" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "Fin de ligne droit" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "Page de code gauche" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "Page de code droite" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "Différences ignorées" -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "Impossible de comparer les fichiers" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "Élément abandonné" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "Fichier ignoré" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "Répertoire ignoré" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "Juste à gauche: %1" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "Juste à droite: %1" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "Les fichiers binaires sont identiques" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "Les fichiers binaires sont différents" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "Les fichiers sont différents" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "Les répertoires sont différents" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "Juste à gauche" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "Juste à droite" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "Erreur" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "Les fichiers de texte sont identiques" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "Les fichiers de texte sont différents" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps écoulé: %ld ms" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "1 élément sélectionné" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "%1 éléments sélectionnés" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "Nom de fichier ou de répertoire." -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom du sous-répertoire lorsque ceux-ci sont inclus." -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparison, format étendu." -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "Date de modification du côté gauche." -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "Date de modification du côté droit." -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "Extension du fichier." -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "Taille du fichier du côté gauche en octets." -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "Taille du fichier du côté droit en octets." -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "Taille du fichier du côté gauche abrégée." -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "Taille du fichier du côté droit abrégée." -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "Date de creation du côté gauche." -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "Date de creation du côté droit." -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "Indique le côté ayant la date de modification la plus récente." -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Version du fichier du côté gauche, certains fichiers seulement." -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Version du fichier du côté droit, certains fichiers seulement." -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "Resultat de la comparison, format abrégé." -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "Attributs du côté gauche." -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "Attributs du côté droit." -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "Type de fin de ligne du côté gauche" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "Type de fin de ligne du côté droit" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "Page de code du côté gauche." -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "Page de code du côté droit." -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nombre total des différences. Elles sont ignorées par WinMerge et ne peuvent être fusionnées." -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nombre de différences à l'exclusion de celles ignorées." -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Indique un astérisque (*) si le fichier est binaire." -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "Comparer %1 avec %2" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "Liste délimitée par des virgules" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "Liste délimitée par des tabulations" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "Format HTML" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "Format XML" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Le rapport existe déjà. Voulez-vous écraser le fichier existant?" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "" "Error creating the report:\n" @@ -4490,32 +4220,32 @@ msgstr "" "Erreur à la création du rapport:\n" "%1" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "Le rapport a été créé avec succès." -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "Le même fichier est ouvert dans les deux volets." -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "Les fichiers sélectionnés sont identiques." -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "Erreur lors de la comparaison des fichiers." -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Des fichiers temporaires ne peuvent être créés. Vérifiez la définition du chemin temporaire." -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4530,17 +4260,17 @@ msgstr "" "\n" "Notez bien: Si vous voulez toujours considérer une telle égalité. Définnissez l'option: Ignorer les différences de fin de ligne à la fenêtre des Préférences sous l'onglet Comparaison (accessible avec le menu Edition/Préférences)." -#: Merge.rc:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "Le répertoire sélectionné est invalide." -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne peut ouvrir un fichier binaire avec l'éditeur." -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4555,7 +4285,7 @@ msgstr "" "%1\n" "à l'autre côté et ouvrir ces répertoires" -#: Merge.rc:2545 +#: Merge.rc:4A700AB0 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4566,152 +4296,152 @@ msgstr "" "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n" "Désirez-vous traiter les deux fichiers avec la page de code windows par défaut (recommandé)?" -#: Merge.rc:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information perdue à cause d'erreurs d'encodage: pour les deux fichiers" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "Aucune différence" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "Ligne différente" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 remplacement(s) effectué(s)." -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "Texte non trouvé \"%s\"" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "Barre de localisation" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "Détail des différences" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "Fichier de retouche écrit avec succès." -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "1. élément non trouvé ou il s'agit d'un répertoire !" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "2. élément non trouvé ou il s'agit d'un répertoire !" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Le fichier de retouche existe déja. Voulez-vous l'écraser ?" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "[%1 fichiers sélectionnés]" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "Contexte" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "Unifié" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "Ne peut écrire au fichier %1." -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Le chemin spécifié n'est pas un chemin absolu: %1" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "Indiquez un fichier de sortie" -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne peut créer un fichier de retouche depuis un fichier binaire." -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne peut créer un fichier de retouche depuis des répertoires." -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "" "Please save all files first.\n" @@ -4722,12 +4452,12 @@ msgstr "" "\n" "Générer une retouche requiert l'état non modifié des fichiers." -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "Le répertoire n'existe pas." -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4738,37 +4468,37 @@ msgstr "" "Tous les composants requis (7-zip et/ou Merge7z*.dll) pour le support d'archives ne peuvent être trouvés.\n" "Consulter la documentation au sujet du support d'archives indiquant comment l'activer." -#: Merge.rc:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "Sélectionner le fichier pour exportation" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "Sélectionner le fichier pour importation" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "Préférences importées du fichier." -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "Préférences exportées au fichier." -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "L'importation (lecture) du fichier des préférences a échoué." -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "L'exportation (écriture) du fichier des préférences a échoué." -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4779,247 +4509,247 @@ msgstr "" "\n" "Voulez-vous continuer ?" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "Combiné" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "Décompresseur" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "Pré-comparaison" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "Éditeur de script" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Appliquer automatiquement le décompresseur approprié (basé sur l'extension d'au moins un des deux fichiers)" -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "Pas de pré-comparaison (normal)" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "Plugiciels suggérés" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "Plugiciels autres" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "Compilation personnelle: %1" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "Ajuster les plugiciels" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH pas trouvé - .sct les scripts sont désactivés" -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "Atteindre la ligne %1" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "Désactivé" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "A partir du système de fichier" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "A partir de la liste des fichiers récents" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "Pas de surbrillance" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "Objet portatif" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "Ressources" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index c8a4fbdcd..301e0910f 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -24,2329 +24,2079 @@ msgstr "" "X-Poedit-Basepath: ../../Src/\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_GALICIAN, SUBLANG_DEFAULT" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "1252" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "C&opiar para a dereita" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "Cop&iar para a esquerda" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "&Seleccionar diferenzas de liña" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "&Desfacer" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "&Refacer" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "Cor&tar" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "&Copiar" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "&Colar" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "&Ir a..." -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "&Abrir" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "coa Aplicación &Rexistrada" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "cun &Editor Externo" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "&con..." -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "&Ningunha" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "&Arquivo" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "Abrir Arquivo de C&onflito..." -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&xecto...\tCtrl+J" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "Gar&dar Proxecto..." -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "Proxectos recentes" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "< Baleiro >" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "Saír" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "&Editar" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "&Opcións..." -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "&Ver" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "Ba&rra de ferramentas" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "&Pequena" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "&Grande" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "&Barra de estado" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "&Barra de pestanas" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "&Ferramentas" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "&Filtros..." -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "&Xerar Patch..." -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "&Plugins" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "&Desempaquetado manual" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "&Desempaquetado automático" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "&Recargar plugins" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "&Fiestra" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "Pe&char" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "Pe&char todo" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "Trocar o &panel\tF6" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &horizontalmente" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &verticalmente" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "&En fervenza" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "&Axuda" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "Axuda do &WinMerge\tF1" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "C&onfiguración..." -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "Licenza Pública Xeral &GNU..." -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "&Acerca de WinMerge..." -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "Banda esquerda só lectura" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "Banda dereita só lectura" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "Seleccion&ar todo\tCtrl+A" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "Amosar os elementos &idénticos" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "Amosar os elementos &diferentes" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "Amosar &elementos únicos da esquerda" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "Amosar e&lementos únicos da dereita" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "Amosar os elementos saltados" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "Amosar os arq&uivos binarios" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "Amosar os elementos ocu<os" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "&Modo Árbore" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "E&xpandir Todos os Subcartafoles" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "&Colapsar Todos os Subcartafoles" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "Escoller &fonte..." -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "Empregar fonte pr&edefinida" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "In&tercambiar paneis" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "Estadístic&as da comparación" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "Refre&scar\tF5" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Refrescar seleccionados\tCtrl+F5" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "&Combinar" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tIntro" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Segui&nte diferenza\tAlt+Down" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferenza &previa\tAlt+Up" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primeira diferenza\tAlt+Home" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferenza a&ctual\tAlt+Intro" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Derradeira diferenza\tAlt+End" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copia&r para a dereita\tAlt+Dereita" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar para a &esquerda\tAlt+Esquerda" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "&Borrar\tDel" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "Personalizar &columnas..." -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "Xera&r informe..." -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "&Gardar\tCtrl+S" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "Gardar banda esquerda" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "Gardar banda &dereita" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "Con&figuración da páxina" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "Vista previa da impresión" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "&Converter quebras de liña a" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modo Combinar\tF9" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "Codificación do ar&quivo" -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfacer\tCtrl+Z" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refacer\tCtrl+Y" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Cor&tar\tCtrl+X" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar &diferenzas de liña\tF4" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "Pr&ocurar...\tCtrl+F" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Substituí&r...\tCtrl+H" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "Avanzado" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar cos números de liña\tCtrl+Shift+C" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Cambiar marcador\tCtrl+F2" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Seguinte marcador\tF2" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Marcador anterior\tShift+F2" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "&Borrar todos os marcadores" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir a...\tCtrl+G" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Aumentar\tCtrl++" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Reducir\tCtrl+-" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "Resaltar sintaxe" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "B&loquear Paneis" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "&Ver espazos en branco" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "Ve&r diferenzas de liña" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "Ver os números de liña" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "Ver as &marxes" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "A&xuste de liñas" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "Panel de &diferenzas" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "Pane&l de situación" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a dereita e avanzar\tAlt+Ctrl+Dereita" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "C&opiar para a esquerda e avanzar\tAlt+Ctrl+Esquerda" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "Copiar todo ¶ a dereita" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "Cop&iar todo para a esquerda" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "&Pre-comparación" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "Compa&rar" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da esquerda para a dereita (%1 de %2)" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "Banda esquerda a...(%1 de %2)" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da dereita para a esquerda (%1 de %2)" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "Banda dereita a...(%1 de %2)" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "&Mover" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "&Borrar" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "&Esquerda" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "&Dereita" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "&Agochar elementos" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "&Abrir arquivo esquerdo" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "&Abrir arquivo dereito" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&iar nomes de camiño" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de %2)" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "Dereita (%1 de %2)" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "Ambas as bandas (%1 de %2)" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "Copiar &nomes dos arquivos" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "&Actualizar" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "Menú Shell Esquerdo" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "Menú Shell Dereito" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "&Copiar o camiño completo" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "Copiar o nome do &arquivo" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "Configuración da pre-comparación" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "&Sen pre-comparación" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "Pre-comparación autom." -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "Ir ¶ a diferenza" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "&Non mostrar bloques movidos" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "&Mostrar todos os bloques movidos" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "Amosar bloques movidos desde a &diferenza actual" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "Es&pazos en branco" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "I&gnorar trocos" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "Ig&norar todo" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "Diferenciar maiúsculas/minúsculas" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferenzas nas quebras de liña (Windows/Unix/Mac)" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "&Incluíndo sub-cartafoles" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "Contidos completos" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "Contidos rápidos" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "Data de modificación" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "Data de modificación e tamaño" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "Tamaño" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "Acerca de Winmerge" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visita a Web Oficial de WinMerge!" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "Aceptar" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "Seleccionar arquivos ou cartafoles" -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "&Explorar..." -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "Explo&rar..." -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "Pro&curar..." -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "&Desempaquetador:" -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "&Seleccionar..." -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "Axuda" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou cartafoles a comparar" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "Base de datos" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "Proxecto:" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "Usuario:" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "Seña:" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "Ligazón ao proxecto VSS de destino" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "Aplicar a tódos os elementos" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "Desprotexer" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "Gardar como..." -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "Sistema de versionado" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "&Sistema de versionado:" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Camiño a cleartool.exe:" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "Xeral" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "Ir &automaticamente á primeira diferenza" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "Pechar as fiestras con ESC" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verificar automaticamente os camiños no diálogo Abrir" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "Per&mitir só unha instancia en curso" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "Pr&eguntar antes de pechar varias fiestras" -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preservar data e hora do arquivo nas comparacións de ficheiros" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Amosar o Diálogo \"Selecciona Arquivos ou Cartafoles\" no Inicio " -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-completar diálogo de apertura:" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ocultar algunhas caixas de mensaxes de uso frecuente. Preme o botón Restaurar para facer visibles todas as mensaxes outra vez." -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "Restaurar" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "Procurar" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "&Procurar:" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "Só se coinci&de toda a palabra" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "&Coincidir maiúsc./minúsc." -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "&Expresión Regular" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "N&on sobrepasar o remate do arquivo" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "&Procurar seguinte" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "&Aceptar" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "Substituír" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "Substituír con:" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "&Non sobrepasar o remate do arquivo" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "Substituír en" -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "&Selección" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "Ar&quivo completo" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "&Substituír" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "Substituír &todo" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "Desprotexer" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "Comentarios" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "Protexer despois de desprotexer" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "Filtros de liña" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "Activar filtros de liña" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresións Regulares (unha por liña):" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "Eliminar" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "Diferenza:" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "Diferenzas seleccionadas:" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "Fondo" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "Borrado" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "Diferenzas ignoradas:" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "Movidas:" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "Seleccionadas movidas:" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "Diferenza de palabra:" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "Diferenza de palabra seleccionada:" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "Predeterminados" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos eliminados para o lixo" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "&Cartafol de filtros:" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "Cartafol de arquivos temporais" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "Cartafol temporal do s&istema" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "Ca&rtafol personalizado:" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "Xerador de Patchs" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "&Cambiar" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "Procu&rar..." -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "Est&ilo" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar liñas en branco" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "Inclu&ír liña de comandos" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "Abrir nun e&ditor externo" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "Amosar columnas" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "Mover E&nriba" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "Mover E&mbaixo" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "Seleccionar desempaquetador" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "Desempaquetador de arquivos:" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Amosar todos os desempaquetadores, non verificar a extensión" -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "Listaxe de extensións:" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "Descrición:" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "A comparar elementos..." -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "Elementos comparados:" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "Total de elementos:" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "Ir a" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "Ir &a:" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "Ir á" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "Li&ña" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "&Diferenza" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "&Ir a" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "Espazo en branco" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "&Ignorar trocos" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "&Ignorar todo" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar &liñas en branco" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "Ignorar maiúsc/minús." -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "A&ctivar detección de bloques movidos" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "&Combinar as liñas semellantes" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "Filtrar comentarios" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "&Resaltar a sintaxe" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneo automático" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "&Conservar os caracteres orixinais EOL" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "Tabulacións" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "&Tamaño da tabulación:" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "&Inserir tabulacións" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "Inserir &espazos" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "Colorar as diferenzas de liña" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "Ver diferenzas de liña" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "&A nivel do caracter" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "&A nivel da palabra:" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "Filtros de arquivos" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "Testar" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "Borrar..." -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "Queres gardar os arquivos modificados?" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "Arquivo da esquerda" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "&Gardar trocos" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "&Desbotar trocos" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "Arquivo da dereita" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "G&ardar trocos" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "Desbo&tar trocos" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "Páxina de códigos" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "Páxina de códigos predeterminada" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecciona a páxina de códigos predeterminada cando se carguen arquivos non-Unicode:" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2355,693 +2105,680 @@ msgstr "" "Detectar a información de páxina de códigos para estes arquivos: .html, .rc, .xml \n" "Precísase reiniciar a sesión" -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "Páxina de códigos do sistema" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "Igual á que emprega a interface de usuario de Winmerge" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "Páxina de códigos á medida: " -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "Opcións" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr "Categorías" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "Palabras chave:" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "Nomes das funcións:" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "Comentarios:" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "Números:" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "Cadeas:" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "Pre-procesador:" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "Usuario 1:" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "Usuario 2:" # Esta tradución atopeina no corpus lingüístico do Open Office, en mancomun.org -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "Negra" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "Informe da comparación de cartafoles" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "Arquivo do &Informe" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "Explorar..." -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para o portapapeis" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "Filtro privado ou compartido" -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro queres crear?" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro compartido (para todos os usuarios desta máquina)" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (só para o usuario actual)" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "Soporte de Arquivos" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "&Activar o soporte de arquivos" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo pola sinatura" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "Estadísticas da comparación" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "Cartafoles:" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "Binario:" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "Único" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "Dereita" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "Iguais" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "Pechar" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "Afecta" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "Selecciona a páxina de códigos para" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "&Cargar o arquivo:" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "Gardar o &arquivo:" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "&Empregar a mesma páxina de códigos para ambas" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "Probar filtro" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "Probando filtro..." -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "&Inserir texto para probar:" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "&Nome do cartafol" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "&Probar" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "&Pechar" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "&Empregar cores de texto personalizadas" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "Espazo en branco:" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "Texto normal" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "Selección:" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "Camiños" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "&Esquerda" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "S&ó lectura" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "&Dereita" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "Só l&ectura" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "Gardar..." -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "Copias de seguridade(backups)" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "Crear copias de seguridade na:" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "Comparación de carta&foles" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "Comparación de arq&uivos" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "Crear as copias de seguridade no: " -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "&Cartafol orixinal do arquivo" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "&Cartafol das copias de seguridade:" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de seguridade" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar extensión .bak" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "&Engadir etiqueta coa data" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Estás seguro de querer copiar XXX elementos?" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "Desde a esquerda" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "Para a dereita" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "Si" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "Non" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "&Activar plugins" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "Integración na Shell" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "Explorador" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "Ac&tivar menú avanzado" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "Eng&adir ao menú de contexto" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "Cartafol" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "P&arar despois da primeira diferenza" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ig&norar diferenzas de tempo inferiores a 3 segundos" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "0x409, 1252" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro descoñecido ao tentar abrir o arquivo do proxecto" -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro descoñecido ao tentar gardar o arquivo do proxecto" -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "Arquivo do proxecto" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "O arquivo do proxecto cargouse correctamente." -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "O arquivo do proxecto gardouse correctamente." -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "" "\n" @@ -3060,7 +2797,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "" "\n" @@ -3079,7 +2816,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "" "Developers:\n" @@ -3088,143 +2825,142 @@ msgstr "" "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, 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 "WinMerge ofrécese sen GARANTÍA DE NINGUNHA CLASE. Este programa é software ceibe e animámoste a distribuílo baixo certas condicións; mira a Licenza Pública Xeral GNU no menú de Axuda para atopar máis información." -#: Merge.rc:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "Ignorar &todo" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "&Si" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "Si a &todo" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "&Non a todo" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "&Saltar" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "S&altar todo" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "Non amosar esta &mensaxe de novo." -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "Non preguntar &isto de novo." -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "Control de versións" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "Diferenzas" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "Dende a esquerda:" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "Dende a dereita:" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "Para a dereita:" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "Versión %1" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "Opcións (%1)" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensaxes amosaranse outra vez." -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3235,84 +2971,82 @@ msgstr "" "\n" "Emprega valores entre 1 e %1" -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos do proxecto de WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos de opcións (*.ini)|*.ini|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os arquivos(*.*)|*.*||" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "Localización" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "Descrición" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "Escoller un nome de arquivo para o filtro novo " -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos arquivos (*.flt)|*.flt|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3325,7 +3059,7 @@ msgstr "" "Copia o arquivo %1 ao cartafol de filtros:\n" "%2" -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3338,7 +3072,7 @@ msgstr "" "\n" "Asegúrate de que existe o cartafol e de que é escribible." -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3349,7 +3083,7 @@ msgstr "" "\n" "Escolle un cartafol de filtros en Opcións/Sistema." -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3362,12 +3096,12 @@ msgstr "" "\n" "Comprobe se o arquivo é do só-lectura." -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "Procurar arquivo de filtros para instalar" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "" "Installing filter file failed.\n" @@ -3378,17 +3112,17 @@ msgstr "" "\n" "Non se poden copiar novos filtros ao cartafol de filtros." -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo de filtros xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "Expresión regular" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3399,173 +3133,173 @@ msgstr "" "\n" "Se non queres regargar todas as comparacións agora podes seleccionar Non e actualizalas máis adiante." -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "&Ruta ao SS.EXE:" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da comparación dos cartafoles " -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "Comparación de arquivos" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "Cadro esquerdo sen título" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "Cadro dereito sen título" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "O Meu Arquivo" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "Liña: %s" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "Diferenza %1 de %2" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenzas atopadas" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "1 diferenza atopada" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 de %2" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "Escolle dous cartafoles ou arquivos para comparar" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "Selección de cartafol" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "Escolle dous cartafoles ou arquivos para comparar." -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "O camiño esquerdo non é válido!" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "O camiño dereito non é válido!" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os camiños non son válidos!" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolle dous arquivos para activar a selección de desempaquetador." -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "Non se pode comparar un arquivo cun cartafol!" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "No se atopou o arquivo: %1" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "O arquivo non está desempaquetado: %1" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "" "Cannot open file\n" @@ -3578,12 +3312,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "Fallo na análise interpretativa do arquivo de conflito." -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "" "The file\n" @@ -3594,27 +3328,27 @@ msgstr "" "%1\n" "non é un arquivo de conflito." -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "Gardar como" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "Queres gardar os cambios en %1?" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, 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 está definido como de só-lectura. Queres sobre-escribilo? (Non gardar cun nome de arquivo novo.)" -#: Merge.rc:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "Erro ao facer unha copia de seguridade do arquivo" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "" "Unable to backup original file:\n" @@ -3627,7 +3361,7 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, c-format msgid "" "Saving file failed.\n" @@ -3644,7 +3378,7 @@ msgstr "" "\t-usar un nome de arquivo distinto (preme Aceptar)\n" "\t-abortar a operación (preme Abortar)?" -#: Merge.rc:2256 +#: Merge.rc:3895053E #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3659,7 +3393,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2257 +#: Merge.rc:5A0BA2DF #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3674,7 +3408,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2258 +#: Merge.rc:78367A47 #, c-format msgid "" "Another application has updated file\n" @@ -3689,7 +3423,7 @@ msgstr "" "\n" "Queres sobre-escribir o arquivo cambiado?" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "" "%1\n" @@ -3698,7 +3432,7 @@ msgstr "" "%1\n" " está marcado como de só-lectura. Queres sobre-escribir o elemento?" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "" "Another application has updated file\n" @@ -3713,27 +3447,27 @@ msgstr "" "\n" "Queres recargar o arquivo?" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "Gardar o arquivo esquerdo como" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "Gardar o arquivo dereito como" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3744,42 +3478,42 @@ msgstr "" "\n" "Actualizar os documentos antes de seguir." -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Debes especificar o camiño do proxecto SourceSafe para continuar (p.e:$/ProxectoMeu)" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "Desprotexer arquivos de VSS..." -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O Sistema de Versionado devolveu un erro mentres se intentaba desprotexer o arquivo. Imposible proseguir..." -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar un comando no sistema de versionado" -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "O cartafol de traballo VSS e a localización do arquivo actual non coinciden. Queres continuar?" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "Non se atopou banco de datos VSS ningún" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "Erro de VSS:" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3790,7 +3524,7 @@ msgstr "" "Comproba a configuración da visualización.\n" "Queres anular a operación de desprotección?" -#: Merge.rc:2284 +#: Merge.rc:1929D7D3 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3799,146 +3533,142 @@ msgstr "" "O sistema de versionado devolveu un erro ao intentar desfacer a desprotección do arquivo.\n" "Comproba a configuración da visualización." -#: Merge.rc:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "Ningún" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior de 5.0)" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiores)" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "Parar no espazo en branco" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "Parar en espazo en branco ou puntuación" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "Da dereita para a esquerda (%1)" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "Da esquerda para a dereita(%1)" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "Banda esquerda a...(%1)" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "Banda dereita a...(%1)" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "Dereita (%1)" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "Ambas (%1)" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "Banda esquerda - escoller cartafol de destino:" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "Banda dereita - escoller cartafol de destino:" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "(%1 arquivos afectados)" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 arquivos afectados)" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3949,17 +3679,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "Tes a certeza de quereres copiar:" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Tes a certeza de quereres copiar %d elementos: " -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, c-format msgid "" "Operation aborted!\n" @@ -3978,534 +3708,534 @@ msgstr "" "\n" "Actualiza a comparación. " -#: Merge.rc:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "Tes a certeza de quereres mover:" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Tes a certeza de quereres mover %d elementos: " -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "Confirmar Movemento" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "Non se puido executar o editor externo: %1" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo descoñecido" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "Nome do arquivo" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "Resultado da comparación" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "Data esquerda" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "Data dereita" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "Tamaño esquerda" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "Tamaño dereita" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dereita (curto)" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "Tamaño esquerda (curto)" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "Data de creación esquerda" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "Data de creación dereita" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "Arquivo máis recente" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "Versión do arquivo esquerdo" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "Versión do arquivo dereito" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "Resultado curto" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "Atributos da esquerda" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "Atributos da dereita" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "EOL esquerdo" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "EOL dereito" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "Codificación esquerda" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "Codificación dereita" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "Diferenzas ignoradas" -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "Non é posible comparar os arquivos" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "Elemento abortado" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "Arquivo saltado" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "Cartafol saltado" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "Só esquerda: %1" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "Só dereita: %1" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binarios son idénticos" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "Os arquivos binarios son diferentes" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "Os arquivos son diferentes" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "Os cartafoles son diferentes" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "Só esquerda" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "Só dereita" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "Os arquivos de texto son idénticos" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "Os arquivos de texto son diferentes" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou cartafol." -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome do sub-cartafol cando os sub-cartafoles están incluídos" -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "Resultados da comparación, formato completo." -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "Data de modificación da banda esquerda." -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "Data de modificación da banda dereita" -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "Extensión do arquivo." -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "Tamaño do arquivo esquerdo en bytes." -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "Tamaño do arquivo dereito en bytes." -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño abreviado do arquivo esquerdo." -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño abreviado do arquivo dereito. " -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "Data de creación do arquivo esquerdo." -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "Data de creación do arquivo dereito." -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "Di que parte foi modificada máis recentemente." -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versión do arquivo da banda esquerda, só para algúns tipos de arquivo." -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versión do arquivo da banda dereita, só para algúns tipos de arquivo." -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "Resultados curtos da comparación." -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "Atributos da banda esquerda." -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "Atributos da banda dereita." -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo esquerdo" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo dereito" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "Codificación da banda esquerda." -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "Codificación da banda dereita." -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferenzas ignoradas no arquivo. Estas diferenzas son ignoradas por WinMerge e non se poden combinar." -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferenzas no arquivo. Este número non inclúe as diferenzas ignoradas." -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Amosa un asterisco (*) se o arquivo é binario." -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "Listaxe separada por comas" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "Listaxe separada por tabulacións" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "HTML simple" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "XML simple" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo de informe xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "Erro ao crear o informe:n%1" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "O informe creouse correctamente." -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo está aberto en ambos paneis." -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "Os arquivos escollidos son idénticos." -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "Produciuse un erro durante a comparación dos arquivos." -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Non se puideron crear os arquivos temporais. Comproba as configuracións dos camiños." -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4520,17 +4250,17 @@ msgstr "" "\n" "Aviso: Se queres tratar todos os tipos de quebra como equivalentes, marca a opción 'Ignorar diferenzas de quebras de liña..' no apartado de comparación do diálogo de opcións (dispoñible en Editar/Opcións)." -#: Merge.rc:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "O cartafol seleccionado non é válido." -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "Non se pode abrir un arquivo binario no editor." -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4545,7 +4275,7 @@ msgstr "" "%1\n" "que coincida co anterior e abrir ámbolos dous?" -#: Merge.rc:2545 +#: Merge.rc:4A700AB0 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4556,152 +4286,152 @@ msgstr "" "Amosando cada arquivo coa súa páxina de códigos proporcionará unha mellor visualización pero combinar/copiar será perigoso.\n" "Preferirías tratar ambos arquivos como se tivesen a páxina de códigos predeterminada de windows (recomendado)?" -#: Merge.rc:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Perdeuse información debido a erros de codificación: en ambos os arquivos" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "Non hai diferenzas" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "Diferenzas de liña" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituídas %1 cadea(s)." -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "Non se atopou a cadea \"%s\"" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "Panel de situación" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "Panel de diferenzas" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "Escribiuse correctamente o arquivo de mendo." -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "1. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo patch xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos seleccionados]" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "Non se puido escribir no arquivo %1." -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O camiño de saída especificado non é un camiño absoluto: %1" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "Especifica un arquivo de saída" -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Non se pode crear un arquivo patch desde arquivos binarios." -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "Non se pode crear un arquivo patch desde un cartafol." -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "" "Please save all files first.\n" @@ -4712,12 +4442,12 @@ msgstr "" "\n" "Crear un arquivo patch precisa que todos os cambios nos arquivos estean gardados." -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "O cartafol non existe." -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4728,37 +4458,37 @@ msgstr "" "Non foron atopados todos os compoñentes precisos (7-zip e/ou Merge7z*.dll).\n" "Mira o manual para máis información acerca do soporte de arquivos e como se activa. " -#: Merge.rc:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "Escolle un arquivo para exportar" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "Escolle un arquivo para importar" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "Opcións importadas desde o arquivo." -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "Opcións exportadas desde o arquivo." -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "Fallo na importación das opcións deste arquivo." -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "Fallo ao escribir as opcións no arquivo." -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4769,247 +4499,247 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "Mesturado" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "Desempaquetador" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "Pre-comparación" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "Script do Editor" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempaquetador escollido utilízase con ambos arquivos (unicamente un arquivo precisa a extensión)" -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "Sen pre-comparación (normal)" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "Plugins recomendados" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "Configuración do plugin" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non atopado - scripts .sct desactivados" -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "I&r á liña %1" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "Da listaxe MRU" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "Sen Resaltar" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "Obxecto Portable" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 606d35189..445207c9c 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -27,2331 +27,2081 @@ msgstr "" "X-Poedit-Basepath: ../../Src/\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_GERMAN, SUBLANG_GERMAN" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "1252" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "&Nach rechts kopieren" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "N&ach links kopieren" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "Zeilen&unterschied markieren" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "&Rückgängig" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "&Wiederherstellen" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "Auss&chneiden" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "&Kopieren" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "E&infügen" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "&Gehe nach..." -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "Ö&ffnen" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "Mit ®istrierter Anwendung" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "Mit &externem Editor" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "&Mit..." -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "&Keine" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "&Datei" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "&Neu\tStrg+N" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "Ö&ffnen...\tStrg+O" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "&Konflikt-Datei öffnen..." -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Pro&jekt öffnen...\tStrg+J" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "Proje&kt speichern..." -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "Kürzliche Projekte" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "< Leer >" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "&Beenden" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "&Bearbeiten" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "&Einstellungen..." -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "&Ansicht" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "&Symbolleiste" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "K&lein" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "&Groß" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "S&tatusleiste" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "Ta&b-Leiste" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "&Tools" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "&Filter..." -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "&Patch generieren..." -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "&Plugins" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "Man&ueller Prediffer" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "Au&tomatischer Prediffer" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "&Manuell entpacken" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch entpacken" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "Plugins &neu laden" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "&Fenster" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "&Schließen" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "Alle s&chließen" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "&Ausschnitt wechseln\tF6" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "&Untereinander" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "&Nebeneinander" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "Über&lappend" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "&Hilfe" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Hilfe\tF1" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "&Konfiguration" -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "Ü&ber WinMerge..." -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "L&inks schreibgeschützt" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "R&echts schreibgeschützt" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "Alles &markieren\tStrg+A" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "&Identische Objekte anzeigen" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "&Unterschiedliche Objekte anzeigen" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "Eindeutige Objekte &links anzeigen" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "Eindeutige Objekte &rechts anzeigen" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "Übersprun&gene Objekte anzeigen" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "Binär&dateien anzeigen" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "Verstec&kte Objekte anzeigen" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "Baum&modus" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "Alle Unterordner erweiter&n" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "Alle Unterordner redu&zieren" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "Schrift &auswählen..." -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "Standard-Schrift &verwenden" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "Ausschnitt v&ertauschen" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "V&ergleichsstatistik" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "&Aktualisieren\tF5" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Ausge&wählte aktualisieren\tStrg+F5" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "&Merge" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "Ver&gleichen\tEnter" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nächster Unterschied\tAlt+Runter" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Voriger Unterschied\tAlt+Hoch" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Erster Unterschied\tAlt+Pos1" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktueller Unterschied\tAlt+Enter" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Letzter Unterschied\tAlt+Ende" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Nach &rechts kopieren\tAlt+Rechts" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Nach l&inks kopieren\tAlt+Links" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "Lös&chen\tEntf" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "&Spalten anpassen..." -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "&Bericht generieren..." -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "&Speichern\tStrg+S" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "&Links speichern" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "&Rechts speichern" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "&Drucken..." -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "Sei&te einrichten" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "Druck&vorschau" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "&Zeilenenden konvertieren nach" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "&Merge Modus\tF9" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "Dateik&odierung..." -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Rückgängig\tStrg+Z" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Wiederherstellen\tStrg+Y" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Auss&chneiden\tStrg+X" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopieren\tStrg+C" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "E&infügen\tStrg+V" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "Zeilen&unterschied markieren\tF4" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Suchen...\tStrg+F" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Erse&tzen...\tStrg+H" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "Erweitert" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopieren mit Zeilennummern\tStrg+Umschalt+C" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "&Lesezeichen" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Lesezeichen ein/aus\tStrg+F2" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nächstes Lesezeichen\tF2" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Vorheriges Lesezeichen\tShift+F2" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "&Alle Lesezeichen löschen" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gehe nach...\tStrg+G" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Ver&größern\tStrg++" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Ver&kleinern\tStrg+-" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tStrg+*" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "Syntaxhervorhebung" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "Ausschnitte &fixieren" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "&Leerzeichen anzeigen" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "Zeilenuntersc&hiede anzeigen" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "Zeilennu&mmern anzeigen" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "&Ränder anzeigen" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "Zeilen &umbrechen" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "U&nterschiedsleiste" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "P&ositionsleiste" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Nach rechts kopieren und &fortschreiten\tAlt+Strg+Rechts" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Nach links kopieren und f&ortschreiten\tAlt+Strg+Links" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "Alles nach rec&hts kopieren" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "Alles nach lin&ks kopieren" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "Skri&pte" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "Ver&gleichen" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "Links nach Rechts (%1 von %2)" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "Links nach... (%1 von %2)" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "Rechts nach Links (%1 von %2)" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "Rechts nach... (%1 von %2)" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "&Verschieben" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "&Löschen" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "&Umbenennen" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "Objekte v&erstecken" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "Ö&ffne links" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "Öff&ne rechts" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiere &Pfade" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 von %2)" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 von %2)" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 von %2)" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "Kopiere &Dateinamen" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "P&acken" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "Ak&tualisieren" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "Linkes Shell-Menü" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "Rechtes Shell-Menü" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "&Kopiere vollständigen Pfad" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "Kopiere &Dateiname" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "&Prediffer Einstellungen" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "&Kein Prediffer" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "&Auto Prediffer" -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "G&ehe nach Unterschied" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "&Keine verschobene Blöcke" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "&Alle verschobene Blöcke" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verschobenen Block für aktuellen &Unterschied" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "&Leerzeichen" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "&Vergleichen" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "Änderung &ignorieren" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "&Alle ignorieren" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "&Groß-/Kleinschreibung beachten" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Zeilen&umbruchunterschiede (Windows/Unix/Mac) ignorieren" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "Unter&ordner einbeziehen" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "Vergleichs&methode:" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "Voller Inhalt" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "Schneller Inhalt" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "Änderungsdatum" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "Änderungsdatum und Größe" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "Größe" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "Info über WinMerge" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besuchen Sie die WinMerge Homepage!" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "Mitwirkende" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "Dateien oder Ordner auswählen..." -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "&Suchen..." -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "Su&chen..." -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "S&uchen..." -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "Auswählen..." -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "&Entpacker:" -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "Auswählen..." -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "Abbrechen" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "Hilfe" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "Zu vergleichende Dateien oder Ordner" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "Datenbank:" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "Nutzer:" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "Passwort:" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "Verbindung zum Ziel-VSS-Projekt" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "Auf alle Objekte anwenden" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "Auschecken" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "Speichern unter..." -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "Versionskontrolle" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "&Versionskontrollsystem" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pfad zu cleartool.exe:" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "Allgemein" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "Anzeige automatisch auf den ersten Unterschied &positionieren" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fenster mit &ESC schließen" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "P&fade im Öffnen-Dialog automatisch überprüfen" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "&Nur eine Programm-Instanz zulassen" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "&Nachfragen, wenn mehrfache Fenster geschlossen werden" -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "Datei&zeit beim Dateivergleich bewahren" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Öffnen-Dialog beim Programmstart anzeigen" -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Öffnen-Dialog Auto&vervollständigung:" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" "WinMerge erlaubt das Verstecken von einigen häufigen Meldungen.\n" "Drücken Sie die Zurücksetzen-Schaltfläche um alle Meldungen wieder sichtbar zumachen." -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "Zurücksetzen" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "Suchen" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "&Suchen nach:" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "&Nur ganze Wörter" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "&Groß-/Kleinschreibung beachten" -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "&Reguläre Ausdrücke" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "&Weitersuchen" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "Ersetzen" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "Erse&tzen durch:" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "Ersetze in" -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "&Auswahl" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "ganzer &Datei" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "E&rsetzen" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "A&lle ersetzen" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "Auschecken" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "Kommentare" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "Einchecken nach Auschecken" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "Zeilenfilter" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "Zeilenfilter aktivieren" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguläre Ausdrücke (einer pro Zeile):" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "Neu" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "Bearbeiten" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "Entfernen" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "Farben" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "Unterschied:" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "Selektierter Unterschied:" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "Hintergrund" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "Gelöscht" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "Ignorierter Unterschied:" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "Verschoben:" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "Verschoben (Selektiert):" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "Wortunterschied:" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "Wortunterschied (Selektiert):" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "Vorgaben" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "System" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Gelöschte Dateien in den &Papierkorb verschieben" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "&Externer Editor:" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "&Filterordner:" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "Temporärer Dateienordner" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "Temporärer Ordner vom S&ystem:" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "&Benutzerdefinierter Ordner:" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "Patch Generator" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "Datei &1:" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "Datei &2:" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "Ver&tauschen" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "A&n vorhandene Datei anfügen" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "&Ergebnis:" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "S&uchen..." -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "Leer&zeilen ignorieren" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "&Befehlszeile einfügen" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "Im e&xternen Editor öffnen" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "Spalten anpassen" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "Nach &oben" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "Nach &unten" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "Entpacker auswählen" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "Datei-Entpacker:" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Zeigt alle Entpacker, nicht die Erweiterung überprüfen." -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "Erweiterungsliste:" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "Beschreibung:" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "Vergleiche Objekte..." -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "Objekte verglichen:" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "Objekte gesamt:" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "Gehe nach" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "&Nach:" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "Datei" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "Ziel" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "&Zeile" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "&Unterschied" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "&Gehe" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "Vergleichen" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "Leerzeichen" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "&Vergleichen" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "Änderung &ignorieren" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "&Alle ignorieren" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "&Leerzeilen ignorieren" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "&Groß-/Kleinschreibung ignorieren" -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "Verschobene &Blöcke erkennen" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "Ä&hnliche Zeilen angleichen" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "Kommentare filtern" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "&Syntax hervorheben" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "&Automatisch aktualisieren" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "&Mischen der Zeilenumbruch-Formate erlauben" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "Tabulatoren" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "&Tabulator-Größe:" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "Tabulatoren &einfügen" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "&Leerzeichen einfügen" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "Zeilenunterschied-Färbung" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "Zeilenunterschied anzeigen" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "&Zeichen-Ebene" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "&Wort-Ebene:" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "W&ort-Abbruchzeichen:" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "Dateifilter" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "Testen" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "Installieren..." -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "Neu..." -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "Bearbeiten..." -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "Löschen..." -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "Geänderte Dateien speichern?" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "Linke Datei" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "Änderungen &speichern" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "Änderungen &verwerfen" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "Rechte Datei" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "Änderungen s&peichern" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "Änderungen ver&werfen" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "&Alle verwerfen" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "Zeichensatz" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "Standard-Zeichensatz" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Wählen Sie den Standard-Zeichensatz, der angenommen wird, wenn man Nicht-Unicode Dateien lädt:" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2360,702 +2110,689 @@ msgstr "" "Ermitteln des Zeichensatzes für folgende Dateien: .html, .rc, .xml \n" "Benötigt einen Neustart des Programmes." -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "System-Zeichensatz" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "Entsprechend der WinMerge Benutzeroberfläche" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "Benutzerdefinierter Zeichensatz:" -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "Einstellungen" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr " Kategorien" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "Importieren..." -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "Exportieren..." -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "Schlüsselwörter:" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "Funktionsnamen:" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "Kommentare:" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "Nummern:" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "Operatoren:" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "Zeichenketten:" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "Preprozessor:" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "Benutzer 1:" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "Benutzer 2:" -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "Fett" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "Ordnervergleichs-Bericht" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "&Berichtsdatei:" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "Suchen..." -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "In die &Zwischenablage kopieren" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "Gemeinsamer oder privater Filter" -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "Welche Art von Filter möchten Sie erzeugen?" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Gemeinsamer Filter (für alle Benutzer auf diesem Computer)" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "Privater Filter (nur für den aktuellen Benutzer)" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "Archiv-Unterstützung" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "&Archiv-Unterstützung aktivieren" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "&Archivtyp aus der Dateisignatur ermitteln" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "Vergleichsstatistik" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "Ordner:" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "Dateien:" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "Unterschiedlich" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "Binär:" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "Eindeutig" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "Links:" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "Rechts:" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "Identisch" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "Gesamt:" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "Schließen" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "Betrifft" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "(Betrifft)" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "Zeichensatz auswählen für" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "&Datei laden:" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "Datei &speichern:" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "&Gleichen Zeichensatz für Beide verwenden" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "An&wenden" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "&Abbrechen" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "Filter testen" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "Teste Filter ..." -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "&Text zum Testen:" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "&Ordnername" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "Ergebnis:" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "&Testen" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "&Schließen" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "&Benutzerdefinierte Textfarben verwenden" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "Benutzerdefinierte Textfarben" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "Leerzeichen:" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "Normaler Text:" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "Auswahl:" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "Pfade" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "Schreib&geschützt" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "Schreibg&eschützt" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "Öffnen..." -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "Speichern..." -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "Sicherungsdateien" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "Sicherungsdateien erzeugen beim:" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "&Ordnervergleich" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "D&ateivergleich" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "Sicherungsdateien erzeugen im:" -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "Ordner der &ursprünglichen Datei" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "&Globalen Sicherungsordner:" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "Sicherungsdateiname:" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr ".bak-&Erweiterung anhängen" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "&Zeitstempel anhängen" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "Kopieren bestätigen" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Wollen Sie wirklich XXX Objekte kopieren?" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "Von links" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "Nach rechts" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "Nein" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "&Plugins aktivieren" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "Shell-Integration" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "Er&weitertes Menü verwenden" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "Zum Kontextmenü &hinzufügen" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "Ordner" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "Nach dem ersten Unterschied &stoppen" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "&Eindeutige Unterordner-Inhalte einbeziehen" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Limit für Schneller Inhalt (MB):" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "Binär" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "040704e4" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "0x407, 1252" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "ER" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "FEST" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "RF" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "ÜB" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "MA" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu öffnen." -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu speichern." -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "Projektdatei" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "Projektdatei erfolgreich geladen." -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "Projektdatei erfolgreich gespeichert." -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nDateivergleich\n\n\n\nWinMerge.Dateivergleich\nWinMerge Dateivergleich" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nOrdnervergleich\n\n\n\nWinMerge.Ordnervergleich\nWinMerge Ordnervergleich" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "" "Developers:\n" @@ -3064,143 +2801,142 @@ msgstr "" "Entwickler:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, 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 "WinMerge kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie können sie unter bestimmten Bedingungen weiter vertreiben; für Details sehen Sie sich die GNU General Public License unter dem Hilfe-Menü an." -#: Merge.rc:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "&Abbruch" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "&Wiederholen" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "&Ignorieren" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "&Alle ignorieren" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "Ja zu &allen" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "&Nein" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "Nein zu a&llen" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "&Fortsetzen" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "Über&springen" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "&Alle überspringen" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "Diese &Meldung nicht erneut anzeigen." -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "Diese &Frage nicht erneut stellen." -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "Versionskontrolle" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "Unterschiede" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "Nach:" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "Von links:" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "Nach links:" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "Von rechts:" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "Nach rechts:" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "Version %1 - Deutsch" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "Eigenschaften (%1)" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle Meldungen werden wieder angezeigt." -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3211,84 +2947,82 @@ msgstr "" "\n" "Bitte benutzen Sie Werte von 1 - %1." -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "Öffnen" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle Dateien (*.*)|*.*||" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektdatei (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Einstellungsdateien (*.ini)|*.ini|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textdateien (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-Dateien (*.htm,*.html)|*.htm;*.html|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "Name" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "Pfad" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "Beschreibung" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "Dateinamen für neuen Filter auswählen" -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3301,7 +3035,7 @@ msgstr "" "Bitte kopieren Sie die Datei %1 in den Filterordner:\n" "%2." -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3314,7 +3048,7 @@ msgstr "" "\n" "Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist." -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3325,7 +3059,7 @@ msgstr "" "\n" "Bitte wählen Sie den Filterordner unter Einstellungen/System aus." -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3338,12 +3072,12 @@ msgstr "" "\n" "Ist die Datei möglicherweise schreibgeschützt?" -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "Zu installierenden Filter auswählen" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "" "Installing filter file failed.\n" @@ -3354,17 +3088,17 @@ msgstr "" "\n" "Die Filterdatei konnte nicht in den Filterordner kopiert werden." -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterdatei existiert bereits. Existierenden Filter überschreiben?" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "Regulärer Ausdruck" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3375,173 +3109,173 @@ msgstr "" "\n" "Wenn Sie nicht jetzt alle Vergleiche aktualisieren möchten, können Sie Nein wählen und die Vergleiche später aktualisieren." -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pfad zu SS.EXE:" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "Ordnervergleichs-Ergebnisse" -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "Dateivergleich" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "Unbenannt links" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "Unbenannt rechts" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "Deren Datei" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "Meine Datei" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "Zeile: %s" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "Merge" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "Unterschied %1 von %2" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "%1 Unterschiede gefunden" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "1 Unterschied gefunden" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 von %2" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "Objekte: %1" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "Ordnerauswahl" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen auswählen." -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "Der linke Pfad ist ungültig!" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "Der rechte Pfad ist ungültig!" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "Beide Pfade sind ungültig!" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl auswählen." -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "Datei und Ordner können nicht verglichen werden!" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "Datei nicht gefunden: %1" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "Datei nicht entpackt: %1" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "" "Cannot open file\n" @@ -3554,12 +3288,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "Fehler beim Analysieren der Konflikt-Datei." -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "" "The file\n" @@ -3570,27 +3304,27 @@ msgstr "" "%1\n" "ist keine Konflikt-Datei." -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "Speichern unter" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "Änderungen in %1 speichern?" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, 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 ist als Schreibgeschützt markiert. Möchten Sie die schreibgeschützte Datei überschreiben? (Nicht unter neuem Dateinamen speichern.)" -#: Merge.rc:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "Fehler beim Erstellen einer Sicherheitskopie" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "" "Unable to backup original file:\n" @@ -3603,7 +3337,7 @@ msgstr "" "\n" "Trotzdem fortfahren?" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, c-format msgid "" "Saving file failed.\n" @@ -3620,7 +3354,7 @@ msgstr "" "\t-einen anderen Dateinamen verwenden? (Ok drücken)\n" "\t-die aktuelle Operation abbrechen? (Abbruch drücken)" -#: Merge.rc:2256 +#: Merge.rc:3895053E #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3635,7 +3369,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2257 +#: Merge.rc:5A0BA2DF #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3650,7 +3384,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2258 +#: Merge.rc:78367A47 #, c-format msgid "" "Another application has updated file\n" @@ -3665,7 +3399,7 @@ msgstr "" "\n" "Geänderte Datei überschreiben?" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "" "%1\n" @@ -3674,32 +3408,32 @@ msgstr "" "%1\n" "ist als schreibgeschützt markiert. Möchten Sie das schreibgeschützte Objekt überschreiben?" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte Mal geprüft hat.\n\nMöchten Sie die Datei neu laden?" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "Speichere linke Datei unter" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "Speichere rechte Datei unter" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "Die Datei\n%1\nist verlorengegangen. Bitte speichern Sie eine Kopie der Datei, um fortzufahren." -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3710,42 +3444,42 @@ msgstr "" "\n" "Aktualisieren Sie die Dokumente, bevor Sie fortfahren." -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Sie müssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "Dateien auschecken vom VSS..." -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..." -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "Fehler beim Ausführen eines Befehles des Versionierungssystems." -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht überein. Fortsetzen?" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "Keine VSS Datenbank(en) gefunden!" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "Fehler vom VSS:" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3756,7 +3490,7 @@ msgstr "" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht.\n" " Auschecken rückgängig machen?" -#: Merge.rc:2284 +#: Merge.rc:1929D7D3 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3765,146 +3499,142 @@ msgstr "" "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei rückgängig zu machen.\n" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht." -#: Merge.rc:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "Keines" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (kleiner als 5.0)" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 und höher)" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "An Leerzeichen abbrechen" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "An Leerzeichen oder Interpunktion abbrechen" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "Rechts nach Links (%1)" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "Links nach Rechts (%1)" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "Links nach... (%1)" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "Rechts nach... (%1)" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "Linke Seite - Zielordner auswählen:" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "Rechte Seite - Zielordner auswählen:" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dateien betroffen)" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 von %2 Dateien betroffen)" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3916,17 +3646,17 @@ msgstr "" "%1\n" "löschen?" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "Wollen Sie wirklich kopieren:" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Wollen Sie wirklich %d Objekte kopieren:" -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, c-format msgid "" "Operation aborted!\n" @@ -3945,502 +3675,502 @@ msgstr "" "\n" "Bitte aktualisieren Sie den Vergleich." -#: Merge.rc:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "Wollen Sie wirklich verschieben:" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Wollen Sie wirklich %d Objekte verschieben:" -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "Verschieben bestätigen" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "Konnte externen Editor nicht ausführen: %1" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "Unbekanntes Archiv Format" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "Dateiname" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "Vergleichsergebnis" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "Linkes Datum" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "Rechtes Datum" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "Erweiterung" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "Linke Größe" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "Rechte Größe" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "Rechte Größe (Kurz)" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "Linke Größe (Kurz)" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "Linkes Erstellungsdatum" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "Rechtes Erstellungsdatum" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "Neuere Datei" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "Linke Dateiversion" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "Rechte Dateiversion" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "Kurz-Ergebnis" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "Linke Attribute" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "Rechte Attribute" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "Linkes Zeilenende" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "Rechtes Zeilenende" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "Linke Kodierung" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "Rechte Kodierung" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "Ignorierte Unter." -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "Dateien können nicht verglichen werden" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "Objekt abgebrochen" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "Datei übersprungen" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "Ordner übersprungen" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "Nur Links: %1" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "Nur Rechts: %1" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "Binärdateien sind identisch" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "Binärdateien sind unterschiedlich" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "Dateien sind unterschiedlich" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "Ordner sind unterschiedlich" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "Nur Links" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "Nur Rechts" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "Fehler" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "Textdateien sind identisch" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "Textdateien sind unterschiedlich" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "Ausführungszeit: %ld ms" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "1 Objekt ausgewählt" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "%1 Objekte ausgewählt" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "Dateiname oder Ordnername." -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "Unterordnername, wenn Unterordner vorhanden sind." -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "Vergleichsergebnis, langes Format." -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "Linkes Änderungsdatum." -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "Rechtes Änderungsdatum." -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "Dateierweiterung." -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "Linke Dateigröße in Byte." -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "Rechte Dateigröße in Byte." -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "Linke Dateigröße gekürzt." -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "Rechte Dateigröße gekürzt." -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "Linkes Erstellungsdatum." -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "Rechtes Erstellungsdatum." -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "Zeigt, welche Seite ein neueres Änderungsdatum hat." -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Linke Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Rechte Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "Vergleichsergebnis, kurzes Format." -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "Linke Attribute." -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "Rechte Attribute." -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "Linker Zeilenenden-Typ" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "Rechter Zeilenenden-Typ" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "Linke Zeichensatz-Kodierung." -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "Rechte Zeichensatz-Kodierung." -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und können nicht vermischt werden." -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Anzahl der Unterschiede in der Datei. Die Zahl enthält nicht die ignorierten Unterschiede." -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zeigt ein Asterisk (*), wenn die Datei binär ist." -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "Vergleiche %1 mit %2" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "Komma-getrennte Liste" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "Tab-getrennte Liste" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "Einfaches HTML" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "Einfaches XML" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Der Bericht existiert bereits. Überschreiben?" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "" "Error creating the report:\n" @@ -4449,32 +4179,32 @@ msgstr "" "Fehler beim Erzeugen des Berichtes:\n" "%1" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "Der Bericht wurde erfolgreich geschrieben." -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "Die gleiche Datei ist in beiden Feldern ausgewählt." -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "Die ausgewählten Dateien sind identisch." -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten." -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Temporäre Dateien konnten nicht erzeugt werden. Überprüfen Sie Ihre Einstellungen für temporäre Dateien." -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4489,17 +4219,17 @@ msgstr "" "\n" "Hinweis: Wenn Sie immer alle Zeilenumbruch-Formate als Gleichwertig behandeln wollen, aktivieren Sie die Option 'Zeilenumbruchunterschiede ignorieren' unter 'Vergleichen' im Einstellungsdialog (erreichbar unter Bearbeiten/Einstellungen)." -#: Merge.rc:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "Der ausgewählte Ordner ist ungültig." -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "Kann keine Binärdatei im Editor öffnen." -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4514,7 +4244,7 @@ msgstr "" "%1\n" "auf der anderen Seite erzeugen und die Ordner öffnen?" -#: Merge.rc:2545 +#: Merge.rc:4A700AB0 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4525,152 +4255,152 @@ msgstr "" "Das Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gefährlich.\n" "Wollen Sie beide Dateien behandeln, als wären sie im gleichen Zeichensatz (empfohlen)?" -#: Merge.rc:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informationsverlust wegen Kodierungsfehlern: Beide Dateien" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "Kein Unterschied" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "Zeilen-Unterschied" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 Vorkommen ersetzt." -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kann \"%s\" nicht finden" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "Positionsleiste" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "Unterschiedsleiste" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "Die Patchdatei wurde erfolgreich geschrieben." -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "1. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Die Patchdatei existiert bereits. Überschreiben?" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "[%1 Dateien ausgewählt]" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "Unified" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "Konnte nicht in die Datei %1 schreiben." -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "Geben Sie eine Ausgabedatei an." -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kann keine Patchdatei von Binärdateien erzeugen." -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kann keine Patchdatei von Verzeichnissen erzeugen." -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "" "Please save all files first.\n" @@ -4681,12 +4411,12 @@ msgstr "" "\n" "Das Erzeugen eines Patches erfordert, dass es keine ungespeicherten Änderungen in den Dateien gibt." -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "Der Ordner existiert nicht." -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4697,37 +4427,37 @@ msgstr "" "Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) für die Archiv-Unterstützung können nicht gefunden werden.\n" "Entnehmen Sie dem Handbuch mehr Informationen über die Archiv-Unterstützung und wie sie aktiviert wird." -#: Merge.rc:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "Datei zum Exportieren auswählen" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "Datei zum Importieren auswählen" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "Einstellungen aus der Datei importiert." -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "Einstellungen in die Datei exportiert." -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "Konnte die Einstellungen nicht aus der Datei importieren." -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "Konnte die Einstellungen nicht in die Datei exportieren." -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4738,247 +4468,247 @@ msgstr "" "\n" "Möchten Sie wirklich fortfahren?" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "Gemischt" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "Entpacker" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "Editor-Skript" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Der passende Entpacker wird auf beide Dateien angewendet (nur eine Datei benötigt die Erweiterung)." -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "Kein Prediffer (Normal)" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "Vorgeschlagene Plugins" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "Andere Plugins" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "Plugin Einstellungen" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nicht gefunden - .sct Skripte deaktiviert." -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "G&ehe nach Zeile %1" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "Deaktiviert" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "Von Dateisystem" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "Von MRU-Liste" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "Keine Hervorhebung" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "Ressourcen" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index bb2874f24..2f85d8d8d 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -23,3019 +23,2756 @@ msgstr "" "X-Poedit-Basepath: ../../Src/\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_GREEK, SUBLANG_DEFAULT" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "1253" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "ÁíôéãñáöÞ Äå&îéÜ" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "ÁíôéãñáöÞ Á&ñéóôåñÜ" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "ÅðéëïãÞ Äéá&öïñÜò ÃñáììÞò" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "Á&íáßñåóç" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "ÅðáíÜëç&øç" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "Áðï&êïðÞ" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "Áíôé&ãñáöÞ" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "Ðñï&óÜñôçóç" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "ÌåôÜ&âáóç..." -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "¢í&ïéãìá" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "ìå Áíôéóôïé÷éóìÝíç Å&öáñìïãÞ" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "ì&å Üëëç ÅöáñìïãÞ" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "ìå..." -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "&Æïõì" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "&Áðüêñõøç" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "&Áñ÷åßï" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "&Äçìéïõñãßá\tCtrl+N" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "¢í&ïéãìá...\tCtrl+O" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "¢íïéãìá Áñ÷åßïõ &ÄéåíÝîåùí..." -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "¢íïéãìá ¸ñ&ãïõ...\tCtrl+J" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "Áðï&èÞêåõóç ¸ñãïõ..." -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "Ðñüó&öáôá ¸ñãá" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "< ¢äåéï >" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "¸îïäï&ò" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "&Åðåîåñãáóßá" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "Åðéë&ïãÝò..." -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "Ðñ&ïâïëÞ" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "ÃñáììÞ Å&ñãáëåßùí" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "Ìé&êñÞ" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "Ìå&ãÜëç" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "ÃñáììÞ &ÊáôáóôÜóåùò" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "ÃñáììÞ Óå&ëéäïäåéêôþí" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "Åñãá&ëåßá" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "&Ößëôñá..." -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "&Äçìéïõñãßá Patch..." -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "Áñ&èñþìáôá" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "Á&ðïóõìðßåóç áðü ôï ×ñÞóôç" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "Á&õôüìáôç Áðïóõìðßåóç" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "ÅðáíÝ&ëåã÷ïò ÁñèñùìÜôùí" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "&ÐáñÜèõñï" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "Ê&ëåßóéìï" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "Êëåßóéìï üë&ùí" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "ÅíáëëáãÞ ìåôáîý Ðå&äßùí\tF6" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "ÐáñÜèåóç Ïñé&æïíôßùò" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "ÐáñÜèåóç Êáôá&êïñýöùò" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "ÅðéêÜëõ&øç" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "&ÂïÞèåéá" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "ÂïÞèåéá WinMerge\tF1" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "&Ñõèìßóåéò" -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "ÃåíéêÞ Äçìïóßá ¢äåéá &GNU" -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "&Ðåñß ôïõ WinMerge..." -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "Áñéóôåñü ãéá ÁíÜã&íùóç ìüíï" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "Äåîéü ãéá ÁíÜãí&ùóç ìüíï" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "ÅðéëïãÞ ¼&ëùí\tCtrl+A" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "ÅìöÜíéóç Ðáíïìïéï&ôýðùí Óôïé÷åßùí" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "ÅìöÜíéóç &Äéáöïñåôéêþí Óôïé÷åßùí" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "ÅìöÜíéóç Ïñöáíþí Óôïé÷åßùí Á&ñéóôåñïý" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "ÅìöÜíéóç Ïñöáíþí Óôïé÷åßùí Äå&îéïý" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "ÅìöÜíéóç Áíôé&ðáñåëèÝíôùí Óôïé÷åßùí" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "ÅìöÜíéóç &Äõáäéêþí Áñ÷åßùí" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "ÅìöÜíéóç Êñõ&öþí Óôïé÷åßùí" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "ÅðéëïãÞ &ÃñáììáôïóåéñÜò..." -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "×ñÞóç Ðñïêá&èïñéóìÝíçò ÃñáììáôïóåéñÜò" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "Áíôé&ìåôÜèåóç Ðåäßùí" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "ÓôáôéóôéêÜ Óõãêñßóåùò" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "Áíá&íÝùóç\tF5" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Áíá&íÝùóç ÅðéëåãìÝíùí\tCtrl+F5" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "Óõã&÷þíåõóç" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "&Óýãêñéóç\tEnter" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&ÅðïìÝíç ÄéáöïñÜ\tAlt+Down" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Ð&ñïçãïõìÝíç ÄéáöïñÜ\tAlt+Up" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Ðñþôç ÄéáöïñÜ\tAlt+Home" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Ô&ñÝ÷ïõóá ÄéáöïñÜ\tAlt+Enter" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Ôåëåõôáßá ÄéáöïñÜ\tAlt+End" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "ÁíôéãñáöÞ Äå&îéÜ\tAlt+Right" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "ÁíôéãñáöÞ Á&ñéóôåñÜ\tAlt+Left" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "&ÄéáãñáöÞ\tDel" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "&ÐñïóáñìïãÞ Óôçëþí..." -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "Äçìéïõñãßá Áíá&öïñÜò..." -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "Áðï&èÞêåõóç\tCtrl+S" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "ÁðïèÞêåõóç Á&ñéóôåñïý" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "ÁðïèÞêåõóç Äå&îéïý" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "Åê&ôýðùóç..." -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "ÄéÜôáîç &Óåëßäáò" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "Ðñïå&ðéóêüðçóç Åêôõðþóåùò" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "&ÌåôáôñïðÞ ×áñáêôÞñùí Ôåñìáôéóìïý" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "Ëåéôïõñãßá Óõã&÷ùíåýóåùò\tF9" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "&Êùäéêïóåëßäá Áñ÷åßïõ..." -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Á&íáßñåóç\tCtrl+Z" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "ÅðáíÜëç&øç\tCtrl+Y" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Áðï&êïðÞ\tCtrl+X" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "Áíôé&ãñáöÞ\tCtrl+C" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "Ðñï&óÜñôçóç\tCtrl+V" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "Åðéëï&ãÞ ÄéáöïñÜò ÃñáììÞò\tF4" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "Áíá&æÞôçóç...\tCtrl+F" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "ÁíôéêáôÜ&óôáóç...\tCtrl+H" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "Åé&äéêÝò ÅíôïëÝò" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "ÁíôéãñáöÞ ìå &Áñßèìçóç Ãñáììþí" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "ÓçìÜí&óåéò" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ÌåôáâïëÞ ÓçìÜí&óåùò\tCtrl+F2" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "Åðï&ìÝíç ÓÞìáíóç\tF2" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Ð&ñïçãïõìÝíç ÓÞìáíóç\tShift+F2" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "Êá&ôÜñãçóç üëùí ôùí ÓçìÜíóåùí" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "ÌåôÜ&âáóç óå...\tCtrl+G" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Æïõì &ÌåãÝèõíóç\tCtrl++" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Æïõì &Óìßêñõíóç\tCtrl+-" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Êáíïíéêü\tCtrl+*" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "&×ñùìáôéóìüò Êþäéêá" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "&ÐÜãùìá Ðåäßùí" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "Åì&öÜíéóç ×áñáêôÞñùí ÄéáóôÞìáôïò" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "Åì&öÜíéóç Äéáöïñþí Ãñáììþí" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "ÅìöÜíéóç &ÁñéèìÞóåùò Ãñáììþí" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "ÅìöÜíéóç Ðåñé&èùñßùí" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "Áíá&äßðëùóç Ãñáììþí" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "&Ðåäßï Äéáöïñþí" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "Ðåäßï &Åíôïðéóìïý" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "ÁíôéãñáöÞ Äå&îéÜ êáé ÌåôÜâáóç óå åðïìÝíç\tAlt+Ctrl+Right" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "ÁíôéãñáöÞ Á&ñéóôåñÜ êáé ÌåôÜâáóç óå åðïìÝíç\tAlt+Ctrl+Left" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "ÁíôéãñáöÞ üëùí &ÄåîéÜ" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "ÁíôéãñáöÞ üëùí &ÁñéóôåñÜ" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "Ðñïåðå&îåñãáóôÞò Äéáöïñþí" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "Ìáê&ñïåíôïëÝò" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "&Óýãêñéóç" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "Áñéóôåñü óôï Äåîéü (%1 áðü %2)" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "Áñéóôåñü óôï... (%1 áðü %2)" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåîéü óôï Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåîéü óôï... (%1 áðü %2)" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "&Ìåôáêßíçóç" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "&ÄéáãñáöÞ" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "Á&ñéóôåñü" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "Äå&îéü" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "Áì&öüôåñá" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "Ìåôï&íïìáóßá" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "Áðüêñõ&øç ÁíôéêåéìÝíùí" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "¢íïéãìá Á&ñéóôåñïý" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "¢íïéãìá Äå&îéïý" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "ÁíôéãñáöÞ Äéá&äñïìþí" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "Äåîéü (%1 áðü %2)" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "Áìöüôåñá (%1áðü %2)" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "ÁíôéãñáöÞ Ï&íïìÜôùí" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "Áíá&íÝùóç" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "ÁíôéãñáöÞ ðëÞñïõò Äéá&äñïìÞò" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "ÁíôéãñáöÞ Ï&íüìáôïò" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "Ñõèìßóåéò ÐñïåðåîåñãáóôÞ Äéáöïñþí" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "Áõôüìáôç åðéëïãÞ ðñïåðåîåñãáóôÞ äéáöïñþí" -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "ÌåôÜ&âáóç óå ÄéáöïñÜ" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "¼÷é ìåôáêéíçèÝíôá ÔìÞìáôá" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "¼&ëá ôá ìåôáêéíçèÝíôá ÔìÞìáôá" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "ÌåôáêéíçèÝí ÔìÞìá ãéá Ô&ñÝ÷ïõóá ÄéáöïñÜ" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "×áñáêôÞñåò &ÄéáóôÞìáôïò" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "Óýã&êñéóç" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "Ïé ìåôáâïëÝò íá Á&ãíïçèïýí" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "Íá Áãíïçèïýí ¼&ëá" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "ÄéÜêñéóç Ðåæþí/&Êåöáëáßùí" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "ÄéáöïñÝò ÷áñáêôÞñùí &ôåñìáôéóìïý (Win/Unix/Mac) íá áãíïïýíôáé" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "Ïé ÕðïöÜêåëïé íá &óõìðåñéëçöèïýí" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "ÐëÞñçò Ðåñéå÷ïìÝíùí" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "Óýíôïìç Ðåñéå÷ïìÝíùí" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò êáé ÌÝãåèïò" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "ÌÝãåèïò" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "Ðåñß ôïõ WinMerge" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "(ÉäéùôéêÞ Ìåôáãëþôôéóç)" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Åðéóêåöèåßôå ôï Óôáèìü ôïõ WinMerge!" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "ÏÊ" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "ÓõíôåëåóôÝò" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "ÅðéëïãÞ Áñ÷åßùí Þ ÖáêÝëùí" -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "ÅðéëïãÞ..." -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "Áðï&óõìðéåóôéêü:" -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "&ÅðéëïãÞ..." -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "ÊáôÜóôáóç:" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "¢&êõñï" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "ÂïÞèåéá" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "Áñ÷åßá Þ ÖÜêåëïé ðñïò Óýãêñéóç" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "ÂÜóç ÄåäïìÝíùí:" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "¸ñãï:" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "×ñÞóôçò:" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "Óõíèçìáôéêü:" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "ÐáñáðïìðÞ óôï Ýñãï VSS Ðñïïñéóìïý" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "ÅöáñìïãÞ óå üëá ôá áíôéêåßìåíá" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "¸ëåã÷ïò ê´ ¸îïäïò" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "ÁðïèÞêåõóç Ùò..." -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "&Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí:" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "&ÄéáäñïìÞ ôïõ cleartool.exe:" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "ÃåíéêÜ" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "Áõôüìáôç &êýëéóç óôçí ðñþôç äéáöïñÜ" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "Ê&ëåßóéìï ðáñáèýñùí ìå ESC" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Áõôüìáôç åðáëÞèåõóç äéáäñïìþí óôï äéÜëïãï áíïßãìáôïò" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "ÅðéôñÝðåôáé ìüíï ìßá õðüóôáóç ôïõ WinMerge áíïéêôÞ" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "Åñþôçóç ðñéí áðü ôï êëåßóéìï ðïëëáðëþí ðáñáèýñùí" -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "Äéá&ôÞñçóç ôçò þñáò ôñïðïðïéÞóåùò êáôÜ ôç óýãêñéóç áñ÷åßùí" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Áõôüìáôç óõìðëÞñùóç äéáëüãïõ áí&ïßãìáôïò" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "Ôï WinMerge åðéôñÝðåé ôçí áðüêñõøç ïñéóìÝíùí êïéíþí ðëáéóßùí ìçíõìÜôùí. ÐáôÞóôå ôï êïõìðß ÅðáíáöïñÜ ãéá íá îáíáêÜíåôå üëá ôá ìçíýìáôá ïñáôÜ." -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "ÅðáíáöïñÜ" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "ÁíáæÞôçóç" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "Áíá&æÞôçóç ãéá:" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "Åýñåóç ïëïêëÞñùí &ëÝîåùí ìüíï" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "ÄéÜêñéóç Ðåæþí/&Êåöáëáßùí" -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "ÔõðïðïéçìÝíç ¸ê&öñáóç" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "×ùñßò áíá&äßðëùóç óôï ôÝëïò ôïõ áñ÷åßïõ" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "Åýñåóç &ÅðïìÝíïõ" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "&ÏÊ" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "ÁíôéêáôÜóôáóç" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "Áíôé&êáôÜóôáóç ìå:" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "×ùñßò áíá&äßðëùóç óôï ôÝëïò ôïõ áñ÷åßïõ" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "ÁíôéêáôÜóôáóç åíôüò" -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "&ÅðéëïãÞò" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "¼&ëïõ ôïõ Áñ÷åßïõ" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "Áíôé&êáôÜóôáóç" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "ÁíôéêáôÜóôáóç ¼&ëùí" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "¸ëåã÷ïò ê´ ¸îïäïò" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "Ó÷üëéá" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "Äéáðßóôåõóç ìåôÜ áðü Ýëåã÷ï ê´ Ýîïäï" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "Ößëôñá Ãñáììþí" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "Åíåñãïðïßçóç Ößëôñùí Ãñáììþí" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "ÔõðïðïéçìÝíåò Åê&öñÜóåéò (ìßá áíÜ ãñáììÞ):" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "Äçìéïõñãßá" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "Åðåîåñãáóßá" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "ÄéáãñáöÞ" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "×ñþìáôá" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "ÄéáöïñÜ:" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "ÅðéëåãìÝíç ÄéáöïñÜ:" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "Öüíôï" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "ÄéáãñáöÝíôá" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "Êåßìåíï" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "Áãíïçèåßóá ÄéáöïñÜ" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "ÌåôáêéíçèÝíôá:" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "ÅðéëåãìÝíá ÌåôáêéíçèÝíôá:" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "ÄéáöïñÜ ËÝîåùò:" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "ÅðéëåãìÝíç ÄéáöïñÜ ËÝîåùò:" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "&Áñ÷éêÝò Ñõèìßóåéò" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "Óýóôçìá" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "ÁðïóôïëÞ äéáãñáöÝíôùí áñ÷åßùí óôïí &ÊÜäï Áíáêõêëþóåùò" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "Åðåîåñãáóßá ìå &Üëëç åöáñìïãÞ:" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "ÖÜêåëïò &Ößëôñùí:" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "ÖÜêåëïò ðñïóùñéíþí áñ÷åßùí" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "ÖÜêåëïò ðñïóùñéíþí áñ÷åßùí ïñßæåôáé áðü ôï &Óýóôçìá" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "Ðñï&ôéìþìåíïò ÖÜêåëïò:" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "ÅöáñìïãÞ Äçìéïõñãßáò Patch" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "Áñ÷åßï&1:" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "Áñ÷åßï&2:" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "ÁíôéìåôÜ&èåóç" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "ÐñïóÜñôçóç óå õðÜñ÷ïí áñ÷åßï" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "&ÁðïôÝëåóìá:" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "Ìïñ&öÞ" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "Óô&õë:" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "&Ðåñéâ. Êåßì.:" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "Ïé êåíÝò ãñáììÝò íá áãíïïýíôáé" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "Ç ãñáììÞ åíôïëÞò íá óõìðåñéëáìâÜíåôáé" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "¢í&ïéãìá ìå Üëëç åöáñìïãÞ åðåîåñãáóßáò" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "ÅìöÜíéóç Óôçëþí" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "Ìåôáêßíçóç ðñïò ôá &Üíù" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "Ìåôáêßíçóç ðñïò ôá &êÜôù" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "ÅðéëïãÞ Áðïóõìðéåóôéêïý" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "Áðïóõìðéåóôéêü Áñ÷åßùí:" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "ÅìöÜíéóç üëùí ôùí áðïóõìðéåóôéêþí, íá ìçí åëÝã÷åôáé ç åðÝêôáóç" -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "ÊáôÜëïãïò ÅðåêôÜóåùí:" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "ÐåñéãñáöÞ:" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "Ôåñìáôéóìüò" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "Óýãêñéóç áíôéêåéìÝíùí..." -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "ÓõãêñéèÝíôá áíôéêåßìåíá:" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "Óýíïëï áíôéêåéìÝíùí:" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "ÌåôÜâáóç" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "&ÌåôÜâáóç:" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "Áñ÷åßï" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "ÌåôÜâáóç óå" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "&ÃñáììÞ" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "&ÄéáöïñÜ" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "ÌåôÜ&âáóç" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "Óýãêñéóç" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "×áñáêôÞñåò ÄéáóôÞìáôïò" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "&Óýãêñéóç" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "Ç ìåôáâïëÞ íá á&ãíïåßôáé" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "Íá áãíïïýíôáé ôá &ðÜíôá" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "Ïé &êåíÝò ãñáììÝò íá áãíïïýíôáé" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "ÄéÜêñéóç ìåôáîý Ðåæþí/&Êåöáëáßùí áíåíåñãüò" -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "Åíåñãïðïßçóç áíé&÷íåýóåùò ìåôáêéíçèÝíôùí ôìçìÜôùí" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "Áíôéóôïß÷éóç ðáñïìïßùí ãñáììþí" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "Ó÷üëéá Ößëôñùí" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "Åðåîåñãáóßá ÊåéìÝíïõ" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "&×ñùìáôéóìüò Êþäéêá" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "Á&õôüìáôç ÅðáíåîÝôáóç" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "Äéá&ôÞñçóç áñ÷éêþí ÷áñáêôÞñùí ôåñìáôéóìïý" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "ÓôçëïèÝôåò" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "ÐëÜôïò Óôçëï&èåôþí" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "Å&éóáãùãÞ Óôçëïèåôþí" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "ÅéóáãùãÞ Êåíþí &ÄéáóôçìÜôùí" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "×ñùìáôéóìüò Äéáöïñþí Ãñáììþí" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "ÅìöÜíéóç äéáöïñþí ãñáììþí" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "Åðßðåäï &×áñáêôÞñùí" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "Åðßðåäï &ËÝîåùí" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "Áñ÷åéïößëôñá" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "ÄïêéìÞ" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "ÅãêáôÜóôáóç..." -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "Äçìéïõñãßá..." -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "Åðåîåñãáóßá..." -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "ÄéáãñáöÞ..." -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "ÁðïèÞêåõóç ôñïðïðïéçìÝíùí áñ÷åßùí;" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "Áñ÷åßï áñéóôåñÞò ðëåõñÜò" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "Áðï&èÞêåõóç áëëáãþí" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "Áðü&ññéøç áëëáãþí" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "Áñ÷åßï äåîéÜò ðëåõñÜò" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "Áðï&èÞêåõóç áëëáãþí" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "Áðü&ññéøç áëëáãþí" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "Êùäéêïóåëßäá" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "ÐñïêáèïñéóìÝíç Êùäéêïóåëßäá" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "ÅðéëÝîáôå ôçí ðñïêáèïñéóìÝíç êùäéêïóåëßäá íïïõìÝíç êáôÜ ôï Üíïéãìá áñ÷åßùí ÷ùñßò êùäéêïðïßçóç Unicode" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "Êùäéêïóåëßäá óõóôÞìáôïò" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "Óýìöùíá ìå ôï ÐåñéâÜëëïí Åñãáóßáò ôïõ WinMerge" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "ÅðéëïãÝò" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr " Êáôçãïñßåò" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "ÅéóáãùãÞ..." -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "ÅîáãùãÞ..." -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "ÄéÜëïãïò" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "ÅéäéêÝò ËÝîåéò:" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "Ïíüìáôá Äéåñãáóéþí:" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "Ó÷üëéá:" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "Áñéèìïß:" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "ÔåëåóôÝò:" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "Áõôïýóéï Êåßìåíï:" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "ÐñïåðåîåñãáóôÞò:" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "áðü ×ñÞóôç 1:" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "áðü ×ñÞóôç 2:" -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "¸íôïíá" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "ÁíáöïñÜ Óõãêñßóåùò ÖáêÝëùí" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "Áñ÷åßï Áíá&öïñÜò" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "&Óôõë:" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "Áíôé&ãñáöÞ óôï Ðñü÷åéñï" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "Êïéíü Þ Éäéùôéêü Ößëôñï" -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "Ôé ôýðï ößëôñïõ åðéèõìåßôå íá äçìéïõñãÞóåôå;" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Êïéíü Ößëôñï (ãéá üëïõò ôïõò ÷ñÞóôåò áõôïý ôïõ óõóôÞìáôïò)" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "Éäéùôéêü Ößëôñï (ìüíï ãéá ôïí ðáñüíôá ÷ñÞóôç)" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "ÕðïóôÞñéîç ÓõìðéåóìÝíùí" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "&Åíåñãïðïßçóç õðïóôçñßîåùò óõìðéåóìÝíùí áñ÷åßùí" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "Áíß&÷íåõóç ôýðïõ óõìðéåóìÝíïõ áñ÷åßïõ áðü ôçí õðïãñáöÞ ôïõ" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "ÓôáôéóôéêÜ Óõãêñßóåùí" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "ÖÜêåëïé:" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "Áñ÷åßá:" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "ÄéáöïñåôéêÜ" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "Êåßìåíï:" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "ÄõáäéêÜ:" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "ÏñöáíÜ" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "ÁñéóôåñÜ:" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "ÄåîéÜ:" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "Ðáíïìïéüôõðá" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "Óýíïëï:" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "Êëåßóéìï" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "ÅðçñåÜæåé" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "(ÅðçñåÜæåé)" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "ÅðéëïãÞ Êùäéêïóåëßäáò ãéá" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "ÁíÜ&ãíùóç Áñ÷åßïõ:" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "Áðï&èÞê. Áñ÷åßïõ:" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "×ñÞóç éäßáò êùäéêïóåëßäáò ãéá áìöüôåñá" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "Å&öáñìïãÞ" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "¢&êõñï" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "ÄïêéìÞ Ößëôñïõ" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "ÄïêéìÞ Ößëôñïõ..." -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "&ÅéóáãùãÞ êåéìÝíïõ ãéá äïêéìÞ:" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "¼íïìá &ÖáêÝëïõ" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "ÁðïôÝëåóìá:" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "&ÄïêéìÞ" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "Ê&ëåßóéìï" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "×ñÞóç ðñï&ôéìùìÝíùí ÷ñùìáôéóìþí êåéìÝíïõ" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "Ðñïôéìþìåíïé ÷ñùìáôéóìïß êåéìÝíïõ" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "×áñáêôÞñåò ÄéáóôÞìáôïò:" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "Áðëü êåßìåíï:" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "ÅðéëïãÞ:" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "ÄéáäñïìÝò" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "Á&ñéóôåñü:" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "Ìüíï ãéá ÁíÜ&ãíùóç" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "Äå&îéü:" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "Ìüíï ãéá ÁíÜ&ãíùóç" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "&Ößëôñï:" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "¢í&ïéãìá" -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "ÁðïèÞêåõóç..." -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "ÅöåäñéêÜ Áñ÷åßá" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "Äçìéïõñãßá åöåäñéêþí áñ÷åßùí åíþ ãßíåôáé:" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "Óýãêñéóç &ÖáêÝëùí" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "Óýãêñéóç &Áñ÷åßùí" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "Äçìéïõñãßá åöåäñéêþí áñ÷åßùí åíôüò:" -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "Áñ&÷éêïý öáêÝëïõ áñ÷åßïõ" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "&Êáèïëéêïý öáêÝëïõ åöåäñåéþí:" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "¼íïìá åöåäñéêïý áñ÷åßïõ:" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr "Ðñïó&èÞêç åðåêôÜóåùò .bak" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "ÐñïóèÞêç &çìåñïìçíßáò ê´ þñáò" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "Åðéâåâáßùóç ÁíôéãñáöÞò" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå XXX áíôéêåßìåíá;" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "Åî áñéóôåñþí" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "Ðñïò ôá äåîéÜ" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "Íáé" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "¼÷é" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "Áñèñþìáôá" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "Åíåñãïðïßçóç ÁñèñùìÜôùí" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "Åíåñãïðïßçóç åîåéäéêåõìÝíùí åðéëïãþí" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "ÖÜêåëïò" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "&Ôåñìáôéóìüò ìåôÜ ôçí ðñþôç äéáöïñÜ" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "ÄéáöïñÝò þñáò ìéêñüôåñåò ôùí &3 äåõôåñïëÝðôùí íá áãíïïýíôáé" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "Äõáäéêü" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ Ýñãïõ." -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôçí áðïèÞêåõóç ôïõ áñ÷åßïõ Ýñãïõ." -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "ÁðïèÞêåõóç ¸ñãïõ Ùò" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "Áñ÷åßï ¸ñãïõ áíïß÷èçêå åðéôõ÷þò." -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "Áñ÷åßï ¸ñãïõ áðïèçêåýèçêå åðéôõ÷þò." -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "" "\n" @@ -3054,7 +2791,7 @@ msgstr "" "WinMerge.ÓýãêñéóçÁñ÷åßùí\n" "Óýãêñéóç Áñ÷åßùí WinMerge" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "" "\n" @@ -3073,7 +2810,7 @@ msgstr "" "WinMerge.ÓýãêñéóçÖáêÝëùí\n" "Óýãêñéóç ÖáêÝëùí WinMerge" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "" "Developers:\n" @@ -3082,143 +2819,142 @@ msgstr "" "ÐñïãñáììáôéóôÝò:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, 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 "Ôï WinMerge ðñïóöÝñåôáé ÷ùñßò ÊÁÌÌÉÁ ÁÐÏËÕÔÙÓ ÅÃÃÕÇÓÇ. Åßíáé åëåýèåñï ëïãéóìéêü êáé åßóèå åõðñüóäåêôïò íá ôï áíáäéáíåßìåôå õðü ïñéóìÝíåò ðåñéóôÜóåéò· äåßôå ôç ÃåíéêÞ Äçìïóßá ¢äåéá GNU óôéò åðéëïãÝò ôçò Âïçèåßáò ãéá ëåðôïìÝñåéåò." -#: Merge.rc:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "&Ìáôáßùóç" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "&ÅðáíÜëçøç" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "Íá &áãíïçèåß" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "Íá áãíïçèïýí &üëá" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "&Íáé" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "Íáé óå &üëá" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "&¼÷é" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "¼÷é óå ü&ëá" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "&ÓõíÝ÷åéá" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "&ÐáñÜëåéøç" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "ÐáñÜëåéøç ¼&ëùí" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "Íá ìçí åìöáíéóèåß îáíÜ áõôü ôï &ÌÞíõìá." -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "Íá ìçí îáíáãßíåé áõôÞ ç &åñþôçóç." -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "Äéá÷åßñéóç Åêäüóåùí" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "ÄéáöïñÝò" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "Ðñïò:" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "Åî áñéóôåñþí:" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "Ðñïò ôá áñéóôåñÜ:" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "Åê äåîéþí:" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "Ðñïò ôá äåîéÜ:" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "¸êäïóç %1" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "ÅðéëïãÝò (%1)" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "¼ëá ôá ðëáßóéá ìçíõìÜôùí åßíáé ðÜëé ïñáôÜ." -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3229,84 +2965,82 @@ msgstr "" "\n" "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôéìÝò 1 - %1." -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "¢íïéãìá" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÐñïãñÜììáôá|*.exe;*.bat;*.cmd|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Áñ÷åßá ¸ñãïõ ôïõ WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Áñ÷åßá ñõèìßóåùí (*.ini)|*.ini|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Áñ÷åßá áðëïý ÊåéìÝíïõ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Áñ÷åßá HTML (*.htm,*.html)|*.htm;*.html|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Áñ÷åßá XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "¼íïìá" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "Ôïðïèåóßá" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "Ößëôñá" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "ÐåñéãñáöÞ" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "ÅðéëÝîáôå üíïìá áñ÷åßïõ ãéá ôï íÝï ößëôñï" -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ößëôñá Áñ÷åßùí (*.flt)|*.flt|¼ëá ôá áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3319,7 +3053,7 @@ msgstr "" "Ðáñáêáëþ áíôéãñÜøáôå ôï áñ÷åßï %1 óôï öÜêåëï WinMerge/Filters:\n" "%2." -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3332,7 +3066,7 @@ msgstr "" "\n" "Ðáñáêáëþ âåâáéùèåßôå üôé ï öÜêåëïò õðÜñ÷åé êáé äåí Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\"." -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3343,7 +3077,7 @@ msgstr "" "\n" "Ðáñáêáëþ åðéëÝîôå öÜêåëï áñ÷åßùí áðü ÅðéëïãÝò/Óýóôçìá." -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3356,12 +3090,12 @@ msgstr "" "\n" "ÌÞðùò ôï áñ÷åßï Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\";" -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "Åíôïðéóìüò áñ÷åßïõ ößëôñïõ ðñïò åãêáôÜóôáóç" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "" "Installing filter file failed.\n" @@ -3372,188 +3106,188 @@ msgstr "" "\n" "Ç áíôéãñáöÞ ôïõ íÝïõ áñ÷åßïõ ößëôñïõ óôï öÜêåëï ößëôñùí Þôáí áäýíáôç." -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôï áñ÷åßï ößëôñïõ õðÜñ÷åé Þäç. ÁíôéêáôÜóôáóç ôïõ õðÜñ÷ïíôïò ößëôñïõ;" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "ÔõðïðïéçìÝíç ¸êöñáóç" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, 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." msgstr "Ôá ößëôñá åíçìåñþèçêáí. Åðéèõìåßôå íá áíáíåùèïýí üëåò ïé áíïéêôÝò óõãêñßóåéò öáêÝëùí;\n\nÅÜí äåí åðéèõìåßôå íá áíáíåùèïýí üëåò ïé óõãêñßóåéò ôþñá, ìðïñåßôå íá åðéëÝîåôå ¼÷é êáé íá áíáíåþóåôå ôéò óõãêñßóåéò áñãüôåñá." -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "ÁðïôåëÝóìáôá Óõãêñßóåùò ÖáêÝëùí" -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "Óýãêñéóç Áñ÷åßùí" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "×ùñßò ôßôëï áñéóôåñÜ" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "×ùñßò ôßôëï äåîéÜ" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "Áñ÷åßï Áõôþí" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "Áñ÷åßï Äéêü ìïõ" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "ÃñáììÞ: %s" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "Óõã÷þíåõóç" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "ÄéáöïñÜ %1 áðü %2" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "%1 ÄéáöïñÝò âñÝèçêáí" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "1 ÄéáöïñÜ âñÝèçêå" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "ÌãÁ" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "Áíôéêåßìåíï %1 áðü %2" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "Áíôéêåßìåíá: %1" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "ÅðéëÝîáôå äýï õðÜñ÷ïíôåò öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "ÅðéëïãÞ ÖáêÝëùí" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "ÅðéëÝîáôå äýï öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç." -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ áñéóôåñïý!" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ äåîéïý!" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "ÓöÜëìá óå áìöüôåñåò ôéò äéáäñïìÝò!" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "ÅðéëÝîáôå äýï áñ÷åßá þóôå íá åíåñãïðïéçèåß ç åðéëïãÞ áðïóõìðéåóôéêïý." -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "Ç óýãêñéóç áñ÷åßïõ êáé öáêÝëïõ äåí åßíáé äõíáôÞ!" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "Ôï áñ÷åßï äå âñÝèçêå: %1" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "Ôï áñ÷åßï äåí áðïóõìðéÝóèçêå: %1" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "" "Cannot open file\n" @@ -3566,12 +3300,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "Áðïôõ÷ßá áíáëýóåùò áñ÷åßïõ äéåíÝîåùí." -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "" "The file\n" @@ -3582,27 +3316,27 @@ msgstr "" "%1\n" "äåí åßíáé áñ÷åßï äéåíÝîåùí." -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "ÁðïèÞêåõóç Ùò" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "ÁðïèÞêåõóç ìåôáâïëþí óôï %1;" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, 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 Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Èá èÝëáôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï; (¼÷é ãéá áðïèÞêåõóç ùò äéáöïñåôéêü áñ÷åßï.)" -#: Merge.rc:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "Áðïôõ÷ßá äçìéïõñãßáò åöåäñéêïý áñ÷åßïõ" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "" "Unable to backup original file:\n" @@ -3615,7 +3349,7 @@ msgstr "" "\n" "ÓõíÝ÷åéá ùò Ý÷åé;" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, c-format msgid "" "Saving file failed.\n" @@ -3632,7 +3366,7 @@ msgstr "" "\t-÷ñçóéìïðïéÞóåôå Ýíá äéáöïñåôéêü üíïìá (ÐéÝóôå ÏÊ)\n" "\t-ìáôáéþóåôå ôçí ôñÝ÷ïõóá åíÝñãåéá (ÐéÝóôå ¢êõñï);" -#: Merge.rc:2256 +#: Merge.rc:3895053E #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3647,7 +3381,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2257 +#: Merge.rc:5A0BA2DF #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3662,7 +3396,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2258 +#: Merge.rc:78367A47 #, c-format msgid "" "Another application has updated file\n" @@ -3677,7 +3411,7 @@ msgstr "" "\n" "ÁíôéêáôÜóôáóç ìåôáâëçèÝíôïò áñ÷åßïõ?" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "" "%1\n" @@ -3686,32 +3420,32 @@ msgstr "" "Ôï %1\n" "Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï;" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "ÁðïèÞêåõóç Áñéóôåñïý Áñ÷åßïõ Ùò" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "ÁðïèÞêåõóç Äåîéïý Áñ÷åßïõ Ùò" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3722,42 +3456,42 @@ msgstr "" "\n" "Áíáíåþóôå ôá áñ÷åßá ðñéí óõíå÷ßóåôå." -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "ÐñÝðåé íá ïñßóåôå ìßá äéáäñïìÞ Ýñãïõ ôïõ SourceSafe þóôå íá óõíå÷ßóåôå (äçë. $/Ôï¸ñãïìïõ)" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "¸ëåã÷ïò ê´ ¸îïäïò áðü ôï VSS..." -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôïí Ýëåã÷ï ê´ Ýîïäï ôïõ áñ÷åßïõ. Ç óõíÝ÷åéá åßíáé áäýíáôç..." -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç åíôïëÞò ôïõ óõóôÞìáôïò äéá÷åéñßóåùò åêäüóåùí." -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ï öÜêåëïò åñãáóßáò ôïõ VSS êáé ç èÝóç ôïõ ôñÝ÷ïíôïò áñ÷åßïõ äåí åßíáé óå óõìöùíßá. ÓõíÝ÷åéá;" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "Äå âñÝèçêáí âÜóåéò äåäïìÝíùí ôïõ VSS!" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "ÓöÜëìá ôïõ VSS:" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3768,7 +3502,7 @@ msgstr "" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" " Áíáßñåóç åíåñãåßáò åëÝã÷ïõ ê´ åîüäïõ;" -#: Merge.rc:2284 +#: Merge.rc:1929D7D3 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3777,146 +3511,142 @@ msgstr "" "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôçí áíáßñåóç åëÝã÷ïõ ê´ åîüäïõ ôïõ áñ÷åßïõ.\n" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" -#: Merge.rc:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "×ùñßò" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (Ýêäïóç ðñï ôçò 5.0)" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (Ýêäïóç 5.0 êáé ìåôáãåíÝóôåñï)" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "ÓôÜóç óôá êåíÜ" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÓôÜóç óôá êåíÜ Þ óôá óçìåßá óôßîåùò" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "Äåîéü óôï Áñéóôåñü (%1)" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "Áñéóôåñü óôï Äåîéü (%1)" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "Áñéóôåñü óôï... (%1)" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "Äåîéü óôï... (%1)" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "Áñéóôåñü (%1)" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "Äåîéü (%1)" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "Áìöüôåñá (%1)" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "ÁñéóôåñÞ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "ÄåîéÜ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 áðü %2 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3927,17 +3657,17 @@ msgstr "" "\n" "%1 ;" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå:" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå %d áíôéêåßìåíá:" -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, c-format msgid "" "Operation aborted!\n" @@ -3956,502 +3686,502 @@ msgstr "" "\n" "Ðáñáêáëþ áíáíåþóôå ôç óýãêñéóç." -#: Merge.rc:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå:" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå %d áíôéêåßìåíá:" -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "Åðéâåâáéþóáôå Ìåôáêßíçóç" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá Üëëçò åöáñìïãÞò: %1" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "¢ãíùóôç ìïñöÞ óõìðéåóìÝíïõ áñ÷åßïõ" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "¼íïìá Áñ÷åßïõ" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "ÁðïôÝëåóìá Óõãêñßóåùò" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "Çìåñïìçíßá Áñéóôåñïý" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "Çìåñïìçíßá Äåîéïý" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "ÅðÝêôáóç" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "ÌÝãåèïò Áñéóôåñïý" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "ÌÝãåèïò Äåîéïý" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "ÌÝãåèïò Äåîéïý (Óýíôïìï)" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "ÌÝãåèïò Áñéóôåñïý (Óýíôïìï)" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Áñéóôåñïý" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Äåîéïý" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "Íåþôåñï Áñ÷åßï" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "¸êäïóç Áñéóôåñïý Áñ÷åßïõ" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "¸êäïóç Äåîéïý Áñ÷åßïõ" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "Óýíôïìï ÁðïôÝëåóìá" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "Éäéüôçôåò Áñéóôåñïý" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "Éäéüôçôåò Äåîéïý" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Áñéóôåñïý" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Äåîéïý" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "Êùäéêïóåëßäá Áñéóôåñïý" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "Êùäéêïóåëßäá Äåîéïý" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "Áãíïçèåßóá ÄéáöïñÜ." -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "Ç óýãêñéóç ôùí áñ÷åßùí åßíáé áäýíáôç" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "Ôï áíôéêåßìåíï ìáôáéþèçêå" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "Ôï áñ÷åßï ðáñåëåßöèç" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "Ï öÜêåëïò ðáñåëåßöèç" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "ÁñéóôåñÜ ìüíï: %1" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "ÄåîéÜ ìüíï: %1" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé ðáíïìïéüôõðá" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "Ôá áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "ÁñéóôåñÜ ìüíï" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "ÄåîéÜ ìüíï" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "ÓöÜëìá" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "Ðáñåëèþí ÷ñüíïò: %ld ms" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "1 áíôéêåßìåíï åðéëåãìÝíï" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "%1 áíôéêåßìåíá åðéëåãìÝíá" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "¼íïìá áñ÷åßïõ Þ üíïìá öáêÝëïõ." -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "¼íïìá õðïöáêÝëïõ üôáí ïé õðïöÜêåëïé ðåñéëáìâÜíïíôáé." -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "ÁðïôÝëåóìá óõãêñßóåùò, ðëÞñçò áíÜðôõîç" -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò äåîéÜò ðëåõñÜò." -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "ÅðÝêôáóç áñ÷åßïõ." -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óå byte." -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óå byte." -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "×ñüíïò äçìéïõñãßáò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "×ñüíïò äçìéïõñãßáò äåîéÜò ðëåõñÜò." -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "Ðëçñïöïñåß ðïéá ðëåõñÜ Ý÷åé ôçí ðëÝïí ðñüóöáôç çìåñïìçíßá ôñïðïðïéÞóåùò." -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ áñéóôåñÞò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ äåîéÜò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "Âñá÷ý áðïôÝëåóìá óõãêñßóåùò." -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "Éäéüôçôåò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "Éäéüôçôåò äåîéÜò ðëåõñÜò." -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý áñéóôåñÞò ðëåõñÜò" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý äåîéÜò ðëåõñÜò" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "Êùäéêïóåëßäá áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "Êùäéêïóåëßäá äåîéÜò ðëåõñÜò." -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áñéèìüò áãíïçèåéóþí äéáöïñþí óôï áñ÷åßï. ÁõôÝò ïé äéáöïñÝò áãíïïýíôáé áðü ôï WinMerge êáé äåí åßíáé äõíáôüí íá óõã÷ùíåõèïýí." -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áñéèìüò äéáöïñþí óôï áñ÷åßï. Áõôüò ï áñéèìüò äåí ðåñéëáìâÜíåé áãíïçèåßóåò äéáöïñÝò." -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Åìöáíßæåé Ýíáí áóôåñßóêï (*) åÜí ôï áñ÷åßï åßíáé äõáäéêü." -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "Óýãêñéóç %1 ìå %2" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "ÊáôÜëïãïò ìå êüììá ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "ÊáôÜëïãïò ìå óôçëïèÝôç ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "Áðëü HTML" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "Áðëü XML" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôï áñ÷åßï áíáöïñÜò áðïôåëåóìÜôùí õðÜñ÷åé Þäç. Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "" "Error creating the report:\n" @@ -4460,32 +4190,32 @@ msgstr "" "ÓöÜëìá êáôÜ ôç äçìéïõñãßá ôçò áíáöïñÜò áðïôåëåóìÜôùí:\n" "%1" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "Ç áíáöïñÜ áðïôåëåóìÜôùí äçìéïõñãÞèçêå åðéôõ÷þò." -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "Ôï ßäéï áñ÷åßï áíïß÷èçêå óå áìöüôåñá ôá ðåäßá." -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "Ôá åðéëåãìÝíá áñ÷åßá åßíáé ðáíïìïéüôõðá." -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôç óýãêñéóç ôùí áñ÷åßùí." -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ç äçìéïõñãßá ðñïóùñéíþí áñ÷åßùí äåí Þôáí äõíáôÞ. ÅëÝãîôå ôéò ñõèìßóåéò óáò ôéò ó÷åôéêÝò ìå ôçí ðñïóùñéíÞ äéáäñïìÞ." -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4500,17 +4230,17 @@ msgstr "" "\n" "Óçìåßùóç: ÅÜí åðéèõìåßôå ïé ÷áñáêôÞñåò ôåñìáôéóìïý íá èåùñïýíôáé ðÜíôïôå éóïäýíáìïé, åíåñãïðïéåßóôå ôçí åðéëïãÞ \"ÄéáöïñÝò ÷áñáêôÞñùí ôåñìáôéóìïý (Win/Unix/Mac) íá áãíïïýíôáé...\" óôçí êáñôÝëá Óýãêñéóç ôïõ äéáëüãïõ åðéëïãþí (åìöáíßæåôáé ìå ôçí åðéëïãÞ Åðåîåñãáóßá/ÅðéëïãÝò)." -#: Merge.rc:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "Ï åðéëåãìÝíïò öÜêåëïò äåí åßíáé Ýãêõñïò." -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "Ôï Üíïéãìá äõáäéêïý áñ÷åßïõ óôï ðåäßï åðåîåñãáóßáò äåí åßíáé äõíáôüí." -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4525,7 +4255,7 @@ msgstr "" "%1\n" "óôçí Üëëç ðëåõñÜ êáé íá áíïßîåôå áõôïýò ôïõò öáêÝëïõò;" -#: Merge.rc:2545 +#: Merge.rc:4A700AB0 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4536,152 +4266,152 @@ msgstr "" "Ç åìöÜíéóç êÜèå öáêÝëïõ ìå ôç äéêÞ ôïõ êùäéêïóåëßäá èá Ý÷åé åìöáíéóéáêÜ êáëýôåñá áðïôåëÝóìáôá áëëÜ ç óõã÷þíåõóç/áíôéãñáöÞ èá åßíáé åðéêßíäõíç.\n" "Åðéèõìåßôå íá èåùñçèåß üôé áìöüôåñá ôá áñ÷åßá ÷ñçóéìïðïéïýí ôçí ðñïêáèïñéóìÝíç êùäéêïóåëßäá ôïõ windows (óõíéóôÜôáé);" -#: Merge.rc:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Áðþëåéá ðëçñïöïñéþí ëüãù óöáëìÜôïò êùäéêïóåëßäáò: áìöüôåñá ôá áñ÷åßá" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "×ùñßò äéáöïñÜ" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "ÄéáöïñÜ ãñáììÞò" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "ÁíôéêáôáóôÜèçêáí %1 áêïëïõèßåò ÷áñáêôÞñùí." -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ç áêïëïõèßá ÷áñáêôÞñùí \"%s\" äåí åßíáé äõíáôüí íá âñåèåß" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "Ðåäßï Åíôïðéóìïý" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "Ðåäßï Äéáöïñþí" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "Ç åããñáöÞ ôïõ áñ÷åßïõ patch ïëïêëçñþèçêå åðéôõ÷þò." -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "1. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ôï áñ÷åßï patch õðÜñ÷åé Þäç. Åðéèõìåßôå íá ôï áíôéêáôáóôÞóåôå;" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "[%1 åðéëåãìÝíá áñ÷åßá]" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "Êáíïíéêü" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "Ìå ðåñéâÜëëïí êåßìåíï" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "ÅíïðïéçìÝíï" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "Ç åããñáöÞ óôï áñ÷åßï %1 äåí Þôáí äõíáôÞ." -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ç ïñéóèåßóá äéáäñïìÞ åîüäïõ äåí åßíáé áðüëõôç äéáäñïìÞ: %1" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "Ïñßóáôå Ýíá áñ÷åßï åîüäïõ" -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü äõáäéêÜ áñ÷åßá äåí åßíáé äõíáôÞ." -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü öáêÝëïõò äåí åßíáé äõíáôÞ." -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "" "Please save all files first.\n" @@ -4692,12 +4422,12 @@ msgstr "" "\n" "Ç äçìéïõñãßá patch áðáéôåß íá ìçí õðÜñ÷ïõí óå áñ÷åßá áëëáãÝò ïé ïðïßåò äåí Ý÷ïõí áðïèçêåõèåß." -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "Ï öÜêåëïò äåí õðÜñ÷åé." -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4708,37 +4438,37 @@ msgstr "" "Äåí åßíáé äõíáôüí íá âñåèïýí üëá ôá áðáñáßôçôá óôïé÷åßá (ôï 7-zip êáé/Þ ôï Merge7z*.dll) ãéá ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí.\n" "Äåßôå óôï åã÷åéñßäéï ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí êáé ìå ôïí ôñüðï åíåñãïðïéÞóåùò áõôÞò." -#: Merge.rc:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åîáãùãÞ" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åéóáãùãÞ" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "Ïé ñõèìßóåéò åéóÞ÷èçóáí áðü ôï áñ÷åßï." -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "Ïé ñõèìßóåéò åîÞ÷èçóáí óôï áñ÷åßï." -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "Áðïôõ÷ßá åéóáãùãÞò ñõèìßóåùí áðü ôï áñ÷åßï." -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "Áðïôõ÷ßá åããñáöÞò ñõèìßóåùí óôï áñ÷åßï." -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4749,247 +4479,247 @@ msgstr "" "\n" "Åðéèõìåßôå íá óõíå÷ßóåôå;" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "Ìéêôü" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "Ôýðïò" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "Áðïóõìðéåóôéêü" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "ÐñïåðåîåñãáóôÞò Äéáöïñþí" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "ÌáêñïåíôïëÝò ÅðåîåñãáóôÞ ÊåéìÝíïõ" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ôï óõíåñãáæüìåíï áðïóõìðéåóôéêü åíåñãåß óå áìöüôåñá ôá áñ÷åßá (ìüíï Ýíá áñ÷åßï ÷ñåéÜæåôáé íá Ý÷åé ôçí åðÝêôáóç)" -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí (ÊáíïíéêÞ Ëåéôïõñãßá)" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "Ðñïôåéíüìåíá Áñèñþìáôá" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "¢ëëá áñèñþìáôá" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "ÉäéùôéêÞ Ìåôáãëþôôéóç: %1" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "Ñõèìßóåéò ÁñèñùìÜôùí" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Ôï ÐåñéâÜëëïí Äéåñìçíåßáò Windows (WSH) äå âñÝèçêå - ç ÷ñÞóç áñ÷åßùí äÝóìçò åíåñãåéþí .sct åßíáé áðåíåñãïðïéçìÝíç" -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "<ÏõäÝí>" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "<Áõôüìáôï>" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "ÌåôÜ&âáóç óôç ÃñáììÞ %1" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "ÁðåíåñãïðïéçìÝíç" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "Áðü Áñ÷åéïóýóôçìá" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "Áðü ÊáôÜëïãï ðñïóöÜôùò ÷ñçóéìïðïéçèÝíôùí" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "×ùñßò ×ñùìáôéóìü Êþäéêá" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 8660a3253..b02acb044 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -24,3170 +24,2906 @@ msgstr "" "X-Poedit-Basepath: ../../Src/\n" #. LANGUAGE, SUBLANGUAGE -#: Merge.rc:22 -#: Merge.rc:51 +#: Merge.rc:5F458438 #, c-format msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_HUNGARIAN, SUBLANG_DEFAULT" #. Codepage -#: Merge.rc:23 -#: Merge.rc:52 +#: Merge.rc:2C983F1 #, c-format msgid "1252" msgstr "1250" -#: Merge.rc:74 +#: Merge.rc:1C6125F3 #, c-format msgid "C&opy to Right" msgstr "Átmásol &Jobbra" -#: Merge.rc:75 +#: Merge.rc:92C6C92 #, c-format msgid "Cop&y to Left" msgstr "Átmásol &Balra" -#: Merge.rc:76 +#: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" msgstr "" -#: Merge.rc:77 +#: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" msgstr "" -#: Merge.rc:79 +#: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" msgstr "" -#: Merge.rc:81 +#: Merge.rc:43017E40 #, c-format msgid "&Undo" msgstr "&Visszavonás" -#: Merge.rc:82 +#: Merge.rc:43017E41 #, c-format msgid "&Redo" msgstr "Még&is" -#: Merge.rc:84 +#: Merge.rc:3CF9F83 #, c-format msgid "Cu&t" msgstr "&Kivágás" -#: Merge.rc:85 -#: Merge.rc:619 +#: Merge.rc:43017E42 #, c-format msgid "&Copy" msgstr "&Másolás" -#: Merge.rc:86 +#: Merge.rc:1D2E49F6 #, c-format msgid "&Paste" msgstr "&Beillesztés" -#: Merge.rc:88 -#: Merge.rc:731 +#: Merge.rc:AC3AA11 #, c-format msgid "&Goto..." msgstr "&Ugrás..." -#: Merge.rc:90 +#: Merge.rc:B4D35A1 #, c-format msgid "Op&en" msgstr "Meg&nyitás" -#: Merge.rc:92 -#: Merge.rc:650 -#: Merge.rc:656 -#: Merge.rc:662 +#: Merge.rc:37625055 #, c-format msgid "with &Registered Application" msgstr "&Társított programmal" -#: Merge.rc:93 -#: Merge.rc:651 -#: Merge.rc:657 -#: Merge.rc:663 +#: Merge.rc:46724E8D #, c-format msgid "with &External Editor" msgstr "&Külsõ szerkesztõvel" -#: Merge.rc:94 -#: Merge.rc:652 -#: Merge.rc:658 -#: Merge.rc:664 +#: Merge.rc:AC3AA12 #, c-format msgid "&with..." msgstr "&Egyéb programmal..." -#: Merge.rc:103 +#: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" msgstr "" -#: Merge.rc:104 +#: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" msgstr "" -#: Merge.rc:113 +#: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" -#: Merge.rc:124 -#: Merge.rc:128 +#: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" msgstr "" -#: Merge.rc:125 -#: Merge.rc:129 +#: Merge.rc:68816EE1 #, c-format msgid "&Next Page" msgstr "" -#: Merge.rc:126 +#: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" msgstr "" -#: Merge.rc:132 -#: Merge.rc:453 +#: Merge.rc:43017E43 #, c-format msgid "&Zoom" msgstr "Nagyítás" -#: Merge.rc:141 +#: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" msgstr "" -#: Merge.rc:143 -#: Merge.rc:179 -#: Merge.rc:285 -#: Merge.rc:487 +#: Merge.rc:43017E44 #, c-format msgid "&None" msgstr "&Nincs" -#: Merge.rc:145 +#: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" msgstr "" -#: Merge.rc:147 +#: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" msgstr "" -#: Merge.rc:153 -#: Merge.rc:230 -#: Merge.rc:359 +#: Merge.rc:43017E45 #, c-format msgid "&File" msgstr "&Fájl" -#: Merge.rc:155 -#: Merge.rc:232 -#: Merge.rc:361 +#: Merge.rc:4DE14273 #, c-format msgid "&New\tCtrl+N" msgstr "&Új\tCtrl+N" -#: Merge.rc:156 -#: Merge.rc:233 -#: Merge.rc:362 +#: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" msgstr "" -#: Merge.rc:157 -#: Merge.rc:234 -#: Merge.rc:363 +#: Merge.rc:1DC30E61 #, c-format msgid "&Open...\tCtrl+O" msgstr "M&egnyitás...\tCtrl+O" -#: Merge.rc:158 -#: Merge.rc:235 -#: Merge.rc:364 +#: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." msgstr "Konfliktus fájl megnyitása..." -#: Merge.rc:160 -#: Merge.rc:237 -#: Merge.rc:366 +#: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Projekt megnyitása...\tCtrl+J" -#: Merge.rc:161 -#: Merge.rc:238 -#: Merge.rc:367 +#: Merge.rc:1BF42625 #, c-format msgid "Sa&ve Project..." msgstr "Projekt mentése..." -#: Merge.rc:163 +#: Merge.rc:47D4A3FA #, c-format msgid "Recent Projects" msgstr "Legutóbbi projektek" -#: Merge.rc:164 -#: Merge.rc:249 -#: Merge.rc:411 +#: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" msgstr "" -#: Merge.rc:166 -#: Merge.rc:251 -#: Merge.rc:413 -#: Merge.rc:573 -#: Merge.rc:2696 +#: Merge.rc:29D50B4A #, c-format msgid "< Empty >" msgstr "< Üres >" -#: Merge.rc:169 -#: Merge.rc:254 -#: Merge.rc:416 +#: Merge.rc:79AB21E0 #, c-format msgid "E&xit" msgstr "&Kilépés" -#: Merge.rc:171 -#: Merge.rc:256 -#: Merge.rc:418 +#: Merge.rc:43017E46 #, c-format msgid "&Edit" msgstr "S&zerkesztés" -#: Merge.rc:173 -#: Merge.rc:260 -#: Merge.rc:447 +#: Merge.rc:27AC6D7E #, c-format msgid "&Options..." msgstr "&Beállítások..." -#: Merge.rc:175 -#: Merge.rc:262 -#: Merge.rc:449 +#: Merge.rc:43017E47 #, c-format msgid "&View" msgstr "&Nézet" -#: Merge.rc:177 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:AC3AA14 #, c-format msgid "&Toolbar" msgstr "Eszköztár" -#: Merge.rc:180 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:1D2E49F7 #, c-format msgid "&Small" msgstr "Kic&si" -#: Merge.rc:181 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:22956A6 #, c-format msgid "&Big" msgstr "Nagy" -#: Merge.rc:183 -#: Merge.rc:289 -#: Merge.rc:491 +#: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" msgstr "&Állapotsor" -#: Merge.rc:184 -#: Merge.rc:290 -#: Merge.rc:492 +#: Merge.rc:2C015CFD #, c-format msgid "Ta&b Bar" msgstr "" -#: Merge.rc:186 -#: Merge.rc:313 -#: Merge.rc:548 +#: Merge.rc:1D2E49F8 #, c-format msgid "&Tools" msgstr "&Eszközök" -#: Merge.rc:188 -#: Merge.rc:316 -#: Merge.rc:550 +#: Merge.rc:27AC6D80 #, c-format msgid "&Filters..." msgstr "&Szûrõk..." -#: Merge.rc:189 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." msgstr "&Patch generálása..." -#: Merge.rc:191 -#: Merge.rc:320 -#: Merge.rc:554 +#: Merge.rc:AC3AA15 #, c-format msgid "&Plugins" msgstr "&Bõvítmények" -#: Merge.rc:193 -#: Merge.rc:322 -#: Merge.rc:556 -#: Merge.rc:1854 +#: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." msgstr "" -#: Merge.rc:195 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" msgstr "" -#: Merge.rc:196 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" msgstr "" -#: Merge.rc:198 -#: Merge.rc:327 -#: Merge.rc:561 +#: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" msgstr "&Kézi kicsomagolás" -#: Merge.rc:199 -#: Merge.rc:328 -#: Merge.rc:562 +#: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" msgstr "&Automatikus kicsomagolás" -#: Merge.rc:201 -#: Merge.rc:330 -#: Merge.rc:564 -#: Merge.rc:1926 +#: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." msgstr "" -#: Merge.rc:203 -#: Merge.rc:332 -#: Merge.rc:576 +#: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" msgstr "&Bõvítmények betöltése" -#: Merge.rc:205 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:89AF4F7 #, c-format msgid "&Window" msgstr "&Ablak" -#: Merge.rc:207 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:4E65D33F #, c-format msgid "Cl&ose" msgstr "&Bezárás" -#: Merge.rc:208 -#: Merge.rc:337 -#: Merge.rc:581 +#: Merge.rc:34E43607 #, c-format msgid "Clo&se All" msgstr "&Mindegyik bezárása" -#: Merge.rc:210 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:8AF7E69 #, c-format msgid "Change &Pane\tF6" msgstr "&Panel váltása\tF6" -#: Merge.rc:212 -#: Merge.rc:341 -#: Merge.rc:585 +#: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" msgstr "Elrendezés &vízszintesen" -#: Merge.rc:213 -#: Merge.rc:342 -#: Merge.rc:586 +#: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" msgstr "Elrendezés &függõlegesen" -#: Merge.rc:214 -#: Merge.rc:343 -#: Merge.rc:587 +#: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" msgstr "&Felosztás" -#: Merge.rc:216 -#: Merge.rc:345 -#: Merge.rc:589 -#: Merge.rc:2057 +#: Merge.rc:43017E48 #, c-format msgid "&Help" msgstr "&Súgó" -#: Merge.rc:218 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:3938FFC1 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Súgó\tF1" -#: Merge.rc:220 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" msgstr "" -#: Merge.rc:221 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:223 -#: Merge.rc:352 -#: Merge.rc:596 +#: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:224 -#: Merge.rc:353 -#: Merge.rc:597 +#: Merge.rc:3938FFC3 #, c-format msgid "&About WinMerge..." msgstr "&A Winmerge névjegye..." -#: Merge.rc:240 -#: Merge.rc:387 +#: Merge.rc:68816EE2 #, c-format msgid "&Read-only" msgstr "" -#: Merge.rc:242 -#: Merge.rc:389 +#: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" msgstr "Bal oldal csak &olvasható" -#: Merge.rc:243 -#: Merge.rc:390 +#: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" msgstr "" -#: Merge.rc:244 -#: Merge.rc:391 +#: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" msgstr "Jobb oldal csak o&lvasható" -#: Merge.rc:247 +#: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." msgstr "" -#: Merge.rc:258 -#: Merge.rc:428 +#: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" msgstr "M&indent kijelöl\tCtrl+A" -#: Merge.rc:264 +#: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" msgstr "Egyezõ elemek mutatása" -#: Merge.rc:265 +#: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" msgstr "Különbözõ elemek mutatása" -#: Merge.rc:266 +#: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" msgstr "Csak bal oldali elemek mutatása" -#: Merge.rc:267 +#: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" msgstr "" -#: Merge.rc:268 +#: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" msgstr "Csak jobb oldali elemek mutatása" -#: Merge.rc:269 +#: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" msgstr "Kihagyott elemek mutatása" -#: Merge.rc:270 +#: Merge.rc:6F833C16 #, c-format msgid "S&how Binary Files" msgstr "Bináris fájlok mutatása" -#: Merge.rc:272 +#: Merge.rc:6F833C17 #, c-format msgid "Show Hidd&en Items" msgstr "&Rejtett elemek mutatása" -#: Merge.rc:274 +#: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" msgstr "Fa &mód" -#: Merge.rc:275 +#: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" msgstr "Minden alkönyvtár kibontása" -#: Merge.rc:276 +#: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" msgstr "Minden alkönyvtár bezárása" -#: Merge.rc:278 -#: Merge.rc:451 +#: Merge.rc:E6D7EE #, c-format msgid "Select &Font..." msgstr "Betûtípus..." -#: Merge.rc:279 -#: Merge.rc:452 +#: Merge.rc:5D3AA8D3 #, c-format msgid "Use Default F&ont" msgstr "Alapértelmezett betûtípus használata" -#: Merge.rc:281 -#: Merge.rc:482 +#: Merge.rc:2E3BFCA1 #, c-format msgid "Sw&ap Panes" msgstr "Panelek megcserélése" -#: Merge.rc:292 +#: Merge.rc:3E681460 #, c-format msgid "Compa&re Statistics" msgstr "Összehasonlítási statisztika" -#: Merge.rc:294 -#: Merge.rc:496 +#: Merge.rc:507A4C02 #, c-format msgid "Refre&sh\tF5" msgstr "&Frissítés\tF5" -#: Merge.rc:295 +#: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Kijelöltek frissítése\tCtrl+F5" -#: Merge.rc:297 -#: Merge.rc:498 +#: Merge.rc:1D2E49F9 #, c-format msgid "&Merge" msgstr "&Olvasztás" -#: Merge.rc:299 +#: Merge.rc:6FC398B7 #, c-format msgid "Co&mpare\tEnter" msgstr "&Összehasonlítás\tEnter" -#: Merge.rc:301 -#: Merge.rc:500 +#: Merge.rc:2E2C5207 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Következõ eltérés\tAlt+Down" -#: Merge.rc:302 -#: Merge.rc:501 +#: Merge.rc:545FEEA0 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Elõzõ eltérés\tAlt+Up" -#: Merge.rc:304 -#: Merge.rc:527 +#: Merge.rc:175DEEEC #, c-format msgid "&First Difference\tAlt+Home" msgstr "E&lsõ eltérés\tAlt+Home" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuális eltérés\tAlt+Enter" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:26A69749 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Utolsó eltérés\tAlt+End" -#: Merge.rc:308 -#: Merge.rc:531 +#: Merge.rc:334E25B0 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Másolás &Jobbra\tAlt+Right" -#: Merge.rc:309 -#: Merge.rc:532 +#: Merge.rc:69AD3BF7 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Másolás &Balra\tAlt+Left" -#: Merge.rc:311 +#: Merge.rc:4DE14274 #, c-format msgid "&Delete\tDel" msgstr "&Törlés\tDel" -#: Merge.rc:315 -#: Merge.rc:703 +#: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." msgstr "&Oszlopok testreszabása..." -#: Merge.rc:318 -#: Merge.rc:552 +#: Merge.rc:2F07210E #, c-format msgid "Generate &Report..." msgstr "&Jelentés generálása..." -#: Merge.rc:369 +#: Merge.rc:6E470BE7 #, c-format msgid "&Save\tCtrl+S" msgstr "&Mentés\tCtrl+S" -#: Merge.rc:370 +#: Merge.rc:125AD721 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:372 +#: Merge.rc:751AB58E #, c-format msgid "Save &Left" msgstr "&Bal oldal mentése" -#: Merge.rc:373 +#: Merge.rc:194397DD #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:374 +#: Merge.rc:2E3BFCA2 #, c-format msgid "Save &Right" msgstr "&Jobb oldal mentése" -#: Merge.rc:376 +#: Merge.rc:79321BE1 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:378 +#: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:379 +#: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:383 +#: Merge.rc:4DB19837 #, c-format msgid "&Print..." msgstr "Nyomtatás..." -#: Merge.rc:384 +#: Merge.rc:60FF375A #, c-format msgid "Page Se&tup" msgstr "Oldalbeállítás" -#: Merge.rc:385 +#: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" msgstr "Nyomtatási kép" -#: Merge.rc:394 +#: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" msgstr "Sorvégek átalakítása" -#: Merge.rc:401 +#: Merge.rc:78B3B623 #, c-format msgid "&Merge Mode\tF9" msgstr "&Olvasztási mód\tF9" -#: Merge.rc:403 +#: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:404 -#: Merge.rc:1925 +#: Merge.rc:1A9EBDED #, c-format msgid "&File Encoding..." msgstr "&Fájl kódolás..." -#: Merge.rc:405 +#: Merge.rc:507A4C03 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:407 -#: Merge.rc:615 +#: Merge.rc:22956A7 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:408 -#: Merge.rc:616 +#: Merge.rc:89AF4F8 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:420 +#: Merge.rc:6E470BE8 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Visszavonás\tCtrl+Z" -#: Merge.rc:421 +#: Merge.rc:6E470BE9 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Még&is\tCtrl+Y" -#: Merge.rc:423 +#: Merge.rc:CAEDA34 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Kivágás\tCtrl+X" -#: Merge.rc:424 +#: Merge.rc:6E470BEA #, c-format msgid "&Copy\tCtrl+C" msgstr "&Másolás\tCtrl+C" -#: Merge.rc:425 +#: Merge.rc:5A9A713A #, c-format msgid "&Paste\tCtrl+V" msgstr "&Beillesztés\tCtrl+V" -#: Merge.rc:427 +#: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:430 +#: Merge.rc:444C5DDB #, c-format msgid "F&ind...\tCtrl+F" msgstr "Keresé&s...\tCtrl+F" -#: Merge.rc:431 +#: Merge.rc:44BC83EC #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Csere...\tCtrl+H" -#: Merge.rc:433 +#: Merge.rc:669F87F4 #, c-format msgid "Advanced" msgstr "Haladó" -#: Merge.rc:435 +#: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Másolás sorszámokkal együtt\tCtrl+Shift+C" -#: Merge.rc:438 +#: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" msgstr "Könyvjelzõk" -#: Merge.rc:440 +#: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Könyvjelzõ ki/be\tCtrl+F2" -#: Merge.rc:441 +#: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" msgstr "Következõ könyvjelzõ\tF2" -#: Merge.rc:442 +#: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Elõzõ könyvjelzõ\tShift+F2" -#: Merge.rc:443 +#: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" msgstr "Összes könyvjelzõ törlése" -#: Merge.rc:445 +#: Merge.rc:1A9EBDEE #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ugrás...\tCtrl+G" -#: Merge.rc:455 +#: Merge.rc:7C622F87 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Nagyítás\tCtrl++" -#: Merge.rc:456 +#: Merge.rc:FE3C1D1 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Kicsinyítés\tCtrl+-" #. Zoom to normal -#: Merge.rc:457 +#: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:459 +#: Merge.rc:1BF42627 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:464 +#: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:466 -#: Merge.rc:643 +#: Merge.rc:22956A8 #, c-format msgid "&All" msgstr "" -#: Merge.rc:475 +#: Merge.rc:27AC6D81 #, c-format msgid "&Lock Panes" msgstr "Pane&lek rögzítése" -#: Merge.rc:476 +#: Merge.rc:1DC30E62 #, c-format msgid "&View Whitespace" msgstr "&Szóközök mutatása" -#: Merge.rc:477 +#: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" msgstr "Sorok &eltérésének mutatása" -#: Merge.rc:478 +#: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" msgstr "Sorszámok megjelenítése" -#: Merge.rc:479 +#: Merge.rc:4FF286 #, c-format msgid "View &Margins" msgstr "Margók megjelenítése" -#: Merge.rc:480 +#: Merge.rc:3FE258FF #, c-format msgid "W&rap Lines" msgstr "Sortördelés" -#: Merge.rc:483 +#: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:493 +#: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" msgstr "Eltérés &panel" -#: Merge.rc:494 +#: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" msgstr "&Pozíció panel" -#: Merge.rc:503 +#: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:504 +#: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:506 +#: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:508 +#: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:509 +#: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:511 +#: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:512 +#: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:514 +#: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:515 +#: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:517 +#: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:518 +#: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:520 +#: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:521 +#: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:523 +#: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:524 +#: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:534 +#: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Másolás J&obbra és ugrás tovább\tAlt+Ctrl+Right" -#: Merge.rc:538 +#: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Másolás B&alra és ugrás tovább\tAlt+Ctrl+Left" -#: Merge.rc:540 +#: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" msgstr "M&inden Jobbra másolása" -#: Merge.rc:541 +#: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" msgstr "Mi&nden Balra másolása" -#: Merge.rc:543 +#: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:545 +#: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:546 +#: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:566 +#: Merge.rc:68816EE4 #, c-format msgid "&Prediffer" msgstr "&Elõvizsgáló" -#: Merge.rc:571 +#: Merge.rc:AC3AA17 #, c-format msgid "&Scripts" msgstr "&Szkriptek" -#: Merge.rc:605 +#: Merge.rc:4C3E0A2B #, c-format msgid "Comp&are" msgstr "&Összehasonlítás" -#: Merge.rc:606 +#: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:608 +#: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:609 +#: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:611 +#: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:613 +#: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:621 -#: Merge.rc:2312 +#: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" msgstr "" -#: Merge.rc:622 -#: Merge.rc:2311 +#: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" msgstr "Balról jobbra (%1 of %2)" -#: Merge.rc:623 -#: Merge.rc:633 -#: Merge.rc:687 -#: Merge.rc:2319 -#: Merge.rc:2343 +#: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" msgstr "Balról... (%1 of %2)" -#: Merge.rc:624 -#: Merge.rc:2309 +#: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" msgstr "" -#: Merge.rc:625 -#: Merge.rc:2310 +#: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" msgstr "" -#: Merge.rc:626 -#: Merge.rc:634 -#: Merge.rc:688 -#: Merge.rc:2320 -#: Merge.rc:2344 +#: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" msgstr "" -#: Merge.rc:627 -#: Merge.rc:2308 +#: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" msgstr "" -#: Merge.rc:628 -#: Merge.rc:2307 +#: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" msgstr "Jobbról balra (%1 of %2)" -#: Merge.rc:629 -#: Merge.rc:635 -#: Merge.rc:689 -#: Merge.rc:2321 -#: Merge.rc:2345 +#: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" msgstr "Jobbról... (%1 of %2)" -#: Merge.rc:631 +#: Merge.rc:43017E49 #, c-format msgid "&Move" msgstr "&Áthelyezés" -#: Merge.rc:637 +#: Merge.rc:89AF4F9 #, c-format msgid "&Delete" msgstr "&Törlés" -#: Merge.rc:639 -#: Merge.rc:1368 -#: Merge.rc:1703 +#: Merge.rc:43017E4A #, c-format msgid "&Left" msgstr "&Bal oldal" -#: Merge.rc:640 -#: Merge.rc:1370 -#: Merge.rc:1706 +#: Merge.rc:89AF4FA #, c-format msgid "&Middle" msgstr "" -#: Merge.rc:641 -#: Merge.rc:1372 -#: Merge.rc:1709 +#: Merge.rc:1D2E49FA #, c-format msgid "&Right" msgstr "&Jobb oldal" -#: Merge.rc:642 +#: Merge.rc:43017E4B #, c-format msgid "&Both" msgstr "&Mindkettõ" -#: Merge.rc:645 +#: Merge.rc:4876CD3D #, c-format msgid "Re&name" msgstr "Át&nevezés" -#: Merge.rc:646 +#: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" msgstr "Elemek &rejtése" -#: Merge.rc:648 +#: Merge.rc:68816EE5 #, c-format msgid "&Open Left" msgstr "&Bal oldal megnyitása" -#: Merge.rc:654 +#: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" msgstr "" -#: Merge.rc:660 +#: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" msgstr "&Jobb oldal megnyitása" -#: Merge.rc:667 +#: Merge.rc:6FC398B8 #, c-format msgid "Cop&y Pathnames" msgstr "&Útvonalak másolása" -#: Merge.rc:669 -#: Merge.rc:678 -#: Merge.rc:2335 +#: Merge.rc:71676C46 #, c-format msgid "Left (%1 of %2)" msgstr "Bal (%1 ennyibõl: %2)" -#: Merge.rc:670 -#: Merge.rc:679 -#: Merge.rc:2336 +#: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:671 -#: Merge.rc:680 -#: Merge.rc:2337 +#: Merge.rc:32BFDBAB #, c-format msgid "Right (%1 of %2)" msgstr "Jobb (%1 ennyibõl: %2)" -#: Merge.rc:672 -#: Merge.rc:681 -#: Merge.rc:2338 +#: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" msgstr "Mindkettõ (%1 ennyibõl: %2)" -#: Merge.rc:673 -#: Merge.rc:682 -#: Merge.rc:2339 +#: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:675 +#: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" msgstr "&Fájlnevek másolása" -#: Merge.rc:676 +#: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:685 +#: Merge.rc:22956A9 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:690 -#: Merge.rc:2322 +#: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:691 -#: Merge.rc:2323 +#: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" msgstr "" -#: Merge.rc:692 -#: Merge.rc:2324 +#: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:695 +#: Merge.rc:AC3AA18 #, c-format msgid "&Refresh" msgstr "&Frissítés" -#: Merge.rc:697 +#: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:698 +#: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:699 +#: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:711 +#: Merge.rc:3CF9F84 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:712 +#: Merge.rc:78B3B625 #, c-format msgid "&Copy Full Path" msgstr "&Teljes útvonal másolása" -#: Merge.rc:713 +#: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" msgstr "&Fájlnév másolása" -#: Merge.rc:719 +#: Merge.rc:27A06B44 #, c-format msgid "Prediffer Settings" msgstr "Elõvizsgáló Beállítások" -#: Merge.rc:721 +#: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" msgstr "&Nincs elõvizsgálat" -#: Merge.rc:722 +#: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" msgstr "Automatikus elõvizsgálat" -#: Merge.rc:730 +#: Merge.rc:24F1D5E9 #, c-format msgid "G&oto Diff" msgstr "Ugrás &eltérésre" -#: Merge.rc:733 +#: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" msgstr "&Nem mozgatott blokkok" -#: Merge.rc:734 +#: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" msgstr "&Minden mozgatott blokk" -#: Merge.rc:735 +#: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" msgstr "A &jelenlegi Eltérés mozgatott blokkja" -#: Merge.rc:743 -#: Merge.rc:1267 +#: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" msgstr "&Szóközök" -#: Merge.rc:745 -#: Merge.rc:1268 +#: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" msgstr "&Összehasonlít" -#: Merge.rc:746 -#: Merge.rc:1270 +#: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" msgstr "&Változások kihagyása" -#: Merge.rc:747 -#: Merge.rc:1272 +#: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" msgstr "Minden kihagyása" -#: Merge.rc:749 -#: Merge.rc:1276 +#: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" msgstr "&Kis-nagybetû érzékenység" -#: Merge.rc:750 -#: Merge.rc:1278 -#: Merge.rc:1394 +#: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Sorvég különbségek figyelmen kívül hagyása (Windows/Unix/Mac)" -#: Merge.rc:752 -#: Merge.rc:898 -#: Merge.rc:1794 +#: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" msgstr "&Alkönyvtárakkal együtt" -#: Merge.rc:753 -#: Merge.rc:1878 +#: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:755 -#: Merge.rc:2134 +#: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" msgstr "Teljes tartalmak" -#: Merge.rc:756 -#: Merge.rc:2135 +#: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" msgstr "Átfutott tartalmak" -#: Merge.rc:757 -#: Merge.rc:2136 +#: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:758 -#: Merge.rc:2137 +#: Merge.rc:2CEE4748 #, c-format msgid "Modified Date" msgstr "Módosítási dátum" -#: Merge.rc:759 -#: Merge.rc:2138 +#: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:760 -#: Merge.rc:2139 +#: Merge.rc:4B89B93 #, c-format msgid "Size" msgstr "Méret" -#: Merge.rc:854 +#: Merge.rc:2515A6BC #, c-format msgid "About WinMerge" msgstr "A WinMerge névjegye" -#: Merge.rc:860 +#: Merge.rc:6AD81E09 #, c-format msgid "(Private Build)" msgstr "(Privát build)" -#: Merge.rc:861 +#: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Látogasd meg a WinMerge honlapját!" -#: Merge.rc:863 -#: Merge.rc:901 -#: Merge.rc:1286 -#: Merge.rc:1318 -#: Merge.rc:1328 -#: Merge.rc:1487 -#: Merge.rc:1523 -#: Merge.rc:1617 -#: Merge.rc:1632 -#: Merge.rc:1855 -#: Merge.rc:1924 +#: Merge.rc:1326F #, c-format msgid "OK" msgstr "Vissza" -#: Merge.rc:864 +#: Merge.rc:CAEDA35 #, c-format msgid "Contributors" msgstr "Közremûködõk" -#: Merge.rc:869 +#: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" msgstr "Válaszd ki a fájlokat vagy könyvtárakat..." -#: Merge.rc:877 -#: Merge.rc:945 -#: Merge.rc:1226 -#: Merge.rc:1248 +#: Merge.rc:68816EE6 #, c-format msgid "&Browse..." msgstr "&Tallózás..." -#: Merge.rc:883 -#: Merge.rc:1229 +#: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." msgstr "Tallóz..." -#: Merge.rc:884 +#: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:889 -#: Merge.rc:1236 -#: Merge.rc:1252 +#: Merge.rc:78E0CE0F #, c-format msgid "Br&owse..." msgstr "T&allózás..." -#: Merge.rc:890 +#: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:893 -#: Merge.rc:1793 +#: Merge.rc:2D1160AF #, c-format msgid "Select..." msgstr "Kiválasztás..." -#: Merge.rc:894 +#: Merge.rc:68816EE7 #, c-format msgid "&Unpacker:" msgstr "&Csomagoló:" -#: Merge.rc:897 +#: Merge.rc:68816EE8 #, c-format msgid "&Select..." msgstr "&Kiválasztás..." -#: Merge.rc:900 +#: Merge.rc:67019DCA #, c-format msgid "Status:" msgstr "Állapot:" -#: Merge.rc:902 -#: Merge.rc:932 -#: Merge.rc:1007 -#: Merge.rc:1026 -#: Merge.rc:1058 -#: Merge.rc:1068 -#: Merge.rc:1287 -#: Merge.rc:1319 -#: Merge.rc:1329 -#: Merge.rc:1380 -#: Merge.rc:1488 -#: Merge.rc:1524 -#: Merge.rc:1618 -#: Merge.rc:1633 -#: Merge.rc:1856 +#: Merge.rc:4E65D340 #, c-format msgid "Cancel" msgstr "Mégsem" -#: Merge.rc:903 -#: Merge.rc:1525 +#: Merge.rc:4186E48 #, c-format msgid "Help" msgstr "Súgó" -#: Merge.rc:904 +#: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" msgstr "Összehasonlítandó fájlok vagy könyvtárak" -#: Merge.rc:916 +#: Merge.rc:629C1DDC #, c-format msgid "Database:" msgstr "Adatbázis:" -#: Merge.rc:919 +#: Merge.rc:60C4588F #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:922 +#: Merge.rc:15E1A7E1 #, c-format msgid "User:" msgstr "Felhasználó:" -#: Merge.rc:924 +#: Merge.rc:37C6B9B8 #, c-format msgid "Password:" msgstr "Jelszó:" -#: Merge.rc:926 +#: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" msgstr "Link a cél VSS projekthez" -#: Merge.rc:928 -#: Merge.rc:1073 +#: Merge.rc:40325727 #, c-format msgid "Apply to all items" msgstr "Alkalmazás minden elemen" -#: Merge.rc:930 +#: Merge.rc:3B833B8A #, c-format msgid "Check Out" msgstr "Ellenõrzés" -#: Merge.rc:931 -#: Merge.rc:1069 +#: Merge.rc:751AB58F #, c-format msgid "Save As..." msgstr "Mentés másként..." -#: Merge.rc:937 +#: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" msgstr "Verzió Rendszer" -#: Merge.rc:940 +#: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" msgstr "&Verzió Rendszer:" -#: Merge.rc:943 -#: Merge.rc:2182 +#: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" msgstr "A &cleartool.exe elérési útvonala:" -#: Merge.rc:950 -#: Merge.rc:2065 -#: Merge.rc:2078 +#: Merge.rc:787FD72B #, c-format msgid "General" msgstr "Általános" -#: Merge.rc:953 +#: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatikus &ugrás az elsõ eltérésre" -#: Merge.rc:956 +#: Merge.rc:69AD3BF8 #, c-format msgid "Cl&ose windows with ESC" msgstr "Ablakok bezárása az &ESC billentyûvel" -#: Merge.rc:958 +#: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automatikus útvonalellenõrzés a &Megnyitás ablakban" -#: Merge.rc:961 +#: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" msgstr "Csak &egy példány futásának engedélyezése" -#: Merge.rc:963 +#: Merge.rc:672CD0E2 #, c-format msgid "As&k when closing multiple windows" msgstr "Rá&kérdezés több ablak bezárásakor" -#: Merge.rc:965 +#: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" msgstr "Fájl idõk megõrzése összehasonlításkor" -#: Merge.rc:968 +#: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "\"Válaszd ki a fájlokat vagy könyvtárakat\" ablak induláskor" -#: Merge.rc:970 +#: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:972 +#: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:975 +#: Merge.rc:1B63306F #, c-format msgid "Language:" msgstr "" -#: Merge.rc:978 +#: Merge.rc:516450B #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "A WinMerge lehetõvé teszi általános üzenetablakok elrejtését. A Visszaállít gombbal minden üzenetablak újra láthatóvá tehetõ." -#: Merge.rc:980 +#: Merge.rc:10976EC1 #, c-format msgid "Reset" msgstr "Visszaállít" -#: Merge.rc:987 -#: Merge.rc:1013 +#: Merge.rc:3FB4EC6 #, c-format msgid "Find" msgstr "Keresés" -#: Merge.rc:990 -#: Merge.rc:1016 -#: Merge.rc:1035 +#: Merge.rc:34DF506F #, c-format msgid "Fi&nd what:" msgstr "&Szöveg:" -#: Merge.rc:993 -#: Merge.rc:1019 -#: Merge.rc:1041 +#: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" msgstr "Csak &teljes szavak mutatása" -#: Merge.rc:995 -#: Merge.rc:1021 -#: Merge.rc:1043 +#: Merge.rc:13C27214 #, c-format msgid "Match &case" msgstr "Kis-nagybetû &érzékenység" -#: Merge.rc:997 -#: Merge.rc:1023 -#: Merge.rc:1045 +#: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" msgstr "&Reguláris kifejezések" -#: Merge.rc:999 +#: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:1002 +#: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:1005 +#: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1055 +#: Merge.rc:68816EE9 #, c-format msgid "&Find Next" msgstr "Kere&sés" -#: Merge.rc:1025 -#: Merge.rc:2039 +#: Merge.rc:11D980 #, c-format msgid "&Ok" msgstr "&Rendben" -#: Merge.rc:1032 +#: Merge.rc:4876CD3E #, c-format msgid "Replace" msgstr "Csere" -#: Merge.rc:1038 +#: Merge.rc:1B17601E #, c-format msgid "Re&place with:" msgstr "Cs&ere erre:" -#: Merge.rc:1047 +#: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" msgstr "&Álljon meg a fájl végénél" -#: Merge.rc:1050 +#: Merge.rc:39174D96 #, c-format msgid "Replace in" msgstr "A csere tartománya" -#: Merge.rc:1051 +#: Merge.rc:68816EEA #, c-format msgid "&Selection" msgstr "&Kijelölés" -#: Merge.rc:1053 +#: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" msgstr "Teljes &fájl" -#: Merge.rc:1056 +#: Merge.rc:AC3AA19 #, c-format msgid "&Replace" msgstr "&Csere" -#: Merge.rc:1057 +#: Merge.rc:507A4C04 #, c-format msgid "Replace &All" msgstr "&Mindet" -#: Merge.rc:1067 +#: Merge.rc:4C3E0A2D #, c-format msgid "CheckOut" msgstr "Ellenõriz" -#: Merge.rc:1072 -#: Merge.rc:1398 +#: Merge.rc:4C3E0A2E #, c-format msgid "Comments" msgstr "Megjegyzések" -#: Merge.rc:1075 +#: Merge.rc:51DC4C3F #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:1081 +#: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" msgstr "Sorszûrõk" -#: Merge.rc:1084 +#: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:1087 +#: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguláris kifejezések (soronként egy):" -#: Merge.rc:1092 +#: Merge.rc:24A380 #, c-format msgid "New" msgstr "Új" -#: Merge.rc:1093 +#: Merge.rc:3ECBF05 #, c-format msgid "Edit" msgstr "Szerkesztés" -#: Merge.rc:1094 +#: Merge.rc:25669B5 #, c-format msgid "Remove" msgstr "Eltávolítás" -#: Merge.rc:1099 -#: Merge.rc:2068 +#: Merge.rc:4E65D341 #, c-format msgid "Colors" msgstr "Színek" -#: Merge.rc:1102 +#: Merge.rc:2C0C2240 #, c-format msgid "Difference:" msgstr "Eltérés:" -#: Merge.rc:1106 +#: Merge.rc:1BA49C3B #, c-format msgid "Selected Difference:" msgstr "Kijelölt Eltérés:" -#: Merge.rc:1110 -#: Merge.rc:1758 +#: Merge.rc:78E0CE10 #, c-format msgid "Background" msgstr "Háttér" -#: Merge.rc:1111 +#: Merge.rc:1CDF6584 #, c-format msgid "Deleted" msgstr "Törölt" -#: Merge.rc:1128 -#: Merge.rc:1551 -#: Merge.rc:1759 -#: Merge.rc:2069 +#: Merge.rc:4C72B54 #, c-format msgid "Text" msgstr "Szöveg" -#: Merge.rc:1132 +#: Merge.rc:2756A765 #, c-format msgid "Ignored Difference:" msgstr "Kihagyott Eltérés:" -#: Merge.rc:1144 +#: Merge.rc:7106378D #, c-format msgid "Moved:" msgstr "Áthelyezett:" -#: Merge.rc:1156 +#: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" msgstr "Kijelölt áthelyezett:" -#: Merge.rc:1165 +#: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:40C55014 #, c-format msgid "Word Difference:" msgstr "Szó eltérés:" -#: Merge.rc:1201 +#: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" msgstr "Kijelölt szó eltérés:" -#: Merge.rc:1214 -#: Merge.rc:1285 -#: Merge.rc:1317 -#: Merge.rc:1401 -#: Merge.rc:1597 -#: Merge.rc:1892 -#: Merge.rc:1906 -#: Merge.rc:1916 +#: Merge.rc:7F0D4B46 #, c-format msgid "Defaults" msgstr "Alapértékek" -#: Merge.rc:1219 -#: Merge.rc:2071 +#: Merge.rc:39000D56 #, c-format msgid "System" msgstr "Rendszer" -#: Merge.rc:1222 +#: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "A törölt fájlok a &Lomtárba kerüljenek" -#: Merge.rc:1224 +#: Merge.rc:1A9EBDF0 #, c-format msgid "&External editor:" msgstr "&Belsõ szerkesztõ:" -#: Merge.rc:1227 +#: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:1230 +#: Merge.rc:1C1FA831 #, c-format msgid "Temporary files folder" msgstr "Átmeneti fájlok könyvtára" -#: Merge.rc:1231 +#: Merge.rc:58EEEB80 #, c-format msgid "S&ystem's temp folder" msgstr "A rendszer temp könyvtára" -#: Merge.rc:1233 +#: Merge.rc:6FC398BB #, c-format msgid "C&ustom folder:" msgstr "Egyedi könyvtár:" -#: Merge.rc:1242 +#: Merge.rc:55B03C13 #, c-format msgid "Patch Generator" msgstr "Patch Generátor" -#: Merge.rc:1245 +#: Merge.rc:59F5069E #, c-format msgid "File&1:" msgstr "Fájl&1:" -#: Merge.rc:1249 +#: Merge.rc:59F5069F #, c-format msgid "File&2:" msgstr "Fájl&2:" -#: Merge.rc:1253 +#: Merge.rc:43017E4C #, c-format msgid "&Swap" msgstr "&Megfordítás" -#: Merge.rc:1254 +#: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" msgstr "&Hozzáfûzés a létezõ fájlhoz" -#: Merge.rc:1256 +#: Merge.rc:AC3AA1A #, c-format msgid "&Result:" msgstr "&Eredmény:" -#: Merge.rc:1259 +#: Merge.rc:78E0CE11 #, c-format msgid "Bro&wse..." msgstr "T&allózás..." -#: Merge.rc:1260 +#: Merge.rc:89AF4FB #, c-format msgid "&Format" msgstr "&Formátum" -#: Merge.rc:1261 +#: Merge.rc:67019DCB #, c-format msgid "St&yle:" msgstr "St&ílus:" -#: Merge.rc:1264 +#: Merge.rc:4DB19838 #, c-format msgid "&Context:" msgstr "&Környezet:" -#: Merge.rc:1274 +#: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" msgstr "Üres sorok kihagyása" -#: Merge.rc:1281 +#: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" msgstr "&Parancssor mellékelése" -#: Merge.rc:1283 +#: Merge.rc:5869BBE #, c-format msgid "Open to e&xternal editor" msgstr "Megnyitás a &Belsõ Szerkesztõvel" -#: Merge.rc:1308 +#: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" msgstr "Oszlopok mutatása" -#: Merge.rc:1314 +#: Merge.rc:4856953D #, c-format msgid "Move &Up" msgstr "Mozgatás fel" -#: Merge.rc:1315 +#: Merge.rc:D0645BC #, c-format msgid "Move &Down" msgstr "Mozgatás le" -#: Merge.rc:1325 +#: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" msgstr "Kicsomagoló kiválasztása" -#: Merge.rc:1330 +#: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" msgstr "Fájl kicsomagoló:" -#: Merge.rc:1333 +#: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Minden kicsomagoló mutatása kiterjesztéstõl függetlenül" -#: Merge.rc:1336 +#: Merge.rc:5B18135F #, c-format msgid "Extensions list:" msgstr "Kiterjesztések listája:" -#: Merge.rc:1337 +#: Merge.rc:5578260E #, c-format msgid "Description:" msgstr "Leírás:" -#: Merge.rc:1348 +#: Merge.rc:4B89B94 #, c-format msgid "Stop" msgstr "Leállítás" -#: Merge.rc:1353 +#: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." msgstr "Elemek összehasonlítása..." -#: Merge.rc:1354 +#: Merge.rc:4630D06C #, c-format msgid "Items compared:" msgstr "Összehasonlított elemek:" -#: Merge.rc:1355 +#: Merge.rc:4166A153 #, c-format msgid "Items total:" msgstr "Összes elem:" -#: Merge.rc:1362 +#: Merge.rc:7D31F2A0 #, c-format msgid "Go To" msgstr "Ugrás" -#: Merge.rc:1365 +#: Merge.rc:290C61C5 #, c-format msgid "G&oto:" msgstr "U&grás:" -#: Merge.rc:1367 +#: Merge.rc:3FB4EC7 #, c-format msgid "File" msgstr "Fájl" -#: Merge.rc:1374 +#: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" msgstr "Mire ugorjon:" -#: Merge.rc:1375 +#: Merge.rc:602FC81 #, c-format msgid "Li&ne" msgstr "&Sorra" -#: Merge.rc:1377 +#: Merge.rc:27AC6D83 #, c-format msgid "&Difference" msgstr "&Eltérésre" -#: Merge.rc:1379 +#: Merge.rc:1D2E49FB #, c-format msgid "&Go To" msgstr "&Ugrás" -#: Merge.rc:1385 -#: Merge.rc:2066 +#: Merge.rc:7E5494F6 #, c-format msgid "Compare" msgstr "Összehasonlítás" -#: Merge.rc:1388 +#: Merge.rc:65285570 #, c-format msgid "Whitespace" msgstr "Szóközök" -#: Merge.rc:1389 +#: Merge.rc:AC3AA1B #, c-format msgid "&Compare" msgstr "&Összehasonlítás" -#: Merge.rc:1390 +#: Merge.rc:5A9A713B #, c-format msgid "&Ignore change" msgstr "&Változtatások kihagyása" -#: Merge.rc:1391 +#: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" msgstr "&Minden kihagyása" -#: Merge.rc:1392 +#: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" msgstr "&Üres sorok kihagyása" -#: Merge.rc:1393 +#: Merge.rc:4166A154 #, c-format msgid "Ignore &case" msgstr "&Kis-nagybetû különbségek kihagyása" -#: Merge.rc:1396 +#: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" msgstr "Mozgatott &blokk észlelés bekapcsolása" -#: Merge.rc:1397 +#: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1406 -#: Merge.rc:2067 +#: Merge.rc:3BB91A82 #, c-format msgid "Editor" msgstr "Szerkesztõ" -#: Merge.rc:1409 +#: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" msgstr "&Szintaxis kiemelés" -#: Merge.rc:1411 +#: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" msgstr "&Automatikus újraolvasás" -#: Merge.rc:1413 +#: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" msgstr "&Eredeti újsor-karakterek megõrzése" -#: Merge.rc:1415 +#: Merge.rc:4C72B55 #, c-format msgid "Tabs" msgstr "Tabulátorok" -#: Merge.rc:1416 +#: Merge.rc:68816EEB #, c-format msgid "&Tab size:" msgstr "Tab. &mérete:" -#: Merge.rc:1419 +#: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" msgstr "&Tabulátorok használata" -#: Merge.rc:1421 +#: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" msgstr "&Szóközök használata" -#: Merge.rc:1423 +#: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" msgstr "Sorok eltérésének színezése" -#: Merge.rc:1425 +#: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" msgstr "Sorok eltérésének mutatása" -#: Merge.rc:1427 +#: Merge.rc:1DC30E65 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1429 +#: Merge.rc:4DE14276 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1433 +#: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1446 +#: Merge.rc:34DF5070 #, c-format msgid "Filefilters" msgstr "FájlSzûrõk" -#: Merge.rc:1452 +#: Merge.rc:4C72B56 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1CF8A5DA #, c-format msgid "Install..." msgstr "Telepítés..." -#: Merge.rc:1454 +#: Merge.rc:27AFDB2F #, c-format msgid "New..." msgstr "Új..." -#: Merge.rc:1455 +#: Merge.rc:3B6A3611 #, c-format msgid "Edit..." msgstr "Szerkeszt..." -#: Merge.rc:1456 +#: Merge.rc:629C1DDD #, c-format msgid "Delete..." msgstr "Töröl..." -#: Merge.rc:1462 +#: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" msgstr "Módosított fájlok mentése?" -#: Merge.rc:1465 +#: Merge.rc:3534E274 #, c-format msgid "Left side file" msgstr "Bal oldali fájl" -#: Merge.rc:1468 +#: Merge.rc:6E470BEE #, c-format msgid "&Save changes" msgstr "&Változtatások mentése" -#: Merge.rc:1470 +#: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" msgstr "Változtatások &elvetése" -#: Merge.rc:1472 +#: Merge.rc:24BA673E #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1479 +#: Merge.rc:47D4A3FB #, c-format msgid "Right side file" msgstr "Jobb oldali fájl" -#: Merge.rc:1482 +#: Merge.rc:F2F641D #, c-format msgid "S&ave changes" msgstr "V&áltoztatások mentése" -#: Merge.rc:1484 +#: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" msgstr "Változtatások e&lvetése" -#: Merge.rc:1486 +#: Merge.rc:5578260F #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1493 -#: Merge.rc:1699 -#: Merge.rc:2073 +#: Merge.rc:4C3E0A2F #, c-format msgid "Codepage" msgstr "Kódlap" -#: Merge.rc:1496 +#: Merge.rc:71E3C8E6 #, c-format msgid "Default Codepage" msgstr "Alapértelmezett kódlap" -#: Merge.rc:1497 +#: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Válaszd ki az alapértelmezett kódlapot a nem-Unicode fájlokhoz:" -#: Merge.rc:1499 +#: Merge.rc:5CC85DF4 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "Kódlap információ detektálása ezen fájloknál: .html, .rc, .xml \nprogram újraindítás szükséges" -#: Merge.rc:1502 +#: Merge.rc:3BCD5104 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:E6D7F1 #, c-format msgid "System codepage" msgstr "Rendszer kódlap" -#: Merge.rc:1509 +#: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" msgstr "A Winmerge felhasználói felületéhez igazodva" -#: Merge.rc:1511 +#: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" msgstr "Egyedi kódlap:" -#: Merge.rc:1520 +#: Merge.rc:6CD65B95 #, c-format msgid "Options" msgstr "Opciók" -#: Merge.rc:1531 +#: Merge.rc:D32E2F1 #, c-format msgid " Categories" msgstr " Kategóriák" -#: Merge.rc:1533 +#: Merge.rc:26188978 #, c-format msgid "Import..." msgstr "Importálás..." -#: Merge.rc:1534 +#: Merge.rc:9B5002F #, c-format msgid "Export..." msgstr "Exportálás..." -#: Merge.rc:1539 -#: Merge.rc:1747 +#: Merge.rc:50F76E1 #, c-format msgid "Dialog" msgstr "Kérdés" -#: Merge.rc:1542 +#: Merge.rc:744A4E1C #, c-format msgid "Keywords:" msgstr "Kulcsszavak:" -#: Merge.rc:1543 +#: Merge.rc:1AFA3492 #, c-format msgid "Function names:" msgstr "Függvény nevek:" -#: Merge.rc:1544 +#: Merge.rc:3B833B8B #, c-format msgid "Comments:" msgstr "Megjegyzések:" -#: Merge.rc:1545 +#: Merge.rc:7B25D658 #, c-format msgid "Numbers:" msgstr "Számok:" -#: Merge.rc:1546 +#: Merge.rc:50D15AD #, c-format msgid "Operators:" msgstr "Operátorok:" -#: Merge.rc:1547 +#: Merge.rc:79321BE2 #, c-format msgid "Strings:" msgstr "Sztringek:" -#: Merge.rc:1548 +#: Merge.rc:1E0ED5B2 #, c-format msgid "Preprocessor:" msgstr "Elõfeldolgozó:" -#: Merge.rc:1549 +#: Merge.rc:24173EE5 #, c-format msgid "User 1:" msgstr "Felhasználó 1:" -#: Merge.rc:1550 +#: Merge.rc:24173EE6 #, c-format msgid "User 2:" msgstr "Felhasználó 2:" -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 -#: Merge.rc:1575 -#: Merge.rc:1580 -#: Merge.rc:1585 -#: Merge.rc:1590 -#: Merge.rc:1595 +#: Merge.rc:3C10FC2 #, c-format msgid "Bold" msgstr "Félkövér" -#: Merge.rc:1603 +#: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" msgstr "Könyvtár összehasonítási jelentés" -#: Merge.rc:1606 +#: Merge.rc:3ECF34A3 #, c-format msgid "Report &File:" msgstr "Jelentés &fájl:" -#: Merge.rc:1609 -#: Merge.rc:1785 -#: Merge.rc:1789 -#: Merge.rc:1816 +#: Merge.rc:146A5938 #, c-format msgid "Browse..." msgstr "Tallózás..." -#: Merge.rc:1610 +#: Merge.rc:89AF4FC #, c-format msgid "&Style:" msgstr "&Stílus:" -#: Merge.rc:1613 +#: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:3938FFC5 #, c-format msgid "&Copy to Clipboard" msgstr "Másolás vágólapra" -#: Merge.rc:1623 +#: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" msgstr "Megosztott vagy saját szûrõ" -#: Merge.rc:1626 +#: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" msgstr "Milyen típusú szûrõt szeretnél létrehozni?" -#: Merge.rc:1628 +#: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Megosztott szûrõ (a gép minden felhasználójának)" -#: Merge.rc:1630 +#: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" msgstr "Saját szûrõ (csak a jelenlegi felhasználónak)" -#: Merge.rc:1638 -#: Merge.rc:2074 +#: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" msgstr "Archívum támogatás" -#: Merge.rc:1641 +#: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" msgstr "Archív fájlok támogatásának &engedélyezése" -#: Merge.rc:1643 +#: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" msgstr "Archív fájl típusának megállapítása a fájl &szignatúrája alapján" -#: Merge.rc:1651 +#: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" msgstr "Összehasonlítási statisztika" -#: Merge.rc:1654 +#: Merge.rc:64ABCD7E #, c-format msgid "Folders:" msgstr "Könyvtárak:" -#: Merge.rc:1655 +#: Merge.rc:7262BE23 #, c-format msgid "Files:" msgstr "Fájlok:" -#: Merge.rc:1656 -#: Merge.rc:2449 +#: Merge.rc:629C1DDE #, c-format msgid "Different" msgstr "Különbözõ" -#: Merge.rc:1657 +#: Merge.rc:141E3F81 #, c-format msgid "Text:" msgstr "Szöveg:" -#: Merge.rc:1660 -#: Merge.rc:1684 +#: Merge.rc:5FC9C469 #, c-format msgid "Binary:" msgstr "Bináris:" -#: Merge.rc:1663 +#: Merge.rc:26535499 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1664 +#: Merge.rc:602FC82 #, c-format msgid "Left:" msgstr "Bal:" -#: Merge.rc:1669 -#, c-format -msgid "Middle:" -msgstr "" - -#: Merge.rc:1674 +#: Merge.rc:25669B6 #, c-format msgid "Right:" msgstr "Jobb:" -#: Merge.rc:1679 -#: Merge.rc:2439 +#: Merge.rc:26188979 #, c-format msgid "Identical" msgstr "Egyezõ" -#: Merge.rc:1688 +#: Merge.rc:6FA9B0F7 #, c-format msgid "Total:" msgstr "Összesen:" -#: Merge.rc:1693 +#: Merge.rc:76245120 #, c-format msgid "Close" msgstr "Bezár" -#: Merge.rc:1702 +#: Merge.rc:2FC0BA7B +#, c-format +msgid "Middle:" +msgstr "" + +#: Merge.rc:2CEE4749 +#, c-format +msgid "Missing Left:" +msgstr "" + +#: Merge.rc:2A79A039 +#, c-format +msgid "Missing Middle:" +msgstr "" + +#: Merge.rc:70DAA20F +#, c-format +msgid "Missing Right:" +msgstr "" + +#: Merge.rc:413EF3DC #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1705 -#: Merge.rc:1708 -#: Merge.rc:1711 +#: Merge.rc:1BE35CDC #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1712 +#: Merge.rc:E4471B #, c-format msgid "Select Codepage for" msgstr "Kódlap kiválasztása" -#: Merge.rc:1713 +#: Merge.rc:5A9A713C #, c-format msgid "&File Loading:" msgstr "Fájl töltése:" -#: Merge.rc:1716 +#: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" msgstr "Fájl menté&se:" -#: Merge.rc:1719 +#: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" msgstr "&Ugyanazon kódlap használata mindkettõhöz" -#: Merge.rc:1722 +#: Merge.rc:1D2E49FC #, c-format msgid "&Apply" msgstr "&Alkalmaz" -#: Merge.rc:1723 -#: Merge.rc:2040 +#: Merge.rc:89AF4FD #, c-format msgid "&Cancel" msgstr "&Mégsem" -#: Merge.rc:1728 +#: Merge.rc:72A593B8 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1731 +#: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1733 +#: Merge.rc:4EF81630 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1735 +#: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" msgstr "Könyvtár neve" -#: Merge.rc:1737 +#: Merge.rc:4876CD3F #, c-format msgid "Result:" msgstr "Eredmény:" -#: Merge.rc:1741 +#: Merge.rc:43017E4D #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1D2E49FD #, c-format msgid "&Close" msgstr "Bezár" -#: Merge.rc:1750 +#: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" msgstr "Egyéni szövegszínek használata" -#: Merge.rc:1753 +#: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" msgstr "Egyéni szövegszínek" -#: Merge.rc:1755 +#: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" msgstr "Szóköz, tab:" -#: Merge.rc:1756 +#: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" msgstr "Sima szöveg:" -#: Merge.rc:1757 +#: Merge.rc:751AB590 #, c-format msgid "Selection:" msgstr "Kijelölés:" -#: Merge.rc:1780 +#: Merge.rc:D109E01 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1D2E49FE #, c-format msgid "&Left:" msgstr "&Bal:" -#: Merge.rc:1786 +#: Merge.rc:39174D97 #, c-format msgid "R&ead-only" msgstr "Csak olvasható" -#: Merge.rc:1787 +#: Merge.rc:89AF4FE #, c-format msgid "&Right:" msgstr "&Jobb:" -#: Merge.rc:1790 +#: Merge.rc:39174D98 #, c-format msgid "Re&ad-only" msgstr "Cs&ak olvasható" -#: Merge.rc:1791 +#: Merge.rc:AC3AA1C #, c-format msgid "&Filter:" msgstr "&Szûrõ:" -#: Merge.rc:1796 +#: Merge.rc:6CD65B96 #, c-format msgid "Open..." msgstr "Megnyitás..." -#: Merge.rc:1797 +#: Merge.rc:67019DCC #, c-format msgid "Save..." msgstr "Mentés..." -#: Merge.rc:1802 -#: Merge.rc:2075 +#: Merge.rc:43E58E59 #, c-format msgid "Backup Files" msgstr "Visszaállítási fájlok" -#: Merge.rc:1805 +#: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" msgstr "Visszaállítási fájlok készítése itt:" -#: Merge.rc:1806 +#: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" msgstr "&Mappa összehasonlításkor" -#: Merge.rc:1808 +#: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" msgstr "&Fájl összehasonlításkor" -#: Merge.rc:1810 +#: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" msgstr "Visszaállítási fájlok készítése ide:" -#: Merge.rc:1811 +#: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" msgstr "Eredeti fájl könyvtára" -#: Merge.rc:1813 +#: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" msgstr "Globális visszaállítási könyvtár:" -#: Merge.rc:1817 +#: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" msgstr "Visszaállítási fájl neve:" -#: Merge.rc:1818 +#: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" msgstr ".bak kiterjesztés hozzáfûzése" -#: Merge.rc:1820 +#: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" msgstr "Idõpecsét hozzáfûzése" -#: Merge.rc:1827 -#: Merge.rc:2362 +#: Merge.rc:CAEDA36 #, c-format msgid "Confirm Copy" msgstr "Másolás megerõsítése" -#: Merge.rc:1831 +#: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Biztosan másolni szeretne XXX elemet?" -#: Merge.rc:1833 +#: Merge.rc:30CDE281 #, c-format msgid "From left" msgstr "Balról" -#: Merge.rc:1836 +#: Merge.rc:2C015CFE #, c-format msgid "To right" msgstr "Jobbra" -#: Merge.rc:1839 +#: Merge.rc:29CE40 #, c-format msgid "Yes" msgstr "Igen" -#: Merge.rc:1840 +#: Merge.rc:12E8E #, c-format msgid "No" msgstr "Nem" -#: Merge.rc:1846 +#: Merge.rc:B612C23 #, c-format msgid "Plugins" msgstr "Bõvítmények" -#: Merge.rc:1849 +#: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" msgstr "Bõvítmény&ek bekapcsolása" -#: Merge.rc:1861 -#: Merge.rc:2076 +#: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1864 +#: Merge.rc:31DC8C62 #, c-format msgid "Explorer" msgstr "Intézõ" -#: Merge.rc:1865 +#: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" msgstr "&Bõvített menü engedélyezése" -#: Merge.rc:1867 +#: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" msgstr "Hozzáadás a helyi menühöz" -#: Merge.rc:1869 +#: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1875 -#: Merge.rc:2079 -#: Merge.rc:2383 +#: Merge.rc:7262BE24 #, c-format msgid "Folder" msgstr "Könyvtár" -#: Merge.rc:1880 +#: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" msgstr "Megállás az &elsõ különbségnél" -#: Merge.rc:1882 +#: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3 másodperc alatti idõkülönbségek mellõzése" -#: Merge.rc:1884 +#: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1897 -#: Merge.rc:2081 -#: Merge.rc:2424 -#: Merge.rc:2630 +#: Merge.rc:17BC2F9E #, c-format msgid "Binary" msgstr "Bináris" -#: Merge.rc:1900 +#: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1904 +#: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1911 -#: Merge.rc:2080 +#: Merge.rc:B8C361 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1914 +#: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:4DB19839 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1952 +#: Merge.rc:6DC3523 #, c-format msgid "040904e4" msgstr "040E04e2" #. VarFileInfo.Translation -#: Merge.rc:1968 +#: Merge.rc:53CC5469 #, c-format msgid "0x409, 1252" msgstr "0x040E, 1250" -#: Merge.rc:1988 +#: Merge.rc:206940 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:1F78C0 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1990 +#: Merge.rc:24A381 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1991 +#: Merge.rc:4B89B95 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:251BC0 #, c-format msgid "OVR" msgstr "ÁTÍR" -#: Merge.rc:1993 +#: Merge.rc:268480 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:E8950E9 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:28AAB7D #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:28AAB7E #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:524AB109 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ismeretlen hiba a projekt fájl megnyitásakor" -#: Merge.rc:2008 +#: Merge.rc:524AB10A #, c-format msgid "Unknown error attempting to save project file" msgstr "Ismeretlen hiba a projekt fájl mentésekor" -#: Merge.rc:2009 +#: Merge.rc:3EE7B44D #, c-format msgid "Project File" msgstr "Projekt fájl" -#: Merge.rc:2010 +#: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." msgstr "Projekt fájl sikeresen betöltve." -#: Merge.rc:2011 +#: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." msgstr "Projekt fájl sikeresen elmentve." -#: Merge.rc:2017 +#: Merge.rc:28AAB7F #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:28AAB80 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2B78E95D #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2026 +#: Merge.rc:293A824F #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2032 +#: Merge.rc:74BA5C8C #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:3EF068BF #, 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:2041 +#: Merge.rc:1D2E49FF #, c-format msgid "&Abort" msgstr "&Leállít" -#: Merge.rc:2042 +#: Merge.rc:1D2E4A00 #, c-format msgid "&Retry" msgstr "&Ismét" -#: Merge.rc:2043 +#: Merge.rc:89AF4FF #, c-format msgid "&Ignore" msgstr "&Kihagy" -#: Merge.rc:2044 +#: Merge.rc:21C15B8 #, c-format msgid "Ignore &all" msgstr "Kihagy M&indent" -#: Merge.rc:2045 +#: Merge.rc:22956AA #, c-format msgid "&Yes" msgstr "&Igen" -#: Merge.rc:2051 +#: Merge.rc:48B5872E #, c-format msgid "Yes to &all" msgstr "Igen &mindenre" -#: Merge.rc:2052 +#: Merge.rc:11D981 #, c-format msgid "&No" msgstr "&Nem" -#: Merge.rc:2053 +#: Merge.rc:4909ADB4 #, c-format msgid "No to a&ll" msgstr "Nem m&indenre" -#: Merge.rc:2054 +#: Merge.rc:4DB1983A #, c-format msgid "&Continue" msgstr "&Folytatás" -#: Merge.rc:2055 +#: Merge.rc:43017E4E #, c-format msgid "&Skip" msgstr "&Kihagy" -#: Merge.rc:2056 +#: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" msgstr "Kihagy &mindent" -#: Merge.rc:2058 +#: Merge.rc:77C09B82 #, c-format msgid "Don't display this &message again." msgstr "&Ne jelenjen meg többet ez az üzenet." -#: Merge.rc:2059 +#: Merge.rc:57F02FB4 #, c-format msgid "Don't ask this &question again." msgstr "&Ne jelenjen meg többet ez a kérdés." -#: Merge.rc:2070 +#: Merge.rc:39000D57 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" msgstr "Verzió Kontroll" -#: Merge.rc:2077 -#: Merge.rc:2423 +#: Merge.rc:2C0C2241 #, c-format msgid "Differences" msgstr "Eltérések" -#: Merge.rc:2088 +#: Merge.rc:277500 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:68EE6DF1 #, c-format msgid "From left:" msgstr "Balról:" -#: Merge.rc:2090 +#: Merge.rc:2C015CFF #, c-format msgid "To left:" msgstr "Jobbra:" -#: Merge.rc:2091 +#: Merge.rc:34DF5071 #, c-format msgid "From right:" msgstr "Jobbról:" -#: Merge.rc:2092 +#: Merge.rc:542A4301 #, c-format msgid "To right:" msgstr "Jobbra:" -#: Merge.rc:2098 +#: Merge.rc:2924ED78 #, c-format msgid "Version %1" msgstr "Verzió %1" -#: Merge.rc:2099 +#: Merge.rc:24173EE7 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2100 +#: Merge.rc:295600 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2106 +#: Merge.rc:761E6873 #, c-format msgid "Options (%1)" msgstr "Opciók (%1)" -#: Merge.rc:2107 +#: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." msgstr "Minden üzenet ezentúl újra megjelenik." -#: Merge.rc:2109 +#: Merge.rc:37825D6A #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3195,84 +2931,82 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:2115 +#: Merge.rc:47E5C8F #, c-format msgid "Open" msgstr "Megnyitás" -#: Merge.rc:2116 +#: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programok|*.exe;*.bat;*.cmd|Minden fájl (*.*)|*.*||" -#: Merge.rc:2117 +#: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Minden fájl (*.*)|*.*||" -#: Merge.rc:2118 +#: Merge.rc:237E9033 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projekt Fájlok (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2120 +#: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2126 +#: Merge.rc:3FF615A0 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2127 +#: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2128 +#: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2145 -#: Merge.rc:2639 +#: Merge.rc:46FCCCE #, c-format msgid "Name" msgstr "Név" -#: Merge.rc:2146 +#: Merge.rc:15875422 #, c-format msgid "Location" msgstr "Hely" -#: Merge.rc:2147 +#: Merge.rc:59F506A0 #, c-format msgid "Filters" msgstr "Szûrõk" -#: Merge.rc:2148 +#: Merge.rc:52D199B #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2149 -#: Merge.rc:2641 +#: Merge.rc:2C0C2242 #, c-format msgid "Description" msgstr "Leírás" -#: Merge.rc:2150 +#: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" msgstr "Válassz fájlnevet az új szûrõhöz" -#: Merge.rc:2151 +#: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fájl szûrõk (*.flt)|*.flt|Minden fájl (*.*)|*.*||" -#: Merge.rc:2153 +#: Merge.rc:24B5241A #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3281,7 +3015,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2A045B49 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3290,7 +3024,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2157 +#: Merge.rc:4EA7BACD #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3298,7 +3032,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:2159 +#: Merge.rc:7DDEC9BD #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3307,12 +3041,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:2160 +#: Merge.rc:6F3BCB34 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:6858E820 #, c-format msgid "" "Installing filter file failed.\n" @@ -3320,188 +3054,188 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2164 +#: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:237A126 #, c-format msgid "Regular expression" msgstr "Reguláris kifejezés" -#: Merge.rc:2176 +#: Merge.rc:34BD4316 #, 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." msgstr "" -#: Merge.rc:2183 +#: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" msgstr "Könyvtár összehasonlítási eredmények" -#: Merge.rc:2190 +#: Merge.rc:1AFA3493 #, c-format msgid "File Comparison" msgstr "Fájl összehasonlítás" -#: Merge.rc:2191 +#: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" msgstr "Névtelen bal oldal" -#: Merge.rc:2192 +#: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" msgstr "Névtelen jobb oldal" -#: Merge.rc:2194 +#: Merge.rc:72A593B9 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:427C12C1 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:55269C51 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:15875423 #, c-format msgid "Line: %s" msgstr "Sor: %s" -#: Merge.rc:2203 +#: Merge.rc:50DE3D68 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:7C664E1 #, c-format msgid "Merge" msgstr "Olvasztás" -#: Merge.rc:2205 +#: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" msgstr "Ennyi különség: %1 ennyibõl: %2" -#: Merge.rc:2206 +#: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" msgstr "%1 különbséget találtam" -#: Merge.rc:2207 +#: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" msgstr "1 különbséget találtam" #. Abbreviation from "Read Only" -#: Merge.rc:2208 +#: Merge.rc:13E12 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:6B6D8965 #, c-format msgid "Item %1 of %2" msgstr "%1 elem ennyibõl: %2" -#: Merge.rc:2215 +#: Merge.rc:2618897A #, c-format msgid "Items: %1" msgstr "%1 elem" -#: Merge.rc:2221 +#: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat" -#: Merge.rc:2222 +#: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" msgstr "Könytár kiválasztás" -#: Merge.rc:2223 +#: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat." -#: Merge.rc:2224 +#: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" msgstr "A bal oldali elérési út érvénytelen!" -#: Merge.rc:2225 +#: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" msgstr "A jobb oldali elérési út érvénytelen!" -#: Merge.rc:2227 +#: Merge.rc:5AB9EEA7 #, c-format msgid "Both paths are invalid!" msgstr "Mindkét elérési út érvénytelen!" -#: Merge.rc:2228 +#: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:237A0532 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Válassz ki két fájlt a kicsomagoló kijelöléshez." -#: Merge.rc:2233 +#: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" msgstr "Nem lehet fájlt könyvtárral összehasonlítani!" -#: Merge.rc:2239 +#: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" msgstr "Ez a fájl nem található: %1" -#: Merge.rc:2240 +#: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" msgstr "A fájl nincs kicsomagolva: %1" -#: Merge.rc:2241 +#: Merge.rc:3676909F #, c-format msgid "" "Cannot open file\n" @@ -3514,37 +3248,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2242 +#: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." msgstr "Hiba a konfliktusfájl értelmezésekor." -#: Merge.rc:2243 +#: Merge.rc:5A765252 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "A fájl\n%1\nnem egy konfliktus fájl." -#: Merge.rc:2249 +#: Merge.rc:67019DCD #, c-format msgid "Save As" msgstr "Mentés másként" -#: Merge.rc:2250 +#: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" msgstr "Mentsem a változtatásokat %1 néven?" -#: Merge.rc:2251 +#: Merge.rc:6A1C6855 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "Ez a fájl: %1 csak olvasható. Szeretnéd ezt megváltoztatni? (Kattints a Nem gombra a fájl új néven való mentéséhez.)" -#: Merge.rc:2252 +#: Merge.rc:673BD332 #, c-format msgid "Error backing up file" msgstr "Hiba a fájl biztonsági másolatának készítésekor" -#: Merge.rc:2254 +#: Merge.rc:3958104B #, c-format msgid "" "Unable to backup original file:\n" @@ -3557,7 +3291,7 @@ msgstr "" "\n" "Folytatni akarod?" -#: Merge.rc:2255 +#: Merge.rc:69020931 #, c-format msgid "" "Saving file failed.\n" @@ -3574,7 +3308,7 @@ msgstr "" "\t-másik fájlnév választása (Ok)\n" "\t-a jelenlegi folyamat megszakítása (Mégsem)?" -#: Merge.rc:2256 +#: Merge.rc:3895053E #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3589,7 +3323,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2257 +#: Merge.rc:5A0BA2DF #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3604,7 +3338,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2258 +#: Merge.rc:78367A47 #, c-format msgid "" "Another application has updated file\n" @@ -3619,7 +3353,7 @@ msgstr "" "\n" "Felülírjuk a megváltoztatott fájlt?" -#: Merge.rc:2259 +#: Merge.rc:462FB760 #, c-format msgid "" "%1\n" @@ -3628,32 +3362,32 @@ msgstr "" "%1\n" "csak olvasható. Szeretnéd ezt megváltoztatni?" -#: Merge.rc:2260 +#: Merge.rc:B9192B #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "Egy másik alkalmazás módosította a fájlt\n%1\nmióta a WinMerge utoljára vizsgálta.\n\nSzeretné újra betölteni a fájlt?" -#: Merge.rc:2261 +#: Merge.rc:62909ED7 #, c-format msgid "Save Left File As" msgstr "Bal oldali fájl mentése más néven" -#: Merge.rc:2262 +#: Merge.rc:E4471D #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:6F833C19 #, c-format msgid "Save Right File As" msgstr "Jobb oldali fájl mentése más néven" -#: Merge.rc:2264 +#: Merge.rc:3C4620F #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "A fájl\n%1\neltûnt. A folytatáshoz mentse el a fájlt." -#: Merge.rc:2270 +#: Merge.rc:4BFC8F0D #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3664,42 +3398,42 @@ msgstr "" "\n" "Frissítsd a dokumentumokat, mielõtt folytatnád." -#: Merge.rc:2276 +#: Merge.rc:5C264194 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Meg kell adnod a SourceSafe projekt elérési útvonalát a folytatáshoz (pl.: $/MyProject)" -#: Merge.rc:2277 +#: Merge.rc:367690A0 #, c-format msgid "Checkout files from VSS..." msgstr "Fájlok ellenõrzése VSS-bõl..." -#: Merge.rc:2278 +#: Merge.rc:5CF52976 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "A Verzió Rendszer hibát adott vissza a fájl ellenõrzése közben. Nem lehet folytatni..." -#: Merge.rc:2279 +#: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." msgstr "Hiba a Verzió Rendszer futtatása közben." -#: Merge.rc:2280 +#: Merge.rc:3ECC9EC3 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A VSS Munka Könyvtár és a jelenlegi fájl útvonala nem egyezik. Folytassuk?" -#: Merge.rc:2281 +#: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" msgstr "Nem található VSS adatbázis!" -#: Merge.rc:2282 +#: Merge.rc:61E8009D #, c-format msgid "Error from VSS:" msgstr "Hiba a VSS-bõl:" -#: Merge.rc:2283 +#: Merge.rc:268A7727 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3707,153 +3441,149 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2284 +#: Merge.rc:1929D7D3 #, 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:2290 -#: Merge.rc:2634 +#: Merge.rc:46FCCCF #, c-format msgid "None" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:5164E1E6 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (régebbi mint 5.0)" -#: Merge.rc:2292 +#: Merge.rc:5164E1E7 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 vagy újabb)" -#: Merge.rc:2294 +#: Merge.rc:2405135 #, c-format msgid "Break at whitespace" msgstr "Megállás szóközöknél" -#: Merge.rc:2295 +#: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" msgstr "Megállás szóközöknél vagy írásjeleknél" -#: Merge.rc:2301 +#: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" msgstr "Jobbról balra (%1)" -#: Merge.rc:2302 +#: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" msgstr "Balról jobbra (%1)" -#: Merge.rc:2306 +#: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" msgstr "" -#: Merge.rc:2313 -#: Merge.rc:2340 +#: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" msgstr "Balról... (%1)" -#: Merge.rc:2314 -#: Merge.rc:2341 +#: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" msgstr "" -#: Merge.rc:2315 -#: Merge.rc:2342 +#: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" msgstr "Jobbról... (%1)" -#: Merge.rc:2316 +#: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" msgstr "" -#: Merge.rc:2318 +#: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:1B633070 #, c-format msgid "Left (%1)" msgstr "Bal (%1)" -#: Merge.rc:2331 +#: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:39174D99 #, c-format msgid "Right (%1)" msgstr "Jobb (%1)" -#: Merge.rc:2333 +#: Merge.rc:146A5939 #, c-format msgid "Both (%1)" msgstr "Mindkettõ (%1)" -#: Merge.rc:2334 +#: Merge.rc:669F87F5 #, c-format msgid "All (%1)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:DD21174 #, c-format msgid "Left side - select destination folder:" msgstr "Bal oldal - válassz úticél mappát:" -#: Merge.rc:2347 +#: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" msgstr "" -#: Merge.rc:2348 +#: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" msgstr "Jobb oldal - válassz úticél mappát:" -#: Merge.rc:2349 +#: Merge.rc:66367ECA #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2350 +#: Merge.rc:65510B09 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2B0F0BA2 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3864,17 +3594,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2357 +#: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:59B96CF #, c-format msgid "" "Operation aborted!\n" @@ -3886,502 +3616,502 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2360 +#: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" msgstr "Mozgatás megerõsítése" -#: Merge.rc:2364 +#: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:4B6299EF #, c-format msgid "Failed to execute external editor: %1" msgstr "Nem sikerült elindítani a külsõ szerkesztõt: %1" -#: Merge.rc:2376 +#: Merge.rc:7350CBB7 #, c-format msgid "Unknown archive format" msgstr "Ismeretlen archívum formátum" -#: Merge.rc:2382 +#: Merge.rc:64ABCD7F #, c-format msgid "Filename" msgstr "Fájlnév" -#: Merge.rc:2384 +#: Merge.rc:D404EDE #, c-format msgid "Comparison result" msgstr "Összehasonlítási eredmények" -#: Merge.rc:2385 +#: Merge.rc:1B633071 #, c-format msgid "Left Date" msgstr "Bal oldali dátum" -#: Merge.rc:2386 +#: Merge.rc:39174D9A #, c-format msgid "Right Date" msgstr "Jobb oldali dátum" -#: Merge.rc:2387 +#: Merge.rc:13C27216 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:9B50030 #, c-format msgid "Extension" msgstr "Kiterjesztés" -#: Merge.rc:2389 +#: Merge.rc:1B633072 #, c-format msgid "Left Size" msgstr "Bal oldali méret" -#: Merge.rc:2390 +#: Merge.rc:39174D9B #, c-format msgid "Right Size" msgstr "Jobb oldali méret" -#: Merge.rc:2391 +#: Merge.rc:13C27217 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:237A128 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2393 +#: Merge.rc:353D7BD8 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2394 +#: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:7271FF81 #, c-format msgid "Left Creation Time" msgstr "Bal oldali létrehozási idõ" -#: Merge.rc:2401 +#: Merge.rc:44BC83EE #, c-format msgid "Right Creation Time" msgstr "Jobb oldali létrehozási idõ" -#: Merge.rc:2402 +#: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:4909ADB5 #, c-format msgid "Newer File" msgstr "Újabb fájl" -#: Merge.rc:2404 +#: Merge.rc:353D7BD9 #, c-format msgid "Left File Version" msgstr "Bal oldali fájl verzió" -#: Merge.rc:2405 +#: Merge.rc:237A129 #, c-format msgid "Right File Version" msgstr "Jobb oldali fájl verzió" -#: Merge.rc:2406 +#: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2407 +#: Merge.rc:194397DE #, c-format msgid "Short Result" msgstr "Rövid eredmények" -#: Merge.rc:2408 +#: Merge.rc:71676C49 #, c-format msgid "Left Attributes" msgstr "Bal oldali attribútumok" -#: Merge.rc:2409 +#: Merge.rc:32BFDBAE #, c-format msgid "Right Attributes" msgstr "Jobb oldali attribútumok" -#: Merge.rc:2410 +#: Merge.rc:729280DC #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:15875424 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:D0645BD #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2413 +#: Merge.rc:5F87E5D #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2419 +#: Merge.rc:5C8E17CF #, c-format msgid "Left Encoding" msgstr "Bal oldali kódolás" -#: Merge.rc:2420 +#: Merge.rc:1B17601F #, c-format msgid "Right Encoding" msgstr "Jobb oldali kódolás" -#: Merge.rc:2421 +#: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2430 +#: Merge.rc:76C8AB99 #, c-format msgid "Unable to compare files" msgstr "Nem lehett összehasonlítani a fájlokat" -#: Merge.rc:2431 +#: Merge.rc:4166A155 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:670ABDC3 #, c-format msgid "File skipped" msgstr "A fájl kihagyva" -#: Merge.rc:2433 +#: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" msgstr "A könyvtár kihagyva" -#: Merge.rc:2434 +#: Merge.rc:5C8E17D0 #, c-format msgid "Left only: %1" msgstr "Csak bal: %1" -#: Merge.rc:2435 +#: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:1B176020 #, c-format msgid "Right only: %1" msgstr "Csak jobb: %1" -#: Merge.rc:2437 +#: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" msgstr "A bináris fájlok megegyezõek" -#: Merge.rc:2440 +#: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" msgstr "A bináris fájlok különbözõek" -#: Merge.rc:2441 +#: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" msgstr "A fájlok különbözõek" -#: Merge.rc:2442 +#: Merge.rc:387F7982 #, c-format msgid "Folders are different" msgstr "A könyvtárak különböznek" -#: Merge.rc:2443 +#: Merge.rc:1B633073 #, c-format msgid "Left Only" msgstr "Csak bal oldal" -#: Merge.rc:2444 +#: Merge.rc:39174D9C #, c-format msgid "Right Only" msgstr "Csak jobb oldal" -#: Merge.rc:2445 +#: Merge.rc:13C27218 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:638BD42C #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:DEEB1BA #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2450 +#: Merge.rc:79AB21E1 #, c-format msgid "Error" msgstr "Hiba" -#: Merge.rc:2451 +#: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" msgstr "A szövegfájlok megegyeznek" -#: Merge.rc:2456 +#: Merge.rc:12D66B45 #, c-format msgid "Text files are different" msgstr "A szövegfájlok különböznek" -#: Merge.rc:2462 +#: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" msgstr "Eltelt idõ: %ld ms" -#: Merge.rc:2463 +#: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" msgstr "1 elem kiválasztva" -#: Merge.rc:2464 +#: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" msgstr "%1 elem kiválasztva" -#: Merge.rc:2470 +#: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." msgstr "fájlnév vagy könyvtárnév." -#: Merge.rc:2471 +#: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." msgstr "Alkönyvtár neve ha az alkönyvtárak is ki vannak választva." -#: Merge.rc:2472 +#: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." msgstr "Összehasonlítási eredmény bõvebb formában." -#: Merge.rc:2473 +#: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." msgstr "Bal oldali módosítási dátum." -#: Merge.rc:2474 +#: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." msgstr "Jobb oldali módosítási dátum." -#: Merge.rc:2475 +#: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2476 +#: Merge.rc:453F5DDC #, c-format msgid "File's extension." msgstr "Fájlok kiterjesztése." -#: Merge.rc:2477 +#: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." msgstr "Bal oldali fájl mérete bájtokban." -#: Merge.rc:2478 +#: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." msgstr "Jobb oldali fájl mérete bájtokban." -#: Merge.rc:2479 +#: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2481 +#: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2482 +#: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:172385A2 #, c-format msgid "Left side creation time." msgstr "Bal oldal létrehozási ideje." -#: Merge.rc:2489 +#: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." msgstr "Jobb oldal létrehozási ideje." -#: Merge.rc:2490 +#: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:4B4CD318 #, c-format msgid "Tells which side has newer modification date." msgstr "Megmutatja, melyik oldalnak újabb a létrehozási dátuma." -#: Merge.rc:2492 +#: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bal oldali fájl verziója, csak bizonyos fájloknál." -#: Merge.rc:2493 +#: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Jobb oldali fájl verziója, csak bizonyos fájloknál." -#: Merge.rc:2494 +#: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2495 +#: Merge.rc:43600E91 #, c-format msgid "Short comparison result." msgstr "Rövid összehasonlítási eredmények." -#: Merge.rc:2496 +#: Merge.rc:20155F5A #, c-format msgid "Left side attributes." msgstr "Bal oldali attribútumok." -#: Merge.rc:2497 +#: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." msgstr "Jobb oldali attribútumok." -#: Merge.rc:2498 +#: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2499 +#: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." msgstr "Bal oldali kódolás." -#: Merge.rc:2508 +#: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." msgstr "Jobb oldali kódolás." -#: Merge.rc:2509 +#: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2510 +#: Merge.rc:58398DFF #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Mellõzött különbségek száma a fájlban. Ezeket a különbségeket a WinMerge mellõzte és nem olvaszthatók." -#: Merge.rc:2511 +#: Merge.rc:6A6D5CB6 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Különbségek száma a fájlban. Ez a szám nem tartalmazza a mellõzött különbségeket." -#: Merge.rc:2512 +#: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "(*) látható, ha a fájl bináris." -#: Merge.rc:2518 +#: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" msgstr "%1 összehasonlítása ezzel: %2" -#: Merge.rc:2519 +#: Merge.rc:E9A77F2 #, c-format msgid "Comma-separated list" msgstr "Vesszõvel elválasztott lista" -#: Merge.rc:2520 +#: Merge.rc:5CCED709 #, c-format msgid "Tab-separated list" msgstr "Tabulált lista" -#: Merge.rc:2521 +#: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" msgstr "Egyszerû HTML" -#: Merge.rc:2522 +#: Merge.rc:751AB591 #, c-format msgid "Simple XML" msgstr "Egyszerû XML" -#: Merge.rc:2524 +#: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "A jelentés fájl már létezik. Szeretnéd felülírni a létezõ fájlt?" -#: Merge.rc:2525 +#: Merge.rc:630F8340 #, c-format msgid "" "Error creating the report:\n" @@ -4390,32 +4120,32 @@ msgstr "" "Hiba a jelentés készítése közben:\n" "%1" -#: Merge.rc:2526 +#: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." msgstr "A jelentés sikeresen elkészült." -#: Merge.rc:2532 +#: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." msgstr "Ugyanaz a fájl van megnyitva mindkét panelen." -#: Merge.rc:2533 +#: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." msgstr "A kijelölt fájlok ugyanazok." -#: Merge.rc:2534 +#: Merge.rc:44565DBD #, c-format msgid "An error occurred while comparing the files." msgstr "Hiba történt a fájlok összehasonlításakor." -#: Merge.rc:2535 +#: Merge.rc:5F16D9DC #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nem lehetett létrehozni az ideiglenes fájlokat. Ellenõrizd az ideiglenes könyvtár beállításait." -#: Merge.rc:2536 +#: Merge.rc:11E6F584 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4430,22 +4160,22 @@ msgstr "" "\n" "Megjegyzés: Amennyiben minden esetben ezt az opciót szeretnéd használni, kapcsold be a 'Sortörési eltérések kihagyása' opciót az Összehasonlítás menüpontban (a Szerkesztés/Opciók menüpont alatt találod meg)." -#: Merge.rc:2537 +#: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2538 +#: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2539 +#: Merge.rc:279EB840 #, 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:2545 +#: Merge.rc:4A700AB0 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4456,152 +4186,152 @@ msgstr "" "A különbözõ kódlapokkal történõ kijelzés könnyebben áttekinthetõ de az olvasztás/törlés kockázatos lehet.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2546 +#: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:7D4E76C0 #, c-format msgid "No difference" msgstr "Nincs eltérés" -#: Merge.rc:2556 +#: Merge.rc:71676C4A #, c-format msgid "Line difference" msgstr "Sor eltérés" -#: Merge.rc:2562 +#: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." msgstr "Cserélve lett %1 sztring." -#: Merge.rc:2563 +#: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nem található ez: \"%s\"" -#: Merge.rc:2569 +#: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:5E0C549 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." msgstr "A Patch fájl sikeresen elkészült." -#: Merge.rc:2594 +#: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" msgstr "Az 1. elem nem található vagy az egy könyvtár!" -#: Merge.rc:2595 +#: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" msgstr "A 2. elem nem található vagy az egy könyvtár!" -#: Merge.rc:2596 +#: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "A patch fájl már létezik. Szeretnéd felülírni azt?" -#: Merge.rc:2597 +#: Merge.rc:62226073 #, c-format msgid "[%1 files selected]" msgstr "[%1 kijelölt fájl]" -#: Merge.rc:2598 +#: Merge.rc:27AFDB30 #, c-format msgid "Normal" msgstr "Normál" -#: Merge.rc:2599 +#: Merge.rc:7E5494F7 #, c-format msgid "Context" msgstr "Környezeti" -#: Merge.rc:2600 +#: Merge.rc:24173EE8 #, c-format msgid "Unified" msgstr "Egységesített" -#: Merge.rc:2602 +#: Merge.rc:185B8391 #, c-format msgid "Could not write to file %1." msgstr "Nem lehetett ebbe a fájlba írni: %1." -#: Merge.rc:2603 +#: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "A megadott kimeneti útvonal nem abszolút elérési út: %1" -#: Merge.rc:2604 +#: Merge.rc:44EE84AA #, c-format msgid "Specify an output file" msgstr "Adj meg egy kimeneti fájlt" -#: Merge.rc:2605 +#: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nem lehet patch fájlt létrehozni bináris fájlokból." -#: Merge.rc:2606 +#: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nem lehet patch fájlt létrehozni könyvtárakból." -#: Merge.rc:2607 +#: Merge.rc:34FF26C7 #, c-format msgid "" "Please save all files first.\n" @@ -4612,12 +4342,12 @@ msgstr "" "\n" "A patch létrehozásához elengedhetetlen, hogy ne legyenek el nem mentett változtatások a fájlokban." -#: Merge.rc:2608 +#: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." msgstr "A mappa nem létezik." -#: Merge.rc:2613 +#: Merge.rc:3377B7B5 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4628,37 +4358,37 @@ msgstr "" "Az ehhez szükséges összetevõk (7-zip és/vagy Merge7z*.dll) nem találhatóak.\n" "Olvasd el a kézikönyv archívum támogatásról szóló részét." -#: Merge.rc:2614 +#: Merge.rc:44EE84AB #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:44EE84AC #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2617 +#: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2618 +#: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2619 +#: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2620 +#: Merge.rc:404DAD7D #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4669,247 +4399,247 @@ msgstr "" "\n" "Biztosan folytatja?" -#: Merge.rc:2629 +#: Merge.rc:7C664E2 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:4C72B57 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:29ECCB83 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:51A4FE5F #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:CF15594 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:6F90DC3A #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:414AF01 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:16618519 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:7C5EF083 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:51A4FE60 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:35CF1E68 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:51A4FE61 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:1DA00C8A #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:E8950EA #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:55A8C466 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:1E864A56 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:7FE60896 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:15F24C75 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:11395D4B #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:42A0CC96 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:6107F02B #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "A választott kicsomagoló lesz használva mindkét fájlnál (az egyik fájlnak csak a kiterjesztése lényeges)" -#: Merge.rc:2678 +#: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" msgstr "Nincs elõvizsgálat (normális)" -#: Merge.rc:2679 +#: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" msgstr "Javasolt bõvítmények" -#: Merge.rc:2680 +#: Merge.rc:4DAEA639 #, c-format msgid "Other plugins" msgstr "Egyéb bõvítmények" -#: Merge.rc:2686 +#: Merge.rc:2A918FD6 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:43B4B204 #, c-format msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" msgstr "Bõvítmény beállítások" -#: Merge.rc:2697 +#: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "A WSH nem található - Az .sct szkriptek le lesznek tiltva" -#: Merge.rc:2698 +#: Merge.rc:4FC259D5 #, c-format msgid "" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:8BF6984 #, c-format msgid "" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" msgstr "&Ugrás a(z) %1. sorra" -#: Merge.rc:2711 +#: Merge.rc:7F0D4B47 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:444C5DDD #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:638BD42D #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2722 +#: Merge.rc:7460E8C0 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:55B03C15 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2742 +#: Merge.rc:5F87E5E #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:125AD722 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:1D2E4A01 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" -- 2.11.0