Thread: [Winmerge-svn] SF.net SVN: winmerge:[6216] branches/R2_12
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <sdo...@us...> - 2008-12-21 12:18:38
|
Revision: 6216 http://winmerge.svn.sourceforge.net/winmerge/?rev=6216&view=rev Author: sdottaka Date: 2008-12-21 12:18:33 +0000 (Sun, 21 Dec 2008) Log Message: ----------- BUG: [2372000] Ampersand in folder names ruins the project file Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/ProjectFile.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 12:16:20 UTC (rev 6215) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 12:18:33 UTC (rev 6216) @@ -3,6 +3,10 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] +WinMerge 2.11.1.9 + Bugfix: Cound not open project file that contains an ampersand + character in folder names (#2372000) + WinMerge 2.12.x (R2_12) branch created (r6202) WinMerge 2.11.1.8 - 2008-12-19 (r6200) Modified: branches/R2_12/Src/ProjectFile.cpp =================================================================== --- branches/R2_12/Src/ProjectFile.cpp 2008-12-21 12:16:20 UTC (rev 6215) +++ branches/R2_12/Src/ProjectFile.cpp 2008-12-21 12:18:33 UTC (rev 6216) @@ -288,6 +288,20 @@ } /** + * @brief Covert characters that are unsafe for use in XML + * @param [in] str The string to be converted + * @return The converted string + */ +static String EscapeXML(const String &str) +{ + String escapedStr = str; + string_replace(escapedStr, _T("&"), _T("&")); + string_replace(escapedStr, _T("<"), _T("<")); + string_replace(escapedStr, _T(">"), _T(">")); + return escapedStr; +} + +/** * @brief Add paths data to the XML tree. * This function adds our paths data to the XML tree. * @param [in] parent Parent element for paths data. @@ -300,29 +314,23 @@ if (!m_leftFile.IsEmpty()) { - LPCTSTR path; element = scew_element_add(parent, Left_element_name); - path = m_leftFile.GetBuffer(MAX_PATH); - scew_element_set_contents(element, T2UTF8(path)); - m_leftFile.ReleaseBuffer(); + String path = m_leftFile; + scew_element_set_contents(element, T2UTF8(EscapeXML(path).c_str())); } if (!m_rightFile.IsEmpty()) { - LPCTSTR path; element = scew_element_add(parent, Right_element_name); - path = m_rightFile.GetBuffer(MAX_PATH); - scew_element_set_contents(element, T2UTF8(path)); - m_rightFile.ReleaseBuffer(); + String path = m_rightFile; + scew_element_set_contents(element, T2UTF8(EscapeXML(path).c_str())); } if (!m_filter.IsEmpty()) { - LPCTSTR filter; element = scew_element_add(parent, Filter_element_name); - filter = m_filter.GetBuffer(MAX_PATH); - scew_element_set_contents(element, T2UTF8(filter)); - m_filter.ReleaseBuffer(); + String filter = m_filter; + scew_element_set_contents(element, T2UTF8(EscapeXML(filter).c_str())); } element = scew_element_add(parent, Subfolders_element_name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2008-12-21 12:25:36
|
Revision: 6219 http://winmerge.svn.sourceforge.net/winmerge/?rev=6219&view=rev Author: sdottaka Date: 2008-12-21 12:25:26 +0000 (Sun, 21 Dec 2008) Log Message: ----------- PATCH: [2292456] Patch for BUG:"Modified Date and Size" seems to ignore size Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/FolderCmp.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 12:24:14 UTC (rev 6218) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 12:25:26 UTC (rev 6219) @@ -6,6 +6,8 @@ WinMerge 2.11.1.9 Bugfix: Cound not open project file that contains an ampersand character in folder names (#2372000) + Bugfix: File compare method "Modified Date and Size" ignored file size + (#2455595) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Src/FolderCmp.cpp =================================================================== --- branches/R2_12/Src/FolderCmp.cpp 2008-12-21 12:24:14 UTC (rev 6218) +++ branches/R2_12/Src/FolderCmp.cpp 2008-12-21 12:25:26 UTC (rev 6219) @@ -309,7 +309,7 @@ // This is actual CMP_DATE_SIZE method.. // If file sizes differ mark them different - if (pCtxt->m_nCompMethod == CMP_DATE_SIZE && di.diffcode.isResultSame()) + if (pCtxt->m_nCompMethod == CMP_DATE_SIZE) { if (di.left.size != di.right.size) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2008-12-21 12:31:34
|
Revision: 6222 http://winmerge.svn.sourceforge.net/winmerge/?rev=6222&view=rev Author: sdottaka Date: 2008-12-21 12:31:31 +0000 (Sun, 21 Dec 2008) Log Message: ----------- BUG: [ 2433677 ] Quick compare EOL ignore doesn't work Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/CompareEngines/ByteComparator.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 12:30:30 UTC (rev 6221) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 12:31:31 UTC (rev 6222) @@ -8,6 +8,7 @@ character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size (#2455595) + BugFix: Quick compare didn't ignore EOL differences (#2433677) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Src/CompareEngines/ByteComparator.cpp =================================================================== --- branches/R2_12/Src/CompareEngines/ByteComparator.cpp 2008-12-21 12:30:30 UTC (rev 6221) +++ branches/R2_12/Src/CompareEngines/ByteComparator.cpp 2008-12-21 12:31:31 UTC (rev 6222) @@ -389,7 +389,10 @@ } else { - return RESULT_DIFF; + if (!eof0 || !eof1) + goto need_more; + else + return RESULT_DIFF; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-12-21 21:56:12
|
Revision: 6226 http://winmerge.svn.sourceforge.net/winmerge/?rev=6226&view=rev Author: kimmov Date: 2008-12-21 21:56:03 +0000 (Sun, 21 Dec 2008) Log Message: ----------- PATCH: [ 2452467 ] A Swedish.po file for the WinMerge trunk Submitted by Hans Eriksson Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Languages/Swedish.po Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 21:50:53 UTC (rev 6225) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-21 21:56:03 UTC (rev 6226) @@ -4,11 +4,13 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.11.1.9 - Bugfix: Cound not open project file that contains an ampersand + Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size (#2455595) BugFix: Quick compare didn't ignore EOL differences (#2433677) + Translation updates: + - Swedish (#2452467) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Src/Languages/Swedish.po =================================================================== --- branches/R2_12/Src/Languages/Swedish.po 2008-12-21 21:50:53 UTC (rev 6225) +++ branches/R2_12/Src/Languages/Swedish.po 2008-12-21 21:56:03 UTC (rev 6226) @@ -1308,7 +1308,7 @@ #: Merge.rc:777 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" -msgstr "" +msgstr "Visa \"V\xE4lj Filer eller Kataloger\" Dialogen vid Uppstart" #: Merge.rc:779 #, c-format @@ -3084,7 +3084,7 @@ #: Merge.rc:1962 #, c-format msgid "X64" -msgstr "" +msgstr "X64" #: Merge.rc:1968 #, c-format @@ -3552,7 +3552,7 @@ #: Merge.rc:2146 #, 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 "" +msgstr "Ett annat program har uppdaterat filen\n%1\nsedan WinMerge scannade den f\xF6rra g\xE5ngen.\n\nVill du \xF6ppna filen igen?" #: Merge.rc:2147 #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-12-27 09:05:19
|
Revision: 6239 http://winmerge.svn.sourceforge.net/winmerge/?rev=6239&view=rev Author: kimmov Date: 2008-12-27 09:05:17 +0000 (Sat, 27 Dec 2008) Log Message: ----------- PATCH: [ 2461443 ] Brazilian translation update Submitted by Felipe Periard Lopes Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Languages/Brazilian.po Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 09:00:12 UTC (rev 6238) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 09:05:17 UTC (rev 6239) @@ -10,6 +10,7 @@ (#2455595) BugFix: Quick compare didn't ignore EOL differences (#2433677) Translation updates: + - Brazilian (#2461443) - Swedish (#2452467) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Src/Languages/Brazilian.po =================================================================== --- branches/R2_12/Src/Languages/Brazilian.po 2008-12-27 09:00:12 UTC (rev 6238) +++ branches/R2_12/Src/Languages/Brazilian.po 2008-12-27 09:05:17 UTC (rev 6239) @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-10-20 21:03+0000\n" -"PO-Revision-Date: 2008-11-01 07:59-0300\n" -"Last-Translator: Felipe Periard Lopes <felipefpl at ig.com.br>\n" +"POT-Creation-Date: 2008-12-05 00:52+0000\n" +"PO-Revision-Date: 2008-12-20 01:06-0300\n" +"Last-Translator: Felipe <fel...@ig...>\n" "Language-Team: Brazilian <win...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" @@ -1305,12 +1305,12 @@ #: Merge.rc:775 #, c-format msgid "Enable Shell &Context Menu" -msgstr "" +msgstr "Ativar o Menu de &Contexto do Shell" #: Merge.rc:777 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" -msgstr "" +msgstr "Mostrar o Di\xE1logo \"Selecionar Arquivos ou Pastas\" ao Iniciar" #: Merge.rc:779 #, c-format @@ -3262,7 +3262,7 @@ #: Merge.rc:1962 #, c-format msgid "X64" -msgstr "" +msgstr "X64" #: Merge.rc:1968 #, c-format @@ -3851,8 +3851,18 @@ #: Merge.rc:2146 #, c-format -msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" +msgid "" +"Another application has updated file\n" +"%1\n" +"since WinMerge scanned it last time.\n" +"\n" +"Do you want to reload the file?" msgstr "" +"Outro aplicativo atualizou o arquivo\n" +"%1\n" +"desde que o WinMerge o escaneou pela \xFAltima vez.\n" +"\n" +"Voc\xEA quer recarregar o arquivo?" #: Merge.rc:2147 #, c-format @@ -4210,12 +4220,12 @@ #: Merge.rc:2257 #, c-format msgid "Left Shell menu" -msgstr "" +msgstr "Menu do Shell Esquerdo" #: Merge.rc:2258 #, c-format msgid "Right Shell menu" -msgstr "" +msgstr "Menu do Shell Direito" #: Merge.rc:2264 #, c-format @@ -6136,7 +6146,7 @@ #: Merge.rc:2846 #, c-format msgid "Verilog" -msgstr "" +msgstr "Verilog" #: Merge.rc:2847 #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-12-27 09:13:38
|
Revision: 6241 http://winmerge.svn.sourceforge.net/winmerge/?rev=6241&view=rev Author: kimmov Date: 2008-12-27 09:13:31 +0000 (Sat, 27 Dec 2008) Log Message: ----------- PATCH: [ 2465385 ] A Swedish translation update of two files... Submitted by Hans Eriksson Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Docs/Users/Languages/ReadMe-Swedish.txt branches/R2_12/Installer/InnoSetup/Languages/Swedish.isl Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 09:12:39 UTC (rev 6240) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 09:13:31 UTC (rev 6241) @@ -11,7 +11,7 @@ BugFix: Quick compare didn't ignore EOL differences (#2433677) Translation updates: - Brazilian (#2461443) - - Swedish (#2452467) + - Swedish (#2452467, #2465385) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Docs/Users/Languages/ReadMe-Swedish.txt =================================================================== --- branches/R2_12/Docs/Users/Languages/ReadMe-Swedish.txt 2008-12-27 09:12:39 UTC (rev 6240) +++ branches/R2_12/Docs/Users/Languages/ReadMe-Swedish.txt 2008-12-27 09:13:31 UTC (rev 6241) @@ -38,7 +38,7 @@ Om du inte av n\xE5gon anledning kan installera 7-Zip-verktyget kan du anv\xE4nda 7-zips plugin-installationsprogram f\xF6r att installera bara de filer som kr\xE4vs -f\xF6r arkivfilest\xF6d. Se Hj\xE4lp\xE4mnet, "7-Zip and archive support" +f\xF6r arkivfilst\xF6d. Se Hj\xE4lp\xE4mnet, "7-Zip and archive support" ("7-zip och arkivst\xF6d") f\xF6r detaljer. WinMerge Support (WinMerge-support) Modified: branches/R2_12/Installer/InnoSetup/Languages/Swedish.isl =================================================================== --- branches/R2_12/Installer/InnoSetup/Languages/Swedish.isl 2008-12-27 09:12:39 UTC (rev 6240) +++ branches/R2_12/Installer/InnoSetup/Languages/Swedish.isl 2008-12-27 09:13:31 UTC (rev 6241) @@ -360,7 +360,7 @@ IntegrateTortoiseCVS=Integrera med &TortoiseCVS IntegrateTortoiseSVN=Integrera med T&ortoiseSVN IntegrateClearCase=Integrera med Rational &ClearCase -AddToPath=&Add WinMerge folder to your system path +AddToPath=&L\xE4gg till WinMerge-katalogen till din systems\xF6kv\xE4g ;Icon Labels ReadMe=L\xE4s Mig This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-12-27 09:49:08
|
Revision: 6247 http://winmerge.svn.sourceforge.net/winmerge/?rev=6247&view=rev Author: kimmov Date: 2008-12-27 09:49:04 +0000 (Sat, 27 Dec 2008) Log Message: ----------- BUG: [ 2458728 ] Need to remove control chars from command line Fix by Jochen Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/MergeCmdLineInfo.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 09:43:44 UTC (rev 6246) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 09:49:04 UTC (rev 6247) @@ -9,6 +9,7 @@ Bugfix: File compare method "Modified Date and Size" ignored file size (#2455595) BugFix: Quick compare didn't ignore EOL differences (#2433677) + Bugfix: Remove EOL characters from command line (#2458728) Translation updates: - Brazilian (#2461443) - Czech (r6201) Modified: branches/R2_12/Src/MergeCmdLineInfo.cpp =================================================================== --- branches/R2_12/Src/MergeCmdLineInfo.cpp 2008-12-27 09:43:44 UTC (rev 6246) +++ branches/R2_12/Src/MergeCmdLineInfo.cpp 2008-12-27 09:49:04 UTC (rev 6247) @@ -50,7 +50,7 @@ */ LPCTSTR MergeCmdLineInfo::EatParam(LPCTSTR p, String ¶m, bool *flag) { - if (p && *(p += StrSpn(p, _T(" \t"))) == '\0') + if (p && *(p += StrSpn(p, _T(" \t\r\n"))) == '\0') p = 0; LPCTSTR q = PathGetArgs(p); if (q > p && flag) @@ -74,8 +74,8 @@ CharLower(&*param.begin()); } // Strip any leading or trailing whitespace or quotes - param.erase(0, param.find_first_not_of(_T(" \t\""))); - param.erase(param.find_last_not_of(_T(" \t\"")) + 1); + param.erase(0, param.find_first_not_of(_T(" \t\r\n\""))); + param.erase(param.find_last_not_of(_T(" \t\r\n\"")) + 1); return q; } @@ -215,7 +215,7 @@ // Its not a flag so it is a path // Convert paths given in Linux-style ('/' as separator) given from // Cygwin to Windows style ('\' as separator) - string_replace(param, String(_T("/")), String(_T("\\"))); + string_replace(param, _T("/"), _T("\\")); // If shortcut, expand it first if (paths_IsShortcut(param.c_str())) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-12-27 10:35:55
|
Revision: 6250 http://winmerge.svn.sourceforge.net/winmerge/?rev=6250&view=rev Author: kimmov Date: 2008-12-27 10:35:52 +0000 (Sat, 27 Dec 2008) Log Message: ----------- PATCH: [ 2456399 ] Fix undo of one-line merge Submitted by Matthias Mayer Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 10:34:59 UTC (rev 6249) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 10:35:52 UTC (rev 6250) @@ -10,6 +10,7 @@ (#2455595) BugFix: Quick compare didn't ignore EOL differences (#2433677) Bugfix: Remove EOL characters from command line (#2458728) + Bugfix: Merging one line diff to empty other side didn't work (#2456399) Translation updates: - Brazilian (#2461443) - Czech (r6201) Modified: branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp 2008-12-27 10:34:59 UTC (rev 6249) +++ branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp 2008-12-27 10:35:52 UTC (rev 6250) @@ -1298,14 +1298,16 @@ nAction = m_aUndoBuf[nPosition].m_nAction; // Advance to next undo group - nPosition++; - vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition; - while (iter != m_aUndoBuf.begin () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0) + if (m_aUndoBuf.size () > 1) { - --iter; - --nPosition; + nPosition++; + vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition; + while (iter != m_aUndoBuf.begin () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0) + { + --iter; + --nPosition; + } } - if (nPosition >= m_aUndoBuf.size ()) return NULL; // No more redo actions! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-12-30 09:23:48
|
Revision: 6257 http://winmerge.svn.sourceforge.net/winmerge/?rev=6257&view=rev Author: kimmov Date: 2008-12-30 09:23:45 +0000 (Tue, 30 Dec 2008) Log Message: ----------- PATCH: [ 2473375 ] Update Python syntax highlight keywords for Python 2.6 Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/editlib/python.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-30 09:22:54 UTC (rev 6256) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-30 09:23:45 UTC (rev 6257) @@ -4,6 +4,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.11.1.9 + Update Python syntax highlight keywords for Python 2.6 (#2473375) Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size Modified: branches/R2_12/Src/editlib/python.cpp =================================================================== --- branches/R2_12/Src/editlib/python.cpp 2008-12-30 09:22:54 UTC (rev 6256) +++ branches/R2_12/Src/editlib/python.cpp 2008-12-30 09:23:45 UTC (rev 6257) @@ -25,11 +25,12 @@ static char THIS_FILE[] = __FILE__; #endif -// C++ keywords (MSVC5.0 + POET5.0) +// Python 2.6 keywords static LPTSTR s_apszPythonKeywordList[] = { - _T ("access"), _T ("and"), + _T ("as"), + _T ("assert"), _T ("break"), _T ("class"), _T ("continue"), @@ -56,6 +57,8 @@ _T ("return"), _T ("try"), _T ("while"), + _T ("whith"), + _T ("yield"), NULL }; @@ -63,15 +66,19 @@ { _T ("argv"), _T ("builtin_module_names"), + _T ("Ellipsis"), _T ("exc_type"), _T ("exc_value"), _T ("exc_traceback"), _T ("exit"), _T ("exitfunc"), + _T ("False"), _T ("last_type"), _T ("last_value"), _T ("last_traceback"), _T ("modules"), + _T ("None"), + _T ("NotImplemented"), _T ("path"), _T ("ps1"), _T ("ps2"), @@ -95,9 +102,11 @@ _T ("SyntaxError"), _T ("SystemError"), _T ("SystemExit"), + _T ("True"), _T ("TypeError"), _T ("ValueError"), _T ("ZeroDivisionError"), + _T ("__debug__"), NULL }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-06 13:29:26
|
Revision: 6285 http://winmerge.svn.sourceforge.net/winmerge/?rev=6285&view=rev Author: kimmov Date: 2009-01-06 13:29:24 +0000 (Tue, 06 Jan 2009) Log Message: ----------- PATCH: [ 2481022 ] Updated Dutch translation Submitted by Thomas De Rocker Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Docs/Users/Contributors.txt branches/R2_12/Src/Languages/Dutch.po Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-05 23:47:25 UTC (rev 6284) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-06 13:29:24 UTC (rev 6285) @@ -15,6 +15,7 @@ Translation updates: - Brazilian (#2461443) - Czech (r6201) + - Dutch (#2481022) - Swedish (#2452467, #2465385) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Docs/Users/Contributors.txt =================================================================== --- branches/R2_12/Docs/Users/Contributors.txt 2009-01-05 23:47:25 UTC (rev 6284) +++ branches/R2_12/Docs/Users/Contributors.txt 2009-01-06 13:29:24 UTC (rev 6285) @@ -50,6 +50,7 @@ * Dutch: Michel Coene + Thomas De Rocker <tho...@ya...> Ronald Schaap <ro...@sc...> * French: Modified: branches/R2_12/Src/Languages/Dutch.po =================================================================== --- branches/R2_12/Src/Languages/Dutch.po 2009-01-05 23:47:25 UTC (rev 6284) +++ branches/R2_12/Src/Languages/Dutch.po 2009-01-06 13:29:24 UTC (rev 6285) @@ -4,6 +4,7 @@ # Translators: # * Ronald Schaap <ronald at schaap.demon.nl> # * Michel Coene +# * Thomas De Rocker <tho...@ya...> # # ID line follows -- this is updated by SVN # $Id$ @@ -12,9 +13,9 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: \n" +"POT-Creation-Date: 2008-08-09 00:09+0000\n" "PO-Revision-Date: \n" -"Last-Translator: \n" +"Last-Translator: Thomas De Rocker <tho...@ya...>\n" "Language-Team: Dutch <win...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" @@ -52,7 +53,7 @@ #: Merge.rc:75 #, c-format msgid "&Select Line Difference" -msgstr "" +msgstr "&Selecteer Regelverschil" #: Merge.rc:77 #, c-format @@ -92,7 +93,7 @@ #: Merge.rc:86 #, c-format msgid "Op&en" -msgstr "" +msgstr "Op&enen" #: Merge.rc:88 #: Merge.rc:532 @@ -127,7 +128,7 @@ #: Merge.rc:314 #, c-format msgid "&New\tCtrl+N" -msgstr "" +msgstr "&Nieuw\tCtrl+N" #: Merge.rc:113 #: Merge.rc:194 @@ -141,26 +142,26 @@ #: Merge.rc:316 #, c-format msgid "Op&en Conflict File..." -msgstr "" +msgstr "Op&en Conflictbestand..." #: Merge.rc:116 #: Merge.rc:197 #: Merge.rc:318 #, c-format msgid "Open Pro&ject...\tCtrl+J" -msgstr "" +msgstr "Pro&ject openen...\tCtrl+J" #: Merge.rc:117 #: Merge.rc:198 #: Merge.rc:319 #, c-format msgid "Sa&ve Project..." -msgstr "" +msgstr "Project Op&slaan..." #: Merge.rc:119 #, c-format msgid "Recent Projects" -msgstr "" +msgstr "Recente Projecten" #: Merge.rc:121 #: Merge.rc:205 @@ -195,56 +196,56 @@ #: Merge.rc:391 #, c-format msgid "Select &Font..." -msgstr "Kies &Font..." +msgstr "Kies &Font..." #: Merge.rc:130 #: Merge.rc:229 #: Merge.rc:392 #, c-format msgid "Use Default F&ont" -msgstr "Gebruik standaard F&ont" +msgstr "Gebruik standaard F&ont" #: Merge.rc:132 #: Merge.rc:231 #: Merge.rc:413 #, c-format msgid "&Toolbar" -msgstr "" +msgstr "&Werkbalk" #: Merge.rc:134 #: Merge.rc:233 #: Merge.rc:415 #, c-format msgid "&None" -msgstr "" +msgstr "Geen" #: Merge.rc:135 #: Merge.rc:234 #: Merge.rc:416 #, c-format msgid "&Small" -msgstr "" +msgstr "Klein" #: Merge.rc:136 #: Merge.rc:235 #: Merge.rc:417 #, c-format msgid "&Big" -msgstr "" +msgstr "Groot" #: Merge.rc:138 #: Merge.rc:237 #: Merge.rc:419 #, c-format msgid "&Status Bar" -msgstr "&Status Balk" +msgstr "&Statusbalk" #: Merge.rc:139 #: Merge.rc:238 #: Merge.rc:420 #, c-format msgid "Ta&b Bar" -msgstr "" +msgstr "Tab-balk" #: Merge.rc:141 #: Merge.rc:241 @@ -258,35 +259,35 @@ #: Merge.rc:446 #, c-format msgid "&Tools" -msgstr "" +msgstr "&Tools" #: Merge.rc:145 #: Merge.rc:265 #: Merge.rc:448 #, c-format msgid "&Filters..." -msgstr "" +msgstr "&Filters..." #: Merge.rc:146 #: Merge.rc:266 #: Merge.rc:449 #, c-format msgid "&Generate Patch..." -msgstr "" +msgstr "Patch &Genereren..." #: Merge.rc:148 #: Merge.rc:269 #: Merge.rc:452 #, c-format msgid "&Plugins" -msgstr "&Plug-ins" +msgstr "&Plugins" #: Merge.rc:150 #: Merge.rc:271 #: Merge.rc:454 #, c-format msgid "&List..." -msgstr "" +msgstr "&Lijst..." #: Merge.rc:152 #: Merge.rc:273 @@ -321,21 +322,21 @@ #: Merge.rc:468 #, c-format msgid "&Debug" -msgstr "" +msgstr "&Debug" #: Merge.rc:161 #: Merge.rc:282 #: Merge.rc:470 #, c-format msgid "&Load Config..." -msgstr "" +msgstr "Configuratie &Laden..." #: Merge.rc:162 #: Merge.rc:283 #: Merge.rc:471 #, c-format msgid "&Reset Options" -msgstr "" +msgstr "Instellingen &Resetten" #: Merge.rc:164 #: Merge.rc:285 @@ -356,7 +357,7 @@ #: Merge.rc:476 #, c-format msgid "Clo&se All" -msgstr "" +msgstr "Alles &Sluiten" #: Merge.rc:169 #: Merge.rc:290 @@ -377,7 +378,7 @@ #: Merge.rc:481 #, c-format msgid "Tile &Vertically" -msgstr "&Vertikaal verdelen" +msgstr "&Verticaal verdelen" #: Merge.rc:173 #: Merge.rc:294 @@ -392,35 +393,35 @@ #: Merge.rc:1925 #, c-format msgid "&Help" -msgstr "" +msgstr "&Help" #: Merge.rc:177 #: Merge.rc:298 #: Merge.rc:486 #, c-format msgid "&WinMerge Help\tF1" -msgstr "" +msgstr "&WinMerge Help\tF1" #: Merge.rc:179 #: Merge.rc:300 #: Merge.rc:488 #, c-format msgid "R&elease Notes" -msgstr "" +msgstr "Uitgave-opme&rkingen" #: Merge.rc:180 #: Merge.rc:301 #: Merge.rc:489 #, c-format msgid "&Translations" -msgstr "" +msgstr "Ver&talingen" #: Merge.rc:181 #: Merge.rc:302 #: Merge.rc:490 #, c-format msgid "C&onfiguration" -msgstr "" +msgstr "C&onfiguratie" #: Merge.rc:182 #: Merge.rc:303 @@ -434,7 +435,7 @@ #: Merge.rc:493 #, c-format msgid "&GNU General Public License" -msgstr "" +msgstr "&GNU General Public License" #: Merge.rc:185 #: Merge.rc:306 @@ -458,7 +459,7 @@ #: Merge.rc:203 #, c-format msgid "File En&coding" -msgstr "" +msgstr "Bestands&codering" #: Merge.rc:209 #: Merge.rc:363 @@ -469,37 +470,37 @@ #: Merge.rc:215 #, c-format msgid "Show &Identical Items" -msgstr "" +msgstr "Toon &Identieke Items" #: Merge.rc:216 #, c-format msgid "Show &Different Items" -msgstr "" +msgstr "Toon Verschillen&de Items" #: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" -msgstr "" +msgstr "Toon Linkse Unieke Items" #: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" -msgstr "" +msgstr "Toon Rechtse Unieke Items" #: Merge.rc:219 #, c-format msgid "Show S&kipped Items" -msgstr "" +msgstr "Toon Overgeslagen Items" #: Merge.rc:220 #, c-format msgid "S&how Binary Files" -msgstr "" +msgstr "Toon Binary Files" #: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" -msgstr "" +msgstr "Toon Verborgen Items" #: Merge.rc:224 #, c-format @@ -519,7 +520,7 @@ #: Merge.rc:239 #, c-format msgid "Compa&re Statistics" -msgstr "" +msgstr "Ve&rgelijk Statistieken" #: Merge.rc:243 #: Merge.rc:426 @@ -530,18 +531,18 @@ #: Merge.rc:244 #, c-format msgid "&Refresh Selected\tCtrl+F5" -msgstr "" +msgstr "Selectie Ve&rversen\tCtrl+F5" #: Merge.rc:246 #: Merge.rc:428 #, c-format msgid "&Merge" -msgstr "" +msgstr "Sa&menvoegen" #: Merge.rc:248 #, c-format msgid "Co&mpare\tEnter" -msgstr "" +msgstr "Vergelijken\tEnter" #: Merge.rc:250 #: Merge.rc:430 @@ -577,7 +578,7 @@ #: Merge.rc:437 #, c-format msgid "Copy to &Right\tAlt+Right" -msgstr "Kopieer naar &Rechts\tAlt+Right" +msgstr "Kopieer naar &Rechts\tAlt+Right" #: Merge.rc:258 #: Merge.rc:438 @@ -588,7 +589,7 @@ #: Merge.rc:260 #, c-format msgid "&Delete\tDel" -msgstr "" +msgstr "Wissen\tDel" #: Merge.rc:264 #: Merge.rc:563 @@ -600,7 +601,7 @@ #: Merge.rc:450 #, c-format msgid "Generate &Report..." -msgstr "" +msgstr "&Rapport Genereren..." #: Merge.rc:321 #, c-format @@ -632,37 +633,37 @@ #: Merge.rc:333 #, c-format msgid "&Print..." -msgstr "" +msgstr "&Afdrukken..." #: Merge.rc:334 #, c-format msgid "Page Se&tup" -msgstr "" +msgstr "Pagina-in&stelling" #: Merge.rc:335 #, c-format msgid "Print Previe&w" -msgstr "" +msgstr "Afdrukvoorbeeld" #: Merge.rc:340 #, c-format msgid "&Convert Line Endings to" -msgstr "" +msgstr "&Converteer regeleindes naar" #: Merge.rc:342 #, c-format msgid "&Windows (CRLF)" -msgstr "" +msgstr "&Windows (CRLF)" #: Merge.rc:343 #, c-format msgid "&Unix (LF)" -msgstr "" +msgstr "&Unix (LF)" #: Merge.rc:344 #, c-format msgid "&Mac (CR)" -msgstr "" +msgstr "&Mac (CR)" #: Merge.rc:347 #, c-format @@ -672,7 +673,7 @@ #: Merge.rc:349 #, c-format msgid "&File Encoding..." -msgstr "" +msgstr "Bestandscodering..." #: Merge.rc:355 #, c-format @@ -702,7 +703,7 @@ #: Merge.rc:362 #, c-format msgid "Select Line &Difference\tF4" -msgstr "" +msgstr "Selecteer Regelverschillen\tF4" #: Merge.rc:365 #, c-format @@ -717,7 +718,7 @@ #: Merge.rc:368 #, c-format msgid "&Scripts" -msgstr "" +msgstr "&Scripts" #: Merge.rc:370 #: Merge.rc:2779 @@ -728,73 +729,73 @@ #: Merge.rc:373 #, c-format msgid "Advanced" -msgstr "" +msgstr "Geavanceerd" #: Merge.rc:375 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" -msgstr "" +msgstr "&Kopieer Met Regelnummers\tCtrl+Shift+C" #: Merge.rc:378 #, c-format msgid "&Bookmarks" -msgstr "" +msgstr "&Bladwijzers" #: Merge.rc:380 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" -msgstr "" +msgstr "Bladwijzer Aan/Uit\tCtrl+F2" #: Merge.rc:381 #, c-format msgid "&Next Bookmark\tF2" -msgstr "" +msgstr "Volge&nde Bladwijzer\tF2" #: Merge.rc:382 #, c-format msgid "&Previous bookmark\tShift+F2" -msgstr "" +msgstr "Vo&rige Bladwijzer\tShift+F2" #: Merge.rc:383 #, c-format msgid "&Clear All Bookmarks" -msgstr "" +msgstr "Alle Bladwijzers Wissen" #: Merge.rc:385 #, c-format msgid "&Go To...\tCtrl+G" -msgstr "" +msgstr "&Ga Naar...\tCtrl+G" #: Merge.rc:393 #, c-format msgid "&Zoom" -msgstr "" +msgstr "&Zoom" #: Merge.rc:395 #, c-format msgid "Zoom &In\tCtrl++" -msgstr "" +msgstr "Zoom &In\tCtrl++" #: Merge.rc:396 #, c-format msgid "Zoom &Out\tCtrl+-" -msgstr "" +msgstr "Zoom &Uit\tCtrl+-" #. Zoom to normal #: Merge.rc:397 #, c-format msgid "&Normal\tCtrl+*" -msgstr "" +msgstr "&Normaal\tCtrl+*" #: Merge.rc:399 #, c-format msgid "Syntax Highlight" -msgstr "" +msgstr "Syntaxmarkering" #: Merge.rc:404 #, c-format msgid "&Lock Panes" -msgstr "" +msgstr "Vensters Vastzetten" #: Merge.rc:405 #, c-format @@ -804,32 +805,32 @@ #: Merge.rc:406 #, c-format msgid "Vie&w Line Differences" -msgstr "" +msgstr "Bekijk Regelverschillen" #: Merge.rc:407 #, c-format msgid "View Line &Numbers" -msgstr "" +msgstr "Bekijk Regel&nummers" #: Merge.rc:408 #, c-format msgid "View &Margins" -msgstr "" +msgstr "Bekijk &Marges" #: Merge.rc:409 #, c-format msgid "W&rap Lines" -msgstr "" +msgstr "Automatische Te&rugloop" #: Merge.rc:411 #, c-format msgid "Sw&ap Panes" -msgstr "" +msgstr "Wissel Vensters" #: Merge.rc:421 #, c-format msgid "Diff &Pane" -msgstr "" +msgstr "Verschilvenster" #: Merge.rc:422 #, c-format @@ -859,22 +860,22 @@ #: Merge.rc:461 #, c-format msgid "&Prediffer" -msgstr "" +msgstr "Voorvergelijking" #: Merge.rc:502 #, c-format msgid "Comp&are" -msgstr "" +msgstr "Vergelijken" #: Merge.rc:503 #, c-format msgid "Co&mpare Special" -msgstr "" +msgstr "Vergelijken speciaal" #: Merge.rc:505 #, c-format msgid "&XML" -msgstr "" +msgstr "&XML" #: Merge.rc:506 #, c-format @@ -943,12 +944,12 @@ #: Merge.rc:527 #, c-format msgid "Re&name" -msgstr "" +msgstr "&Naam wijzigen" #: Merge.rc:528 #, c-format msgid "&Hide Items" -msgstr "" +msgstr "Items Verbergen" #: Merge.rc:530 #, c-format @@ -1013,7 +1014,7 @@ #: Merge.rc:559 #, c-format msgid "&Refresh" -msgstr "" +msgstr "Ve&rnieuwen" #: Merge.rc:571 #, c-format @@ -1063,12 +1064,12 @@ #: Merge.rc:663 #, c-format msgid "About WinMerge" -msgstr "" +msgstr "Over WinMerge" #: Merge.rc:669 #, c-format msgid "(Private Build)" -msgstr "" +msgstr "(Private Versie)" #: Merge.rc:670 #, c-format @@ -1095,12 +1096,12 @@ #: Merge.rc:1675 #, c-format msgid "OK" -msgstr "" +msgstr "OK" #: Merge.rc:675 #, c-format msgid "Contributors" -msgstr "" +msgstr "Medewerkers" #: Merge.rc:682 #, c-format @@ -1137,7 +1138,7 @@ #: Merge.rc:1612 #, c-format msgid "&Filter:" -msgstr "" +msgstr "&Filter:" #: Merge.rc:698 #: Merge.rc:1614 @@ -1164,7 +1165,7 @@ #: Merge.rc:705 #, c-format msgid "Status:" -msgstr "" +msgstr "Status:" #: Merge.rc:707 #: Merge.rc:737 @@ -1189,7 +1190,7 @@ #: Merge.rc:1348 #, c-format msgid "Help" -msgstr "" +msgstr "Help" #: Merge.rc:709 #, c-format @@ -1199,17 +1200,17 @@ #: Merge.rc:716 #, c-format msgid "Visual SourceSafe" -msgstr "" +msgstr "Visual SourceSafe" #: Merge.rc:721 #, c-format msgid "Database:" -msgstr "" +msgstr "Database:" #: Merge.rc:724 #, c-format msgid "Project:" -msgstr "" +msgstr "Project:" #: Merge.rc:727 #, c-format @@ -1293,12 +1294,12 @@ #: Merge.rc:770 #, c-format msgid "As&k when closing multiple windows" -msgstr "" +msgstr "Vragen bij &sluiten van meerdere vensters" #: Merge.rc:772 #, c-format msgid "&Preserve file time in file compare" -msgstr "" +msgstr "Behoud bestandstijd bij bestandsvergelijking" #: Merge.rc:775 #, c-format @@ -1313,29 +1314,29 @@ #: Merge.rc:779 #, c-format msgid "O&pen-dialog Auto-Completion:" -msgstr "" +msgstr "Auto-Aanvullen O&penen-venster:" #: Merge.rc:782 #, c-format msgid "Enable multiple compare windows for" -msgstr "" +msgstr "Activeer meerdere vergelijkingsvensters voor" #: Merge.rc:784 #: Merge.rc:1627 #, c-format msgid "&Folder compare" -msgstr "" +msgstr "Mappen vergelijken" #: Merge.rc:786 #: Merge.rc:1629 #, c-format msgid "Fil&e compare" -msgstr "" +msgstr "B&estanden vergelijken" #: Merge.rc:788 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." -msgstr "" +msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Reset-knop om alle berichtvensters terug zichtbaar te maken." #: Merge.rc:790 #, c-format @@ -1384,7 +1385,7 @@ #: Merge.rc:822 #, c-format msgid "D&on't wrap end of file" -msgstr "" +msgstr "Bij einde bestand st&oppen" #: Merge.rc:825 #, c-format @@ -1451,7 +1452,7 @@ #: Merge.rc:2177 #, c-format msgid "Rational ClearCase" -msgstr "" +msgstr "Rational ClearCase" #: Merge.rc:872 #, c-format @@ -1467,7 +1468,7 @@ #: Merge.rc:880 #, c-format msgid "CheckIn after checkout" -msgstr "" +msgstr "CheckIn na checkout" #: Merge.rc:886 #, c-format @@ -1477,7 +1478,7 @@ #: Merge.rc:889 #, c-format msgid "Enable Line Filters" -msgstr "" +msgstr "Activeer Regelfilters" #: Merge.rc:892 #, c-format @@ -1487,22 +1488,22 @@ #: Merge.rc:899 #, c-format msgid "Save" -msgstr "" +msgstr "Opslaan" #: Merge.rc:900 #, c-format msgid "New" -msgstr "" +msgstr "Nieuw" #: Merge.rc:901 #, c-format msgid "Edit" -msgstr "" +msgstr "Bewerken" #: Merge.rc:902 #, c-format msgid "Remove" -msgstr "" +msgstr "Verwijderen" #: Merge.rc:907 #: Merge.rc:1936 @@ -1551,17 +1552,17 @@ #: Merge.rc:956 #, c-format msgid "Selected Moved:" -msgstr "Geselecteerd verplaatst verschil:" +msgstr "Geselecteerd verplaatst:" #: Merge.rc:963 #, c-format msgid "Word Difference:" -msgstr "" +msgstr "Woordverschil:" #: Merge.rc:970 #, c-format msgid "Selected Word Diff:" -msgstr "" +msgstr "Geselect. Woordverschil:" #: Merge.rc:977 #: Merge.rc:1063 @@ -1593,7 +1594,7 @@ #: Merge.rc:998 #, c-format msgid "Integration" -msgstr "" +msgstr "Integratie" #: Merge.rc:999 #, c-format @@ -1608,7 +1609,7 @@ #: Merge.rc:1003 #, c-format msgid "In&clude subfolders by default" -msgstr "" +msgstr "Submappen standaard bijvoegen" #: Merge.rc:1005 #, c-format @@ -1618,27 +1619,27 @@ #: Merge.rc:1008 #, c-format msgid "&Filter folder:" -msgstr "" +msgstr "&Filter map:" #: Merge.rc:1010 #, c-format msgid "B&rowse..." -msgstr "" +msgstr "Bladeren..." #: Merge.rc:1011 #, c-format msgid "Temporary files folder" -msgstr "" +msgstr "Map met tijdelijke bestanden" #: Merge.rc:1012 #, c-format msgid "S&ystem's temp folder" -msgstr "" +msgstr "Tijdelijke map van het systeem" #: Merge.rc:1014 #, c-format msgid "C&ustom folder:" -msgstr "" +msgstr "Eigen map:" #: Merge.rc:1017 #: Merge.rc:1033 @@ -1689,7 +1690,7 @@ #: Merge.rc:1045 #, c-format msgid "&Context:" -msgstr "" +msgstr "&Context:" #: Merge.rc:1048 #, c-format @@ -1739,12 +1740,12 @@ #: Merge.rc:1089 #, c-format msgid "Move &Up" -msgstr "" +msgstr "Verplaats Omhoog" #: Merge.rc:1090 #, c-format msgid "Move &Down" -msgstr "" +msgstr "Verplaats Omlaag" #: Merge.rc:1100 #, c-format @@ -1774,7 +1775,7 @@ #: Merge.rc:1123 #, c-format msgid " Folder Compare Progress" -msgstr "" +msgstr "Voortgang Mapvergelijking" #: Merge.rc:1126 #: Merge.rc:1886 @@ -1785,17 +1786,17 @@ #: Merge.rc:1131 #, c-format msgid "Comparing items..." -msgstr "" +msgstr "Items vergelijken..." #: Merge.rc:1132 #, c-format msgid "Items compared:" -msgstr "" +msgstr "Items vergeleken:" #: Merge.rc:1133 #, c-format msgid "Items total:" -msgstr "" +msgstr "Totaal aantal items:" #: Merge.rc:1139 #, c-format @@ -1871,7 +1872,7 @@ #: Merge.rc:1174 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" -msgstr "" +msgstr "Negee&r regeleindeteken-verschillen (Windows/Unix/Mac)" #: Merge.rc:1177 #, c-format @@ -1881,12 +1882,12 @@ #: Merge.rc:1179 #, c-format msgid "&Match similar lines" -msgstr "" +msgstr "Laat gelijke lijnen overeenko&men" #: Merge.rc:1181 #, c-format msgid "Ign&ore time differences less than 3 seconds" -msgstr "" +msgstr "Negeer tijdsverschillen kleiner dan 3 sec&onden" #: Merge.rc:1184 #, c-format @@ -1896,18 +1897,18 @@ #: Merge.rc:1187 #, c-format msgid "S&top after first difference" -msgstr "" +msgstr "S&top na eerste verschil" #: Merge.rc:1190 #, c-format msgid "Filter Comments" -msgstr "" +msgstr "Filter-commentaar" #: Merge.rc:1197 #: Merge.rc:1935 #, c-format msgid "Editor" -msgstr "" +msgstr "Editor" #: Merge.rc:1200 #, c-format @@ -1947,22 +1948,22 @@ #: Merge.rc:1214 #, c-format msgid "Line Difference Coloring" -msgstr "" +msgstr "Kleur van Regelverschillen" #: Merge.rc:1216 #, c-format msgid "View line differences" -msgstr "" +msgstr "Bekijk regelverschillen" #: Merge.rc:1218 #, c-format msgid "&Character level" -msgstr "" +msgstr "Tekenniveau" #: Merge.rc:1220 #, c-format msgid "&Word-level:" -msgstr "" +msgstr "&Woordniveau:" #: Merge.rc:1235 #, c-format @@ -1972,17 +1973,17 @@ #: Merge.rc:1241 #, c-format msgid "Test" -msgstr "" +msgstr "Test" #: Merge.rc:1242 #, c-format msgid "Install..." -msgstr "" +msgstr "Installeren..." #: Merge.rc:1243 #, c-format msgid "New..." -msgstr "" +msgstr "Nieuw..." #: Merge.rc:1244 #, c-format @@ -1992,7 +1993,7 @@ #: Merge.rc:1245 #, c-format msgid "Delete..." -msgstr "" +msgstr "Wissen" #: Merge.rc:1251 #, c-format @@ -2032,7 +2033,7 @@ #: Merge.rc:1268 #, c-format msgid "Discard All" -msgstr "" +msgstr "Alles Negeren" #: Merge.rc:1275 #: Merge.rc:1523 @@ -2044,17 +2045,21 @@ #: Merge.rc:1278 #, c-format msgid "Default Codepage" -msgstr "" +msgstr "Standaard Codetabel" #: Merge.rc:1279 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" -msgstr "" +msgstr "Selecteer de standaard veronderstelde codetabel bij laden van niet-Unicodebestanden:" #: Merge.rc:1281 #, c-format -msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" +msgid "" +"Detect codepage info for these files : .html, .rc, .xml \n" +"need to restart session" msgstr "" +"Tekenset detecteren voor deze bestanden: .html, .rc \n" +"Herstarten sessie noodzakelijk" #: Merge.rc:1284 #, c-format @@ -2064,22 +2069,22 @@ #: Merge.rc:1286 #, c-format msgid "According to WinMerge User Interface" -msgstr "Volgens WinMerge gebruikersinterface" +msgstr "Volgens WinMerge-gebruikersinterface" #: Merge.rc:1288 #, c-format -msgid "Custom codepage:" -msgstr "" +msgid "Custom codepage :" +msgstr "Aangepaste tekenset:" #: Merge.rc:1296 #, c-format msgid "WinMerge - Archive support disabled" -msgstr "" +msgstr "WinMerge - Archiefondersteuning uitgeschakeld" #: Merge.rc:1299 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" -msgstr "" +msgstr "Kon geen 7-zipversie detecteren (niet ge\xEFnstalleerd?)" #: Merge.rc:1302 #, c-format @@ -2087,11 +2092,13 @@ "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" +"Archiefondersteuning vereist dat 7-zip 3.11 of later ge\xEFnstalleerd is op uw pc, of dat de\n" +"essenti\xEBle onderdelen gekopieerd worden naar de programmamap voor standalone-werking." #: Merge.rc:1304 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." -msgstr "" +msgstr "Er moet ook een overeenkomstige interface-plugin (Merge7z*.dll) aanwezig zijn op het pad." #: Merge.rc:1306 #, c-format @@ -2099,11 +2106,13 @@ "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" +"Gebruik a.u.b. de hieronder aangeraden versie van 7-zip totdat interface-plugins voor\n" +"latere versies beschikbaar worden." #: Merge.rc:1308 #, c-format msgid "Version" -msgstr "" +msgstr "Versie" #: Merge.rc:1310 #, c-format @@ -2111,128 +2120,134 @@ "Plugin required\n" "(dllbuild %04u)" msgstr "" +"Plugin nodig\n" +"(dllbuild %04u)" #: Merge.rc:1312 #, c-format msgid "Recommended version of 7-Zip:" -msgstr "" +msgstr "Aangeraden versie van 7-Zip:" #: Merge.rc:1315 #: Merge.rc:1318 #, c-format msgid "present" -msgstr "" +msgstr "aanwezig" #: Merge.rc:1316 #, c-format msgid "Merge7z000U.dll" -msgstr "" +msgstr "Merge7z000U.dll" #: Merge.rc:1319 #, c-format msgid "7-Zip software installed on your computer:" -msgstr "" +msgstr "7-Zip software ge\xEFnstalleerd op deze pc:" #: Merge.rc:1321 #: Merge.rc:1326 #, c-format msgid "none" -msgstr "" +msgstr "geen" #: Merge.rc:1323 #, c-format msgid "missing" -msgstr "" +msgstr "ontbreekt" #: Merge.rc:1324 #, c-format msgid "7-Zip components for standalone operation:" -msgstr "" +msgstr "7-Zip-onderdelen voor standalone-werking:" #: Merge.rc:1328 #, c-format msgid "outdated" -msgstr "" +msgstr "verouderd" #: Merge.rc:1329 #, c-format msgid "Plugins on path:" -msgstr "" +msgstr "Plugins op pad:" #: Merge.rc:1330 #, c-format -msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" +msgid "" +"Don't display this &message again.\n" +"(You can always recall this message from the Help menu.)" msgstr "" +"Toon dit bericht niet meer.\n" +"(U kan dit bericht altijd terugroepen van het Help-menu.)" #: Merge.rc:1334 #, c-format msgid "Plugin Download" -msgstr "" +msgstr "Plugin-download" #: Merge.rc:1343 #, c-format msgid "Options" -msgstr "" +msgstr "Opties" #: Merge.rc:1354 #, c-format msgid " Categories" -msgstr "" +msgstr " Categorie\xEBn" #: Merge.rc:1356 #, c-format msgid "Import..." -msgstr "" +msgstr "Importeren..." #: Merge.rc:1357 #, c-format msgid "Export..." -msgstr "" +msgstr "Exporteren..." #: Merge.rc:1365 #, c-format msgid "Keywords:" -msgstr "" +msgstr "Sleutelwoorden:" #: Merge.rc:1366 #, c-format msgid "Function names:" -msgstr "" +msgstr "Functienamen" #: Merge.rc:1367 #, c-format msgid "Comments:" -msgstr "" +msgstr "Opmerkingen:" #: Merge.rc:1368 #, c-format msgid "Numbers:" -msgstr "" +msgstr "Nummers:" #: Merge.rc:1369 #, c-format msgid "Operators:" -msgstr "" +msgstr "Operators:" #: Merge.rc:1370 #, c-format msgid "Strings:" -msgstr "" +msgstr "Strings:" #: Merge.rc:1371 #, c-format msgid "Preprocessor:" -msgstr "" +msgstr "Preprocessor:" #: Merge.rc:1372 #, c-format msgid "User 1:" -msgstr "" +msgstr "Gebruiker 1:" #: Merge.rc:1373 #, c-format msgid "User 2:" -msgstr "" +msgstr "Gebruiker 2:" #: Merge.rc:1378 #: Merge.rc:1383 @@ -2245,7 +2260,7 @@ #: Merge.rc:1418 #, c-format msgid "Bold" -msgstr "" +msgstr "Vet" #: Merge.rc:1426 #, c-format @@ -2255,7 +2270,7 @@ #: Merge.rc:1429 #, c-format msgid "Report &File:" -msgstr "" +msgstr "Rapporteer &Bestand" #: Merge.rc:1432 #: Merge.rc:1606 @@ -2263,88 +2278,88 @@ #: Merge.rc:1637 #, c-format msgid "Browse..." -msgstr "" +msgstr "Bladeren..." #: Merge.rc:1433 #, c-format msgid "&Style:" -msgstr "" +msgstr "&Stijl:" #: Merge.rc:1436 #, c-format msgid "&Copy to Clipboard" -msgstr "" +msgstr "Naar Klembord Kopi\xEBren" #: Merge.rc:1444 #, c-format msgid "Shared or Private Filter" -msgstr "" +msgstr "Gedeelde of Persoonlijke Filter" #: Merge.rc:1447 #, c-format msgid "Which type of filter do you want to create?" -msgstr "" +msgstr "Welk type filter wilt u maken?" #: Merge.rc:1449 #, c-format msgid "Shared Filter (for all users on this machine)" -msgstr "" +msgstr "Gedeelde Filter (voor alle gebruikers op deze pc)" #: Merge.rc:1451 #, c-format msgid "Private Filter (only for current user)" -msgstr "" +msgstr "Private Filter (alleen voor huidige gebruiker)" #: Merge.rc:1459 #: Merge.rc:1942 #, c-format msgid "Archive Support" -msgstr "" +msgstr "Archiefondersteuning" #: Merge.rc:1462 #, c-format msgid "Archive support requires 7-Zip plugin installed:" -msgstr "" +msgstr "Archiefondersteuning vereist dat de 7-Zip-plugin ge\xEFnstalleerd is:" #: Merge.rc:1464 #, c-format msgid "Download 7-zip Plugin" -msgstr "" +msgstr "Download de 7-Zip-plugin" #: Merge.rc:1465 #, c-format msgid "&Enable archive file support" -msgstr "" +msgstr "Activeer archiefbestand-ondersteuning" #: Merge.rc:1467 #, c-format msgid "&Use stand-alone 7-Zip if available" -msgstr "" +msgstr "Gebr&uik stand-alone 7-Zip indien beschikbaar" #: Merge.rc:1470 #, c-format msgid "U&se local 7-Zip from WinMerge folder" -msgstr "" +msgstr "Gebruik lokale 7-Zip van WinMerge-map" #: Merge.rc:1472 #, c-format msgid "&Detect archive type from file signature" -msgstr "" +msgstr "&Detecteer archieftype via bestandssignatuur" #: Merge.rc:1480 #, c-format msgid "Compare Statistics" -msgstr "" +msgstr "Vergelijkingsstatistieken" #: Merge.rc:1483 #, c-format msgid "Folders:" -msgstr "" +msgstr "Mappen:" #: Merge.rc:1484 #, c-format msgid "Files:" -msgstr "" +msgstr "Bestanden:" #: Merge.rc:1485 #: Merge.rc:2331 @@ -2355,28 +2370,28 @@ #: Merge.rc:1486 #, c-format msgid "Text:" -msgstr "" +msgstr "Tekst:" #: Merge.rc:1489 #: Merge.rc:1508 #, c-format msgid "Binary:" -msgstr "" +msgstr "Binary:" #: Merge.rc:1492 #, c-format msgid "Unique" -msgstr "" +msgstr "Uniek" #: Merge.rc:1493 #, c-format msgid "Left:" -msgstr "" +msgstr "Links:" #: Merge.rc:1498 #, c-format msgid "Right:" -msgstr "" +msgstr "Rechts:" #: Merge.rc:1503 #: Merge.rc:2325 @@ -2387,54 +2402,54 @@ #: Merge.rc:1512 #, c-format msgid "Total:" -msgstr "" +msgstr "Totaal:" #: Merge.rc:1517 #, c-format msgid "Close" -msgstr "" +msgstr "Sluiten" #: Merge.rc:1526 #, c-format msgid "Affects" -msgstr "" +msgstr "Aanpassingen" #: Merge.rc:1529 #: Merge.rc:1532 #, c-format msgid "(Affects)" -msgstr "" +msgstr "(Aanpassingen)" #: Merge.rc:1533 #, c-format msgid "Select Codepage for" -msgstr "" +msgstr "Selecteer Codetabel voor" #: Merge.rc:1534 #, c-format msgid "&File Loading:" -msgstr "" +msgstr "Bestanden Laden:" #: Merge.rc:1536 #: Merge.rc:1539 #, c-format msgid "..." -msgstr "" +msgstr "..." #: Merge.rc:1537 #, c-format msgid "File &Saving:" -msgstr "" +msgstr "Bestanden Op&slaan:" #: Merge.rc:1540 #, c-format msgid "&Use same codepage for both" -msgstr "" +msgstr "Gebr&uik dezelfde codetabel voor beide" #: Merge.rc:1543 #, c-format msgid "&Apply" -msgstr "" +msgstr "Toepassen" #: Merge.rc:1544 #: Merge.rc:1908 @@ -2445,169 +2460,169 @@ #: Merge.rc:1549 #, c-format msgid "Test Filter" -msgstr "" +msgstr "Test Filter" #: Merge.rc:1552 #, c-format msgid "Testing filter ..." -msgstr "" +msgstr "Filter testen..." #: Merge.rc:1554 #, c-format msgid "&Enter text to test:" -msgstr "" +msgstr "G&eef tekst op om te testen:" #: Merge.rc:1556 #, c-format msgid "&Folder Name" -msgstr "" +msgstr "Mapnaam" #: Merge.rc:1558 #, c-format msgid "Result:" -msgstr "" +msgstr "Resultaat:" #: Merge.rc:1562 #, c-format msgid "&Test" -msgstr "" +msgstr "&Test" #: Merge.rc:1563 #, c-format msgid "&Close" -msgstr "" +msgstr "Sluiten" #: Merge.rc:1571 #, c-format msgid "&Use customized text colors" -msgstr "" +msgstr "Gebr&uik aangepaste tekstkleuren" #: Merge.rc:1574 #, c-format msgid "Custom text colors" -msgstr "" +msgstr "Aangepaste tekstkleuren" #: Merge.rc:1576 #, c-format msgid "Whitespace:" -msgstr "" +msgstr "Witruimte:" #: Merge.rc:1577 #, c-format msgid "Regular text:" -msgstr "" +msgstr "Gewone tekst:" #: Merge.rc:1578 #, c-format msgid "Selection:" -msgstr "" +msgstr "Selectie:" #: Merge.rc:1601 #, c-format msgid "Paths" -msgstr "" +msgstr "Paden" #: Merge.rc:1607 #, c-format msgid "R&ead-only" -msgstr "" +msgstr "All&een-lezen" #: Merge.rc:1611 #, c-format msgid "Re&ad-only" -msgstr "" +msgstr "&Alleen-lezen" #: Merge.rc:1617 #, c-format msgid "Open..." -msgstr "" +msgstr "Openen..." #: Merge.rc:1618 #, c-format msgid "Save..." -msgstr "" +msgstr "Opslaan..." #: Merge.rc:1623 #: Merge.rc:1943 #, c-format msgid "Backup Files" -msgstr "" +msgstr "Backupbestanden" #: Merge.rc:1626 #, c-format msgid "Create backup files in:" -msgstr "" +msgstr "Maak backupbestanden in:" #: Merge.rc:1631 #, c-format msgid "Create backup files into:" -msgstr "" +msgstr "Maak backupbestanden binnen:" #: Merge.rc:1632 #, c-format msgid "&Original file's folder" -msgstr "" +msgstr "Map van &origineel bestand" #: Merge.rc:1634 #, c-format msgid "&Global backup folder:" -msgstr "" +msgstr "&Globale backupmap:" #: Merge.rc:1638 #, c-format msgid "Backup filename:" -msgstr "" +msgstr "Bestandsnaam backup:" #: Merge.rc:1639 #, c-format msgid "&Append .bak -extension" -msgstr "" +msgstr "Voeg .b&ak-extensie toe" #: Merge.rc:1641 #, c-format msgid "A&ppend timestamp" -msgstr "" +msgstr "Voeg tijdstem&pel toe" #: Merge.rc:1648 #: Merge.rc:2233 #, c-format msgid "Confirm Copy" -msgstr "" +msgstr "Bevestig Kopi\xEBren" #: Merge.rc:1652 #, c-format msgid "Are you sure you want to copy XXX items?" -msgstr "" +msgstr "Bent u zeker dat u XXX items wilt kopi\xEBren?" #: Merge.rc:1654 #, c-format msgid "From left" -msgstr "" +msgstr "Van links" #: Merge.rc:1657 #, c-format msgid "To right" -msgstr "" +msgstr "Naar rechts" #: Merge.rc:1660 #, c-format msgid "Yes" -msgstr "" +msgstr "Ja" #: Merge.rc:1661 #, c-format msgid "No" -msgstr "" +msgstr "Nee" #: Merge.rc:1667 #, c-format msgid "Plugins" -msgstr "" +msgstr "Plugins" #: Merge.rc:1670 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "Plugins activeren" #. StringFileInfo.Block #: Merge.rc:1700 @@ -2629,32 +2644,32 @@ #: Merge.rc:1737 #, c-format msgid "EXT" -msgstr "" +msgstr "UIT" #: Merge.rc:1738 #, c-format msgid "CAP" -msgstr "" +msgstr "CAP" #: Merge.rc:1739 #, c-format msgid "NUM" -msgstr "" +msgstr "NUM" #: Merge.rc:1740 #, c-format msgid "SCRL" -msgstr "" +msgstr "SCRL" #: Merge.rc:1741 #, c-format msgid "OVR" -msgstr "" +msgstr "OVR" #: Merge.rc:1742 #, c-format msgid "REC" -msgstr "" +msgstr "OPN" #: Merge.rc:1748 #, c-format @@ -2672,7 +2687,7 @@ "Open (Ctrl+O)" msgstr "" "Een bestaand document openen.\n" -"Openen" +"Openen (Ctrl+O)" #: Merge.rc:1750 #, c-format @@ -2734,13 +2749,13 @@ "Display full pages\n" "Print Preview" msgstr "" -"Afdrukvoorbeeld.\n" -"Afdruk voorbeeld" +"Toon volledige pagina's\n" +"Afdrukvoorbeeld" #: Merge.rc:1761 #, c-format msgid "Make all hidden items visible again" -msgstr "" +msgstr "Maak alle verborgen items terug zichtbaar" #: Merge.rc:1762 #, c-format @@ -2763,31 +2778,33 @@ "Open project file\n" "Project file (Ctrl+J)" msgstr "" +"Open projectbestand\n" +"Projectbestand (Ctrl+J)" #: Merge.rc:1771 #, c-format msgid "Unknown error attempting to open project file" -msgstr "" +msgstr "Onbekende fout bij poging tot openen van projectbestand" #: Merge.rc:1772 #, c-format msgid "Unknown error attempting to save project file" -msgstr "" +msgstr "Onbekende fout bij poging tot opslaan van projectbestand" #: Merge.rc:1773 #, c-format msgid "Project File" -msgstr "" +msgstr "Projectbestand" #: Merge.rc:1774 #, c-format msgid "Project file successfully loaded." -msgstr "" +msgstr "Projectbestand met succes geladen." #: Merge.rc:1775 #, c-format msgid "Project file successfully saved." -msgstr "" +msgstr "Projectbestand met succes opgeslagen." #: Merge.rc:1776 #, c-format @@ -2795,6 +2812,8 @@ "Save current paths and options to project file\n" "Save Project File" msgstr "" +"Huidige paden en opties opslaan naar projectbestand\n" +"Projectbestand Opslaan" #: Merge.rc:1781 #, c-format @@ -2841,7 +2860,7 @@ "Next Pane" msgstr "" "Ga naar het volgende venster deel.\n" -"Volgende deel" +"Volgende Venster" #: Merge.rc:1809 #, c-format @@ -2850,7 +2869,7 @@ "Previous Pane" msgstr "" "Ga naar het vorige venster deel.\n" -"Vorige deel" +"Vorige Venster" #: Merge.rc:1815 #, c-format @@ -2984,11 +3003,17 @@ "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" +"Toon of verberg de tab-balk\n" +"Tab-balk aan/uit" #: Merge.rc:1840 #, c-format -msgid "Automatically resize panes\nLock Panes" +msgid "" +"Automatically resize panes\n" +"Lock Panes" msgstr "" +"Stel venstergrootte automatisch in\n" +"Vensters Vastzetten" #: Merge.rc:1846 #, c-format @@ -3046,18 +3071,46 @@ "Close print preview mode\n" "Cancel Preview" msgstr "" -"Afdrukvoorbeeld sluiten.\n" +"Afdrukvoorbeeld sluiten\n" "Afsluiten voorbeeld" #: Merge.rc:1872 #, c-format -msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" +msgid "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge File Compare" msgstr "" +"\n" +"BestandsVergelijking\n" +"\n" +"\n" +"\n" +"WinMerge.BestandsVergelijking\n" +"WinMerge BestandsVergelijking" #: Merge.rc:1873 #, c-format -msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" +msgid "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge Folder Compare" msgstr "" +"\n" +"MapVergelijking\n" +"\n" +"\n" +"\n" +"WinMerge.MapVergelijking\n" +"WinMerge MapVergelijking" #: Merge.rc:1880 #, c-format @@ -3077,13 +3130,17 @@ #: Merge.rc:1900 #, c-format -msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" +"Ontwikkelaars:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" #: Merge.rc:1901 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." -msgstr "" +msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is gratis software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details." #: Merge.rc:1907 #, c-format @@ -3158,42 +3215,42 @@ #: Merge.rc:1937 #, c-format msgid "Syntax colors" -msgstr "" +msgstr "Syntaxkleuren" #: Merge.rc:1938 #, c-format msgid "Text Colors" -msgstr "" +msgstr "Tekstkleuren" #: Merge.rc:1940 #, c-format msgid "Version Control" -msgstr "" +msgstr "Versiebeheer" #: Merge.rc:1950 #, c-format msgid "To:" -msgstr "" +msgstr "Naar:" #: Merge.rc:1951 #, c-format msgid "From left:" -msgstr "" +msgstr "Van links:" #: Merge.rc:1952 #, c-format msgid "To left:" -msgstr "" +msgstr "Naar links:" #: Merge.rc:1953 #, c-format msgid "From right:" -msgstr "" +msgstr "Van rechts:" #: Merge.rc:1954 #, c-format msgid "To right:" -msgstr "" +msgstr "Naar rechts:" #: Merge.rc:1960 #, c-format @@ -3203,7 +3260,7 @@ #: Merge.rc:1961 #, c-format msgid "Unicode" -msgstr "" +msgstr "Unicode" #: Merge.rc:1962 #, c-format @@ -3213,7 +3270,7 @@ #: Merge.rc:1968 #, c-format msgid "Options (%1)" -msgstr "Eigenschappen" +msgstr "Opties (%1)" #: Merge.rc:1969 #, c-format @@ -3228,7 +3285,7 @@ #: Merge.rc:1971 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." -msgstr "De geselecteerde wijziging van het lettertype wordt niet verwerkt in de openstaande vensters." +msgstr "De geselecteerde wijziging van het lettertype wordt niet toegepast in de openstaande vensters." #: Merge.rc:1973 #, c-format @@ -3237,6 +3294,9 @@ "\n" "Please use values 1 - %1." msgstr "" +"Waarde in Tabgrootte-veld is niet binnen acceptatiebereik van WinMerge\n" +"\n" +"Gebruik waarden 1 - %1." #: Merge.rc:1975 #, c-format @@ -3245,6 +3305,9 @@ "\n" "Please re-start WinMerge after the reset." msgstr "" +"Bent u zeker dat u alle WinMerge-opties wilt herstellen naar de standaardwaarden?\n" +"\n" +"Herstart WinMerge na herstellen." #: Merge.rc:1981 #, c-format @@ -3264,72 +3327,72 @@ #: Merge.rc:1984 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" -msgstr "" +msgstr "WinMerge Projectbestanden (*.WinMerge)|*.WinMerge||" #: Merge.rc:1986 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" -msgstr "" +msgstr "Optie-bestanden (*.ini)|*.ini|Alle Bestanden (*.*)|*.*||" #: Merge.rc:1992 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -msgstr "" +msgstr "Tekstbestanden (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Bestanden (*.*)|*.*||" #: Merge.rc:1993 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -msgstr "" +msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle Bestanden (*.*)|*.*||" #: Merge.rc:1994 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" -msgstr "" +msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||" #: Merge.rc:2000 #, c-format msgid "UTF-8" -msgstr "" +msgstr "UTF-8" #: Merge.rc:2001 #, c-format msgid "UTF-8 (B)" -msgstr "" +msgstr "UTF-8 (B)" #: Merge.rc:2002 #, c-format msgid "UCS-2 LE" -msgstr "" +msgstr "UCS-2 LE" #: Merge.rc:2003 #, c-format msgid "UCS-2 BE" -msgstr "" +msgstr "UCS-2 BE" #: Merge.rc:2009 #, c-format msgid "Full Contents" -msgstr "" +msgstr "Volledige Inhoud" #: Merge.rc:2010 #, c-format msgid "Quick Contents" -msgstr "" +msgstr "Snelle Inhoud" #: Merge.rc:2011 #, c-format msgid "Modified Date" -msgstr "Laatst veranderd datum" +msgstr "Datum Laatste Wijziging" #: Merge.rc:2012 #, c-format msgid "Modified Date and Size" -msgstr "" +msgstr "Aangepaste Datum en Grootte" #: Merge.rc:2013 #, c-format msgid "Size" -msgstr "" +msgstr "Grootte" #: Merge.rc:2019 #: Merge.rc:2643 @@ -3340,33 +3403,33 @@ #: Merge.rc:2020 #, c-format msgid "Location" -msgstr "Lokatie" +msgstr "Locatie" #: Merge.rc:2021 #, c-format msgid "Filters" -msgstr "" +msgstr "Filters" #: Merge.rc:2022 #, c-format msgid "[F] " -msgstr "" +msgstr "[F] " #: Merge.rc:2023 #: Merge.rc:2645 #, c-format msgid "Description" -msgstr "" +msgstr "Beschrijving" #: Merge.rc:2024 #, c-format msgid "Select filename for new filter" -msgstr "" +msgstr "Selecteer bestandsnaam voor nieuwe filter" #: Merge.rc:2025 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" -msgstr "" +msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||" #: Merge.rc:2027 #, c-format @@ -3376,6 +3439,10 @@ "Please copy file %1 to WinMerge/Filters -folder:\n" "%2." msgstr "" +"Kan bestandsfilter-sjabloon niet vinden!\n" +"\n" +"Kopieer bestand %1 naar map WinMerge/Filters:\n" +"%2." #: Merge.rc:2029 #, c-format @@ -3385,6 +3452,10 @@ "\n" "Please make sure the folder exists and is writable." msgstr "" +"Kan filtersjabloonbestand niet kopi\xEBren naar filtermap:\n" +"%1\n" +"\n" +"Ga na of de map bestaat en schrijfbaar is." #: Merge.rc:2031 #, c-format @@ -3393,6 +3464,9 @@ "\n" "Please select filter folder in Options/System." msgstr "" +"Filterbestandsmap van gebruiker is niet gedefinieerd!\n" +"\n" +"Selecteer filtermap in Opties/Systeem." #: Merge.rc:2033 #, c-format @@ -3402,11 +3476,15 @@ "\n" "Maybe the file is read-only?" msgstr "" +"Wissen van filterbestand mislukt:\n" +"%1\n" +"\n" +"Misschien is het bestand alleen-lezen?" #: Merge.rc:2034 #, c-format msgid "Locate filter file to install" -msgstr "" +msgstr "Localiseer te installeren filterbestand" #: Merge.rc:2036 #, c-format @@ -3415,26 +3493,35 @@ "\n" "Could not copy new filter file to filter folder." msgstr "" +"Installeren filterbestand mislukt.\n" +"\n" +"Kon nieuwe filter niet kopi\xEBren naar filtermap." #: Merge.rc:2038 #, c-format msgid "Filter file already exists. Overwrite existing filter?" -msgstr "" +msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?" #: Merge.rc:2044 #, c-format msgid "Regular expression" -msgstr "" +msgstr "Reguliere expressie" #: Merge.rc:2050 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"Filters werden ge\xFCpdatet. Wilt u alle geopende mapvergelijkingen vernieuwen?\n" +"\n" +"Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen later vernieuwen." #: Merge.rc:2057 #, c-format msgid "&Path to SS.EXE:" -msgstr "" +msgstr "&Pad naar SS.EXE:" #: Merge.rc:2063 #, c-format @@ -3459,12 +3546,12 @@ #: Merge.rc:2067 #, c-format msgid "Theirs File" -msgstr "" +msgstr "Hun Bestand" #: Merge.rc:2068 #, c-format msgid "Mine File" -msgstr "" +msgstr "Mijn Bestand" #: Merge.rc:2074 #, c-format @@ -3514,17 +3601,17 @@ #: Merge.rc:2083 #, c-format msgid "Creating the report..." -msgstr "" +msgstr "Rapport genereren..." #: Merge.rc:2084 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "Laatste operatie ongedaan maken..." #: Merge.rc:2085 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "Vorige operatie opnieuw doen..." #: Merge.rc:2091 #, c-format @@ -3570,12 +3657,12 @@ #: Merge.rc:2104 #, c-format msgid "Item %1 of %2" -msgstr "" +msgstr "Item %1 van %2" #: Merge.rc:2105 #, c-format msgid "Items: %1" -msgstr "" +msgstr "Items: %1" #: Merge.rc:2111 #, c-format @@ -3643,12 +3730,18 @@ #: Merge.rc:2127 #, c-format msgid "Failed to parse conflict file." -msgstr "" +msgstr "Analyseren van conflictbestand mislukt." #: Merge.rc:2128 #, c-format -msgid "The file\n%1\nis not a conflict file." +msgid "" +"The file\n" +"%1\n" +"is not a conflict file." msgstr "" +"Bestand\n" +"%1\n" +"is geen conflictbestand." #: Merge.rc:2134 #, c-format @@ -3683,6 +3776,10 @@ "\n" "Continue anyway?" msgstr "" +"Kon geen backup maken van origineel bestand:\n" +"%1\n" +"\n" +"Toch doorgaan?" #: Merge.rc:2141 #, c-format @@ -3775,6 +3872,9 @@ "\n" "Refresh documents before continuing." msgstr "" +"Kan geen verschillen samenvoegen wanneer documenten niet gelijklopend zijn.\n" +"\n" +"Vernieuw documenten voordat u doorgaat." #: Merge.rc:2160 #, c-format @@ -3818,6 +3918,9 @@ " Please, check config spec of used view.\n" " Undo checkout operation?" msgstr "" +"Versie-systeem gaf een fout bij een poging tot een bestands-checkin.\n" +" Controleer configuratie-specificaties van de gebruikte weergave.\n" +" Checkout ongedaan maken?" #: Merge.rc:2168 #, c-format @@ -3825,6 +3928,8 @@ "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" +"Versie-systeem gaf een fout bij een poging tot het ongedaan maken van een bestands-checkout.\n" +" Controleer configuratie-specificaties van de gebruikte weergave." #: Merge.rc:2174 #: Merge.rc:2627 @@ -3845,24 +3950,24 @@ #: Merge.rc:2178 #, c-format msgid "Break at whitespace" -msgstr "" +msgstr "Afbreken bij witruimte" #: Merge.rc:2179 #, c-format msgid "Break at whitespace or punctuation" -msgstr "" +msgstr "Afbreken bij witruimte of interpunctie" #: Merge.rc:2185 #: Merge.rc:2187 #, c-format msgid "Copy selected item to named directory" -msgstr "" +msgstr "Kopieer geselecteerd item naar genoemde map" #: Merge.rc:2186 #: Merge.rc:2188 #, c-format msgid "Copy selected item to custom directory" -msgstr "" +msgstr "Kopieer geselecteerd item naar aangepaste map" #: Merge.rc:2189 #, c-format @@ -3882,12 +3987,12 @@ #: Merge.rc:2192 #, c-format msgid "Hide selected item(s) (on the fly filter)" -msgstr "" +msgstr "Verberg geselecteerd(e) item(s) (on-the-fly-filter)" #: Merge.rc:2193 #, c-format msgid "Rename selected item on both sides" -msgstr "" +msgstr "Herbenoem geselecteerd item aan beide kanten" #: Merge.rc:2194 #, c-format @@ -3961,7 +4066,7 @@ #: Merge.rc:2212 #, c-format msgid "Both (%1 of %2)" -msgstr "" +msgstr "Beide (%1 of %2)" #: Merge.rc:2213 #, c-format @@ -3971,22 +4076,22 @@ #: Merge.rc:2218 #, c-format msgid "Left side - select destination folder:" -msgstr "" +msgstr "Linkerkant - selecteer doelmap:" #: Merge.rc:2219 #, c-format msgid "Right side - select destination folder:" -msgstr "" +msgstr "Rechterkant - selecteer doelmap:" #: Merge.rc:2220 #, c-format msgid "(%1 Files Affected)" -msgstr "" +msgstr "(%1 Bestanden Aangepast)" #: Merge.rc:2221 #, c-format msgid "(%1 of %2 Files Affected)" -msgstr "" +msgstr "(%1 van %2 Bestanden Aangepast)" #: Merge.rc:2227 #, c-format @@ -4003,12 +4108,12 @@ #: Merge.rc:2228 #, c-format msgid "Are you sure you want to copy:" -msgstr "" +msgstr "Bent u zeker dat u het volgende wilt kopi\xEBren:" #: Merge.rc:2229 #, c-format msgid "Are you sure you want to copy %d items:" -msgstr "" +msgstr "Bent u zeker dat u %d items wilt kopi\xEBren:" #: Merge.rc:2230 #, c-format @@ -4021,21 +4126,28 @@ "\n" "Please refresh the compare." msgstr "" +"Bewerking afgebroken!\n" +"\n" +"Inhoud van de map op de schijven is veranderd, pad\n" +"%1\n" +"werd niet gevonden.\n" +"\n" +"Vernieuw a.u.b. de vergelijking." #: Merge.rc:2231 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "Bent u zeker dat u wilt verplaatsen:" #: Merge.rc:2232 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "Bent u zeker dat u %d items wilt verplaatsen:" #: Merge.rc:2234 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "Bevestig Verplaatsen" #: Merge.rc:2240 #, c-format @@ -4070,12 +4182,12 @@ #: Merge.rc:2246 #, c-format msgid "Failed to execute external editor: %1" -msgstr "" +msgstr "Uitvoeren externe editor mislukt: %1" #: Merge.rc:2247 #, c-format msgid "Unknown extension on external editor: %1" -msgstr "" +msgstr "Onbekende extensie bij externe editor: %1" #: Merge.rc:2248 #, c-format @@ -4185,12 +4297,12 @@ #: Merge.rc:2286 #, c-format msgid "Right Size (Short)" -msgstr "" +msgstr "Rechtse Grootte (Kort)" #: Merge.rc:2287 #, c-format msgid "Left Size (Short)" -msgstr "" +msgstr "Linkse Grootte (Kort)" #: Merge.rc:2293 #, c-format @@ -4235,12 +4347,12 @@ #: Merge.rc:2301 #, c-format msgid "Left EOL" -msgstr "" +msgstr "Links regeleinde" #: Merge.rc:2302 #, c-format msgid "Right EOL" -msgstr "" +msgstr "Rechts regeleinde" #: Merge.rc:2308 #, c-format @@ -4255,12 +4367,12 @@ #: Merge.rc:2310 #, c-format msgid "Ignored Diff." -msgstr "" +msgstr "Genegeerde Versch." #: Merge.rc:2311 #, c-format msgid "Differences" -msgstr "" +msgstr "Verschillen" #: Merge.rc:2312 #: Merge.rc:2623 @@ -4276,7 +4388,7 @@ #: Merge.rc:2319 #, c-format msgid "Item aborted" -msgstr "" +msgstr "Item afgebroken" #: Merge.rc:2320 #, c-format @@ -4291,12 +4403,12 @@ #: Merge.rc:2322 #, c-format msgid "Left only: %1" -msgstr "" +msgstr "Alleen links: %1" #: Merge.rc:2323 #, c-format msgid "Right only: %1" -msgstr "" +msgstr "Alleen rechts: %1" #: Merge.rc:2324 #, c-format @@ -4331,7 +4443,7 @@ #: Merge.rc:2332 #, c-format msgid "Error" -msgstr "" +msgstr "Fout" #: Merge.rc:2333 #, c-format @@ -4401,12 +4513,12 @@ #: Merge.rc:2360 #, c-format msgid "Left file size abbreviated." -msgstr "" +msgstr "Linker bestandsgrootte ingekort." #: Merge.rc:2361 #, c-format msgid "Right file size abbreviated." -msgstr "" +msgstr "Rechter bestandsgrootte ingekort." #: Merge.rc:2367 #, c-format @@ -4451,12 +4563,12 @@ #: Merge.rc:2375 #, c-format msgid "Left side file EOL type" -msgstr "" +msgstr "Type regeleinde linker bestand" #: Merge.rc:2376 #, c-format msgid "Right side file EOL type" -msgstr "" +msgstr "Type regeleinde rechter bestand" #: Merge.rc:2382 #, c-format @@ -4471,12 +4583,12 @@ #: Merge.rc:2384 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." -msgstr "" +msgstr "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd door WinMerge en kunnen niet samengevoegd worden." #: Merge.rc:2385 #, c-format msgid "Number of differences in file. This number does not include ignored differences." -msgstr "" +msgstr "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen." #: Merge.rc:2386 #, c-format @@ -4491,27 +4603,27 @@ #: Merge.rc:2393 #, c-format msgid "Comma-separated list" -msgstr "" +msgstr "Komma-gescheiden lijst" #: Merge.rc:2394 #, c-format msgid "Tab-separated list" -msgstr "" +msgstr "Tab-gescheiden lijst" #: Merge.rc:2395 #, c-format msgid "Simple HTML" -msgstr "" +msgstr "Simpele html" #: Merge.rc:2396 #, c-format msgid "Simple XML" -msgstr "" +msgstr "Simpele xml" #: Merge.rc:2398 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" -msgstr "" +msgstr "Het rapportbestand bestaat reeds. Wilt u het bestaande bestand overschrijven?" #: Merge.rc:2399 #, c-format @@ -4519,11 +4631,13 @@ "Error creating the report:\n" "%1" msgstr "" +"Fout bij maken van rapport:\n" +"%1" #: Merge.rc:2400 #, c-format msgid "The report has been created successfully." -msgstr "" +msgstr "Het rapport is met succes opgesteld." #: Merge.rc:2406 #, c-format @@ -4554,31 +4668,52 @@ "\n" "Note: 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 "" +"Deze bestanden gebruiken verschillende regeleinde-types.\n" +"\n" +"Wilt u alle regeleinde-types behandelen als equivalent voor deze vergelijking?\n" +"\n" +"Opmerking: Indien u op elk moment alle regeleinde-types als equivalent wilt behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)" #: Merge.rc:2411 #, c-format -msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?" +msgid "" +"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" +" With the current options, they will be unified to the main type.\n" +" Do you want to change the options and preserve the different EOL ?" msgstr "" +"De regeleindes zijn verschillende types (Windows/Unix/Mac) in bestand '%1'.\n" +" Met de huidige opties zullen ze \xE9\xE9n gemaakt worden naar het hoofdtype.\n" +" Wilt u de opties wijzigen en de verschillende regeleindes behouden?" #: Merge.rc:2412 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." -msgstr "" +msgstr "Er trad een fout op bij het voorvergelijken van bestand '%1' met plugin '%2'. De voorvergelijking is niet meer toegepast." #: Merge.rc:2413 #, c-format msgid "The selected folder is invalid." -msgstr "" +msgstr "De geselecteerde map is ongeldig." #: Merge.rc:2414 #, c-format msgid "Cannot open a binary file to editor." -msgstr "" +msgstr "Kan geen binair bestand openen met de editor." #: Merge.rc:2415 #, 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?" +msgid "" +"The folder exists only in other side and cannot be opened.\n" +"\n" +"Do you want to create a matching folder:\n" +"%1\n" +"to the other side and open these folders?" msgstr "" +"De map bestaat slechts aan de andere kant en kan niet geopend worden.\n" +"\n" +"Wilt u een gelijkaardige map:\n" +"%1\n" +"maken aan de andere kant en deze mappen openen?" #: Merge.rc:2421 #, c-format @@ -4587,26 +4722,29 @@ "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" +"Verschillende codetabellen gevonden in linker (cp%d) en rechter (cp%d) bestanden. \n" +"Elk bestand in zijn eigen codetabel weergeven zal resulteren in een betere weergave, maar samenvoegen/kopi\xEBren zal gevaarlijk zijn.\n" +"Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel zijn (aangeraden)?" #: Merge.rc:2422 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." -msgstr "" +msgstr "Waarschuwing: Bestanden gebruiken verschillende coderingen, links=%s en rechts=%s, en samenvoegen kan leiden tot verlies van informatie." #: Merge.rc:2423 #, c-format msgid "Information lost due to encoding errors: both files" -msgstr "" +msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden" #: Merge.rc:2424 #, c-format msgid "Information lost due to encoding errors: right file" -msgstr "" +msgstr "Informatie verloren gegaan wegens coderingsfouten: rechter bestand" #: Merge.rc:2425 #, c-format msgid "Information lost due to encoding errors: left file" -msgstr "" +msgstr "Informatie verloren gegaan wegens coderingsfouten: linker bestand" #: Merge.rc:2431 #, c-format @@ -4616,7 +4754,7 @@ #: Merge.rc:2432 #, c-format msgid "Line difference" -msgstr "Verschil binnen regel" +msgstr "Regelverschil" #: Merge.rc:2438 #, c-format @@ -4641,12 +4779,12 @@ #: Merge.rc:2452 #, c-format msgid "Location Pane" -msgstr "" +msgstr "Locatievenster" #: Merge.rc:2453 #, c-format msgid "Diff Pane" -msgstr "" +msgstr "Verschilvenster" #: Merge.rc:2459 #, c-format @@ -4681,7 +4819,7 @@ #: Merge.rc:2465 #, c-format msgid "Context" -msgstr "" +msgstr "Context" #: Merge.rc:2466 #, c-format @@ -4696,12 +4834,12 @@ #: Merge.rc:2468 #, c-format msgid "The specified output path is not an absolute path: %1" -msgstr "" +msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1" #: Merge.rc:2469 #, c-format msgid "Specify an output file" -msgstr "" +msgstr "Specifieer een uitvoerbestand" #: Merge.rc:2470 #, c-format @@ -4720,11 +4858,14 @@ "\n" "Creating a patch requires that there are no unsaved changes in files." msgstr "" +"Sla alle bestanden eerst op.\n" +"\n" +"Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in bestanden zijn." #: Merge.rc:2473 #, c-format msgid "Folder does not exist." -msgstr "" +msgstr "Map bestaat niet." #: Merge.rc:2478 #, c-format @@ -4738,6 +4879,9 @@ "All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n" "See manual for more info about archive support and how to enable it." msgstr "" +"Archiefondersteuning is niet ingeschakeld.\n" +"Er kon geen enkel onderdeel voor archiefondersteuning (7-zip and/or Merge7z*.dll) gevonden worden.\n" +"Zie de handleiding voor meer info over archiefondersteuning en hoe het te activeren." #: Merge.rc:2480 #, c-format @@ -4745,6 +4889,8 @@ "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" +"\n" +"Opmerking: 7-Zip-integratie is uitgeschakeld in de instellingen van WinMerge." #: Merge.rc:2481 #, c-format @@ -4752,36 +4898,38 @@ "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" +"\n" +"Opmerking: 7-Zip-integratie is gelimiteerd tot standalone-operatie in de instellingen van WinMerge." #: Merge.rc:2482 #, c-format msgid "Select file for export" -msgstr "" +msgstr "Selecteer te exporteren bestand" #: Merge.rc:2483 #, c-format msgid "Select file for import" -msgstr "" +msgstr "Selecteer te importeren bestand" #: Merge.rc:2484 #, c-format msgid "Options imported from the file." -msgstr "" +msgstr "Opties ge\xEFmporteerd van bestand" #: Merge.rc:2485 #, c-format msgid "Options exported to the file." -msgstr "" +msgstr "Opties ge\xEBxporteerd naar bestand." #: Merge.rc:2486 #, c-format msgid "Failed to import options from the file." -msgstr "" +msgstr "Opties importeren van bestand mislukt." #: Merge.rc:2487 #, c-format msgid "Failed to write options to the file." -msgstr "" +msgstr "Opties schrijven naar bestand mislukt." #: Merge.rc:2488 #, c-format @@ -4790,6 +4938,9 @@ "\n" "Do you want to continue?" msgstr "" +"U staat op het punt verschillende vergelijkingsvensters tegelijk te sluiten.\n" +"\n" +"Wilt u doorgaan?" #: Merge.rc:2494 #, c-format @@ -4879,353 +5030,353 @@ #: Merge.rc:2520 #, c-format msgid "Western European" -msgstr "" +msgstr "West-Europees" #: Merge.rc:2521 #, c-format msgid "Eastern European" -msgstr "" +msgstr "Oost-Europees" #: Merge.rc:2522 #, c-format msgid "East Asian" -msgstr "" +msgstr "Oost-Aziatisch" #: Merge.rc:2523 #, c-format msgid "SE & SW Asian" -msgstr "" +msgstr "ZO- & ZW-Aziatisch" #: Merge.rc:2524 #, c-format msgid "Middle Eastern" -msgstr "" +msgstr "Midden-Oosters" #: Merge.rc:2525 #: Merge.rc:2535 #, c-format msgid "Not applicable" -msgstr "" +msgstr "Niet toepasbaar" #: Merge.rc:2531 #, c-format msgid "MS-Windows" -msgstr "" +msgstr "MS-Windows" #: Merge.rc:2532 #, c-format msgid "MS-DOS" -msgstr "" +msgstr "MS-DOS" #: Merge.rc:2533 #, c-format msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #: Merge.rc:2534 #, c-format msgid "IBM" -msgstr "" +msgstr "IBM" #: Merge.rc:2541 #, c-format msgid "EBCDIC" -msgstr "" +msgstr "EBCDIC" #: Merge.rc:2542 #, c-format msgid "IBM EBCDIC Cyrillic" -msgstr "" +msgstr "IBM EBCDIC Cyrillisch" #: Merge.rc:2548 #, c-format msgid "MS-DOS Latin US" -msgstr "" +msgstr "MS-DOS Latijn US" #: Merge.rc:2549 #, c-format msgid "MS-DOS Arabic" -msgstr "" +msgstr "MS-DOS Arabisch" #: Merge.rc:2550 #, c-format msgid "MS-DOS Greek" -msgstr "" +msgstr "MS-DOS Grieks" #: Merge.rc:2551 #, c-format msgid "MS-DOS Baltic Rim" -msgstr "" +msgstr "MS-DOS Baltisch" ... [truncated message content] |
From: <ki...@us...> - 2009-01-06 15:13:39
|
Revision: 6287 http://winmerge.svn.sourceforge.net/winmerge/?rev=6287&view=rev Author: kimmov Date: 2009-01-06 15:13:37 +0000 (Tue, 06 Jan 2009) Log Message: ----------- BUG: [ 2459234 ] Location pane doesn't show any differences Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/LocationView.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-06 14:10:29 UTC (rev 6286) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-06 15:13:37 UTC (rev 6287) @@ -12,6 +12,7 @@ BugFix: Quick compare didn't ignore EOL differences (#2433677) Bugfix: Remove EOL characters from command line (#2458728) Bugfix: Merging one line diff to empty other side didn't work (#2456399) + Bugfix: Location pane was empty for some files with diffs (#2459234) Translation updates: - Brazilian (#2461443) - Czech (r6201) Modified: branches/R2_12/Src/LocationView.cpp =================================================================== --- branches/R2_12/Src/LocationView.cpp 2009-01-06 14:10:29 UTC (rev 6286) +++ branches/R2_12/Src/LocationView.cpp 2009-01-06 15:13:37 UTC (rev 6287) @@ -297,7 +297,13 @@ block.bottom_coord = nEndY; block.diff_index = nDiff; m_diffBlocks.push_back(block); - } + } + + // First diff having only blank lines in other side causes the + // blank value be -1. Set it to 0 as top line of diff. + if (diff.blank0 == -1) + diff.blank0 = 0; + // Now the block for blank lines side0! CalculateBlocksPixel( pView->GetSubLineIndex(diff.blank0), @@ -329,6 +335,12 @@ block.diff_index = nDiff; m_diffBlocks.push_back(block); } + + // First diff having only blank lines in other side causes the + // blank value be -1. Set it to 0 as top line of diff. + if (diff.blank1 == -1) + diff.blank1 = 0; + // Now the block for blank lines side1! CalculateBlocksPixel( pView->GetSubLineIndex(diff.blank1), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-11 19:10:56
|
Revision: 6312 http://winmerge.svn.sourceforge.net/winmerge/?rev=6312&view=rev Author: kimmov Date: 2009-01-11 19:10:50 +0000 (Sun, 11 Jan 2009) Log Message: ----------- PATCH: [ 2494378 ] Updated Dutch translation for trunk & branch Submitted by Thomas De Rocker Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Languages/Dutch.po Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-11 18:46:38 UTC (rev 6311) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-11 19:10:50 UTC (rev 6312) @@ -16,7 +16,7 @@ Translation updates: - Brazilian (#2461443) - Czech (r6201) - - Dutch (#2481022) + - Dutch (#2481022, #2494378) - Swedish (#2452467, #2465385) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Src/Languages/Dutch.po =================================================================== --- branches/R2_12/Src/Languages/Dutch.po 2009-01-11 18:46:38 UTC (rev 6311) +++ branches/R2_12/Src/Languages/Dutch.po 2009-01-11 19:10:50 UTC (rev 6312) @@ -505,17 +505,17 @@ #: Merge.rc:224 #, c-format msgid "Tree &Mode" -msgstr "" +msgstr "Tree-&modus" #: Merge.rc:225 #, c-format msgid "E&xpand All Subfolders" -msgstr "" +msgstr "Alle Submappen Uitklappen" #: Merge.rc:226 #, c-format msgid "&Collapse All Subfolders" -msgstr "" +msgstr "Alle Submappen Inklappen" #: Merge.rc:239 #, c-format @@ -880,7 +880,7 @@ #: Merge.rc:506 #, c-format msgid "&HEX" -msgstr "" +msgstr "&HEX" #: Merge.rc:511 #, c-format @@ -1106,7 +1106,7 @@ #: Merge.rc:682 #, c-format msgid "Select Files or Folders" -msgstr "Bestanden of mappen selecteren" +msgstr "Bestanden of Mappen Selecteren" #: Merge.rc:685 #: Merge.rc:1604 @@ -1289,7 +1289,7 @@ #: Merge.rc:768 #, c-format msgid "All&ow only one instance to run" -msgstr "&Allow only one instance to run" +msgstr "Slechts \xE9\xE9n draaiende toepassing toestaan" #: Merge.rc:770 #, c-format @@ -1309,7 +1309,7 @@ #: Merge.rc:777 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" -msgstr "" +msgstr "Toon \"Bestanden of Mappen Selecteren\"-dialoog bij Opstarten" #: Merge.rc:779 #, c-format @@ -1336,7 +1336,7 @@ #: Merge.rc:788 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." -msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Reset-knop om alle berichtvensters terug zichtbaar te maken." +msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Herstellen-knop om alle berichtvensters terug zichtbaar te maken." #: Merge.rc:790 #, c-format @@ -2055,10 +2055,10 @@ #: Merge.rc:1281 #, c-format msgid "" -"Detect codepage info for these files : .html, .rc, .xml \n" +"Detect codepage info for these files: .html, .rc, .xml \n" "need to restart session" msgstr "" -"Tekenset detecteren voor deze bestanden: .html, .rc \n" +"Tekenset detecteren voor deze bestanden: .html, .rc, .xml \n" "Herstarten sessie noodzakelijk" #: Merge.rc:1284 @@ -2073,7 +2073,7 @@ #: Merge.rc:1288 #, c-format -msgid "Custom codepage :" +msgid "Custom codepage:" msgstr "Aangepaste tekenset:" #: Merge.rc:1296 @@ -2760,17 +2760,17 @@ #: Merge.rc:1762 #, c-format msgid "Toggle tree mode" -msgstr "" +msgstr "Tree-modus aan/uit" #: Merge.rc:1763 #, c-format msgid "Expand all subfolders" -msgstr "" +msgstr "Alle submappen uitklappen" #: Merge.rc:1764 #, c-format msgid "Collapse all subfolders" -msgstr "" +msgstr "Alle submappen inklappen" #: Merge.rc:1770 #, c-format @@ -3140,7 +3140,7 @@ #: Merge.rc:1901 #, 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 komt ABSOLUUT ZONDER GARANTIE. Dit is gratis software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details." +msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is vrije software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details." #: Merge.rc:1907 #, c-format @@ -3265,7 +3265,7 @@ #: Merge.rc:1962 #, c-format msgid "X64" -msgstr "" +msgstr "X64" #: Merge.rc:1968 #, c-format @@ -3852,8 +3852,18 @@ #: Merge.rc:2146 #, c-format -msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" +msgid "" +"Another application has updated file\n" +"%1\n" +"since WinMerge scanned it last time.\n" +"\n" +"Do you want to reload the file?" msgstr "" +"Een andere toepassing heeft bestand\n" +"%1 ge\xFCpdated\n" +"sinds WinMerge het de laatste keer scande.\n" +"\n" +"Wilt u het bestand opnieuw laden?" #: Merge.rc:2147 #, c-format @@ -4212,12 +4222,12 @@ #: Merge.rc:2257 #, c-format msgid "Left Shell menu" -msgstr "" +msgstr "Linker Shellmenu" #: Merge.rc:2258 #, c-format msgid "Right Shell menu" -msgstr "" +msgstr "Rechter Shellmenu" #: Merge.rc:2264 #, c-format @@ -4428,7 +4438,7 @@ #: Merge.rc:2328 #, c-format msgid "Folders are different" -msgstr "" +msgstr "Mappen zijn verschillend" #: Merge.rc:2329 #, c-format @@ -4448,12 +4458,12 @@ #: Merge.rc:2333 #, c-format msgid "Text files are identical" -msgstr "" +msgstr "Tekstbestanden zijn identiek" #: Merge.rc:2338 #, c-format msgid "Text files are different" -msgstr "" +msgstr "Tekstbestanden zijn verschillend" #: Merge.rc:2344 #, c-format @@ -5588,7 +5598,7 @@ #: Merge.rc:2701 #, c-format msgid "Toggle Diff Pane" -msgstr "Omschakelen verschilvenster" +msgstr "Verschilvenster Aan/Uit" #: Merge.rc:2702 #, c-format @@ -5817,7 +5827,7 @@ #: Merge.rc:2749 #, c-format msgid "No prediffer (normal)" -msgstr "Geen voorvergelijking (normal)" +msgstr "Geen voorvergelijking (normaal)" #: Merge.rc:2750 #, c-format @@ -6138,7 +6148,7 @@ #: Merge.rc:2846 #, c-format msgid "Verilog" -msgstr "" +msgstr "Verilog" #: Merge.rc:2847 #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-11 20:21:16
|
Revision: 6314 http://winmerge.svn.sourceforge.net/winmerge/?rev=6314&view=rev Author: kimmov Date: 2009-01-11 20:21:06 +0000 (Sun, 11 Jan 2009) Log Message: ----------- PATCH: [ 2479804 ] Locationview Submitted by Matthias Mayer Commit the part improving visible area location in location pane. Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/LocationView.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-11 19:13:25 UTC (rev 6313) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-11 20:21:06 UTC (rev 6314) @@ -5,6 +5,7 @@ WinMerge 2.11.1.9 Update Python syntax highlight keywords for Python 2.6 (#2473375) + More accurate visible area rect in location pane (#2479804) Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size Modified: branches/R2_12/Src/LocationView.cpp =================================================================== --- branches/R2_12/Src/LocationView.cpp 2009-01-11 19:13:25 UTC (rev 6313) +++ branches/R2_12/Src/LocationView.cpp 2009-01-11 20:21:06 UTC (rev 6314) @@ -919,7 +919,16 @@ if (nTopCoord < Y_OFFSET + 20) nBottomCoord += INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord); else - nTopCoord -= INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord); + { + // Make sure locationbox has min hight + if ((nBottomCoord - nTopCoord) < INDICATOR_MIN_HEIGHT) + { + int iPos = (INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord) )/2; + nTopCoord -= iPos; + nBottomCoord +=iPos; + } + } + } // Store current values for later use (to check if area changes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-12 20:16:59
|
Revision: 6316 http://winmerge.svn.sourceforge.net/winmerge/?rev=6316&view=rev Author: kimmov Date: 2009-01-12 20:16:51 +0000 (Mon, 12 Jan 2009) Log Message: ----------- PATCH: [ 2499994 ] Updated Dutch translation: Installer/ReadMe Submitted by Thomas De Rocker Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Installer/InnoSetup/Languages/Dutch.isl branches/R2_12/Installer/InnoSetup/WinMerge.iss Added Paths: ----------- branches/R2_12/Docs/Users/Languages/ReadMe-Dutch.txt Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-11 21:22:56 UTC (rev 6315) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-12 20:16:51 UTC (rev 6316) @@ -17,7 +17,7 @@ Translation updates: - Brazilian (#2461443) - Czech (r6201) - - Dutch (#2481022, #2494378) + - Dutch (#2481022, #2494378, #2499994) - Swedish (#2452467, #2465385) WinMerge 2.12.x (R2_12) branch created (r6202) Copied: branches/R2_12/Docs/Users/Languages/ReadMe-Dutch.txt (from rev 6315, trunk/Docs/Users/Languages/ReadMe-Dutch.txt) =================================================================== --- branches/R2_12/Docs/Users/Languages/ReadMe-Dutch.txt (rev 0) +++ branches/R2_12/Docs/Users/Languages/ReadMe-Dutch.txt 2009-01-12 20:16:51 UTC (rev 6316) @@ -0,0 +1,60 @@ +WINMERGE + + +WinMerge is een Open Source toepassing die bestanden vergelijkt en +samenvoegt. Ze werkt op alle moderne Windows-versies. Sommige functies +vereisen aanvullende installaties of componenten. + +De laatste WinMerge-versie en andere WinMerge-informatie zijn beschikbaar +op http://winmerge.org + +Quickstart voor WinMerge: +Lees hoofdstuk "Quickstart" in de online handleiding om te leren werken +met WinMerge: http://winmerge.org/docs/manual/QuickStart.html + +HTML-handleiding: +De handleiding is online beschikbaar op +http://winmerge.org/docs/manual/ +het is mogelijk ook lokaal ge\xEFnstalleerd (indien zo gekozen) en kan apart +gedownload worden van http://winmerge.org/ (zie documentatie) + +Archiefondersteuning: +WinMerge gebruikt 7-Zip voor ondersteuning van archiefbestanden. 7-Zip +(http://www.7-zip.org) is een Open Source archiveringstoepassing. Om +ondersteuning voor archiefbestanden te installeren, download het 7-Zip +installatiebestand http://winmerge.org/. + +Installeren van archiefondersteuning: +Het is aangeraden om de 7-Ziptoepassing te installeren. Indien dit om +een of andere reden niet kan gedaan worden, kan de 7-Zip plugin-installer +ook de uiterst noodzakelijke bestanden installeren om ondersteuning voor +archiefbestanden in te schakelen. Merk op dat dit GEEN standalone-gebruik +van 7-Zip toestaat, maar slechts archiefondersteuning voor WinMerge. + +Scriptondersteuning: +Indien u met scripts wil werken, zal u de Windows Scripting Host moeten +ge\xEFnstalleerd hebben. Indien u fouten krijgt die te maken hebben met uw +scripts, kan u volgende site bezoeken om u ervan te verzekeren dat uw +Scripting Host up-to-date en niet corrupt is: +http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp + +Ondersteuning: +Ontwikkelaars beantwoorden vragen op de WinMerge-forums van Sourceforge.net: +http://sourceforge.net/forum/?group_id=13216 + +Bugs en functie-aanvragen: +Bugs en suggesties voor nieuwe functies kunnen gestuurd worden naar bug- en +RFE-trackers op Sourceforge.net. + +Bug tracker: +http://sourceforge.net/tracker/?group_id=13216&atid=113216 +Wanneer u een bug rapporteert, vertel ons uw WinMerge-versienummer! +WinMerge versies 2.2.0 en later kunnen de 'Configuratie-log' exporteren via +menu Help/Configuratie. Voeg deze informatie bij het bugrapport (als bijlage), +het heeft veel bruikbare informatie voor ontwikkelaars. + +RFE (functie-aanvraag) tracker: +http://sourceforge.net/tracker/?group_id=13216&atid=363216 + + +- De WinMerge-ontwikkelaars Modified: branches/R2_12/Installer/InnoSetup/Languages/Dutch.isl =================================================================== --- branches/R2_12/Installer/InnoSetup/Languages/Dutch.isl 2009-01-11 21:22:56 UTC (rev 6315) +++ branches/R2_12/Installer/InnoSetup/Languages/Dutch.isl 2009-01-12 20:16:51 UTC (rev 6316) @@ -288,7 +288,7 @@ ;Inno Setup Built-in Custom Messages NameAndVersion=%1 versie %2 AdditionalIcons=Extra snelkoppelingen: -OptionalFeatures=Optional Features: +OptionalFeatures=Optionele Functies: CreateDesktopIcon=Maak een snelkoppeling op het &bureaublad CreateQuickLaunchIcon=Maak een snelkoppeling op de &Snel starten werkbalk ProgramOnTheWeb=%1 op het Web @@ -301,61 +301,61 @@ CompanyName=Thingamahoochie Software ;Types -TypicalInstallation=Typical Installation -FullInstallation=Full Installation -CompactInstallation=Compact Installation -CustomInstallation=Custom Installation +TypicalInstallation=Standaard Installatie +FullInstallation=Volledige Installatie +CompactInstallation=Compacte Installatie +CustomInstallation=Persoonlijke Installatie ;Components -AppCoreFiles=WinMerge Core Files +AppCoreFiles=WinMerge Basisbestanden Filters=Filters Plugins=Plugins ;Localization Components -Languages=Languages -BulgarianLanguage=Bulgarian menus and dialogs -CatalanLanguage=Catalan menus and dialogs -ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs -ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs -CroatianLanguage=Croatian menus and dialogs -CzechLanguage=Czech menus and dialogs -DanishLanguage=Danish menus and dialogs -DutchLanguage=Dutch menus and dialogs -FrenchLanguage=French menus and dialogs -GalicianLanguage=Galician menus and dialogs -GermanLanguage=German menus and dialogs -GreekLanguage=Greek menus and dialogs -HungarianLanguage=Hungarian menus and dialogs -ItalianLanguage=Italian menus and dialogs -JapaneseLanguage=Japanese menus and dialogs -KoreanLanguage=Korean menus and dialogs -NorwegianLanguage=Norwegian menus and dialogs -PolishLanguage=Polish menus and dialogs -PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs -PortugueseLanguage=Portuguese menus and dialogs -RomanianLanguage=Romanian menus and dialogs -RussianLanguage=Russian menus and dialogs -SlovakLanguage=Slovak menus and dialogs -SlovenianLanguage=Slovenian menus and dialogs -SpanishLanguage=Spanish menus and dialogs -SwedishLanguage=Swedish menus and dialogs -TurkishLanguage=Turkish menus and dialogs -UkrainianLanguage=Ukrainian menus and dialogs +Languages=Talen +BulgarianLanguage=Bulgaarse menu\x92s en vensters +CatalanLanguage=Catalaanse menu\x92s en vensters +ChineseSimplifiedLanguage=Chinese (versimpeld) menu\x92s en vensters +ChineseTraditionalLanguage=Chinese (traditioneel) menu\x92s en vensters +CroatianLanguage=Kroatische menu\x92s en vensters +CzechLanguage=Tsjechische menu\x92s en vensters +DanishLanguage=Deense menu\x92s en vensters +DutchLanguage=Nederlandstalige menu\x92s en vensters +FrenchLanguage=Franse menu\x92s en vensters +GalicianLanguage=Galicische menu\x92s en vensters +GermanLanguage=Duitse menu\x92s en vensters +GreekLanguage=Griekse menu\x92s en vensters +HungarianLanguage=Hongaarse menu\x92s en vensters +ItalianLanguage=Italiaanse menu\x92s en vensters +JapaneseLanguage=Japanse menu\x92s en vensters +KoreanLanguage=Koreaanse menu\x92s en vensters +NorwegianLanguage=Noorse menu\x92s en vensters +PolishLanguage=Poolse menu\x92s en vensters +PortugueseBrazilLanguage=Portugese (Braziliaanse) menu\x92s en vensters +PortugueseLanguage=Portugese menu\x92s en vensters +RomanianLanguage=Roemeense menu\x92s en vensters +RussianLanguage=Russische menu\x92s en vensters +SlovakLanguage=Slovaakse menu\x92s en vensters +SlovenianLanguage=Sloveense menu\x92s en vensters +SpanishLanguage=Spaanse menu\x92s en vensters +SwedishLanguage=Zweedse menu\x92s en vensters +TurkishLanguage=Turkse menu\x92s en vensters +UkrainianLanguage=Oekra\xEFense menu\x92s en vensters ;Tasks -ExplorerContextMenu=&Enable Explorer context menu integration -IntegrateTortoiseCVS=Integrate with &TortoiseCVS -IntegrateTortoiseSVN=Integrate with T&ortoiseSVN -IntegrateClearCase=Integrate with Rational &ClearCase +ExplorerContextMenu=&Activeer integratie in contextmenu van Verkenner +IntegrateTortoiseCVS=Integreren met &TortoiseCVS +IntegrateTortoiseSVN= Integreren met T&ortoiseSVN +IntegrateClearCase= Integreren met Rational &ClearCase AddToPath=&Add WinMerge folder to your system path ;Icon Labels -ReadMe=Read Me -UsersGuide=User's Guide -ViewStartMenuFolder=&View the WinMerge Start Menu Folder +ReadMe=Lees Mij +UsersGuide=Gebruikershandleiding +ViewStartMenuFolder=Bekijk de WinMerge startmenu-map ;Code Dialogs -DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder? +DeletePreviousStartMenu=De installer heeft ontdekt dat u de locatie van uw startmenu veranderd heeft van "%s" naar "%s". Wilt u de vorige startmenu-map wissen? ; Project file description -ProjectFileDesc=WinMerge Project file +ProjectFileDesc=WinMerge Projectbestand Modified: branches/R2_12/Installer/InnoSetup/WinMerge.iss =================================================================== --- branches/R2_12/Installer/InnoSetup/WinMerge.iss 2009-01-11 21:22:56 UTC (rev 6315) +++ branches/R2_12/Installer/InnoSetup/WinMerge.iss 2009-01-12 20:16:51 UTC (rev 6316) @@ -118,7 +118,7 @@ Name: Croatian; MessagesFile: Languages\Croatian.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Croatian.txt Name: Czech; MessagesFile: Languages\Czech.isl Name: Danish; MessagesFile: Languages\Danish.isl -Name: Dutch; MessagesFile: Languages\Dutch.isl +Name: Dutch; MessagesFile: Languages\Dutch.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Dutch.txt Name: French; MessagesFile: Languages\French.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-French.txt Name: Galician; MessagesFile: Languages\Galician.isl Name: German; MessagesFile: Languages\German.isl @@ -392,6 +392,7 @@ Source: ..\..\Src\Languages\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Danish.po; DestDir: {app}\Languages; Components: Languages\Danish; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp +Source: ..\..\Docs\Users\Languages\ReadMe-Dutch.txt; DestDir: {app}\Docs; Components: Languages\Dutch Source: ..\..\Src\Languages\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp Source: ..\..\Docs\Users\Languages\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French Source: ..\..\Src\Languages\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp @@ -450,6 +451,7 @@ Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Catalan.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Catalan Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-ChineseSimplified.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Chinese_Simplified Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Croatian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Croatian +Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Dutch.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Dutch Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-French.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: French Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Greek.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Greek Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Japanese.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Japanese This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-13 22:49:17
|
Revision: 6320 http://winmerge.svn.sourceforge.net/winmerge/?rev=6320&view=rev Author: kimmov Date: 2009-01-13 22:29:14 +0000 (Tue, 13 Jan 2009) Log Message: ----------- Include year 2009 in WinMerge executable and manual copyright. Modified Paths: -------------- branches/R2_12/Docs/Users/Manual/WinMerge_help.xml branches/R2_12/Src/Merge.rc Modified: branches/R2_12/Docs/Users/Manual/WinMerge_help.xml =================================================================== --- branches/R2_12/Docs/Users/Manual/WinMerge_help.xml 2009-01-13 22:14:42 UTC (rev 6319) +++ branches/R2_12/Docs/Users/Manual/WinMerge_help.xml 2009-01-13 22:29:14 UTC (rev 6320) @@ -29,7 +29,7 @@ <releaseinfo><emphasis>Revision 1.5.6</emphasis></releaseinfo> <copyright> - <year>2004-2008</year> + <year>2004-2009</year> <holder>Thingamahoochie Software.</holder> </copyright> Modified: branches/R2_12/Src/Merge.rc =================================================================== --- branches/R2_12/Src/Merge.rc 2009-01-13 22:14:42 UTC (rev 6319) +++ branches/R2_12/Src/Merge.rc 2009-01-13 22:29:14 UTC (rev 6320) @@ -1704,7 +1704,7 @@ VALUE "FileDescription", "WinMerge Application\0" VALUE "FileVersion", "000.000.000.000\0" VALUE "InternalName", "WinMerge\0" - VALUE "LegalCopyright", "(c) 1996-2008 Dean P. Grimm / Thingamahoochie Software\0" + VALUE "LegalCopyright", "(c) 1996-2009 Dean P. Grimm / Thingamahoochie Software\0" VALUE "OriginalFilename", "WinMerge.EXE\0" VALUE "PrivateBuild", "" VALUE "ProductName", "WinMerge\0" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-14 22:50:21
|
Revision: 6329 http://winmerge.svn.sourceforge.net/winmerge/?rev=6329&view=rev Author: kimmov Date: 2009-01-14 22:50:19 +0000 (Wed, 14 Jan 2009) Log Message: ----------- PATCH: [ 2508148 ] Field not refreshed in Line Filter dialogue on ESC Submitted by Paul <pav...@us...> Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/LineFiltersDlg.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-14 22:48:29 UTC (rev 6328) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-14 22:50:19 UTC (rev 6329) @@ -14,6 +14,8 @@ Bugfix: Remove EOL characters from command line (#2458728) Bugfix: Merging one line diff to empty other side didn't work (#2456399) Bugfix: Location pane was empty for some files with diffs (#2459234) + Bugfix: Line filter editing didn't update edit box when editing was + canceled by ESC key (#2493935) Translation updates: - Brazilian (#2461443) - Czech (r6201) Modified: branches/R2_12/Src/LineFiltersDlg.cpp =================================================================== --- branches/R2_12/Src/LineFiltersDlg.cpp 2009-01-14 22:48:29 UTC (rev 6328) +++ branches/R2_12/Src/LineFiltersDlg.cpp 2009-01-14 22:50:19 UTC (rev 6329) @@ -164,9 +164,8 @@ */ void LineFiltersDlg::EditSelectedFilter() { - int sel =- 1; m_filtersList.SetFocus(); - sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED); + int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED); if (sel > -1) { CString text = m_filtersList.GetItemText(sel, 0); @@ -273,6 +272,12 @@ m_editRegexp.SetReadOnly(TRUE); m_bEditing = FALSE; m_filtersList.SetFocus(); + int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED); + if (sel > -1) + { + CString text = m_filtersList.GetItemText(sel, 0); + m_editRegexp.SetWindowText(text); + } return TRUE; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-22 19:12:58
|
Revision: 6359 http://winmerge.svn.sourceforge.net/winmerge/?rev=6359&view=rev Author: kimmov Date: 2009-01-22 19:12:53 +0000 (Thu, 22 Jan 2009) Log Message: ----------- PATCH: [ 2433648 ] Create new options page for Shell Integration Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Common/PreferencesDlg.cpp branches/R2_12/Src/Common/PreferencesDlg.h branches/R2_12/Src/Merge.rc branches/R2_12/Src/Merge.vcproj branches/R2_12/Src/PropGeneral.cpp branches/R2_12/Src/PropGeneral.h branches/R2_12/Src/PropRegistry.cpp branches/R2_12/Src/PropRegistry.h branches/R2_12/Src/resource.h Added Paths: ----------- branches/R2_12/Src/PropShell.cpp branches/R2_12/Src/PropShell.h Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-22 19:12:53 UTC (rev 6359) @@ -6,6 +6,7 @@ WinMerge 2.11.1.9 Update Python syntax highlight keywords for Python 2.6 (#2473375) More accurate visible area rect in location pane (#2479804) + New options page for Shell Integration options (#2433648) Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size Modified: branches/R2_12/Src/Common/PreferencesDlg.cpp =================================================================== --- branches/R2_12/Src/Common/PreferencesDlg.cpp 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/Common/PreferencesDlg.cpp 2009-01-22 19:12:53 UTC (rev 6359) @@ -57,6 +57,7 @@ , m_pageSystem(regOptions) , m_pageBackups(regOptions) , m_pageVss(regOptions) +, m_pageShell(regOptions) { UNREFERENCED_PARAMETER(nMenuID); } @@ -109,6 +110,7 @@ AddPage(&m_pageBackups, IDS_OPTIONSPG_BACKUPS); AddPage(&m_pageVss, IDS_OPTIONSPG_VERSIONCONTROL); AddPage(&m_pageCodepage, IDS_OPTIONSPG_CODEPAGE); + AddPage(&m_pageShell, IDS_OPTIONSPG_SHELL); ReadOptions(); @@ -255,6 +257,7 @@ m_pageVss.ReadOptions(); m_pageArchive.ReadOptions(); m_pageBackups.ReadOptions(); + m_pageShell.ReadOptions(); if (bUpdate) { @@ -269,6 +272,7 @@ SafeUpdatePage(&m_pageVss, FALSE); SafeUpdatePage(&m_pageArchive, FALSE); SafeUpdatePage(&m_pageBackups, FALSE); + SafeUpdatePage(&m_pageShell, FALSE); } } @@ -288,6 +292,7 @@ m_pageVss.WriteOptions(); m_pageArchive.WriteOptions(); m_pageBackups.WriteOptions(); + m_pageShell.WriteOptions(); } void CPreferencesDlg::SetSyntaxColors(SyntaxColors *pColors) Modified: branches/R2_12/Src/Common/PreferencesDlg.h =================================================================== --- branches/R2_12/Src/Common/PreferencesDlg.h 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/Common/PreferencesDlg.h 2009-01-22 19:12:53 UTC (rev 6359) @@ -29,6 +29,7 @@ #include "PropCodepage.h" #include "PropArchive.h" #include "PropBackups.h" +#include "PropShell.h" #include "PropertyPageHost.h" @@ -68,6 +69,7 @@ CPropSyntaxColors m_pageSyntaxColors; CPropArchive m_pageArchive; CPropBackups m_pageBackups; + PropShell m_pageShell; SyntaxColors *m_pSyntaxColors; Modified: branches/R2_12/Src/Merge.rc =================================================================== --- branches/R2_12/Src/Merge.rc 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/Merge.rc 2009-01-22 19:12:53 UTC (rev 6359) @@ -772,22 +772,20 @@ CONTROL "&Preserve file time in file compare", IDC_PRESERVE_FILETIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,220,10 - CONTROL "Enable Shell &Context Menu",IDC_ENABLE_SHELL_CONTEXT_MENU, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,220,10 CONTROL "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,86,176,13 - LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,103,125,8 - COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,111,147,41,CBS_DROPDOWNLIST | + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,176,13 + LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,91,125,8 + COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,101,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,130, + GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,120, 221,37 CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,142,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,206,10 CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,151,206,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,141,206,10 LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", - IDC_STATIC,7,183,168,31 - PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,190,50,14,NOT + IDC_STATIC,7,173,168,31 + PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,180,50,14,NOT WS_TABSTOP END @@ -995,26 +993,19 @@ BEGIN CONTROL "&Send deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10 - GROUPBOX "Integration",IDC_STATIC,7,20,218,46 - CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,31,200,10 - CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,27,41,190,10 - CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,51,190,10 - LTEXT "&External editor:",IDC_STATIC,7,73,222,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,83,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,83,50,14 - LTEXT "&Filter folder:",IDC_STATIC,7,101,166,8 - EDITTEXT IDC_FILTER_USER_PATH,7,111,167,14,ES_AUTOHSCROLL - PUSHBUTTON "B&rowse...",IDC_FILTER_USER_BROWSE,179,111,50,14 - GROUPBOX "Temporary files folder",IDC_STATIC,7,130,218,56 + LTEXT "&External editor:",IDC_STATIC,7,23,222,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,33,167,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,33,50,14 + LTEXT "&Filter folder:",IDC_STATIC,7,51,166,8 + EDITTEXT IDC_FILTER_USER_PATH,7,61,167,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_FILTER_USER_BROWSE,179,61,50,14 + GROUPBOX "Temporary files folder",IDC_STATIC,7,80,218,56 CONTROL "S&ystem's temp folder",IDC_TMPFOLDER_SYSTEM,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,17,142,199,10 + BS_AUTORADIOBUTTON | WS_GROUP,17,92,199,10 CONTROL "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON, - 17,152,199,10 - EDITTEXT IDC_TMPFOLDER_NAME,27,164,136,14,ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,167,164,50,14 + 17,102,199,10 + EDITTEXT IDC_TMPFOLDER_NAME,27,114,136,14,ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,167,114,50,14 END IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180 @@ -1676,6 +1667,24 @@ PUSHBUTTON "Cancel",IDCANCEL,313,190,50,14 END +IDD_PROPPAGE_SHELL DIALOGEX 0, 0, 236, 222 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Shell Integration" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Explorer",IDC_STATIC,7,7,218,46 + CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,27,28,190,10 + CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,38,190,10 + CONTROL "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,17,18,200,10 + GROUPBOX "Folder compare",IDC_STATIC,7,58,218,26 + CONTROL "Add &Shell menu to context menu", + IDC_ENABLE_SHELL_CONTEXT_MENU,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,19,69,200,10 +END + #ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // @@ -1941,6 +1950,7 @@ IDS_OPTIONSPG_CODEPAGE "Codepage" IDS_OPTIONSPG_ARCHIVE "Archive Support" IDS_OPTIONSPG_BACKUPS "Backup Files" + IDS_OPTIONSPG_SHELL "Shell Integration" END // WINMERGE CUSTOM STRINGS Modified: branches/R2_12/Src/Merge.vcproj =================================================================== --- branches/R2_12/Src/Merge.vcproj 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/Merge.vcproj 2009-01-22 19:12:53 UTC (rev 6359) @@ -4522,6 +4522,9 @@ </FileConfiguration> </File> <File + RelativePath="PropShell.cpp"> + </File> + <File RelativePath="PropSyntaxColors.cpp"> <FileConfiguration Name="UnicodeRelease|Win32"> @@ -6338,6 +6341,9 @@ RelativePath="PropRegistry.h"> </File> <File + RelativePath="PropShell.h"> + </File> + <File RelativePath="PropSyntaxColors.h"> </File> <File Modified: branches/R2_12/Src/PropGeneral.cpp =================================================================== --- branches/R2_12/Src/PropGeneral.cpp 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/PropGeneral.cpp 2009-01-22 19:12:53 UTC (rev 6359) @@ -57,7 +57,6 @@ , m_bMultipleDirCmp(FALSE) , m_nAutoCompleteSource(0) , m_bPreserveFiletime(FALSE) -, m_bEnableShellContextMenu(FALSE) , m_bShowSelectFolderOnStartup(FALSE) { } @@ -97,7 +96,6 @@ DDX_Check(pDX, IDC_MULTIDOC_DIRCMP, m_bMultipleDirCmp); DDX_CBIndex(pDX, IDC_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource); DDX_Check(pDX, IDC_PRESERVE_FILETIME, m_bPreserveFiletime); - DDX_Check(pDX, IDC_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu); DDX_Check(pDX, IDC_STARTUP_FOLDER_SELECT, m_bShowSelectFolderOnStartup); //}}AFX_DATA_MAP } @@ -124,7 +122,6 @@ m_bMultipleDirCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_DIRDOCS); m_nAutoCompleteSource = m_pOptionsMgr->GetInt(OPT_AUTO_COMPLETE_SOURCE); m_bPreserveFiletime = m_pOptionsMgr->GetBool(OPT_PRESERVE_FILETIMES); - m_bEnableShellContextMenu = m_pOptionsMgr->GetBool(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU); m_bShowSelectFolderOnStartup = m_pOptionsMgr->GetBool(OPT_SHOW_SELECT_FILES_AT_STARTUP); } @@ -143,7 +140,6 @@ m_pOptionsMgr->SaveOption(OPT_MULTIDOC_DIRDOCS, m_bMultipleDirCmp == TRUE); m_pOptionsMgr->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource); m_pOptionsMgr->SaveOption(OPT_PRESERVE_FILETIMES, m_bPreserveFiletime); - m_pOptionsMgr->SaveOption(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu); m_pOptionsMgr->SaveOption(OPT_SHOW_SELECT_FILES_AT_STARTUP, m_bShowSelectFolderOnStartup); } Modified: branches/R2_12/Src/PropGeneral.h =================================================================== --- branches/R2_12/Src/PropGeneral.h 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/PropGeneral.h 2009-01-22 19:12:53 UTC (rev 6359) @@ -43,7 +43,6 @@ BOOL m_bMultipleDirCmp; int m_nAutoCompleteSource; BOOL m_bPreserveFiletime; - BOOL m_bEnableShellContextMenu; BOOL m_bShowSelectFolderOnStartup; //}}AFX_DATA Modified: branches/R2_12/Src/PropRegistry.cpp =================================================================== --- branches/R2_12/Src/PropRegistry.cpp 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/PropRegistry.cpp 2009-01-22 19:12:53 UTC (rev 6359) @@ -38,11 +38,6 @@ static char THIS_FILE[] = __FILE__; #endif -/// Flags for enabling and mode of extension -#define CONTEXT_F_ENABLED 0x01 -#define CONTEXT_F_ADVANCED 0x02 -#define CONTEXT_F_SUBFOLDERS 0x04 - // registry dir to WinMerge static LPCTSTR f_RegDir = _T("Software\\Thingamahoochie\\WinMerge"); @@ -57,10 +52,7 @@ CPropRegistry::CPropRegistry(COptionsMgr *optionsMgr) : CPropertyPage(CPropRegistry::IDD) , m_pOptionsMgr(optionsMgr) -, m_bContextAdded(FALSE) , m_bUseRecycleBin(TRUE) -, m_bContextAdvanced(FALSE) -, m_bContextSubfolders(FALSE) , m_tempFolderType(0) { } @@ -69,12 +61,9 @@ { CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CPropRegistry) - DDX_Check(pDX, IDC_EXPLORER_CONTEXT, m_bContextAdded); DDX_Text(pDX, IDC_EXT_EDITOR_PATH, m_strEditorPath); DDX_Check(pDX, IDC_USE_RECYCLE_BIN, m_bUseRecycleBin); - DDX_Check(pDX, IDC_EXPLORER_ADVANCED, m_bContextAdvanced); DDX_Text(pDX, IDC_FILTER_USER_PATH, m_strUserFilterPath); - DDX_Check(pDX, IDC_EXPLORER_SUBFOLDERS, m_bContextSubfolders); DDX_Radio(pDX, IDC_TMPFOLDER_SYSTEM, m_tempFolderType); DDX_Text(pDX, IDC_TMPFOLDER_NAME, m_tempFolder); //}}AFX_DATA_MAP @@ -82,7 +71,6 @@ BEGIN_MESSAGE_MAP(CPropRegistry, CDialog) //{{AFX_MSG_MAP(CPropRegistry) - ON_BN_CLICKED(IDC_EXPLORER_CONTEXT, OnAddToExplorer) ON_BN_CLICKED(IDC_EXT_EDITOR_BROWSE, OnBrowseEditor) ON_BN_CLICKED(IDC_FILTER_USER_BROWSE, OnBrowseFilterPath) ON_BN_CLICKED(IDC_TMPFOLDER_BROWSE, OnBrowseTmpFolder) @@ -95,7 +83,6 @@ void CPropRegistry::ReadOptions() { m_strEditorPath = m_pOptionsMgr->GetString(OPT_EXT_EDITOR_CMD).c_str(); - GetContextRegValues(); m_bUseRecycleBin = m_pOptionsMgr->GetBool(OPT_USE_RECYCLE_BIN); m_strUserFilterPath = m_pOptionsMgr->GetString(OPT_FILTER_USERPATH).c_str(); m_tempFolderType = m_pOptionsMgr->GetBool(OPT_USE_SYSTEM_TEMP_PATH) ? 0 : 1; @@ -112,8 +99,6 @@ m_pOptionsMgr->SaveOption(OPT_USE_RECYCLE_BIN, m_bUseRecycleBin == TRUE); - SaveMergePath(); // saves context menu settings as well - CString sExtEditor = m_strEditorPath; sExtEditor.TrimLeft(); sExtEditor.TrimRight(); @@ -143,106 +128,12 @@ theApp.TranslateDialog(m_hWnd); CPropertyPage::OnInitDialog(); - // Update shell extension checkboxes - GetContextRegValues(); - AdvancedContextMenuCheck(); - SubfolderOptionCheck(); UpdateData(FALSE); return TRUE; // return TRUE unless you set the focus to a control // EXCEPTION: OCX Property Pages should return FALSE } -/// Get registry values for ShellExtension -void CPropRegistry::GetContextRegValues() -{ - CRegKeyEx reg; - LONG retVal = 0; - retVal = reg.Open(HKEY_CURRENT_USER, f_RegDir); - if (retVal != ERROR_SUCCESS) - { - CString msg; - msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"), - f_RegDir, retVal, GetSysError(retVal)); - LogErrorString(msg); - return; - } - - // Read bitmask for shell extension settings - DWORD dwContextEnabled = reg.ReadDword(f_RegValueEnabled, 0); - - if (dwContextEnabled & CONTEXT_F_ENABLED) - m_bContextAdded = TRUE; - - if (dwContextEnabled & CONTEXT_F_ADVANCED) - m_bContextAdvanced = TRUE; - - if (dwContextEnabled & CONTEXT_F_SUBFOLDERS) - m_bContextSubfolders = TRUE; -} - -/// Set registry values for ShellExtension -void CPropRegistry::OnAddToExplorer() -{ - AdvancedContextMenuCheck(); - SubfolderOptionCheck(); -} - -/// Saves given path to registry for ShellExtension, and Context Menu settings -void CPropRegistry::SaveMergePath() -{ - TCHAR temp[MAX_PATH] = {0}; - LONG retVal = 0; - GetModuleFileName(AfxGetInstanceHandle(), temp, MAX_PATH); - - CRegKeyEx reg; - retVal = reg.Open(HKEY_CURRENT_USER, f_RegDir); - if (retVal != ERROR_SUCCESS) - { - CString msg; - msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"), - f_RegDir, retVal, GetSysError(retVal)); - LogErrorString(msg); - return; - } - - // Save path to WinMerge(U).exe - retVal = reg.WriteString(f_RegValuePath, temp); - if (retVal != ERROR_SUCCESS) - { - CString msg; - msg.Format(_T("Failed to set registry value %s:\n\t%d : %s"), - f_RegValuePath, retVal, GetSysError(retVal)); - LogErrorString(msg); - } - - // Determine bitmask for shell extension - DWORD dwContextEnabled = reg.ReadDword(f_RegValueEnabled, 0); - if (m_bContextAdded) - dwContextEnabled |= CONTEXT_F_ENABLED; - else - dwContextEnabled &= ~CONTEXT_F_ENABLED; - - if (m_bContextAdvanced) - dwContextEnabled |= CONTEXT_F_ADVANCED; - else - dwContextEnabled &= ~CONTEXT_F_ADVANCED; - - if (m_bContextSubfolders) - dwContextEnabled |= CONTEXT_F_SUBFOLDERS; - else - dwContextEnabled &= ~CONTEXT_F_SUBFOLDERS; - - retVal = reg.WriteDword(f_RegValueEnabled, dwContextEnabled); - if (retVal != ERROR_SUCCESS) - { - CString msg; - msg.Format(_T("Failed to set registry value %s to %d:\n\t%d : %s"), - f_RegValueEnabled, dwContextEnabled, retVal, GetSysError(retVal)); - LogErrorString(msg); - } -} - /// Open file browse dialog to locate editor void CPropRegistry::OnBrowseEditor() { @@ -254,32 +145,6 @@ } } -/// Enable/Disable "Advanced menu" checkbox. -void CPropRegistry::AdvancedContextMenuCheck() -{ - if (IsDlgButtonChecked(IDC_EXPLORER_CONTEXT)) - GetDlgItem(IDC_EXPLORER_ADVANCED)->EnableWindow(TRUE); - else - { - GetDlgItem(IDC_EXPLORER_ADVANCED)->EnableWindow(FALSE); - CheckDlgButton(IDC_EXPLORER_ADVANCED, FALSE); - m_bContextAdvanced = FALSE; - } -} - -/// Enable/Disable "Include subfolders by default" checkbox. -void CPropRegistry::SubfolderOptionCheck() -{ - if (IsDlgButtonChecked(IDC_EXPLORER_CONTEXT)) - GetDlgItem(IDC_EXPLORER_SUBFOLDERS)->EnableWindow(TRUE); - else - { - GetDlgItem(IDC_EXPLORER_SUBFOLDERS)->EnableWindow(FALSE); - CheckDlgButton(IDC_EXPLORER_SUBFOLDERS, FALSE); - m_bContextSubfolders = FALSE; - } -} - /// Open Folder selection dialog for user to select filter folder. void CPropRegistry::OnBrowseFilterPath() { Modified: branches/R2_12/Src/PropRegistry.h =================================================================== --- branches/R2_12/Src/PropRegistry.h 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/PropRegistry.h 2009-01-22 19:12:53 UTC (rev 6359) @@ -52,11 +52,8 @@ // Dialog Data //{{AFX_DATA(CPropRegistry) enum { IDD = IDD_PROPPAGE_SYSTEM }; - BOOL m_bContextAdded; CString m_strEditorPath; BOOL m_bUseRecycleBin; - BOOL m_bContextAdvanced; - BOOL m_bContextSubfolders; CString m_strUserFilterPath; int m_tempFolderType; CString m_tempFolder; @@ -74,18 +71,12 @@ // Generated message map functions //{{AFX_MSG(CPropRegistry) virtual BOOL OnInitDialog(); - afx_msg void OnAddToExplorer(); afx_msg void OnBrowseEditor(); afx_msg void OnBrowseFilterPath(); afx_msg void OnBrowseTmpFolder(); //}}AFX_MSG DECLARE_MESSAGE_MAP() - void GetContextRegValues(); - void SaveMergePath(); - void AdvancedContextMenuCheck(); - void SubfolderOptionCheck(); - // Implementation data private: COptionsMgr * m_pOptionsMgr; /**< Pointer to options manager */ Copied: branches/R2_12/Src/PropShell.cpp (from rev 6351, trunk/Src/PropShell.cpp) =================================================================== --- branches/R2_12/Src/PropShell.cpp (rev 0) +++ branches/R2_12/Src/PropShell.cpp 2009-01-22 19:12:53 UTC (rev 6359) @@ -0,0 +1,209 @@ +/** + * @file PropShell.h + * + * @brief Implementation file for Shell Options dialog. + * + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#include "stdafx.h" +#include "resource.h" +#include "merge.h" +#include "PropShell.h" +#include "RegKey.h" +#include "OptionsDef.h" +#include "OptionsMgr.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +/// Flags for enabling and mode of extension +#define CONTEXT_F_ENABLED 0x01 +#define CONTEXT_F_ADVANCED 0x02 +#define CONTEXT_F_SUBFOLDERS 0x04 + + // registry dir to WinMerge +static LPCTSTR f_RegDir = _T("Software\\Thingamahoochie\\WinMerge"); + +// registry values +static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled"); +static LPCTSTR f_RegValuePath = _T("Executable"); + + +PropShell::PropShell(COptionsMgr *optionsMgr) : CPropertyPage(PropShell::IDD) +, m_pOptionsMgr(optionsMgr) +, m_bEnableShellContextMenu(FALSE) +, m_bContextAdded(FALSE) +, m_bContextAdvanced(FALSE) +, m_bContextSubfolders(FALSE) +{ +} + +BOOL PropShell::OnInitDialog() +{ + theApp.TranslateDialog(m_hWnd); + CPropertyPage::OnInitDialog(); + + // Update shell extension checkboxes + GetContextRegValues(); + AdvancedContextMenuCheck(); + SubfolderOptionCheck(); + UpdateData(FALSE); + + return TRUE; // return TRUE unless you set the focus to a control +} + +void PropShell::DoDataExchange(CDataExchange* pDX) +{ + CPropertyPage::DoDataExchange(pDX); + //{{AFX_DATA_MAP(PropShell) + DDX_Check(pDX, IDC_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu); + DDX_Check(pDX, IDC_EXPLORER_CONTEXT, m_bContextAdded); + DDX_Check(pDX, IDC_EXPLORER_ADVANCED, m_bContextAdvanced); + DDX_Check(pDX, IDC_EXPLORER_SUBFOLDERS, m_bContextSubfolders); + //}}AFX_DATA_MAP +} + +BEGIN_MESSAGE_MAP(PropShell, CPropertyPage) + //{{AFX_MSG_MAP(PropShell) + ON_BN_CLICKED(IDC_EXPLORER_CONTEXT, OnAddToExplorer) + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +/** + * @brief Reads options values from storage to UI. + */ +void PropShell::ReadOptions() +{ + GetContextRegValues(); + m_bEnableShellContextMenu = m_pOptionsMgr->GetBool(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU); +} + +/** + * @brief Writes options values from UI to storage. + */ +void PropShell::WriteOptions() +{ + m_pOptionsMgr->SaveOption(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu); + SaveMergePath(); // saves context menu settings as well +} + +/// Get registry values for ShellExtension +void PropShell::GetContextRegValues() +{ + CRegKeyEx reg; + LONG retVal = 0; + retVal = reg.Open(HKEY_CURRENT_USER, f_RegDir); + if (retVal != ERROR_SUCCESS) + { + CString msg; + msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"), + f_RegDir, retVal, GetSysError(retVal)); + LogErrorString(msg); + return; + } + + // Read bitmask for shell extension settings + DWORD dwContextEnabled = reg.ReadDword(f_RegValueEnabled, 0); + + if (dwContextEnabled & CONTEXT_F_ENABLED) + m_bContextAdded = TRUE; + + if (dwContextEnabled & CONTEXT_F_ADVANCED) + m_bContextAdvanced = TRUE; + + if (dwContextEnabled & CONTEXT_F_SUBFOLDERS) + m_bContextSubfolders = TRUE; +} + +/// Set registry values for ShellExtension +void PropShell::OnAddToExplorer() +{ + AdvancedContextMenuCheck(); + SubfolderOptionCheck(); +} + +/// Saves given path to registry for ShellExtension, and Context Menu settings +void PropShell::SaveMergePath() +{ + TCHAR temp[MAX_PATH] = {0}; + LONG retVal = 0; + GetModuleFileName(AfxGetInstanceHandle(), temp, MAX_PATH); + + CRegKeyEx reg; + retVal = reg.Open(HKEY_CURRENT_USER, f_RegDir); + if (retVal != ERROR_SUCCESS) + { + CString msg; + msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"), + f_RegDir, retVal, GetSysError(retVal)); + LogErrorString(msg); + return; + } + + // Save path to WinMerge(U).exe + retVal = reg.WriteString(f_RegValuePath, temp); + if (retVal != ERROR_SUCCESS) + { + CString msg; + msg.Format(_T("Failed to set registry value %s:\n\t%d : %s"), + f_RegValuePath, retVal, GetSysError(retVal)); + LogErrorString(msg); + } + + // Determine bitmask for shell extension + DWORD dwContextEnabled = reg.ReadDword(f_RegValueEnabled, 0); + if (m_bContextAdded) + dwContextEnabled |= CONTEXT_F_ENABLED; + else + dwContextEnabled &= ~CONTEXT_F_ENABLED; + + if (m_bContextAdvanced) + dwContextEnabled |= CONTEXT_F_ADVANCED; + else + dwContextEnabled &= ~CONTEXT_F_ADVANCED; + + if (m_bContextSubfolders) + dwContextEnabled |= CONTEXT_F_SUBFOLDERS; + else + dwContextEnabled &= ~CONTEXT_F_SUBFOLDERS; + + retVal = reg.WriteDword(f_RegValueEnabled, dwContextEnabled); + if (retVal != ERROR_SUCCESS) + { + CString msg; + msg.Format(_T("Failed to set registry value %s to %d:\n\t%d : %s"), + f_RegValueEnabled, dwContextEnabled, retVal, GetSysError(retVal)); + LogErrorString(msg); + } +} + +/// Enable/Disable "Advanced menu" checkbox. +void PropShell::AdvancedContextMenuCheck() +{ + if (IsDlgButtonChecked(IDC_EXPLORER_CONTEXT)) + GetDlgItem(IDC_EXPLORER_ADVANCED)->EnableWindow(TRUE); + else + { + GetDlgItem(IDC_EXPLORER_ADVANCED)->EnableWindow(FALSE); + CheckDlgButton(IDC_EXPLORER_ADVANCED, FALSE); + m_bContextAdvanced = FALSE; + } +} + +/// Enable/Disable "Include subfolders by default" checkbox. +void PropShell::SubfolderOptionCheck() +{ + if (IsDlgButtonChecked(IDC_EXPLORER_CONTEXT)) + GetDlgItem(IDC_EXPLORER_SUBFOLDERS)->EnableWindow(TRUE); + else + { + GetDlgItem(IDC_EXPLORER_SUBFOLDERS)->EnableWindow(FALSE); + CheckDlgButton(IDC_EXPLORER_SUBFOLDERS, FALSE); + m_bContextSubfolders = FALSE; + } +} Copied: branches/R2_12/Src/PropShell.h (from rev 6351, trunk/Src/PropShell.h) =================================================================== --- branches/R2_12/Src/PropShell.h (rev 0) +++ branches/R2_12/Src/PropShell.h 2009-01-22 19:12:53 UTC (rev 6359) @@ -0,0 +1,56 @@ +/** + * @file PropShell.h + * + * @brief Declaration of Shell options dialog class + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#ifndef _PROP_SHELL_H_ +#define _PROP_SHELL_H_ + +#include "IOptionsPanel.h" + +/** + * @brief Class for Shell options -propertypage. + */ +class PropShell : public CPropertyPage, public IOptionsPanel +{ +// Construction +public: + PropShell(COptionsMgr *optionsMgr); + +// Implement IOptionsPanel + virtual void ReadOptions(); + virtual void WriteOptions(); + +// Dialog Data + enum { IDD = IDD_PROPPAGE_SHELL }; + BOOL m_bContextAdded; + BOOL m_bContextAdvanced; + BOOL m_bContextSubfolders; + BOOL m_bEnableShellContextMenu; + +// Overrides + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + +// Implementation +protected: + virtual BOOL OnInitDialog(); + afx_msg void OnAddToExplorer(); + + void GetContextRegValues(); + void AdvancedContextMenuCheck(); + void SubfolderOptionCheck(); + + DECLARE_MESSAGE_MAP() + + void SaveMergePath(); + +private: + COptionsMgr *m_pOptionsMgr; + +}; + +#endif // _PROP_SHELL_H_ Modified: branches/R2_12/Src/resource.h =================================================================== --- branches/R2_12/Src/resource.h 2009-01-22 18:49:30 UTC (rev 6358) +++ branches/R2_12/Src/resource.h 2009-01-22 19:12:53 UTC (rev 6359) @@ -55,6 +55,7 @@ #define IDD_PROPPAGE_BACKUPS 234 #define IDD_CONFIRM_COPY 235 #define IDD_PLUGINS_LIST 236 +#define IDD_PROPPAGE_SHELL 237 #define IDR_SPLASH 308 #define IDB_WINMERGE 309 #define IDB_OLDSPLASH 310 @@ -490,6 +491,7 @@ #define IDS_OPTIONSPG_CODEPAGE 9049 #define IDS_OPTIONSPG_ARCHIVE 9050 #define IDS_OPTIONSPG_BACKUPS 9051 +#define IDS_OPTIONSPG_SHELL 9052 #define IDS_TO 16000 #define IDS_FROM_LEFT 16001 #define IDS_TO_LEFT 16002 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-22 19:21:03
|
Revision: 6360 http://winmerge.svn.sourceforge.net/winmerge/?rev=6360&view=rev Author: kimmov Date: 2009-01-22 19:20:57 +0000 (Thu, 22 Jan 2009) Log Message: ----------- PATCH: [ 2511043 ] Updated Swedish.po for WinMerge Experimental 2.13.1 Submitted by Hans Eriksson Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Languages/Swedish.po Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-22 19:12:53 UTC (rev 6359) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-22 19:20:57 UTC (rev 6360) @@ -21,7 +21,7 @@ - Brazilian (#2461443) - Czech (r6201) - Dutch (#2481022, #2494378, #2499994) - - Swedish (#2452467, #2465385) + - Swedish (#2452467, #2465385, #2511043) WinMerge 2.12.x (R2_12) branch created (r6202) Modified: branches/R2_12/Src/Languages/Swedish.po =================================================================== --- branches/R2_12/Src/Languages/Swedish.po 2009-01-22 19:12:53 UTC (rev 6359) +++ branches/R2_12/Src/Languages/Swedish.po 2009-01-22 19:20:57 UTC (rev 6360) @@ -389,7 +389,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1925 +#: Merge.rc:1934 #, c-format msgid "&Help" msgstr "&Hj\xE4lp" @@ -720,7 +720,7 @@ msgstr "&Script" #: Merge.rc:370 -#: Merge.rc:2779 +#: Merge.rc:2789 #, c-format msgid "< Empty >" msgstr "< Inga >" @@ -922,15 +922,15 @@ msgstr "&Ta bort" #: Merge.rc:523 -#: Merge.rc:1145 -#: Merge.rc:1527 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&V\xE4nster" #: Merge.rc:524 -#: Merge.rc:1147 -#: Merge.rc:1530 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&H\xF6ger" @@ -1082,17 +1082,17 @@ #: Merge.rc:674 #: Merge.rc:706 -#: Merge.rc:800 -#: Merge.rc:986 -#: Merge.rc:1064 -#: Merge.rc:1093 -#: Merge.rc:1103 -#: Merge.rc:1269 -#: Merge.rc:1333 -#: Merge.rc:1346 -#: Merge.rc:1438 -#: Merge.rc:1453 -#: Merge.rc:1675 +#: Merge.rc:798 +#: Merge.rc:984 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" @@ -1108,39 +1108,39 @@ msgstr "V\xE4lj filer eller kataloger..." #: Merge.rc:685 -#: Merge.rc:1604 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&V\xE4nster:" #: Merge.rc:689 #: Merge.rc:750 -#: Merge.rc:1007 -#: Merge.rc:1029 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Bl\xE4ddra..." #: Merge.rc:690 -#: Merge.rc:1608 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&H\xF6ger:" #: Merge.rc:694 -#: Merge.rc:1040 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "B&l\xE4ddra..." #: Merge.rc:695 -#: Merge.rc:1612 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filter:" #: Merge.rc:698 -#: Merge.rc:1614 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "V\xE4lj..." @@ -1156,7 +1156,7 @@ msgstr "V\xE4lj..." #: Merge.rc:703 -#: Merge.rc:1615 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Inkludera Underkataloger" @@ -1168,25 +1168,25 @@ #: Merge.rc:707 #: Merge.rc:737 -#: Merge.rc:801 -#: Merge.rc:831 -#: Merge.rc:863 -#: Merge.rc:873 -#: Merge.rc:1065 -#: Merge.rc:1094 -#: Merge.rc:1104 -#: Merge.rc:1155 -#: Merge.rc:1270 -#: Merge.rc:1347 -#: Merge.rc:1439 -#: Merge.rc:1454 -#: Merge.rc:1676 +#: Merge.rc:799 +#: Merge.rc:829 +#: Merge.rc:861 +#: Merge.rc:871 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Avbryt" #: Merge.rc:708 -#: Merge.rc:1348 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Hj\xE4lp" @@ -1227,7 +1227,7 @@ msgstr "L\xE4nka till valt VSS-projekt" #: Merge.rc:733 -#: Merge.rc:878 +#: Merge.rc:876 #, c-format msgid "Apply to all items" msgstr "Till\xE4mpa p\xE5 alla objekt" @@ -1238,7 +1238,7 @@ msgstr "Checka ut" #: Merge.rc:736 -#: Merge.rc:874 +#: Merge.rc:872 #, c-format msgid "Save As..." msgstr "Spara som..." @@ -1254,13 +1254,13 @@ msgstr "&Versionsstyrningssystem:" #: Merge.rc:748 -#: Merge.rc:2056 +#: Merge.rc:2066 #, c-format msgid "&Path to cleartool.exe:" msgstr "&S\xF6kv\xE4g till Cleartool.exe:" #: Merge.rc:755 -#: Merge.rc:1933 +#: Merge.rc:1942 #, c-format msgid "General" msgstr "Generellt" @@ -1302,1473 +1302,1475 @@ #: Merge.rc:775 #, c-format -msgid "Enable Shell &Context Menu" -msgstr "Starta Gr\xE4nssnitt och Kontextmeny" - -#: Merge.rc:777 -#, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Visa \"V\xE4lj Filer eller Kataloger\" Dialogen vid Uppstart" -#: Merge.rc:779 +#: Merge.rc:777 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "\xD6&ppna-dialog Auto-Komplettera:" -#: Merge.rc:782 +#: Merge.rc:780 #, c-format msgid "Enable multiple compare windows for" msgstr "Starta flera j\xE4mf\xF6rf\xF6nster f\xF6r" -#: Merge.rc:784 -#: Merge.rc:1627 +#: Merge.rc:782 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "&J\xE4mf\xF6r kataloger" -#: Merge.rc:786 -#: Merge.rc:1629 +#: Merge.rc:784 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "J\xE4m&f\xF6r filer" -#: Merge.rc:788 +#: Merge.rc:786 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge till\xE5ter att vissa meddelanderutor d\xF6ljs. Klicka p\xE5 \xC5terst\xE4ll-knappen f\xF6r att g\xF6ra alla meddelanderutor synliga igen." -#: Merge.rc:790 +#: Merge.rc:788 #, c-format msgid "Reset" msgstr "\xC5terst\xE4ll" -#: Merge.rc:797 +#: Merge.rc:795 #, c-format msgid "Language" msgstr "Spr\xE5k" -#: Merge.rc:804 +#: Merge.rc:802 #, c-format msgid "Available languages:" msgstr "Tillg\xE4ngliga spr\xE5k:" -#: Merge.rc:810 +#: Merge.rc:808 #, c-format msgid "Find" msgstr "S\xF6k" -#: Merge.rc:813 -#: Merge.rc:840 +#: Merge.rc:811 +#: Merge.rc:838 #, c-format msgid "Fi&nd what:" msgstr "S&\xF6k efter:" -#: Merge.rc:816 -#: Merge.rc:846 +#: Merge.rc:814 +#: Merge.rc:844 #, c-format msgid "Match &whole word only" msgstr "Matcha &hela ord" -#: Merge.rc:818 -#: Merge.rc:848 +#: Merge.rc:816 +#: Merge.rc:846 #, c-format msgid "Match &case" msgstr "Mat&cha VERSALER och gemener" -#: Merge.rc:820 -#: Merge.rc:850 +#: Merge.rc:818 +#: Merge.rc:848 #, c-format msgid "Regular &expression" msgstr "&Regulj\xE4rt uttryck" -#: Merge.rc:822 +#: Merge.rc:820 #, c-format msgid "D&on't wrap end of file" msgstr "V&\xE4nd inte vid slutet av filen" -#: Merge.rc:825 +#: Merge.rc:823 #, c-format msgid "Direction" msgstr "Riktning" -#: Merge.rc:826 +#: Merge.rc:824 #, c-format msgid "&Up" msgstr "&Upp" -#: Merge.rc:828 +#: Merge.rc:826 #, c-format msgid "&Down" msgstr "&Ner" -#: Merge.rc:830 -#: Merge.rc:860 +#: Merge.rc:828 +#: Merge.rc:858 #, c-format msgid "&Find Next" msgstr "&S\xF6k n\xE4sta" -#: Merge.rc:837 +#: Merge.rc:835 #, c-format msgid "Replace" msgstr "Ers\xE4tt" -#: Merge.rc:843 +#: Merge.rc:841 #, c-format msgid "Re&place with:" msgstr "Ers\xE4&tt med:" -#: Merge.rc:852 +#: Merge.rc:850 #, c-format msgid "&Don't wrap end of file" msgstr "V\xE4nd inte vid slutet av filen" -#: Merge.rc:855 +#: Merge.rc:853 #, c-format msgid "Replace in" msgstr "Ers\xE4tt i" -#: Merge.rc:856 +#: Merge.rc:854 #, c-format msgid "&Selection" msgstr "&Markering" -#: Merge.rc:858 +#: Merge.rc:856 #, c-format msgid "Wh&ole file" msgstr "He&la filen" -#: Merge.rc:861 +#: Merge.rc:859 #, c-format msgid "&Replace" msgstr "&Ers\xE4tt" -#: Merge.rc:862 +#: Merge.rc:860 #, c-format msgid "Replace &All" msgstr "Ers\xE4tt &alla" -#: Merge.rc:869 -#: Merge.rc:2177 +#: Merge.rc:867 +#: Merge.rc:2187 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:872 +#: Merge.rc:870 #, c-format msgid "CheckOut" msgstr "Checka ut" -#: Merge.rc:877 -#: Merge.rc:1189 +#: Merge.rc:875 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:880 +#: Merge.rc:878 #, c-format msgid "CheckIn after checkout" msgstr "Checka in efter Checka ut" -#: Merge.rc:886 +#: Merge.rc:884 #, c-format msgid "Linefilters" msgstr "Radfilter" -#: Merge.rc:889 +#: Merge.rc:887 #, c-format msgid "Enable Line Filters" msgstr "Anv\xE4nd Radfilter" -#: Merge.rc:892 +#: Merge.rc:890 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulj\xE4ra uttryck (ett per rad):" -#: Merge.rc:899 +#: Merge.rc:897 #, c-format msgid "Save" msgstr "Spara" -#: Merge.rc:900 +#: Merge.rc:898 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:901 +#: Merge.rc:899 #, c-format msgid "Edit" msgstr "\xC4ndra" -#: Merge.rc:902 +#: Merge.rc:900 #, c-format msgid "Remove" msgstr "Ta bort" -#: Merge.rc:907 -#: Merge.rc:1936 +#: Merge.rc:905 +#: Merge.rc:1945 #, c-format msgid "Colors" msgstr "Kul\xF6rer" -#: Merge.rc:910 +#: Merge.rc:908 #, c-format msgid "Difference:" msgstr "Skillnader:" -#: Merge.rc:914 +#: Merge.rc:912 #, c-format msgid "Selected Difference:" msgstr "Markerade skillnader:" -#: Merge.rc:918 -#: Merge.rc:1579 +#: Merge.rc:916 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Bakgrund" -#: Merge.rc:919 +#: Merge.rc:917 #, c-format msgid "Deleted" msgstr "Borttaget" -#: Merge.rc:932 -#: Merge.rc:1374 -#: Merge.rc:1580 +#: Merge.rc:930 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:936 +#: Merge.rc:934 #, c-format msgid "Ignored Difference:" msgstr "Ignorerad Skillnad:" -#: Merge.rc:946 +#: Merge.rc:944 #, c-format msgid "Moved:" msgstr "Flyttad:" -#: Merge.rc:956 +#: Merge.rc:954 #, c-format msgid "Selected Moved:" msgstr "Markerad flyttad:" -#: Merge.rc:963 +#: Merge.rc:961 #, c-format msgid "Word Difference:" msgstr "Ordskillnad:" -#: Merge.rc:970 +#: Merge.rc:968 #, c-format msgid "Selected Word Diff:" msgstr "Vald ordskillnad:" -#: Merge.rc:977 -#: Merge.rc:1063 -#: Merge.rc:1092 -#: Merge.rc:1192 -#: Merge.rc:1420 +#: Merge.rc:975 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:983 -#: Merge.rc:1362 -#: Merge.rc:1568 +#: Merge.rc:981 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:993 -#: Merge.rc:1939 +#: Merge.rc:991 +#: Merge.rc:1948 #, c-format msgid "System" msgstr "System" -#: Merge.rc:996 +#: Merge.rc:994 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Skicka borttagna filer till Papperskorgen" -#: Merge.rc:998 +#: Merge.rc:996 #, c-format -msgid "Integration" -msgstr "Integration" - -#: Merge.rc:999 -#, c-format -msgid "&Add to explorer context menu" -msgstr "L\xE4gg till i Utforskarens popup-meny" - -#: Merge.rc:1001 -#, c-format -msgid "E&nable advanced menu" -msgstr "A&nv\xE4nd avancerad meny" - -#: Merge.rc:1003 -#, c-format -msgid "In&clude subfolders by default" -msgstr "In&kludera underkataloger som standard" - -#: Merge.rc:1005 -#, c-format msgid "&External editor:" msgstr "Extern Editor:" -#: Merge.rc:1008 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filterkatalog:" -#: Merge.rc:1010 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "Bl\xE4ddra..." -#: Merge.rc:1011 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Katalog f\xF6r Tempor\xE4ra filer" -#: Merge.rc:1012 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "S&ystemets tempor\xE4ra katalog" -#: Merge.rc:1014 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "A&npassad katalog:" -#: Merge.rc:1017 -#: Merge.rc:1033 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Bl\xE4ddra..." -#: Merge.rc:1023 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Patchgenerator" -#: Merge.rc:1026 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Fil &1:" -#: Merge.rc:1030 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Fil &2:" -#: Merge.rc:1034 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Byt" -#: Merge.rc:1035 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "L\xE4gg till i befintlig fil" -#: Merge.rc:1037 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1041 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1042 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "T&yp:" -#: Merge.rc:1045 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "Samman&hang:" -#: Merge.rc:1048 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Mellanslag" -#: Merge.rc:1049 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&J\xE4mf\xF6r" -#: Merge.rc:1051 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Ignorera skillnader" -#: Merge.rc:1053 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ignorera alla" -#: Merge.rc:1055 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorera blanka rader" -#: Merge.rc:1057 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "VERSAL/gemen-k\xE4nslig" -#: Merge.rc:1059 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inklu&dera kommandorad" -#: Merge.rc:1061 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "\xD6ppna i Extern editor" -#: Merge.rc:1083 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Visa kolumner" -#: Merge.rc:1089 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Flytta &Upp" -#: Merge.rc:1090 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Flytta &Ned" -#: Merge.rc:1100 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "V\xE4lj Uppackare" -#: Merge.rc:1105 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Fil-uppackare:" -#: Merge.rc:1108 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visa alla uppackare, kontrollera inte filsuffixet" -#: Merge.rc:1111 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Filsuffixlista:" -#: Merge.rc:1112 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Beskrivning:" -#: Merge.rc:1123 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Katalogj\xE4mf\xF6relsens fortskridande" -#: Merge.rc:1126 -#: Merge.rc:1886 +#: Merge.rc:1117 +#: Merge.rc:1895 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1131 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "J\xE4mf\xF6r objekt..." -#: Merge.rc:1132 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "J\xE4mf\xF6rda objekt:" -#: Merge.rc:1133 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Objekt totalt:" -#: Merge.rc:1139 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "G\xE5 till" -#: Merge.rc:1142 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "G&\xE5 till:" -#: Merge.rc:1144 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1149 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "G\xE5 till vad" -#: Merge.rc:1150 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Ra&d" -#: Merge.rc:1152 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Skillnad" -#: Merge.rc:1154 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&G\xE5 till" -#: Merge.rc:1160 -#: Merge.rc:1934 +#: Merge.rc:1151 +#: Merge.rc:1943 #, c-format msgid "Compare" msgstr "J\xE4mf\xF6r" -#: Merge.rc:1163 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Mellanslag" -#: Merge.rc:1164 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "J\xE4mf\xF6r &mellanslag" -#: Merge.rc:1166 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignorera mellanslagsskillnader " -#: Merge.rc:1168 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ignorera &alla mellanslag" -#: Merge.rc:1170 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorera blan&ka rader" -#: Merge.rc:1172 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "&Ignorera VERSAL/gemen-skillnader" -#: Merge.rc:1174 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rera skillnader i radslut (Windows/Unix/Mac)" -#: Merge.rc:1177 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "M&\xF6jligg\xF6r detektion av flyttade textblock" -#: Merge.rc:1179 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Matcha liknande rader" -#: Merge.rc:1181 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orera tidsskillnad mindre \xE4n 3 sekunder" -#: Merge.rc:1184 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Filj\xE4mf\xF6relsemetod:" -#: Merge.rc:1187 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "S&toppa efter f\xF6rsta skillnaden" -#: Merge.rc:1190 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filterkommentarer" -#: Merge.rc:1197 -#: Merge.rc:1935 +#: Merge.rc:1188 +#: Merge.rc:1944 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1200 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Markera syntaxen" -#: Merge.rc:1202 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &uppdatering" -#: Merge.rc:1204 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1206 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabbar" -#: Merge.rc:1207 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tabbsteg:" -#: Merge.rc:1210 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Infoga tabbar" -#: Merge.rc:1212 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Infoga mellanslag" -#: Merge.rc:1214 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Radskillnadskul\xF6rer" -#: Merge.rc:1216 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Visa radskillnader" -#: Merge.rc:1218 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "&Teckenniv\xE5" -#: Merge.rc:1220 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&Ordniv\xE5:" -#: Merge.rc:1235 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filfilter" -#: Merge.rc:1241 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Testa" -#: Merge.rc:1242 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Installera..." -#: Merge.rc:1243 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1244 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Redigera..." -#: Merge.rc:1245 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Ta bort..." -#: Merge.rc:1251 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Spara \xE4ndrade filer?" -#: Merge.rc:1254 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "V\xE4nster fil" -#: Merge.rc:1257 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Spara \xE4ndringar" -#: Merge.rc:1259 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Ignorera \xE4ndringar" -#: Merge.rc:1261 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "H\xF6ger fil" -#: Merge.rc:1264 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "S¶ \xE4ndringar" -#: Merge.rc:1266 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Ign&orera \xE4ndringar" -#: Merge.rc:1268 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Ignorera alla \xE4ndringar" -#: Merge.rc:1275 -#: Merge.rc:1523 -#: Merge.rc:1941 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1950 #, c-format msgid "Codepage" msgstr "Codepage" -#: Merge.rc:1278 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Standard Codepage" -#: Merge.rc:1279 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "V\xE4lj den Codepage som anv\xE4nds som standard n\xE4r icke-Unicodefiler \xF6ppnas:" -#: Merge.rc:1281 +#: Merge.rc:1272 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "Detektera Codepage-info f\xF6r dessa filer: .html, .rc, .xml \nbeh\xF6ver omstarta sessionen" -#: Merge.rc:1284 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "System Codepage" -#: Merge.rc:1286 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Enligt WinMerges anv\xE4ndargr\xE4nssnitt" -#: Merge.rc:1288 +#: Merge.rc:1279 #, c-format msgid "Custom codepage:" msgstr "Anpassad Codepage:" -#: Merge.rc:1296 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Arkivst\xF6d \xE4r avst\xE4ngt" -#: Merge.rc:1299 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Kan inte detektera 7-Zip-version (\xE4r 7-Zip inte installerat?)" -#: Merge.rc:1302 +#: Merge.rc:1293 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "Arkivst\xF6d kr\xE4ver antingen att version 3.11 eller h\xF6gre av 7-Zip \xE4r installerat p\xE5 din dator, eller att dess\nn\xF6dv\xE4ndiga komponenter kopieras till WinMerges programkatalog f\xF6r frist\xE5ende anv\xE4ndning." -#: Merge.rc:1304 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Det m\xE5ste ocks\xE5 finnas ett l\xE4mpligt gr\xE4nssnittsplugin (Merge7z*.dll) i s\xF6kv\xE4gen." -#: Merge.rc:1306 +#: Merge.rc:1297 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "Var god och anv\xE4nd den version av 7-Zip som rekommenderas nedanf\xF6r tills gr\xE4nssnittsplugins f\xF6r senare\nversioner blir tillg\xE4ngliga." -#: Merge.rc:1308 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Version" -#: Merge.rc:1310 +#: Merge.rc:1301 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "Plugin kr\xE4vd\n(dllbuild %04u)" -#: Merge.rc:1312 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Rekommenderad version av 7-Zip:" -#: Merge.rc:1315 -#: Merge.rc:1318 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "finns" -#: Merge.rc:1316 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1319 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip program installerat p\xE5 din dator:" -#: Merge.rc:1321 -#: Merge.rc:1326 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "inget" -#: Merge.rc:1323 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "saknas" -#: Merge.rc:1324 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip komponenter f\xF6r frist\xE5ende anv\xE4ndning:" -#: Merge.rc:1328 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "utdaterad" -#: Merge.rc:1329 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins i s\xF6kv\xE4g:" -#: Merge.rc:1330 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "Visa inte detta &meddelande igen.\n(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)" -#: Merge.rc:1334 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Ladda ner Plugin" -#: Merge.rc:1343 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Inst\xE4llningar" -#: Merge.rc:1354 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategorier" -#: Merge.rc:1356 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importera..." -#: Merge.rc:1357 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportera..." -#: Merge.rc:1365 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Nyckelord:" -#: Merge.rc:1366 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Funktionsnamn:" -#: Merge.rc:1367 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1368 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nummer:" -#: Merge.rc:1369 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatorer:" -#: Merge.rc:1370 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Str\xE4ngar:" -#: Merge.rc:1371 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocessor:" -#: Merge.rc:1372 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Anv\xE4ndare 1:" -#: Merge.rc:1373 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Anv\xE4ndare 2:" -#: Merge.rc:1378 -#: Merge.rc:1383 -#: Merge.rc:1388 -#: Merge.rc:1393 -#: Merge.rc:1398 -#: Merge.rc:1403 -#: Merge.rc:1408 -#: Merge.rc:1413 -#: Merge.rc:1418 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Fet" -#: Merge.rc:1426 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Rapport f\xF6r Katalogj\xE4mf\xF6relse" -#: Merge.rc:1429 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Rapport&fil:" -#: Merge.rc:1432 -#: Merge.rc:1606 -#: Merge.rc:1610 -#: Merge.rc:1637 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Bl\xE4ddra..." -#: Merge.rc:1433 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1436 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiera till klippbordet" -#: Merge.rc:1444 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Delat eller privat filter?" -#: Merge.rc:1447 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Vilken typ av filter vill du skapa?" -#: Merge.rc:1449 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delat filter (f\xF6r alla anv\xE4ndare p\xE5 denna dator)" -#: Merge.rc:1451 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat filter (bara f\xF6r den aktuella anv\xE4ndaren)" -#: Merge.rc:1459 -#: Merge.rc:1942 +#: Merge.rc:1450 +#: Merge.rc:1951 #, c-format msgid "Archive Support" msgstr "Arkivst\xF6d" -#: Merge.rc:1462 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Arkivst\xF6det kr\xE4ver att 7-Zip-plugin \xE4r installerad:" -#: Merge.rc:1464 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Ladda ner 7-zip-plugin" -#: Merge.rc:1465 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Aktivera arkivfilst\xF6d" -#: Merge.rc:1467 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Anv\xE4nd frist\xE5ende 7-Zip om det finns" -#: Merge.rc:1470 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "A&nv\xE4nd lokal 7-Zip fr\xE5n WinMerges katalog" -#: Merge.rc:1472 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detektera arkivtyp fr\xE5n filsignatur" -#: Merge.rc:1480 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "J\xE4mf\xF6relsestatistik" -#: Merge.rc:1483 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Kataloger:" -#: Merge.rc:1484 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1485 -#: Merge.rc:2331 +#: Merge.rc:1476 +#: Merge.rc:2341 #, c-format msgid "Different" msgstr "Olika" -#: Merge.rc:1486 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1489 -#: Merge.rc:1508 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Bin\xE4r:" -#: Merge.rc:1492 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1493 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "V\xE4nster:" -#: Merge.rc:1498 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "H\xF6ger:" -#: Merge.rc:1503 -#: Merge.rc:2325 +#: Merge.rc:1494 +#: Merge.rc:2335 #, c-format msgid "Identical" msgstr "Identisk" -#: Merge.rc:1512 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Totalt:" -#: Merge.rc:1517 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "St\xE4ng" -#: Merge.rc:1526 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "P\xE5verkar" -#: Merge.rc:1529 -#: Merge.rc:1532 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(P\xE5verkar)" -#: Merge.rc:1533 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "V\xE4lj Codepage f\xF6r" -#: Merge.rc:1534 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Fil\xF6ppnande:" -#: Merge.rc:1536 -#: Merge.rc:1539 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1537 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Filsparande:" -#: Merge.rc:1540 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Anv\xE4nd samma Codepage f\xF6r b\xE5da" -#: Merge.rc:1543 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Verkst\xE4ll" -#: Merge.rc:1544 -#: Merge.rc:1908 +#: Merge.rc:1535 +#: Merge.rc:1917 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1549 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testa Filter" -#: Merge.rc:1552 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testar filter ..." -#: Merge.rc:1554 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Skriv in text att testa:" -#: Merge.rc:1556 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Katalognamn" -#: Merge.rc:1558 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1562 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Testa" -#: Merge.rc:1563 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&St\xE4ng" -#: Merge.rc:1571 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Anv\xE4nd anpassade textkul\xF6rer" -#: Merge.rc:1574 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Anpassade textkul\xF6rer" -#: Merge.rc:1576 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Mellanslag:" -#: Merge.rc:1577 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Vanlig text:" -#: Merge.rc:1578 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Markering:" -#: Merge.rc:1601 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "S\xF6kv\xE4gar" -#: Merge.rc:1607 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Bara& l\xE4sbar" -#: Merge.rc:1611 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Bara& l\xE4sbar" -#: Merge.rc:1617 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "\xD6ppna..." -#: Merge.rc:1618 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Spara..." -#: Merge.rc:1623 -#: Merge.rc:1943 +#: Merge.rc:1614 +#: Merge.rc:1952 #, c-format msgid "Backup Files" msgstr "Backup p\xE5 filer" -#: Merge.rc:1626 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1631 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1632 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens katalog" -#: Merge.rc:1634 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Global backupkatalog:" -#: Merge.rc:1638 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Backupfilnamn:" -#: Merge.rc:1639 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&L\xE4gg till filsuffixet .bak" -#: Merge.rc:1641 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "L&\xE4gg till tidsmarkering" -#: Merge.rc:1648 -#: Merge.rc:2233 +#: Merge.rc:1639 +#: Merge.rc:2243 #, c-format msgid "Confirm Copy" msgstr "Bekr\xE4fta kopiering" -#: Merge.rc:1652 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "\xC4r du s\xE4ker p\xE5 att du vill kopiera XXX objekt?" -#: Merge.rc:1654 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Fr\xE5n v\xE4nster" -#: Merge.rc:1657 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Till h\xF6ger" -#: Merge.rc:1660 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1661 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Nej" -#: Merge.rc:1667 +#: Merge.rc:1658 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1670 +#: Merge.rc:1661 #, c-format msgid "&Enable plugins" msgstr "&Starta Plugins" +#: Merge.rc:1672 +#: Merge.rc:1953 +#, c-format +msgid "Shell Integration" +msgstr "Gr\xE4nssnittsintegration" + +#: Merge.rc:1675 +#, c-format +msgid "Explorer" +msgstr "Explorer" + +#: Merge.rc:1676 +#, c-format +msgid "E&nable advanced menu" +msgstr "A&nv\xE4nd avancerad meny" + +#: Merge.rc:1678 +#, c-format +msgid "In&clude subfolders by default" +msgstr "In&kludera underkataloger som standard" + +#: Merge.rc:1680 +#, c-format +msgid "&Add to context menu" +msgstr "&L\xE4gg till i kontextmeny" + +#: Merge.rc:1682 +#, c-format +msgid "Folder compare" +msgstr "Katalogj\xE4mf\xF6relse" + +#: Merge.rc:1683 +#, c-format +msgid "Add &Shell menu to context menu" +msgstr "L\xE4gg till &gr\xE4nssnittsmeny i kontextmeny" + #. StringFileInfo.Block -#: Merge.rc:1700 +#: Merge.rc:1709 #, c-format msgid "040904e4" msgstr "041d04e4" #. VarFileInfo.Translation -#: Merge.rc:1716 +#: Merge.rc:1725 #, c-format msgid "0x409, 1252" msgstr "0x41d, 1252" -#: Merge.rc:1731 +#: Merge.rc:1740 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1737 +#: Merge.rc:1746 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1738 +#: Merge.rc:1747 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1739 +#: Merge.rc:1748 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1740 +#: Merge.rc:1749 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1741 +#: Merge.rc:1750 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1742 +#: Merge.rc:1751 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1748 +#: Merge.rc:1757 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "Skapar nya dokument\nNya Dokument (Ctrl+N)" -#: Merge.rc:1749 +#: Merge.rc:1758 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "\xD6ppnar ett befintligt dokument\n\xD6ppna (Ctrl+O)" -#: Merge.rc:1750 +#: Merge.rc:1759 #, c-format msgid "Close the active document\nClose" msgstr "St\xE4nger det aktiva dokumentet\nSt\xE4ng" -#: Merge.rc:1751 +#: Merge.rc:1760 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "Sparar det aktiva dokumentet\nSpara (Ctrl+S)" -#: Merge.rc:1752 +#: Merge.rc:1761 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "Sparar det aktiva dokumentet med ett nytt namn\nSpara som" -#: Merge.rc:1753 +#: Merge.rc:1762 #, c-format msgid "Change the printing options\nPage Setup" msgstr "\xC4ndrar Utskriftsinst\xE4llningar\nSidinst\xE4llningar" -#: Merge.rc:1754 +#: Merge.rc:1763 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "\xC4ndrar skrivare och skrivarinst\xE4llningar\nSkrivarinst\xE4llningar" -#: Merge.rc:1755 +#: Merge.rc:1764 #, c-format msgid "Print the active document\nPrint" msgstr "Skriver ut det aktiva dokumentet\nSkriv ut" -#: Merge.rc:1756 +#: Merge.rc:1765 #, c-format msgid "Display full pages\nPrint Preview" msgstr "Visar helsidor\nF\xF6rhandsgranska" -#: Merge.rc:1761 +#: Merge.rc:1770 #, c-format msgid "Make all hidden items visible again" msgstr "G\xF6r alla dolda objekt synliga igen" -#: Merge.rc:1762 +#: Merge.rc:1771 #, c-format msgid "Toggle tree mode" msgstr "V\xE4xla tr\xE4dmod" -#: Merge.rc:1763 +#: Merge.rc:1772 #, c-format msgid "Expand all subfolders" msgstr "Expandera alla underkataloger" -#: Merge.rc:1764 +#: Merge.rc:1773 #, c-format msgid "Collapse all subfolders" msgstr "Minimera alla underkataloger" -#: Merge.rc:1770 +#: Merge.rc:1779 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "\xD6ppna projektfil\nProjektfil (Ctrl+J)" -#: Merge.rc:1771 +#: Merge.rc:1780 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att \xF6ppna Projektfil" -#: Merge.rc:1772 +#: Merge.rc:1781 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att spara Projektfil" -#: Merge.rc:1773 +#: Merge.rc:1782 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:1774 +#: Merge.rc:1783 #, c-format msgid "Project file successfully loaded." msgstr "Projektfilen \xE4r framg\xE5ngsrikt \xF6ppnad." -#: Merge.rc:1775 +#: Merge.rc:1784 #, c-format msgid "Project file successfully saved." msgstr "Projektfilen \xE4r framg\xE5ngsrikt sparad." -#: Merge.rc:1776 +#: Merge.rc:1785 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "Sparar aktuella s\xF6kv\xE4gar och inst\xE4llningar till Projektfil\nSpara Projektfil" -#: Merge.rc:1781 +#: Merge.rc:1790 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "Visar Programinformation, Versionsnummer och Copyright\nOm" -#: Merge.rc:1782 +#: Merge.rc:1791 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "Avslutar WinMerge och fr\xE5gar om du vill spara dokument\nAvsluta" -#: Merge.rc:1788 -#: Merge.rc:1789 -#: Merge.rc:1790 -#: Merge.rc:1791 -#: Merge.rc:1792 -#: Merge.rc:1793 -#: Merge.rc:1794 -#: Merge.rc:1795 -#: Merge.rc:1796 #: Merge.rc:1797 #: Merge.rc:1798 #: Merge.rc:1799 @@ -2776,2854 +2778,2863 @@ #: Merge.rc:1801 #: Merge.rc:1802 #: Merge.rc:1803 +#: Merge.rc:1804 +#: Merge.rc:1805 +#: Merge.rc:1806 +#: Merge.rc:1807 +#: Merge.rc:1808 +#: Merge.rc:1809 +#: Merge.rc:1810 +#: Merge.rc:1811 +#: Merge.rc:1812 #, c-format msgid "Open this document" msgstr "\xD6ppna detta dokument" -#: Merge.rc:1808 +#: Merge.rc:1817 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "V\xE4xlar till n\xE4sta f\xF6nster\nN\xE4sta f\xF6nster" -#: Merge.rc:1809 +#: Merge.rc:1818 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "V\xE4xlar till f\xF6rra f\xF6nstret\nF\xF6rra f\xF6nstret" -#: Merge.rc:1815 +#: Merge.rc:1824 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "Arrangerar f\xF6nstren s\xE5 att de \xF6verlappar varandra\n\xD6verlappande f\xF6nster" -#: Merge.rc:1816 +#: Merge.rc:1825 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "Ordnar f\xF6nstren icke-\xF6verlappande horisontellt\nOrdna horisontellt" -#: Merge.rc:1817 +#: Merge.rc:1826 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "Ordnar f\xF6nstren icke-\xF6verlappande vertikalt\nOrdna vertikalt" -#: Merge.rc:1823 +#: Merge.rc:1832 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "Kopierar den markerade texten och l\xE4gger det i klippbordet\nKopiera" -#: Merge.rc:1824 +#: Merge.rc:1833 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "Klipper ut den markerade texten och l\xE4gger det i klippbordet\nKlipp ut" -#: Merge.rc:1825 +#: Merge.rc:1834 #, c-format msgid "Find the specified text\nFind" msgstr "S\xF6ker den angivna texten\nS\xF6k" -#: Merge.rc:1826 +#: Merge.rc:1835 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "Klistrar in inneh\xE5llet i klippbordet\nKlistra in" -#: Merge.rc:1827 +#: Merge.rc:1836 #, c-format msgid "Repeat the last action\nRepeat" msgstr "Upprepar den senaste \xE5tg\xE4rden\nUpprepa" -#: Merge.rc:1828 +#: Merge.rc:1837 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "Ers\xE4tter den markerade texten med annan text\nErs\xE4tt" -#: Merge.rc:1829 +#: Merge.rc:1838 #, c-format msgid "Select the entire document\nSelect All" msgstr "V\xE4ljer hela dokumentet\nV\xE4lj allt" -#: Merge.rc:1830 +#: Merge.rc:1839 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "\xC5ngrar den senaste \xE5tg\xE4rden\n\xC5ngra" -#: Merge.rc:1831 +#: Merge.rc:1840 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "G\xF6r om den tidigare \xE5ngrade \xE5tg\xE4rden\nG\xF6r om (Ctrl+Y)" -#: Merge.rc:1837 +#: Merge.rc:1846 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "Visar eller g\xF6mmer verktygsf\xE4ltet\nV\xE4xla verktygsf\xE4lt" -#: Merge.rc:1838 +#: Merge.rc:1847 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "Visar eller g\xF6mmer statusf\xE4ltet\nV\xE4xla statusf\xE4ltet" -#: Merge.rc:1839 +#: Merge.rc:1848 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "Visar eller g\xF6mmer filraden\nV\xE4xla filraden" -#: Merge.rc:1840 +#: Merge.rc:1849 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Automatisk storleks\xE4ndring av placering\nL\xE5s Placering" -#: Merge.rc:1846 +#: Merge.rc:1855 #, c-format msgid "Change the window size" msgstr "\xC4ndra f\xF6nsterstorlek" -#: Merge.rc:1847 +#: Merge.rc:1856 #, c-format msgid "Change the window position" msgstr "Flytta f\xF6nster" -#: Merge.rc:1848 +#: Merge.rc:1857 #, c-format msgid "Reduce the window to an icon" msgstr "Minimera f\xF6nstret till en ikon" -#: Merge.rc:1849 +#: Merge.rc:1858 #, c-format msgid "Enlarge the window to full size" msgstr "Maximera f\xF6nstret till full storlek" -#: Merge.rc:1850 +#: Merge.rc:1859 #, c-format msgid "Switch to the next document window" msgstr "V\xE4xla till n\xE4sta dokumentf\xF6nster" -#: Merge.rc:1851 +#: Merge.rc:1860 #, c-format msgid "Switch to the previous document window" msgstr "V\xE4xla till f\xF6rra dokumentf\xF6nstret" -#: Merge.rc:1852 +#: Merge.rc:1861 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "St\xE4ng det aktiva f\xF6nstret och fr\xE5ga om dokumenten skall sparas" -#: Merge.rc:1857 +#: Merge.rc:1866 #, c-format msgid "Restore the window to normal size" msgstr "\xC5terst\xE4ll f\xF6nstret till normal storlek" -#: Merge.rc:1858 +#: Merge.rc:1867 #, c-format msgid "Activate Task List" msgstr "Lista med aktiva f\xF6nster" -#: Merge.rc:1859 +#: Merge.rc:1868 #, c-format msgid "Activate this window" msgstr "Aktiverar det h\xE4r f\xF6nstret" -#: Merge.rc:1865 +#: Merge.rc:1874 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "St\xE4nger F\xF6rhandsgranskning\nSt\xE4ng F\xF6rhandsgranskning" -#: Merge.rc:1872 +#: Merge.rc:1881 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nFilj\xE4mf\xF6relse\n\n\n\nWinMerge.Filj\xE4mf\xF6relse\nWinMerge Filj\xE4mf\xF6relse" -#: Merge.rc:1873 +#: Merge.rc:1882 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nKatalogj\xE4mf\xF6relse\n\n\n\nWinMerge.Katalogj\xE4mf\xF6relse\nWinMerge Katalogj\xE4mf\xF6relse" -#: Merge.rc:1880 +#: Merge.rc:1889 #, c-format msgid "Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1887 +#: Merge.rc:1896 #, c-format msgid "Press any key" msgstr "Tryck p\xE5 en valfri tangent" -#: Merge.rc:1893 -#: Merge.rc:1894 +#: Merge.rc:1902 +#: Merge.rc:1903 #, c-format msgid "Right click on the path to copy" msgstr "H\xF6gerklicka p\xE5 s\xF6kv\xE4gen f\xF6r att kopiera" -#: Merge.rc:1900 +#: Merge.rc:1909 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Utvecklare:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1901 +#: Merge.rc:1910 #, 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 kommer med ABSOLUT INGA GARANTIER. Detta \xE4r fri programvara och du \xE4r v\xE4lkommen att vidaredistribuera den under vissa omst\xE4ndigheter; se GNU General Public License i Hj\xE4lpmenyn f\xF6r detaljer." -#: Merge.rc:1907 +#: Merge.rc:1916 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1909 +#: Merge.rc:1918 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:1910 +#: Merge.rc:1919 #, c-format msgid "&Retry" msgstr "&F\xF6rs\xF6k igen" -#: Merge.rc:1911 +#: Merge.rc:1920 #, c-format msgid "&Ignore" msgstr "&Ignorera" -#: Merge.rc:1912 +#: Merge.rc:1921 #, c-format msgid "Ignore &all" msgstr "Ignorera &allt" -#: Merge.rc:1913 +#: Merge.rc:1922 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1919 +#: Merge.rc:1928 #, c-format msgid "Yes to &all" msgstr "Ja till &allt" -#: Merge.rc:1920 +#: Merge.rc:1929 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:1921 +#: Merge.rc:1930 #, c-format msgid "No to a&ll" msgstr "Nej till a&llt" -#: Merge.rc:1922 +#: Merge.rc:1931 #, c-format msgid "&Continue" msgstr "&Forts\xE4tt" -#: Merge.rc:1923 +#: Merge.rc:1932 #, c-format msgid "&Skip" msgstr "&Skippa" -#: Merge.rc:1924 +#: Merge.rc:1933 #, c-format msgid "Skip &all" msgstr "Skippa &allt" -#: Merge.rc:1926 +#: Merge.rc:1935 #, c-format msgid "Don't display this &message again." msgstr "Visa inte detta &meddelande igen." -#: Merge.rc:1927 +#: Merge.rc:1936 #, c-format msgid "Don't ask this &question again." msgstr "Fr\xE5ga inte denna &fr\xE5ga igen." -#: Merge.rc:1937 +#: Merge.rc:1946 #, c-format msgid "Syntax colors" msgstr "Syntaxkul\xF6rer" -#: Merge.rc:1938 +#: Merge.rc:1947 #, c-format msgid "Text Colors" msgstr "Textkul\xF6rer" -#: Merge.rc:1940 +#: Merge.rc:1949 #, c-format msgid "Version Control" msgstr "Versionskontroll" -#: Merge.rc:1950 +#: Merge.rc:1960 #, c-format msgid "To:" msgstr "Till:" -#: Merge.rc:1951 +#: Merge.rc:1961 #, c-format msgid "From left:" msgstr "Fr\xE5n v\xE4nster:" -#: Merge.rc:1952 +#: Merge.rc:1962 #, c-format msgid "To left:" msgstr "Till v\xE4nster:" -#: Merge.rc:1953 +#: Merge.rc:1963 #, c-format msgid "From right:" msgstr "Fr\xE5n h\xF6ger:" -#: Merge.rc:1954 +#: Merge.rc:1964 #, c-format msgid "To right:" msgstr "Till h\xF6ger:" -#: Merge.rc:1960 +#: Merge.rc:1970 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:1961 +#: Merge.rc:1971 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1962 +#: Merge.rc:1972 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:1968 +#: Merge.rc:1978 #, c-format msgid "Options (%1)" msgstr "Egenskaper (%1)" -#: Merge.rc:1969 +#: Merge.rc:1979 #, c-format msgid "All message boxes are now displayed again." msgstr "Alla meddelanderutor visas nu igen." -#: Merge.rc:1970 +#: Merge.rc:1980 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "\xC4ndringar har gjorts i den aktuella filj\xE4mf\xF6relsesessionen. Vissa inst\xE4llningar kanske inte syns f\xF6rr\xE4n den aktuella filj\xE4mf\xF6relsen startas om." -#: Merge.rc:1971 +#: Merge.rc:1981 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "\xC4ndringen av typsnitt kommer inte att synas i redan \xF6ppna f\xF6nster." -#: Merge.rc:1973 +#: Merge.rc:1983 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "V\xE4rdet i Tabbstorleks-f\xE4ltet \xE4r inte inom vad WinMerge accepterar.\n\nVar god och anv\xE4nd v\xE4rden fr\xE5n 1 - %1." -#: Merge.rc:1975 +#: Merge.rc:1985 #, c-format msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset." msgstr "\xC4r du s\xE4ker att du vill \xE5terst\xE4lla alla WinMerges inst\xE4llningar till standardv\xE4rden?\n\nVar god och \xE5terstarta WinMerge efter \xE5terst\xE4llningen." -#: Merge.rc:1981 +#: Merge.rc:1991 #, c-format msgid "Open" msgstr "\xD6ppna" -#: Merge.rc:1982 +#: Merge.rc:1992 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||" -#: Merge.rc:1983 +#: Merge.rc:1993 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" -#: Merge.rc:1984 +#: Merge.rc:1994 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1986 +#: Merge.rc:1996 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Inst\xE4llningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2002 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text-filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alla filer (*.*)|*.*||" -#: Merge.rc:1993 +#: Merge.rc:2003 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||" -#: Merge.rc:1994 +#: Merge.rc:2004 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" -#: Merge.rc:2000 +#: Merge.rc:2010 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:2001 +#: Merge.rc:2011 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:2002 +#: Merge.rc:2012 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:2003 +#: Merge.rc:2013 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2009 +#: Merge.rc:2019 #, c-format msgid "Full Contents" msgstr "Total j\xE4mf\xF6relse" -#: Merge.rc:2010 +#: Merge.rc:2020 #, c-format msgid "Quick Contents" msgstr "Snabb j\xE4mf\xF6relse" -#: Merge.rc:2011 +#: Merge.rc:2021 #, c-format msgid "Modified Date" msgstr "Datum f\xF6r f\xF6r\xE4ndring" -#: Merge.rc:2012 +#: Merge.rc:2022 #, c-format msgid "Modified Date and Size" msgstr "\xC4ndrat Datum och Storlek" -#: Merge.rc:2013 +#: Merge.rc:2023 #, c-format msgid "Size" msgstr "Filstorlek" -#: Merge.rc:2019 -#: Merge.rc:2643 +#: Merge.rc:2029 +#: Merge.rc:2653 #, c-format msgid "Name" msgstr "Namn" -#: Merge.rc:2020 +#: Merge.rc:2030 #, c-format msgid "Location" msgstr "S\xF6kv\xE4g" -#: Merge.rc:2021 +#: Merge.rc:2031 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2022 +#: Merge.rc:2032 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2023 -#: Merge.rc:2645 +#: Merge.rc:2033 +#: Merge.rc:2655 #, c-format msgid "Description" msgstr "Beskrivning" -#: Merge.rc:2024 +#: Merge.rc:2034 #, c-format msgid "Select filename for new filter" msgstr "V\xE4lj filnamn f\xF6r nytt filter" -#: Merge.rc:2025 +#: Merge.rc:2035 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||" -#: Merge.rc:2027 +#: Merge.rc:2037 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "Kan inte hitta filfilterfilen!\n\nVar god och kopiera filen %1 till WinMerges Filterkatalog:\n%2." -#: Merge.rc:2029 +#: Merge.rc:2039 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "Kan inte kopiera filterfilen till filterkatalogen:\n%1\n\nVar god och verifiera att katalogen finns och att den \xE4r skrivbar." -#: Merge.rc:2031 +#: Merge.rc:2041 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "Anv\xE4ndarens filterfilkatalog \xE4r inte definierad!\n\nVar god och v\xE4lj filterkatalog i Inst\xE4llningar/System." -#: Merge.rc:2033 +#: Merge.rc:2043 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "Kan inte ta bort filterfilen:\n%1\n\nKanske \xE4r filen bara l\xE4sbar?" -#: Merge.rc:2034 +#: Merge.rc:2044 #, c-format msgid "Locate filter file to install" msgstr "Ange s\xF6kv\xE4g f\xF6r filterfil att installera" -#: Merge.rc:2036 +#: Merge.rc:2046 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "Installation av filterfilen misslyckades.\n\nKunde inte kopiera ny filterfil till filterkatalogen." -#: Merge.rc:2038 +#: Merge.rc:2048 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterfilen \xE4r redan installerad. Vill du skriva \xF6ver existerande filterfil?" -#: Merge.rc:2044 +#: Merge.rc:2054 #, c-format msgid "Regular expression" msgstr "Regulj\xE4rt uttryck" -#: Merge.rc:2050 +#: Merge.rc:2060 #, 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 "Filtren \xE4r uppdaterade Vill du uppdatera alla \xF6ppna katalogj\xE4mf\xF6relser?\n\nOm du inte vill uppdatera alla j\xE4mf\xF6relser nu kan du v\xE4lja Nej och uppdatera j\xE4mf\xF6relser senare." -#: Merge.rc:2057 +#: Merge.rc:2067 #, c-format msgid "&Path to SS.EXE:" msgstr "&S\xF6kv\xE4g till SS.EXE" -#: Merge.rc:2063 +#: Merge.rc:2073 #, c-format msgid "Folder Comparison Results" msgstr "Resultat f\xF6r j\xE4mf\xF6rda kataloger" -#: Merge.rc:2064 +#: Merge.rc:2074 #, c-format msgid "File Comparison" msgstr "Filj\xE4mf\xF6relse" -#: Merge.rc:2065 +#: Merge.rc:2075 #, c-format msgid "Untitled left" msgstr "Namnl\xF6s v\xE4nster" -#: Merge.rc:2066 +#: Merge.rc:2076 #, c-format msgid "Untitled right" msgstr "Namnl\xF6s h\xF6ger" -#: Merge.rc:2067 +#: Merge.rc:2077 #, c-format msgid "Theirs File" msgstr "Deras fil" -#: Merge.rc:2068 +#: Merge.rc:2078 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2074 +#: Merge.rc:2084 #, c-format msgid "Scanning files..." msgstr "S\xF6ker filer..." -#: Merge.rc:2075 +#: Merge.rc:2085 #, c-format msgid "Opening selection" msgstr "\xD6ppnar val" -#: Merge.rc:2076 +#: Merge.rc:2086 #, c-format msgid "Copying Left to Right" msgstr "Kopiera v\xE4nster till h\xF6ger" -#: Merge.rc:2077 +#: Merge.rc:2087 #, c-format msgid "Copying Right to Left" msgstr "Kopiera h\xF6ger till v\xE4nster" -#: Merge.rc:2078 +#: Merge.rc:2088 #, c-format msgid "Copying All to Left" msgstr "Kopiera allt till v\xE4nster" -#: Merge.rc:2079 +#: Merge.rc:2089 #, c-format msgid "Copying All to Right" msgstr "Kopiera allt till h\xF6ger" -#: Merge.rc:2080 +#: Merge.rc:2090 #, c-format msgid "Copying files..." msgstr "Kopierar filer..." -#: Merge.rc:2081 +#: Merge.rc:2091 #, c-format msgid "Deleting files..." msgstr "Tar bort filer..." -#: Merge.rc:2082 +#: Merge.rc:2092 #, c-format msgid "Moving files..." msgstr "Flyttar filer..." -#: Merge.rc:2083 +#: Merge.rc:2093 #, c-format msgid "Creating the report..." msgstr "Skapar rapport..." -#: Merge.rc:2084 +#: Merge.rc:2094 #, c-format msgid "Undoing the last operation..." msgstr "\xC5ngrar den sista \xE5tg\xE4rden..." -#: Merge.rc:2085 +#: Merge.rc:2095 #, c-format msgid "Redoing the previous operation..." msgstr "G\xF6r om den tidigare \xE5tg\xE4rden..." -#: Merge.rc:2091 +#: Merge.rc:2101 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d Radslut: %s" -#: Merge.rc:2092 +#: Merge.rc:2102 #, c-format msgid "Line: %s" msgstr "Rad: %s" -#: Merge.rc:2093 +#: Merge.rc:2103 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d" -#: Merge.rc:2094 +#: Merge.rc:2104 #, c-format msgid "Merge" msgstr "Mergemod" -#: Merge.rc:2095 +#: Merge.rc:2105 #, c-format msgid "Difference %1 of %2" msgstr "Skillnad %1 av %2" -#: Merge.rc:2096 +#: Merge.rc:2106 #, c-format msgid "%1 Differences Found" msgstr "%1 skillnader funna" -#: Merge.rc:2097 +#: Merge.rc:2107 #, c-format msgid "1 Difference Found" msgstr "1 skillnad funnen" #. Abbreviation from "Read Only" -#: Merge.rc:2098 +#: Merge.rc:2108 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2104 +#: Merge.rc:2114 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2105 +#: Merge.rc:2115 #, c-format msgid "Items: %1" msgstr "Objekt: %1" -#: Merge.rc:2111 +#: Merge.rc:2121 #, c-format msgid "Select two existing folders or files to compare" msgstr "V\xE4lj tv\xE5 existerande kataloger eller filer att j\xE4mf\xF6ra" -#: Merge.rc:2112 +#: Merge.rc:2122 #, c-format msgid "Folder Selection" msgstr "Val av katalog" -#: Merge.rc:2113 +#: Merge.rc:2123 #, c-format msgid "Select two folders or two files to compare." msgstr "V\xE4lj tv\xE5 kataloger eller tv\xE5 filer att j\xE4mf\xF6ra." -#: Merge.rc:2114 +#: Merge.rc:2124 #, c-format msgid "Left path is invalid!" msgstr "V\xE4nster s\xF6kv\xE4g \xE4r felaktig!" -#: Merge.rc:2115 +#: Merge.rc:2125 #, c-format msgid "Right path is invalid!" msgstr "H\xF6ger s\xF6kv\xE4g \xE4r felaktig!" -#: Merge.rc:2116 +#: Merge.rc:2126 #, c-format msgid "Both paths are invalid!" msgstr "B\xE5da s\xF6kv\xE4garna \xE4r felaktiga!" -#: Merge.rc:2117 +#: Merge.rc:2127 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "V\xE4lj tv\xE5 filer f\xF6r att starta valet av uppackare." -#: Merge.rc:2118 +#: Merge.rc:2128 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan inte j\xE4mf\xF6ra en fil med en katalog!" -#: Merge.rc:2124 +#: Merge.rc:2134 #, c-format msgid "File not found: %1" msgstr "Kan inte hitta: %1" -#: Merge.rc:2125 +#: Merge.rc:2135 #, c-format msgid "File not unpacked: %1" msgstr "Filen \xE4r inte uppackad: %1" -#: Merge.rc:2126 +#: Merge.rc:2136 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "Kan inte \xF6ppna fil\n%1\n\n%2" -#: Merge.rc:2127 +#: Merge.rc:2137 #, c-format msgid "Failed to parse conflict file." msgstr "Kunde inte tolka Konfliktfilen." -#: Merge.rc:2128 +#: Merge.rc:2138 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Filen\n%1\n\xE4r inte en Konfliktfil." -#: Merge.rc:2134 +#: Merge.rc:2144 #, c-format msgid "Save As" msgstr "Spara som" -#: Merge.rc:2135 +#: Merge.rc:2145 #, c-format msgid "Save changes to %1?" msgstr "Spara \xE4ndringar i %1?" -#: Merge.rc:2136 +#: Merge.rc:2146 #, 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 \xE4r skrivskyddad. Vill du skriva \xF6ver filen (v\xE4lj Nej f\xF6r att spara filen med ett annat namn)?" -#: Merge.rc:2137 +#: Merge.rc:2147 #, c-format msgid "Error checking destination writeability" msgstr "Fel vid kontroll av skrivbarhet p\xE5 destinationen!" -#: Merge.rc:2138 +#: Merge.rc:2148 #, c-format msgid "Error backing up file" msgstr "Fel... [truncated message content] |
From: <ki...@us...> - 2009-01-22 19:24:20
|
Revision: 6361 http://winmerge.svn.sourceforge.net/winmerge/?rev=6361&view=rev Author: kimmov Date: 2009-01-22 19:24:13 +0000 (Thu, 22 Jan 2009) Log Message: ----------- PATCH: [ 2524796 ] Brazilian translation update Submitted by Felipe Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Languages/Brazilian.po Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-22 19:20:57 UTC (rev 6360) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-22 19:24:13 UTC (rev 6361) @@ -18,7 +18,7 @@ Bugfix: Line filter editing didn't update edit box when editing was canceled by ESC key (#2493935) Translation updates: - - Brazilian (#2461443) + - Brazilian (#2461443, #2524796) - Czech (r6201) - Dutch (#2481022, #2494378, #2499994) - Swedish (#2452467, #2465385, #2511043) Modified: branches/R2_12/Src/Languages/Brazilian.po =================================================================== --- branches/R2_12/Src/Languages/Brazilian.po 2009-01-22 19:20:57 UTC (rev 6360) +++ branches/R2_12/Src/Languages/Brazilian.po 2009-01-22 19:24:13 UTC (rev 6361) @@ -391,7 +391,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1925 +#: Merge.rc:1934 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -722,7 +722,7 @@ msgstr "&Scripts" #: Merge.rc:370 -#: Merge.rc:2779 +#: Merge.rc:2789 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -924,15 +924,15 @@ msgstr "&Apagar" #: Merge.rc:523 -#: Merge.rc:1145 -#: Merge.rc:1527 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Esquerda" #: Merge.rc:524 -#: Merge.rc:1147 -#: Merge.rc:1530 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Direita" @@ -1084,17 +1084,17 @@ #: Merge.rc:674 #: Merge.rc:706 -#: Merge.rc:800 -#: Merge.rc:986 -#: Merge.rc:1064 -#: Merge.rc:1093 -#: Merge.rc:1103 -#: Merge.rc:1269 -#: Merge.rc:1333 -#: Merge.rc:1346 -#: Merge.rc:1438 -#: Merge.rc:1453 -#: Merge.rc:1675 +#: Merge.rc:798 +#: Merge.rc:984 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" @@ -1110,39 +1110,39 @@ msgstr "Selecionar Arquivos ou Pastas" #: Merge.rc:685 -#: Merge.rc:1604 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Esquerda:" #: Merge.rc:689 #: Merge.rc:750 -#: Merge.rc:1007 -#: Merge.rc:1029 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Procurar..." #: Merge.rc:690 -#: Merge.rc:1608 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Direita:" #: Merge.rc:694 -#: Merge.rc:1040 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." #: Merge.rc:695 -#: Merge.rc:1612 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtro:" #: Merge.rc:698 -#: Merge.rc:1614 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Selecionar..." @@ -1158,7 +1158,7 @@ msgstr "&Selecionar..." #: Merge.rc:703 -#: Merge.rc:1615 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" @@ -1170,25 +1170,25 @@ #: Merge.rc:707 #: Merge.rc:737 -#: Merge.rc:801 -#: Merge.rc:831 -#: Merge.rc:863 -#: Merge.rc:873 -#: Merge.rc:1065 -#: Merge.rc:1094 -#: Merge.rc:1104 -#: Merge.rc:1155 -#: Merge.rc:1270 -#: Merge.rc:1347 -#: Merge.rc:1439 -#: Merge.rc:1454 -#: Merge.rc:1676 +#: Merge.rc:799 +#: Merge.rc:829 +#: Merge.rc:861 +#: Merge.rc:871 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Cancelar" #: Merge.rc:708 -#: Merge.rc:1348 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Ajuda" @@ -1229,7 +1229,7 @@ msgstr "Link para o projeto VSS Destino" #: Merge.rc:733 -#: Merge.rc:878 +#: Merge.rc:876 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" @@ -1240,7 +1240,7 @@ msgstr "Veja Isso" #: Merge.rc:736 -#: Merge.rc:874 +#: Merge.rc:872 #, c-format msgid "Save As..." msgstr "Salvar Como..." @@ -1256,13 +1256,13 @@ msgstr "&Sistema de Vers\xF5es:" #: Merge.rc:748 -#: Merge.rc:2056 +#: Merge.rc:2066 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" #: Merge.rc:755 -#: Merge.rc:1933 +#: Merge.rc:1942 #, c-format msgid "General" msgstr "Geral" @@ -1304,756 +1304,731 @@ #: Merge.rc:775 #, c-format -msgid "Enable Shell &Context Menu" -msgstr "Ativar o Menu de &Contexto do Shell" - -#: Merge.rc:777 -#, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Mostrar o Di\xE1logo \"Selecionar Arquivos ou Pastas\" ao Iniciar" -#: Merge.rc:779 +#: Merge.rc:777 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:" -#: Merge.rc:782 +#: Merge.rc:780 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" -#: Merge.rc:784 -#: Merge.rc:1627 +#: Merge.rc:782 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:786 -#: Merge.rc:1629 +#: Merge.rc:784 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:788 +#: Merge.rc:786 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo." -#: Merge.rc:790 +#: Merge.rc:788 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:797 +#: Merge.rc:795 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:804 +#: Merge.rc:802 #, c-format msgid "Available languages:" msgstr "Idiomas dispon\xEDveis:" -#: Merge.rc:810 +#: Merge.rc:808 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:813 -#: Merge.rc:840 +#: Merge.rc:811 +#: Merge.rc:838 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:816 -#: Merge.rc:846 +#: Merge.rc:814 +#: Merge.rc:844 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:818 -#: Merge.rc:848 +#: Merge.rc:816 +#: Merge.rc:846 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:820 -#: Merge.rc:850 +#: Merge.rc:818 +#: Merge.rc:848 #, c-format msgid "Regular &expression" msgstr "Express&\xE3o regular" -#: Merge.rc:822 +#: Merge.rc:820 #, c-format msgid "D&on't wrap end of file" msgstr "N&\xE3o organizar o final do arquivo" -#: Merge.rc:825 +#: Merge.rc:823 #, c-format msgid "Direction" msgstr "Dire\xE7\xE3o" -#: Merge.rc:826 +#: Merge.rc:824 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:828 +#: Merge.rc:826 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:830 -#: Merge.rc:860 +#: Merge.rc:828 +#: Merge.rc:858 #, c-format msgid "&Find Next" msgstr "&Achar o Pr\xF3ximo" -#: Merge.rc:837 +#: Merge.rc:835 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:843 +#: Merge.rc:841 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:852 +#: Merge.rc:850 #, c-format msgid "&Don't wrap end of file" msgstr "&N\xE3o organizar o final do arquivo" -#: Merge.rc:855 +#: Merge.rc:853 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:856 +#: Merge.rc:854 #, c-format msgid "&Selection" msgstr "&Sele\xE7\xE3o" -#: Merge.rc:858 +#: Merge.rc:856 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:861 +#: Merge.rc:859 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:862 +#: Merge.rc:860 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:869 -#: Merge.rc:2177 +#: Merge.rc:867 +#: Merge.rc:2187 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:872 +#: Merge.rc:870 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:877 -#: Merge.rc:1189 +#: Merge.rc:875 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Coment\xE1rios" -#: Merge.rc:880 +#: Merge.rc:878 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ap\xF3s o checkout" -#: Merge.rc:886 +#: Merge.rc:884 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:889 +#: Merge.rc:887 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:892 +#: Merge.rc:890 #, c-format msgid "Regular Expressions (one per line):" msgstr "Express\xF5es Regulares (uma por linha):" -#: Merge.rc:899 +#: Merge.rc:897 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:900 +#: Merge.rc:898 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:901 +#: Merge.rc:899 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:902 +#: Merge.rc:900 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:907 -#: Merge.rc:1936 +#: Merge.rc:905 +#: Merge.rc:1945 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:910 +#: Merge.rc:908 #, c-format msgid "Difference:" msgstr "Diferen\xE7a:" -#: Merge.rc:914 +#: Merge.rc:912 #, c-format msgid "Selected Difference:" msgstr "Diferen\xE7a Selecionada:" -#: Merge.rc:918 -#: Merge.rc:1579 +#: Merge.rc:916 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "2\xBA Plano" -#: Merge.rc:919 +#: Merge.rc:917 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:932 -#: Merge.rc:1374 -#: Merge.rc:1580 +#: Merge.rc:930 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:936 +#: Merge.rc:934 #, c-format msgid "Ignored Difference:" msgstr "Diferen\xE7a Ignorada:" -#: Merge.rc:946 +#: Merge.rc:944 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:956 +#: Merge.rc:954 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:963 +#: Merge.rc:961 #, c-format msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:970 +#: Merge.rc:968 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:977 -#: Merge.rc:1063 -#: Merge.rc:1092 -#: Merge.rc:1192 -#: Merge.rc:1420 +#: Merge.rc:975 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:983 -#: Merge.rc:1362 -#: Merge.rc:1568 +#: Merge.rc:981 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:993 -#: Merge.rc:1939 +#: Merge.rc:991 +#: Merge.rc:1948 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:996 +#: Merge.rc:994 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:998 +#: Merge.rc:996 #, c-format -msgid "Integration" -msgstr "Integra\xE7\xE3o" - -#: Merge.rc:999 -#, c-format -msgid "&Add to explorer context menu" -msgstr "&Adicionar ao menu de contexto do explorer" - -#: Merge.rc:1001 -#, c-format -msgid "E&nable advanced menu" -msgstr "A&tivar o menu avan\xE7ado" - -#: Merge.rc:1003 -#, c-format -msgid "In&clude subfolders by default" -msgstr "In&cluir as sub-pastas por padr\xE3o" - -#: Merge.rc:1005 -#, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1008 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1010 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:1011 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:1012 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:1014 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1017 -#: Merge.rc:1033 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1023 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1026 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1030 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1034 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1035 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1037 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1041 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1042 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1045 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1048 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1049 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1051 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1053 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1055 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1057 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1059 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1061 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1083 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1089 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1090 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1100 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1105 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1108 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1111 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1112 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1123 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1126 -#: Merge.rc:1886 +#: Merge.rc:1117 +#: Merge.rc:1895 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1131 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1132 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1133 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1139 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1142 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1144 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1149 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1150 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1152 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1154 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1160 -#: Merge.rc:1934 +#: Merge.rc:1151 +#: Merge.rc:1943 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1163 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1164 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1166 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1168 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1170 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1172 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1174 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1177 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1179 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1181 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1184 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1187 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1190 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1197 -#: Merge.rc:1935 +#: Merge.rc:1188 +#: Merge.rc:1944 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1200 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1202 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1204 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1206 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1207 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1210 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1212 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1214 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1216 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1218 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1220 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1235 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1241 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1242 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1243 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1244 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1245 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1251 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1254 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1257 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1259 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1261 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1264 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1266 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1268 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Descartar Tudo" -#: Merge.rc:1275 -#: Merge.rc:1523 -#: Merge.rc:1941 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1950 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1278 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1279 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1281 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2062,56 +2037,56 @@ "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sess\xE3o" -#: Merge.rc:1284 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1286 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1288 +#: Merge.rc:1279 #, c-format msgid "Custom codepage:" msgstr "C\xF3digo de p\xE1gina personalizado:" -#: Merge.rc:1296 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1299 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1302 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1304 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1306 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1308 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1310 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2120,54 +2095,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1312 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1315 -#: Merge.rc:1318 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1316 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1319 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1321 -#: Merge.rc:1326 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1323 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1324 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1328 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1329 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1330 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2176,499 +2151,535 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1334 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1343 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1354 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1356 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1357 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1365 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1366 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1367 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1368 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1369 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1370 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1371 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1372 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1373 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1378 -#: Merge.rc:1383 -#: Merge.rc:1388 -#: Merge.rc:1393 -#: Merge.rc:1398 -#: Merge.rc:1403 -#: Merge.rc:1408 -#: Merge.rc:1413 -#: Merge.rc:1418 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1426 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1429 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1432 -#: Merge.rc:1606 -#: Merge.rc:1610 -#: Merge.rc:1637 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1433 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1436 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1444 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1447 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1449 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1451 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1459 -#: Merge.rc:1942 +#: Merge.rc:1450 +#: Merge.rc:1951 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1462 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1464 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1465 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1467 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1470 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1472 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1480 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1483 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1484 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1485 -#: Merge.rc:2331 +#: Merge.rc:1476 +#: Merge.rc:2341 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1486 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1489 -#: Merge.rc:1508 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1492 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1493 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1498 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1503 -#: Merge.rc:2325 +#: Merge.rc:1494 +#: Merge.rc:2335 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1512 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1517 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1526 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1529 -#: Merge.rc:1532 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1533 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1534 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1536 -#: Merge.rc:1539 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1537 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1540 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1543 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1544 -#: Merge.rc:1908 +#: Merge.rc:1535 +#: Merge.rc:1917 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1549 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1552 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1554 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1556 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1558 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1562 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1563 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1571 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1574 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1576 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1577 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1578 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1601 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1607 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1611 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1617 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1618 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1623 -#: Merge.rc:1943 +#: Merge.rc:1614 +#: Merge.rc:1952 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1626 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1631 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1632 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1634 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1638 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1639 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1641 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1648 -#: Merge.rc:2233 +#: Merge.rc:1639 +#: Merge.rc:2243 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1652 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1654 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1657 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1660 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1661 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "N\xE3o" -#: Merge.rc:1667 +#: Merge.rc:1658 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1670 +#: Merge.rc:1661 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" +#: Merge.rc:1672 +#: Merge.rc:1953 +#, c-format +msgid "Shell Integration" +msgstr "Integra\xE7\xE3o com o Shell" + +#: Merge.rc:1675 +#, c-format +msgid "Explorer" +msgstr "Explorer" + +#: Merge.rc:1676 +#, c-format +msgid "E&nable advanced menu" +msgstr "A&tivar o menu avan\xE7ado" + +#: Merge.rc:1678 +#, c-format +msgid "In&clude subfolders by default" +msgstr "In&cluir as sub-pastas por padr\xE3o" + +#: Merge.rc:1680 +#, c-format +msgid "&Add to context menu" +msgstr "&Adicionar ao menu de contexto" + +#: Merge.rc:1682 +#, c-format +msgid "Folder compare" +msgstr "Comparar as pastas" + +#: Merge.rc:1683 +#, c-format +msgid "Add &Shell menu to context menu" +msgstr "Adicionar o &menu do Shell ao menu de contexto" + #. StringFileInfo.Block -#: Merge.rc:1700 +#: Merge.rc:1709 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1716 +#: Merge.rc:1725 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1731 +#: Merge.rc:1740 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1737 +#: Merge.rc:1746 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1738 +#: Merge.rc:1747 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1739 +#: Merge.rc:1748 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1740 +#: Merge.rc:1749 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1741 +#: Merge.rc:1750 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1742 +#: Merge.rc:1751 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1748 +#: Merge.rc:1757 #, c-format msgid "" "Create empty documents\n" @@ -2677,7 +2688,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1749 +#: Merge.rc:1758 #, c-format msgid "" "Open an existing document\n" @@ -2686,7 +2697,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1750 +#: Merge.rc:1759 #, c-format msgid "" "Close the active document\n" @@ -2695,7 +2706,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1751 +#: Merge.rc:1760 #, c-format msgid "" "Save the active document\n" @@ -2704,7 +2715,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1752 +#: Merge.rc:1761 #, c-format msgid "" "Save the active document with a new name\n" @@ -2713,7 +2724,7 @@ "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1753 +#: Merge.rc:1762 #, c-format msgid "" "Change the printing options\n" @@ -2722,7 +2733,7 @@ "Mudar as op\xE7\xF5es de impress\xE3o\n" "Configurar P\xE1gina" -#: Merge.rc:1754 +#: Merge.rc:1763 #, c-format msgid "" "Change the printer and printing options\n" @@ -2731,7 +2742,7 @@ "Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n" "Configurar a impress\xE3o" -#: Merge.rc:1755 +#: Merge.rc:1764 #, c-format msgid "" "Print the active document\n" @@ -2740,7 +2751,7 @@ "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1756 +#: Merge.rc:1765 #, c-format msgid "" "Display full pages\n" @@ -2749,27 +2760,27 @@ "Exibir p\xE1ginas completas\n" "Pr\xE9-Visualizar Impress\xE3o" -#: Merge.rc:1761 +#: Merge.rc:1770 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos vis\xEDveis de novo" -#: Merge.rc:1762 +#: Merge.rc:1771 #, c-format msgid "Toggle tree mode" msgstr "Ativar o modo \xE1rvore" -#: Merge.rc:1763 +#: Merge.rc:1772 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas as sub-pastas" -#: Merge.rc:1764 +#: Merge.rc:1773 #, c-format msgid "Collapse all subfolders" msgstr "Retrair todas as sub-pastas" -#: Merge.rc:1770 +#: Merge.rc:1779 #, c-format msgid "" "Open project file\n" @@ -2778,32 +2789,32 @@ "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:1771 +#: Merge.rc:1780 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1772 +#: Merge.rc:1781 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1773 +#: Merge.rc:1782 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1774 +#: Merge.rc:1783 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1775 +#: Merge.rc:1784 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1776 +#: Merge.rc:1785 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2812,7 +2823,7 @@ "Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:1781 +#: Merge.rc:1790 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2821,7 +2832,7 @@ "Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n" "Sobre" -#: Merge.rc:1782 +#: Merge.rc:1791 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2830,15 +2841,6 @@ "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:1788 -#: Merge.rc:1789 -#: Merge.rc:1790 -#: Merge.rc:1791 -#: Merge.rc:1792 -#: Merge.rc:1793 -#: Merge.rc:1794 -#: Merge.rc:1795 -#: Merge.rc:1796 #: Merge.rc:1797 #: Merge.rc:1798 #: Merge.rc:1799 @@ -2846,11 +2848,20 @@ #: Merge.rc:1801 #: Merge.rc:1802 #: Merge.rc:1803 +#: Merge.rc:1804 +#: Merge.rc:1805 +#: Merge.rc:1806 +#: Merge.rc:1807 +#: Merge.rc:1808 +#: Merge.rc:1809 +#: Merge.rc:1810 +#: Merge.rc:1811 +#: Merge.rc:1812 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1808 +#: Merge.rc:1817 #, c-format msgid "" "Switch to the next window pane\n" @@ -2859,7 +2870,7 @@ "Troca para o pr\xF3ximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:1809 +#: Merge.rc:1818 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2868,7 +2879,7 @@ "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:1815 +#: Merge.rc:1824 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2877,7 +2888,7 @@ "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:1816 +#: Merge.rc:1825 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2886,7 +2897,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:1817 +#: Merge.rc:1826 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2895,7 +2906,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:1823 +#: Merge.rc:1832 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2904,7 +2915,7 @@ "Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Copiar" -#: Merge.rc:1824 +#: Merge.rc:1833 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2913,7 +2924,7 @@ "Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Cortar" -#: Merge.rc:1825 +#: Merge.rc:1834 #, c-format msgid "" "Find the specified text\n" @@ -2922,7 +2933,7 @@ "Achar o texto especificado\n" "Achar" -#: Merge.rc:1826 +#: Merge.rc:1835 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2931,7 +2942,7 @@ "Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n" "Colar" -#: Merge.rc:1827 +#: Merge.rc:1836 #, c-format msgid "" "Repeat the last action\n" @@ -2940,7 +2951,7 @@ "Repetir a \xFAltima a\xE7\xE3o\n" "Repetir" -#: Merge.rc:1828 +#: Merge.rc:1837 #, c-format msgid "" "Replace specific text with different text\n" @@ -2949,7 +2960,7 @@ "Substitui o texto espec\xEDfico com um texto diferente\n" "Substituir" -#: Merge.rc:1829 +#: Merge.rc:1838 #, c-format msgid "" "Select the entire document\n" @@ -2958,7 +2969,7 @@ "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:1830 +#: Merge.rc:1839 #, c-format msgid "" "Undo the last action\n" @@ -2967,7 +2978,7 @@ "Desfazer a \xFAltima a\xE7\xE3o\n" "Desfazer" -#: Merge.rc:1831 +#: Merge.rc:1840 #, c-format msgid "" "Redo the previously undone action\n" @@ -2976,7 +2987,7 @@ "Refazer a a\xE7\xE3o desfeita anteriormente\n" "Refazer" -#: Merge.rc:1837 +#: Merge.rc:1846 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2985,7 +2996,7 @@ "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:1838 +#: Merge.rc:1847 #, c-format msgid "" "Show or hide the status bar\n" @@ -2994,7 +3005,7 @@ "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:1839 +#: Merge.rc:1848 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3003,7 +3014,7 @@ "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:1840 +#: Merge.rc:1849 #, c-format msgid "" "Automatically resize panes\n" @@ -3012,57 +3023,57 @@ "Automaticamente redimensionar os pain\xE9is\n" "Trancar os Pain\xE9is" -#: Merge.rc:1846 +#: Merge.rc:1855 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:1847 +#: Merge.rc:1856 #, c-format msgid "Change the window position" msgstr "Mudar a posi\xE7\xE3o da janela" -#: Merge.rc:1848 +#: Merge.rc:1857 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um \xEDcone" -#: Merge.rc:1849 +#: Merge.rc:1858 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:1850 +#: Merge.rc:1859 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a pr\xF3xima janela do documento" -#: Merge.rc:1851 +#: Merge.rc:1860 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:1852 +#: Merge.rc:1861 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:1857 +#: Merge.rc:1866 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:1858 +#: Merge.rc:1867 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:1859 +#: Merge.rc:1868 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1865 +#: Merge.rc:1874 #, c-format msgid "" "Close print preview mode\n" @@ -3071,7 +3082,7 @@ "Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n" "Cancelar a Pr\xE9-Visualiza\xE7\xE3o" -#: Merge.rc:1872 +#: Merge.rc:1881 #, c-format msgid "" "\n" @@ -3090,7 +3101,7 @@ "WinMerge.FileCompare\n" "Compara\xE7\xE3o dos Arquivos do WinMerge" -#: Merge.rc:1873 +#: Merge.rc:1882 #, c-format msgid "" "\n" @@ -3109,23 +3120,23 @@ "WinMerge.FolderCompare\n" "Compara\xE7\xE3o das Pastas do WinMerge" -#: Merge.rc:1880 +#: Merge.rc:1889 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:1887 +#: Merge.rc:1896 #, c-format msgid "Press any key" msgstr "Pressione qualquer tecla" -#: Merge.rc:1893 -#: Merge.rc:1894 +#: Merge.rc:1902 +#: Merge.rc:1903 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:1900 +#: Merge.rc:1909 #, c-format msgid "" "Developers:\n" @@ -3134,157 +3145,157 @@ "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1901 +#: Merge.rc:1910 #, 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 vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes." -#: Merge.rc:1907 +#: Merge.rc:1916 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1909 +#: Merge.rc:1918 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:1910 +#: Merge.rc:1919 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:1911 +#: Merge.rc:1920 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1912 +#: Merge.rc:1921 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:1913 +#: Merge.rc:1922 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:1919 +#: Merge.rc:1928 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:1920 +#: Merge.rc:1929 #, c-format msgid "&No" msgstr "&N\xE3o" -#: Merge.rc:1921 +#: Merge.rc:1930 #, c-format msgid "No to a&ll" msgstr "N\xE3o para t&odos" -#: Merge.rc:1922 +#: Merge.rc:1931 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1923 +#: Merge.rc:1932 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:1924 +#: Merge.rc:1933 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:1926 +#: Merge.rc:1935 #, c-format msgid "Don't display this &message again." msgstr "N\xE3o exibir esta &mensagem de novo." -#: Merge.rc:1927 +#: Merge.rc:1936 #, c-format msgid "Don't ask this &question again." msgstr "N\xE3o perguntar esta &quest\xE3o de novo." -#: Merge.rc:1937 +#: Merge.rc:1946 #, c-format msgid "Syntax colors" msgstr "Cores da sintaxe" -#: Merge.rc:1938 +#: Merge.rc:1947 #, c-format msgid "Text Colors" msgstr "Cores do Texto" -#: Merge.rc:1940 +#: Merge.rc:1949 #, c-format msgid "Version Control" msgstr "Controle da Vers\xE3o" -#: Merge.rc:1950 +#: Merge.rc:1960 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:1951 +#: Merge.rc:1961 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:1952 +#: Merge.rc:1962 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:1953 +#: Merge.rc:1963 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:1954 +#: Merge.rc:1964 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:1960 +#: Merge.rc:1970 #, c-format msgid "Version %1" msgstr "Vers\xE3o %1" -#: Merge.rc:1961 +#: Merge.rc:1971 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1962 +#: Merge.rc:1972 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:1968 +#: Merge.rc:1978 #, c-format msgid "Options (%1)" msgstr "Op\xE7\xF5es (%1)" -#: Merge.rc:1969 +#: Merge.rc:1979 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo." -#: Merge.rc:1970 +#: Merge.rc:1980 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada." -#: Merge.rc:1971 +#: Merge.rc:1981 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis." -#: Merge.rc:1973 +#: Merge.rc:1983 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3295,7 +3306,7 @@ "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:1975 +#: Merge.rc:1985 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3306,129 +3317,129 @@ "\n" "Por favor reinicie o WinMerge ap\xF3s o reset." -#: Merge.rc:1981 +#: Merge.rc:1991 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1982 +#: Merge.rc:1992 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1983 +#: Merge.rc:1993 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1984 +#: Merge.rc:1994 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1986 +#: Merge.rc:1996 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2002 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1993 +#: Merge.rc:2003 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1994 +#: Merge.rc:2004 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2000 +#: Merge.rc:2010 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:2001 +#: Merge.rc:2011 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:2002 +#: Merge.rc:2012 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:2003 +#: Merge.rc:2013 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2009 +#: Merge.rc:2019 #, c-format msgid "Full Contents" msgstr "Conte\xFAdos Completos" -#: Merge.rc:2010 +#: Merge.rc:2020 #, c-format msgid "Quick Contents" msgstr "Conte\xFAdos R\xE1pidos" -#: Merge.rc:2011 +#: Merge.rc:2021 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:2012 +#: Merge.rc:2022 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:2013 +#: Merge.rc:2023 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:2019 -#: Merge.rc:2643 +#: Merge.rc:2029 +#: Merge.rc:2653 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2020 +#: Merge.rc:2030 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2021 +#: Merge.rc:2031 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2022 +#: Merge.rc:2032 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2023 -#: Merge.rc:2645 +#: Merge.rc:2033 +#: Merge.rc:2655 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" -#: Merge.rc:2024 +#: Merge.rc:2034 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2025 +#: Merge.rc:2035 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2027 +#: Merge.rc:2037 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3441,7 +3452,7 @@ "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2029 +#: Merge.rc:2039 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3454,7 +3465,7 @@ "\n" "Por favor tenha certeza de que a pasta exista e \xE9 grav\xE1vel." -#: Merge.rc:2031 +#: Merge.rc:2041 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3465,7 +3476,7 @@ "\n" "Por favor selecione a pasta do filtro em Op\xE7\xF5es/Sistema." -#: Merge.rc:2033 +#: Merge.rc:2043 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3478,12 +3489,12 @@ "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2034 +#: Merge.rc:2044 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2036 +#: Merge.rc:2046 #, c-format msgid "" "Installing filter file failed.\n" @@ -3494,17 +3505,17 @@ "\n" "N\xE3o p\xF4de copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2038 +#: Merge.rc:2048 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro j\xE1 existe. Sobrescrever o filtro existente?" -#: Merge.rc:2044 +#: Merge.rc:2054 #, c-format msgid "Regular expression" msgstr "Express\xE3o regular" -#: Merge.rc:2050 +#: Merge.rc:2060 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3515,203 +3526,203 @@ "\n" "Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde." -#: Merge.rc:2057 +#: Merge.rc:2067 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2063 +#: Merge.rc:2073 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Compara\xE7\xE3o dos Pastas" -#: Merge.rc:2064 +#: Merge.rc:2074 #, c-format msgid "File Comparison" msgstr "Compara\xE7\xE3o de Arquivo" -#: Merge.rc:2065 +#: Merge.rc:2075 #, c-format msgid "Untitled left" msgstr "Sem t\xEDtulo a esquerda" -#: Merge.rc:2066 +#: Merge.rc:2076 #, c-format msgid "Untitled right" msgstr "Sem t\xEDtulo a direita" -#: Merge.rc:2067 +#: Merge.rc:2077 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2068 +#: Merge.rc:2078 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2074 +#: Merge.rc:2084 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2075 +#: Merge.rc:2085 #, c-format msgid "Opening selection" msgstr "Abrindo a sele\xE7\xE3o" -#: Merge.rc:2076 +#: Merge.rc:2086 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2077 +#: Merge.rc:2087 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2078 +#: Merge.rc:2088 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2079 +#: Merge.rc:2089 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2080 +#: Merge.rc:2090 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2081 +#: Merge.rc:2091 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2082 +#: Merge.rc:2092 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2083 +#: Merge.rc:2093 #, c-format msgid "Creating the report..." msgstr "Criando o relat\xF3rio..." -#: Merge.rc:2084 +#: Merge.rc:2094 #, c-format msgid "Undoing the last operation..." msgstr "Desfazendo a \xFAltima opera\xE7\xE3o..." -#: Merge.rc:2085 +#: Merge.rc:2095 #, c-format msgid "Redoing the previous operation..." msgstr "Refazendo a opera\xE7\xE3o anterior" -#: Merge.rc:2091 +#: Merge.rc:2101 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" -#: Merge.rc:2092 +#: Merge.rc:2102 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2093 +#: Merge.rc:2103 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2094 +#: Merge.rc:2104 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2095 +#: Merge.rc:2105 #, c-format msgid "Difference %1 of %2" msgstr "Diferen\xE7a %1 de %2" -#: Merge.rc:2096 +#: Merge.rc:2106 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferen\xE7as Achadas" -#: Merge.rc:2097 +#: Merge.rc:2107 #, c-format msgid "1 Difference Found" msgstr "1 Diferen\xE7a Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2098 +#: Merge.rc:2108 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2104 +#: Merge.rc:2114 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2105 +#: Merge.rc:2115 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2111 +#: Merge.rc:2121 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2112 +#: Merge.rc:2122 #, c-format msgid "Folder Selection" msgstr "Sele\xE7\xE3o de Pastas" -#: Merge.rc:2113 +#: Merge.rc:2123 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2114 +#: Merge.rc:2124 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo \xE9 inv\xE1lido!" -#: Merge.rc:2115 +#: Merge.rc:2125 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito \xE9 inv\xE1lido!" -#: Merge.rc:2116 +#: Merge.rc:2126 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos s\xE3o inv\xE1lidos!" -#: Merge.rc:2117 +#: Merge.rc:2127 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a sele\xE7\xE3o do desempacotador." -#: Merge.rc:2118 +#: Merge.rc:2128 #, c-format msgid "Cannot compare file and folder!" msgstr "N\xE3o p\xF4de comparar o arquivo e a pasta!" -#: Merge.rc:2124 +#: Merge.rc:2134 #, c-format msgid "File not found: %1" msgstr "Arquivo n\xE3o achado: %1" -#: Merge.rc:2125 +#: Merge.rc:2135 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo n\xE3o desempacotado: %1" -#: Merge.rc:2126 +#: Merge.rc:2136 #, c-format msgid "" "Cannot open file\n" @@ -3724,12 +3735,12 @@ "\n" "%2" -#: Merge.rc:2127 +#: Merge.rc:2137 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2128 +#: Merge.rc:2138 #, c-format msgid "" "The file\n" @@ -3740,32 +3751,32 @@ "%1\n" "n\xE3o \xE9 um arquivo de conflito." -#: Merge.rc:2134 +#: Merge.rc:2144 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2135 +#: Merge.rc:2145 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudan\xE7as em %1?" -#: Merge.rc:2136 +#: Merge.rc:2146 #, c-format ms... [truncated message content] |
From: <ki...@us...> - 2009-01-23 15:42:58
|
Revision: 6369 http://winmerge.svn.sourceforge.net/winmerge/?rev=6369&view=rev Author: kimmov Date: 2009-01-23 15:42:56 +0000 (Fri, 23 Jan 2009) Log Message: ----------- BUG: [ 2493980 ] Compare Window: Difference 4 of 1 Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/DiffList.cpp branches/R2_12/Src/DiffList.h branches/R2_12/Src/MergeDoc.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-22 23:36:05 UTC (rev 6368) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-23 15:42:56 UTC (rev 6369) @@ -17,6 +17,7 @@ Bugfix: Location pane was empty for some files with diffs (#2459234) Bugfix: Line filter editing didn't update edit box when editing was canceled by ESC key (#2493935) + Bugfix: Wrong number shown for difference when using line filters (#2493980) Translation updates: - Brazilian (#2461443, #2524796) - Czech (r6201) Modified: branches/R2_12/Src/DiffList.cpp =================================================================== --- branches/R2_12/Src/DiffList.cpp 2009-01-22 23:36:05 UTC (rev 6368) +++ branches/R2_12/Src/DiffList.cpp 2009-01-23 15:42:56 UTC (rev 6369) @@ -125,6 +125,28 @@ } /** + * @brief Get significant difference index of the diff. + * This function returns the index of diff when only significant differences + * are calculated. + * @param [in] nDiff Index of difference to check. + * @return Significant difference index of the diff. + */ +int DiffList::GetSignificantIndex(int nDiff) const +{ + int significants = -1; + + for (int i = 0; i <= nDiff; i++) + { + const DIFFRANGE * dfi = DiffRangeAt(i); + if (dfi->op != OP_TRIVIAL) + { + ++significants; + } + } + return significants; +} + +/** * @brief Returns copy of DIFFRANGE from diff-list. * @param [in] nDiff Index of DIFFRANGE to return. * @param [out] di DIFFRANGE returned (empty if error) Modified: branches/R2_12/Src/DiffList.h =================================================================== --- branches/R2_12/Src/DiffList.h 2009-01-22 23:36:05 UTC (rev 6368) +++ branches/R2_12/Src/DiffList.h 2009-01-23 15:42:56 UTC (rev 6369) @@ -137,6 +137,7 @@ int GetSignificantDiffs() const; void AddDiff(const DIFFRANGE & di); bool IsDiffSignificant(int nDiff) const; + int GetSignificantIndex(int nDiff) const; bool GetDiff(int nDiff, DIFFRANGE & di) const; bool SetDiff(int nDiff, const DIFFRANGE & di); int LineRelDiff(UINT nLine, UINT nDiff) const; Modified: branches/R2_12/Src/MergeDoc.cpp =================================================================== --- branches/R2_12/Src/MergeDoc.cpp 2009-01-22 23:36:05 UTC (rev 6368) +++ branches/R2_12/Src/MergeDoc.cpp 2009-01-23 15:42:56 UTC (rev 6369) @@ -1534,7 +1534,12 @@ } /** - * @brief Update diff-number pane text + * @brief Update diff-number pane text in file compare. + * The diff number pane shows selected difference/amount of differences when + * there is difference selected. If there is no difference selected, then + * the panel shows amount of differences. If there are ignored differences, + * those are not count into numbers. + * @param [in] pCmdUI UI component to update. */ void CMergeDoc::OnUpdateStatusNum(CCmdUI* pCmdUI) { @@ -1560,7 +1565,8 @@ else { s = theApp.LoadString(IDS_DIFF_NUMBER_STATUS_FMT); - string_replace(s, _T("%1"), _itot(GetCurrentDiff() + 1, sIdx, 10)); + const int signInd = m_diffList.GetSignificantIndex(GetCurrentDiff()); + string_replace(s, _T("%1"), _itot(signInd + 1, sIdx, 10)); string_replace(s, _T("%2"), _itot(nDiffs, sCnt, 10)); } pCmdUI->SetText(s.c_str()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-25 17:57:31
|
Revision: 6376 http://winmerge.svn.sourceforge.net/winmerge/?rev=6376&view=rev Author: kimmov Date: 2009-01-25 17:57:29 +0000 (Sun, 25 Jan 2009) Log Message: ----------- Remove Frhed hex editor from GUI (context menu) Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/DirView.cpp branches/R2_12/Src/Merge.rc branches/R2_12/Src/resource.h Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-24 13:37:45 UTC (rev 6375) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-25 17:57:29 UTC (rev 6376) @@ -7,6 +7,7 @@ Update Python syntax highlight keywords for Python 2.6 (#2473375) More accurate visible area rect in location pane (#2479804) New options page for Shell Integration options (#2433648) + Remove Frhed hex editor from GUI (context menu) (r6376) Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size Modified: branches/R2_12/Src/DirView.cpp =================================================================== --- branches/R2_12/Src/DirView.cpp 2009-01-24 13:37:45 UTC (rev 6375) +++ branches/R2_12/Src/DirView.cpp 2009-01-25 17:57:29 UTC (rev 6376) @@ -234,8 +234,6 @@ ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE, OnUpdateMergeCompare) ON_COMMAND(ID_MERGE_COMPARE_XML, OnMergeCompareXML) ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_XML, OnUpdateMergeCompare) - ON_COMMAND(ID_MERGE_COMPARE_HEX, OnMergeCompareHex) - ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_HEX, OnUpdateMergeCompare) ON_COMMAND(ID_VIEW_TREEMODE, OnViewTreeMode) ON_UPDATE_COMMAND_UI(ID_VIEW_TREEMODE, OnUpdateViewTreeMode) ON_COMMAND(ID_VIEW_EXPAND_ALLSUBDIRS, OnViewExpandAllSubdirs) Modified: branches/R2_12/Src/Merge.rc =================================================================== --- branches/R2_12/Src/Merge.rc 2009-01-24 13:37:45 UTC (rev 6375) +++ branches/R2_12/Src/Merge.rc 2009-01-25 17:57:29 UTC (rev 6376) @@ -503,7 +503,6 @@ POPUP "Co&mpare Special" BEGIN MENUITEM "&XML", ID_MERGE_COMPARE_XML - MENUITEM "&HEX", ID_MERGE_COMPARE_HEX END MENUITEM SEPARATOR POPUP "&Copy" Modified: branches/R2_12/Src/resource.h =================================================================== --- branches/R2_12/Src/resource.h 2009-01-24 13:37:45 UTC (rev 6375) +++ branches/R2_12/Src/resource.h 2009-01-25 17:57:29 UTC (rev 6376) @@ -949,7 +949,6 @@ #define ID_TOOLS_GENERATEREPORT 32868 #define ID_MERGE_COMPARE 32869 #define ID_MERGE_COMPARE_XML 32870 -#define ID_MERGE_COMPARE_HEX 32871 #define ID_UNPACK_MANUAL 32880 #define ID_UNPACK_AUTO 32881 #define ID_POPUP_OPEN_WITH_UNPACKER 32882 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-27 14:32:54
|
Revision: 6385 http://winmerge.svn.sourceforge.net/winmerge/?rev=6385&view=rev Author: kimmov Date: 2009-01-27 14:32:47 +0000 (Tue, 27 Jan 2009) Log Message: ----------- BUG: [ 2536582 ] Register.bat should use Find with full path. Fix submitted by Joe Kidd Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Docs/Users/Contributors.txt branches/R2_12/ShellExtension/Register.bat Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 14:30:07 UTC (rev 6384) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 14:32:47 UTC (rev 6385) @@ -8,6 +8,7 @@ More accurate visible area rect in location pane (#2479804) New options page for Shell Integration options (#2433648) Remove Frhed hex editor from GUI (context menu) (r6376) + Register.bat should use Find with full path (#2536582) Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size Modified: branches/R2_12/Docs/Users/Contributors.txt =================================================================== --- branches/R2_12/Docs/Users/Contributors.txt 2009-01-27 14:30:07 UTC (rev 6384) +++ branches/R2_12/Docs/Users/Contributors.txt 2009-01-27 14:32:47 UTC (rev 6385) @@ -141,6 +141,7 @@ * jwdevel * Ed_K * Alberto Kalb +* Joe Kidd <cas...@so...> * Robert Knienider * Ferenc Kubatovics * Ren\xE9 Leonhardt Modified: branches/R2_12/ShellExtension/Register.bat =================================================================== --- branches/R2_12/ShellExtension/Register.bat 2009-01-27 14:30:07 UTC (rev 6384) +++ branches/R2_12/ShellExtension/Register.bat 2009-01-27 14:32:47 UTC (rev 6385) @@ -32,7 +32,7 @@ Goto End :ExecuteRegSvr32 -Ver | Find "Version 6." > NUL +Ver | %WINDIR%\System32\Find "Version 6." > NUL IF NOT ERRORLEVEL 1 ( rem Windows Vista, Server 2008? Echo args="": For Each a in WScript.Arguments: args = args ^& """" ^& a ^& """ ": Next: CreateObject^("Shell.Application"^).ShellExecute "RegSvr32", args, "", "runas" > "%TEMP%\RegSvr32Elevated.vbs" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-27 19:19:12
|
Revision: 6388 http://winmerge.svn.sourceforge.net/winmerge/?rev=6388&view=rev Author: kimmov Date: 2009-01-27 19:19:09 +0000 (Tue, 27 Jan 2009) Log Message: ----------- PATCH: [ 2540115 ] update ChineseTraditional.po Submitted by wck3 Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Languages/ChineseTraditional.po Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:16:24 UTC (rev 6387) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:19:09 UTC (rev 6388) @@ -22,6 +22,7 @@ Bugfix: Wrong number shown for difference when using line filters (#2493980) Translation updates: - Brazilian (#2461443, #2524796) + - Chinese Traditional (#2540115) - Czech (r6201) - Dutch (#2481022, #2494378, #2499994) - Swedish (#2452467, #2465385, #2511043) Modified: branches/R2_12/Src/Languages/ChineseTraditional.po =================================================================== --- branches/R2_12/Src/Languages/ChineseTraditional.po 2009-01-27 19:16:24 UTC (rev 6387) +++ branches/R2_12/Src/Languages/ChineseTraditional.po 2009-01-27 19:19:09 UTC (rev 6388) @@ -12,9 +12,9 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-07-30 21:25+0000\n" -"PO-Revision-Date: 2008-08-06 17:00+0800\n" -"Last-Translator: \xC5Ǻ\xFB\xA5\xBF <wc...@pc...>\n" +"POT-Creation-Date: 2009-01-15 20:39+0000\n" +"PO-Revision-Date: 2009-01-27 19:11+0800\n" +"Last-Translator: wck <wc...@pc...>\n" "Language-Team: ChineseTraditional <win...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP950\n" @@ -680,7 +680,7 @@ #: Merge.rc:355 #, c-format msgid "&Undo\tCtrl+Z" -msgstr "\xB4_\xAD\xEC(&U)\tCtrl+Z" +msgstr "\xBAM\xA6^(&U)\tCtrl+Z" #: Merge.rc:356 #, c-format @@ -771,7 +771,7 @@ #: Merge.rc:393 #, c-format msgid "&Zoom" -msgstr "\xA9Ԫ\xF1\xA9Ի\xB7(&Z)" +msgstr "\xA9Ԫ\xF1\xB1\xC0\xBB\xB7(&Z)" #: Merge.rc:395 #, c-format @@ -886,7 +886,7 @@ #: Merge.rc:506 #, c-format msgid "&HEX" -msgstr "" +msgstr "HEX(&H)" #: Merge.rc:511 #, c-format @@ -1317,7 +1317,7 @@ #: Merge.rc:777 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" -msgstr "" +msgstr "\xB1Ұʮ\xC9\xC5\xE3\xA5ܡu\xBF\xEF\xBE\xDC\xC0ɮשθ\xEA\xAEƧ\xA8\xA1v\xB9\xEF\xB8ܤ\xE8\xB6\xF4" #: Merge.rc:779 #, c-format @@ -2062,8 +2062,12 @@ #: Merge.rc:1281 #, c-format -msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" +msgid "" +"Detect codepage info for these files: .html, .rc, .xml \n" +"need to restart session" msgstr "" +"\xB0\xBB\xB4\xFA\xAB᭱\xC0ɮת\xBA\xBDs\xBDX\xAD\xB6\xB8\xEA\xB0T\xA1G.html, .rc, .xml \n" +"\xAD\xAB\xB1Ұʫ\xE1\xA4~\xB0\xBB\xB4\xFA" #: Merge.rc:1284 #, c-format @@ -2078,7 +2082,7 @@ #: Merge.rc:1288 #, c-format msgid "Custom codepage:" -msgstr "" +msgstr "\xA6ۭq\xBDs\xBDX\xAD\xB6\xA1G" #: Merge.rc:1296 #, c-format @@ -2991,8 +2995,8 @@ "Redo the previously undone action\n" "Redo (Ctrl+Y)" msgstr "" -"\xAD\xAB\xB0\xB5\xA4W\xA6\xB8\xBAM\xA6^\xAA\xBA\xB0ʧ@\n" -"\xAD\xAB\xB0\xB5" +"\xA6A\xB0\xB5\xA4W\xA6\xB8\xAA\xBA\xBAM\xA6^\n" +"\xA6A\xB0\xB5" #: Merge.rc:1837 #, c-format @@ -3280,7 +3284,7 @@ #: Merge.rc:1962 #, c-format msgid "X64" -msgstr "" +msgstr "X64" #: Merge.rc:1968 #, c-format @@ -3537,7 +3541,7 @@ #: Merge.rc:2057 #, c-format msgid "&Path to SS.EXE:" -msgstr "" +msgstr "\xA6\xDC SS.EXE \xAA\xBA\xB8\xF4\xAE|(&P)" #: Merge.rc:2063 #, c-format @@ -3622,12 +3626,12 @@ #: Merge.rc:2084 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "\xBAM\xA6^\xA4W\xA6\xB8\xAA\xBA\xBEާ@..." #: Merge.rc:2085 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "\xA6A\xB0\xB5\xA4W\xA6\xB8\xAA\xBA\xBEާ@..." #: Merge.rc:2091 #, c-format @@ -3870,8 +3874,18 @@ #: Merge.rc:2146 #, c-format -msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" +msgid "" +"Another application has updated file\n" +"%1\n" +"since WinMerge scanned it last time.\n" +"\n" +"Do you want to reload the file?" msgstr "" +"WinMerge\xA4W\xA6\xB8\xB1\xBD\xB4y\xB9L\xC0ɮ\xD7\n" +"%1\n" +"\xAB\xE1\xA1A\xA8\xE4\xA5L\xC0\xB3\xA5ε{\xA6\xA1\xA4S\xA6A\xA7\xF3\xB7s\xA5\xA6\n" +"\n" +"\xADn\xAD\xAB\xB7s\xB8\xFC\xA4J\xA5\xA6\xB6ܡH" #: Merge.rc:2147 #, c-format @@ -4226,12 +4240,12 @@ #: Merge.rc:2257 #, c-format msgid "Left Shell menu" -msgstr "" +msgstr "\xA5\xAA\xC3䤶\xAD\xB1\xBF\xEF\xB3\xE6" #: Merge.rc:2258 #, c-format msgid "Right Shell menu" -msgstr "" +msgstr "\xA5k\xC3䤶\xAD\xB1\xBF\xEF\xB3\xE6" #: Merge.rc:2264 #, c-format @@ -4462,12 +4476,12 @@ #: Merge.rc:2333 #, c-format msgid "Text files are identical" -msgstr "" +msgstr "\xA4\xE5\xA6r\xC0ɤ\xBA\xAEe\xACۦP" #: Merge.rc:2338 #, c-format msgid "Text files are different" -msgstr "" +msgstr "\xA4\xE5\xA6r\xC0ɤ\xBA\xAEe\xA4\xA3\xA6P" #: Merge.rc:2344 #, c-format @@ -5681,7 +5695,7 @@ #: Merge.rc:2711 #, c-format msgid "Decrease text size" -msgstr "\xB4\xEE\xA4p\xA4\xE5\xA6r" +msgstr "\xC1Y\xA4p\xA4\xE5\xA6r" #: Merge.rc:2712 #, c-format @@ -6165,7 +6179,7 @@ #: Merge.rc:2846 #, c-format msgid "Verilog" -msgstr "" +msgstr "Verilog" #: Merge.rc:2847 #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-27 19:42:49
|
Revision: 6389 http://winmerge.svn.sourceforge.net/winmerge/?rev=6389&view=rev Author: kimmov Date: 2009-01-27 19:42:42 +0000 (Tue, 27 Jan 2009) Log Message: ----------- BUG: [ 2493945 ] Crash if one of the diffed file was erased by another applic Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/Merge.rc branches/R2_12/Src/MergeDoc.cpp branches/R2_12/Src/MergeDoc.h branches/R2_12/Src/resource.h Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:19:09 UTC (rev 6388) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:42:42 UTC (rev 6389) @@ -20,6 +20,8 @@ Bugfix: Line filter editing didn't update edit box when editing was canceled by ESC key (#2493935) Bugfix: Wrong number shown for difference when using line filters (#2493980) + Bugfix: Crashed if compared file disappeared during file compare (#2493945) + Bugfix: Creating new files caused message about missing files (#2515875) Translation updates: - Brazilian (#2461443, #2524796) - Chinese Traditional (#2540115) Modified: branches/R2_12/Src/Merge.rc =================================================================== --- branches/R2_12/Src/Merge.rc 2009-01-27 19:19:09 UTC (rev 6388) +++ branches/R2_12/Src/Merge.rc 2009-01-27 19:42:42 UTC (rev 6389) @@ -2155,6 +2155,7 @@ IDS_FILECHANGED_RESCAN "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" IDS_SAVE_LEFT_AS "Save Left File As" IDS_SAVE_RIGHT_AS "Save Right File As" + IDS_FILE_DISAPPEARED "The file\n%1\ndisappeared. Please save a copy of the file to continue." END // Editing/Merging file Modified: branches/R2_12/Src/MergeDoc.cpp =================================================================== --- branches/R2_12/Src/MergeDoc.cpp 2009-01-27 19:19:09 UTC (rev 6388) +++ branches/R2_12/Src/MergeDoc.cpp 2009-01-27 19:42:42 UTC (rev 6389) @@ -29,6 +29,7 @@ #include "StdAfx.h" #include <shlwapi.h> // PathCompactPathEx() +#include <io.h> #include "UnicodeString.h" #include "Merge.h" #include "MainFrm.h" @@ -384,8 +385,8 @@ DiffFileInfo fileInfo; BOOL diffSuccess; int nResult = RESCAN_OK; - bool bLeftFileChanged = false; - bool bRightFileChanged = false; + FileChange leftFileChanged = FileNoChange; + FileChange rightFileChanged = FileNoChange; if (!bForced) { @@ -403,12 +404,45 @@ m_diffWrapper.SetFilterList(_T("")); } - bLeftFileChanged = IsFileChangedOnDisk(m_filePaths.GetLeft().c_str(), fileInfo, - false, 0); - bRightFileChanged = IsFileChangedOnDisk(m_filePaths.GetRight().c_str(), fileInfo, - false, 1); + // Check if files have been modified since last rescan + // Ignore checking in case of scratchpads (empty filenames) + if (!m_filePaths.GetLeft().empty()) + { + leftFileChanged = IsFileChangedOnDisk(m_filePaths.GetLeft().c_str(), + fileInfo, false, 0); + } + if (!m_filePaths.GetRight().empty()) + { + rightFileChanged = IsFileChangedOnDisk(m_filePaths.GetRight().c_str(), + fileInfo, false, 1); + } m_LastRescan = COleDateTime::GetCurrentTime(); + if (leftFileChanged == FileRemoved) + { + CString msg; + LangFormatString1(msg, IDS_FILE_DISAPPEARED, m_filePaths.GetLeft().c_str()); + AfxMessageBox(msg, MB_ICONWARNING); + BOOL bSaveResult = FALSE; + bool ok = DoSaveAs(m_filePaths.GetLeft().c_str(), bSaveResult, 0); + if (!ok || !bSaveResult) + { + return RESCAN_FILE_ERR; + } + } + if (rightFileChanged == FileRemoved) + { + CString msg; + LangFormatString1(msg, IDS_FILE_DISAPPEARED, m_filePaths.GetRight().c_str()); + AfxMessageBox(msg); + BOOL bSaveResult = FALSE; + bool ok = DoSaveAs(m_filePaths.GetRight().c_str(), bSaveResult, 0); + if (!ok || !bSaveResult) + { + return RESCAN_FILE_ERR; + } + } + String temp1 = m_tempFiles[0].GetPath(); if (temp1.empty()) { @@ -539,7 +573,7 @@ m_pRescanFileInfo[0]->Update(m_filePaths.GetLeft().c_str()); m_pRescanFileInfo[1]->Update(m_filePaths.GetRight().c_str()); - if (bLeftFileChanged) + if (leftFileChanged == FileChanged) { CString msg; LangFormatString1(msg, IDS_FILECHANGED_RESCAN, m_filePaths.GetLeft().c_str()); @@ -548,7 +582,7 @@ ReloadDoc(0); } } - else if (bRightFileChanged) + else if (rightFileChanged == FileChanged) { CString msg; LangFormatString1(msg, IDS_FILECHANGED_RESCAN, m_filePaths.GetRight().c_str()); @@ -1065,12 +1099,12 @@ { DiffFileInfo fileInfo; CString strSavePath(szPath); - bool bFileChanged = false; + FileChange fileChanged; BOOL bApplyToAll = FALSE; int nRetVal = -1; - bFileChanged = IsFileChangedOnDisk(szPath, fileInfo, true, nBuffer); - if (bFileChanged) + fileChanged = IsFileChangedOnDisk(szPath, fileInfo, true, nBuffer); + if (fileChanged == FileChanged) { CString msg; LangFormatString1(msg, IDS_FILECHANGED_ONDISK, szPath); @@ -1789,7 +1823,7 @@ * @param [in] nBuffer Index (0-based) of buffer * @return TRUE if file is changed. */ -bool CMergeDoc::IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi, +CMergeDoc::FileChange CMergeDoc::IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi, bool bSave, int nBuffer) { DiffFileInfo *fileInfo = NULL; @@ -1804,6 +1838,10 @@ else fileInfo = m_pRescanFileInfo[nBuffer]; + // We assume file existed, so disappearing means removal + if (_taccess(szPath, 0) == -1) + return FileRemoved; + dfi.Update(szPath); __int64 timeDiff = dfi.mtime - fileInfo->mtime; @@ -1813,7 +1851,10 @@ bFileChanged = true; } - return bFileChanged; + if (bFileChanged) + return FileChanged; + else + return FileNoChange; } /** Modified: branches/R2_12/Src/MergeDoc.h =================================================================== --- branches/R2_12/Src/MergeDoc.h 2009-01-27 19:19:09 UTC (rev 6388) +++ branches/R2_12/Src/MergeDoc.h 2009-01-27 19:42:42 UTC (rev 6389) @@ -120,6 +120,14 @@ */ class CMergeDoc : public CDocument { +public: + enum FileChange + { + FileNoChange, + FileChanged, + FileRemoved, + }; + // Attributes public: CDiffTextBuffer *m_ptBuf[2]; /**< Left/Right side text buffer */ @@ -212,7 +220,7 @@ // Implementation public: - bool IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi, + FileChange IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi, bool bSave, int nBuffer); bool PromptAndSaveIfNeeded(BOOL bAllowCancel); std::vector<CMergeEditView*> undoTgt; Modified: branches/R2_12/Src/resource.h =================================================================== --- branches/R2_12/Src/resource.h 2009-01-27 19:19:09 UTC (rev 6388) +++ branches/R2_12/Src/resource.h 2009-01-27 19:42:42 UTC (rev 6389) @@ -590,6 +590,7 @@ #define IDS_FILECHANGED_RESCAN 17243 #define IDS_SAVE_LEFT_AS 17244 #define IDS_SAVE_RIGHT_AS 17245 +#define IDS_FILE_DISAPPEARED 17246 #define IDS_NOPROJECT 17264 #define IDS_VSS_CHECKOUT_STATUS 17265 #define IDS_VSSERROR 17266 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-01-27 19:47:46
|
Revision: 6390 http://winmerge.svn.sourceforge.net/winmerge/?rev=6390&view=rev Author: kimmov Date: 2009-01-27 19:47:40 +0000 (Tue, 27 Jan 2009) Log Message: ----------- BUG: [ 2528749 ] Disable "Show * Unique Items" don't hide folders Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/DirDoc.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:42:42 UTC (rev 6389) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:47:40 UTC (rev 6390) @@ -22,6 +22,7 @@ Bugfix: Wrong number shown for difference when using line filters (#2493980) Bugfix: Crashed if compared file disappeared during file compare (#2493945) Bugfix: Creating new files caused message about missing files (#2515875) + Bugfix: Could not hide folders in recursive compare (#2528749) Translation updates: - Brazilian (#2461443, #2524796) - Chinese Traditional (#2540115) Modified: branches/R2_12/Src/DirDoc.cpp =================================================================== --- branches/R2_12/Src/DirDoc.cpp 2009-01-27 19:42:42 UTC (rev 6389) +++ branches/R2_12/Src/DirDoc.cpp 2009-01-27 19:47:40 UTC (rev 6390) @@ -383,6 +383,12 @@ /** * @brief Determines if the user wants to see given item. + * This function determines what items to show and what items to hide. There + * are lots of combinations, but basically we check if menuitem is enabled or + * disabled and show/hide matching items. For non-recursive compare we never + * hide folders as that would disable user browsing into them. And we even + * don't really know if folders are identical or different as we haven't + * compared them. * @param [in] di Item to check. * @return TRUE if item should be shown, FALSE if not. * @sa CDirDoc::Redisplay() @@ -414,6 +420,24 @@ if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT)) return FALSE; } + else // recursive (perhaps tree?) mode + { + // result filters + if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors) + return FALSE; + + // result filters + if (di.diffcode.isResultSame() && !GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL)) + return FALSE; + if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT)) + return FALSE; + // left/right filters + if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT)) + return FALSE; + if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT)) + return FALSE; + + } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |