|
From: <ki...@us...> - 2009-03-05 17:03:33
|
Revision: 6538
http://winmerge.svn.sourceforge.net/winmerge/?rev=6538&view=rev
Author: kimmov
Date: 2009-03-05 17:03:31 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Merge Czech translation updates from trunk. Previous commit only updated the changelog, this updates also the PO file.
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Czech.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-05 16:59:10 UTC (rev 6537)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-05 17:03:31 UTC (rev 6538)
@@ -15,7 +15,7 @@
Translation updates:
- Chinese Traditional (#2608190)
- Croatian (#2596949)
- - Czech (r6534)
+ - Czech (r6538)
- Danish (#2648183)
- Dutch (#2586422, #2590430)
- French (#2603591)
Modified: branches/R2_12/Src/Languages/Czech.po
===================================================================
--- branches/R2_12/Src/Languages/Czech.po 2009-03-05 16:59:10 UTC (rev 6537)
+++ branches/R2_12/Src/Languages/Czech.po 2009-03-05 17:03:31 UTC (rev 6538)
@@ -2587,12 +2587,12 @@
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Syst\xE9mov\xE1 integrace"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Pr\xF9zkumn\xEDk"
#: Merge.rc:1675
#, c-format
@@ -2602,22 +2602,22 @@
#: Merge.rc:1677
#, c-format
msgid "In&clude subfolders by default"
-msgstr "V\xFDchoz\xED porovn\xE1n\xED v\xE8etn\xEC pod&slo\x9Eek"
+msgstr "&V\xFDchoz\xED porovn\xE1n\xED v\xE8etn\xEC podslo\x9Eek"
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "P\xF8idat do &syst\xE9mov\xE9 m\xEDstn\xED nab\xEDdky"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Porovn\xE1n\xED slo\x9Eek"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "P\xF8idat syst\xE9movou &m\xEDstn\xED nab\xEDdku"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -3816,8 +3816,8 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
-msgstr ""
+msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgstr "Soubor\n%1\nse ztratil. Pro pokra\xE8ov\xE1n\xED pros\xEDm ulo\x9Ete kopii souboru."
#: Merge.rc:2164
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-10 14:55:38
|
Revision: 6554
http://winmerge.svn.sourceforge.net/winmerge/?rev=6554&view=rev
Author: kimmov
Date: 2009-03-10 14:55:26 +0000 (Tue, 10 Mar 2009)
Log Message:
-----------
PATCH: [ 2670046 ] Extension Column is Empty.
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirViewColItems.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-09 14:06:45 UTC (rev 6553)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-10 14:55:26 UTC (rev 6554)
@@ -3,6 +3,9 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
+WinMerge 2.12.2
+ Bugfix: Filename extension column was empty for files (#2670046)
+
WinMerge 2.12.0 - 2009-03-05 (r6542)
Remember last target folder for Copy/Move to in folder compare (#2659228)
Detect Windows 7 and Windows 2008 in config log (#2599256)
Modified: branches/R2_12/Src/DirViewColItems.cpp
===================================================================
--- branches/R2_12/Src/DirViewColItems.cpp 2009-03-09 14:06:45 UTC (rev 6553)
+++ branches/R2_12/Src/DirViewColItems.cpp 2009-03-10 14:55:26 UTC (rev 6554)
@@ -198,7 +198,7 @@
// We don't show extension for folder names
if (di.diffcode.isDirectory())
return _T("");
- const String &r = di.left.path;
+ const String &r = di.left.filename;
LPCTSTR s = PathFindExtension(r.c_str());
return s + _tcsspn(s, _T("."));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-15 18:17:08
|
Revision: 6571
http://winmerge.svn.sourceforge.net/winmerge/?rev=6571&view=rev
Author: kimmov
Date: 2009-03-15 18:16:50 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
Bugfix: Crash when selecting backup folder (#2686382)
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/FileOrFolderSelect.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-15 17:30:19 UTC (rev 6570)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-15 18:16:50 UTC (rev 6571)
@@ -5,6 +5,7 @@
WinMerge 2.12.2
Bugfix: Filename extension column was empty for files (#2670046)
+ Bugfix: Crash when selecting backup folder (#2686382)
WinMerge 2.12.0 - 2009-03-05 (r6542)
Remember last target folder for Copy/Move to in folder compare (#2659228)
Modified: branches/R2_12/Src/FileOrFolderSelect.cpp
===================================================================
--- branches/R2_12/Src/FileOrFolderSelect.cpp 2009-03-15 17:30:19 UTC (rev 6570)
+++ branches/R2_12/Src/FileOrFolderSelect.cpp 2009-03-15 18:16:50 UTC (rev 6571)
@@ -153,14 +153,16 @@
UINT titleid /*=0*/,
HWND hwndOwner /*=NULL*/)
{
- UNREFERENCED_PARAMETER(root_path);
BROWSEINFO bi;
LPMALLOC pMalloc;
LPITEMIDLIST pidl;
TCHAR szPath[MAX_PATH] = {0};
BOOL bRet = FALSE;
String title = theApp.LoadString(titleid);
- LastSelectedFolder = root_path;
+ if (root_path == NULL)
+ LastSelectedFolder.clear();
+ else
+ LastSelectedFolder = root_path;
bi.hwndOwner = hwndOwner;
bi.pidlRoot = NULL; // Start from desktop folder
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-23 21:00:06
|
Revision: 6588
http://winmerge.svn.sourceforge.net/winmerge/?rev=6588&view=rev
Author: kimmov
Date: 2009-03-23 20:59:52 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
BUG: [ 2661838 ] 2.10.4.0 swap panes should swap stats too
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/MergeDoc.cpp
branches/R2_12/Src/MergeEditView.cpp
branches/R2_12/Src/MergeEditView.h
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-23 15:29:39 UTC (rev 6587)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-23 20:59:52 UTC (rev 6588)
@@ -6,6 +6,7 @@
WinMerge 2.12.2
Bugfix: Filename extension column was empty for files (#2670046)
Bugfix: Crash when selecting backup folder (#2686382)
+ bugfix: Swapping panes did not update statusbar (#2661838)
WinMerge 2.12.0 - 2009-03-05 (r6542)
Remember last target folder for Copy/Move to in folder compare (#2659228)
Modified: branches/R2_12/Src/MergeDoc.cpp
===================================================================
--- branches/R2_12/Src/MergeDoc.cpp 2009-03-23 15:29:39 UTC (rev 6587)
+++ branches/R2_12/Src/MergeDoc.cpp 2009-03-23 20:59:52 UTC (rev 6588)
@@ -2823,11 +2823,14 @@
m_ptBuf[1]->m_nThisPane = 1;
m_pView[MERGE_VIEW_RIGHT]->m_nThisPane = 1;
m_pDetailView[1]->m_nThisPane = 1;
+ swap(m_pView[MERGE_VIEW_LEFT]->m_piMergeEditStatus, m_pView[MERGE_VIEW_RIGHT]->m_piMergeEditStatus);
// Update views
UpdateHeaderPath(0);
UpdateHeaderPath(1);
GetParentFrame()->UpdateSplitter();
+ m_pView[MERGE_VIEW_LEFT]->UpdateStatusbar();
+ m_pView[MERGE_VIEW_RIGHT]->UpdateStatusbar();
UpdateAllViews(NULL);
}
Modified: branches/R2_12/Src/MergeEditView.cpp
===================================================================
--- branches/R2_12/Src/MergeEditView.cpp 2009-03-23 15:29:39 UTC (rev 6587)
+++ branches/R2_12/Src/MergeEditView.cpp 2009-03-23 20:59:52 UTC (rev 6588)
@@ -1756,6 +1756,14 @@
}
/**
+ * @brief Update status bar contents.
+ */
+void CMergeEditView::UpdateStatusbar()
+{
+ OnUpdateCaret();
+}
+
+/**
* @brief Update statusbar info, Override from CCrystalTextView
* @note we tab-expand column, but we don't tab-expand char count,
* since we want to show how many chars there are and tab is just one
Modified: branches/R2_12/Src/MergeEditView.h
===================================================================
--- branches/R2_12/Src/MergeEditView.h 2009-03-23 15:29:39 UTC (rev 6587)
+++ branches/R2_12/Src/MergeEditView.h 2009-03-23 20:59:52 UTC (rev 6588)
@@ -184,6 +184,7 @@
virtual void GetPrintHeaderText(int nPageNum, CString & text);
virtual void PrintHeader(CDC * pdc, int nPageNum);
virtual void PrintFooter(CDC * pdc, int nPageNum);
+ void UpdateStatusbar();
// to customize the mergeview menu
static HMENU createScriptsSubmenu(HMENU hMenu);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-25 10:43:06
|
Revision: 6596
http://winmerge.svn.sourceforge.net/winmerge/?rev=6596&view=rev
Author: kimmov
Date: 2009-03-25 10:43:00 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
BUG: [ 2672737 ] Wrong ""The selected files are identical." after F5
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/MergeDoc.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-25 08:49:02 UTC (rev 6595)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-25 10:43:00 UTC (rev 6596)
@@ -7,6 +7,8 @@
Bugfix: Filename extension column was empty for files (#2670046)
Bugfix: Crash when selecting backup folder (#2686382)
bugfix: Swapping panes did not update statusbar (#2661838)
+ Bugfix: Says files are identical after making files different in another
+ application and re-loading them (#2672737)
WinMerge 2.12.0 - 2009-03-05 (r6542)
Remember last target folder for Copy/Move to in folder compare (#2659228)
Modified: branches/R2_12/Src/MergeDoc.cpp
===================================================================
--- branches/R2_12/Src/MergeDoc.cpp 2009-03-25 08:49:02 UTC (rev 6595)
+++ branches/R2_12/Src/MergeDoc.cpp 2009-03-25 10:43:00 UTC (rev 6596)
@@ -443,6 +443,25 @@
}
}
+ if (leftFileChanged == FileChanged)
+ {
+ CString msg;
+ LangFormatString1(msg, IDS_FILECHANGED_RESCAN, m_filePaths.GetLeft().c_str());
+ if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
+ {
+ ReloadDoc(0);
+ }
+ }
+ else if (rightFileChanged == FileChanged)
+ {
+ CString msg;
+ LangFormatString1(msg, IDS_FILECHANGED_RESCAN, m_filePaths.GetRight().c_str());
+ if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
+ {
+ ReloadDoc(1);
+ }
+ }
+
String temp1 = m_tempFiles[0].GetPath();
if (temp1.empty())
{
@@ -573,24 +592,6 @@
m_pRescanFileInfo[0]->Update(m_filePaths.GetLeft().c_str());
m_pRescanFileInfo[1]->Update(m_filePaths.GetRight().c_str());
- if (leftFileChanged == FileChanged)
- {
- CString msg;
- LangFormatString1(msg, IDS_FILECHANGED_RESCAN, m_filePaths.GetLeft().c_str());
- if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
- {
- ReloadDoc(0);
- }
- }
- else if (rightFileChanged == FileChanged)
- {
- CString msg;
- LangFormatString1(msg, IDS_FILECHANGED_RESCAN, m_filePaths.GetRight().c_str());
- if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
- {
- ReloadDoc(1);
- }
- }
return nResult;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-29 09:41:31
|
Revision: 6612
http://winmerge.svn.sourceforge.net/winmerge/?rev=6612&view=rev
Author: kimmov
Date: 2009-03-29 09:41:24 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
PATCH: [ 2717382 ] Polish Update files for Branch+Trunk
Submitted by M.T <mt...@us...>
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Contributors.txt
branches/R2_12/Installer/InnoSetup/Languages/Polish.isl
branches/R2_12/Src/Languages/Polish.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-29 09:37:27 UTC (rev 6611)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-29 09:41:24 UTC (rev 6612)
@@ -9,6 +9,8 @@
bugfix: Swapping panes did not update statusbar (#2661838)
Bugfix: Says files are identical after making files different in another
application and re-loading them (#2672737)
+ Translation updates:
+ - Polish (#2717382)
WinMerge 2.12.0 - 2009-03-05 (r6542)
Remember last target folder for Copy/Move to in folder compare (#2659228)
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2009-03-29 09:37:27 UTC (rev 6611)
+++ branches/R2_12/Docs/Users/Contributors.txt 2009-03-29 09:41:24 UTC (rev 6612)
@@ -89,6 +89,7 @@
Hans Fredrik Nordhaug <ha...@us...>
* Polish:
+ M.T <mt...@us...>
Skiff <ski...@us...>
Pawel Wawrzysko <tr...@kk...>
Modified: branches/R2_12/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- branches/R2_12/Installer/InnoSetup/Languages/Polish.isl 2009-03-29 09:37:27 UTC (rev 6611)
+++ branches/R2_12/Installer/InnoSetup/Languages/Polish.isl 2009-03-29 09:41:24 UTC (rev 6612)
@@ -324,50 +324,50 @@
Plugins=Wtyczki
;Localization Components
-Languages=Jezyki
-BulgarianLanguage=Bulgarski interfejs
-CatalanLanguage=Katalonski interfejs
-ChineseSimplifiedLanguage=Chinski (uproszczony) interfejs
-ChineseTraditionalLanguage=Chinski (tradycyjny) interfejs
-CroatianLanguage=Croatian menus and dialogs
+Languages=J\xEAzyki
+BulgarianLanguage=Bu\xB3garski interfejs
+CatalanLanguage=Katalo\xF1ski interfejs
+ChineseSimplifiedLanguage=Chi\xF1ski (uproszczony) interfejs
+ChineseTraditionalLanguage=Chi\xF1ski (tradycyjny) interfejs
+CroatianLanguage=Chorwacki interfejs
CzechLanguage=Czeski interfejs
-DanishLanguage=Dunski interfejs
+DanishLanguage=Du\xF1ski interfejs
DutchLanguage=Holenderski interfejs
FrenchLanguage=Francuski interfejs
-GalicianLanguage=Galician menus and dialogs
+GalicianLanguage=Galisyjski interfejs
GermanLanguage=Niemiecki interfejs
-GreekLanguage=Greek menus and dialogs
-HungarianLanguage=Wegierski interfejs
-ItalianLanguage=Wloski interfejs
-JapaneseLanguage=Japonski interfejs
-KoreanLanguage=Koreanski interfejs
+GreekLanguage=Grecki interfejs
+HungarianLanguage=W\xEAgierski interfejs
+ItalianLanguage=W\xB3oski interfejs
+JapaneseLanguage=Japo\xF1ski interfejs
+KoreanLanguage=Korea\xF1ski interfejs
NorwegianLanguage=Norweski interfejs
PolishLanguage=Polski interfejs
PortugueseBrazilLanguage=Portugalski (Brazylijski) interfejs
PortugueseLanguage=Portugalski interfejs
-RomanianLanguage=Romanian menus and dialogs
+RomanianLanguage=Rumu\xF1ski interfejs
RussianLanguage=Rosyjski interfejs
-SlovakLanguage=Slowacki interfejs
-SlovenianLanguage=Slovenian menus and dialogs
-SpanishLanguage=Hiszpanski interfejs
+SlovakLanguage=S\xB3owacki interfejs
+SlovenianLanguage=S\xB3owe\xF1ski interfejs
+SpanishLanguage=Hiszpa\xF1ski interfejs
SwedishLanguage=Szwedzki interfejs
-TurkishLanguage=turecki interfejs
-UkrainianLanguage=Ukrainian menus and dialogs
+TurkishLanguage=Turecki interfejs
+UkrainianLanguage=Ukrai\xF1ski interfejs
;Tasks
-ExplorerContextMenu=&Wlacz integracje z menu Eksploratora
+ExplorerContextMenu=&W\xB3\xB9cz integracj\xEA z menu Eksploratora
IntegrateTortoiseCVS=Integracja z &TortoiseCVS
IntegrateTortoiseSVN=Integracja z T&ortoiseSVN
IntegrateClearCase=Integracja z Rational &ClearCase
-AddToPath=&Add WinMerge folder to your system path
+AddToPath=&Dodaj katalog WinMerge do \x9Ccie\xBFki systemowej
;Icon Labels
ReadMe=Czytaj to
-UsersGuide=Przewodnik uzytkownika
-ViewStartMenuFolder=&Podglad katalogu menu Start programu WinMerge
+UsersGuide=Przewodnik u\xBFytkownika
+ViewStartMenuFolder=&Podgl\xB9d katalogu menu Start programu WinMerge
;Code Dialogs
-DeletePreviousStartMenu=Instalator wykryl, ze zmieniles lokalizacje menu startowego z "%s" na "%s". Czy usunac poprzedni katalog menu startowego?
+DeletePreviousStartMenu=Instalator wykry\xB3, \xBFe zmieni\xB3e\x9C lokalizacj\xEA menu startowego z "%s" na "%s". Czy usun\xB9\xE6 poprzedni katalog menu startowego?
; Project file description
-ProjectFileDesc=WinMerge Project file
+ProjectFileDesc=Plik projektu WinMerge
Modified: branches/R2_12/Src/Languages/Polish.po
===================================================================
--- branches/R2_12/Src/Languages/Polish.po 2009-03-29 09:37:27 UTC (rev 6611)
+++ branches/R2_12/Src/Languages/Polish.po 2009-03-29 09:41:24 UTC (rev 6612)
@@ -4,6 +4,7 @@
# Translators:
# * Pawel Wawrzysko <traduc at kki.pl>
# * Skiff <skiffatsf at users.sourceforge.net>
+# * Micha\xB3 Trzebiatowski <hip...@ho...>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -13,8 +14,8 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-04-04 10:19+0100\n"
-"Last-Translator: Skiff\n"
+"PO-Revision-Date: 2009-03-27 17:38+0100\n"
+"Last-Translator: Micha\xB3 Trzebiatowski <hip...@ho...>\n"
"Language-Team: Polish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1250\n"
@@ -286,7 +287,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
#: Merge.rc:152
#: Merge.rc:273
@@ -504,17 +505,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Tryb drzewa"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "&Rozwi\xF1 wszystkie podkatalogi"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Zwi\xF1 wszystkie podkatalogi"
#: Merge.rc:239
#, c-format
@@ -1298,7 +1299,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Pokazuj okno startowe \"Wybierz pliki lub katalogi\""
#: Merge.rc:776
#, c-format
@@ -2023,8 +2024,12 @@
#: Merge.rc:1271
#, 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 ""
+"Wykrywa informacje strony kodowej dla tych plik\xF3w: .html, .rc, .xml \n"
+"konieczne jest ponowne uruchomienie sesji"
#: Merge.rc:1274
#, c-format
@@ -2039,7 +2044,7 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Strona kodowa u\xBFytkownika:"
#: Merge.rc:1286
#, c-format
@@ -2202,7 +2207,7 @@
#: Merge.rc:1361
#, c-format
msgid "Preprocessor:"
-msgstr ""
+msgstr "Preprocesor:"
#: Merge.rc:1362
#, c-format
@@ -2582,23 +2587,23 @@
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Wtyczki"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&W\xB3\xB9cz wtyczki"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integracja shella"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Eksplorator"
#: Merge.rc:1675
#, c-format
@@ -2613,17 +2618,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&Dodaj do menu kontekstowego"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Por\xF3wnywanie katalog\xF3w"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "Dodaj menu &shella do menu kontekstowego"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2761,17 +2766,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Prze\xB3\xB9cz tryb drzewa"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Rozwi\xF1 wszystkie podkatalogi"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Zwi\xF1 wszystkie podkatalogi"
#: Merge.rc:1778
#, c-format
@@ -3266,7 +3271,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3510,13 +3515,19 @@
#: Merge.rc:2059
#, 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 ""
+"Filtry zosta\xB3y zaktualizowane. Czy chcesz od\x9Cwie\xBFy\xE6 wszystkie otwarte por\xF3wnywania katalog\xF3w?\n"
+"\n"
+"Je\x9Cli nie chcesz teraz od\x9Cwie\xBFy\xE6 wszystkich por\xF3wnywa\xF1, mo\xBFesz wybra\xE6 Nie i od\x9Cwie\xBFy\xE6 por\xF3wnania p\xF3\x9Fniej."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "\x8Ccie\xBFka do &SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3601,12 +3612,12 @@
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Cofam ostatni\xB9 operacj\xEA..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Powtarzam poprzedni\xB9 operacj\xEA..."
#: Merge.rc:2100
#, c-format
@@ -3849,8 +3860,18 @@
#: Merge.rc:2155
#, 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 ""
+"Inna aplikacja zaktualizowa\xB3a plik\n"
+"%1\n"
+"od ostatniego skanowania z WinMerge.\n"
+"\n"
+"Czy chcesz od\x9Cwie\xBFy\xE6 plik?"
#: Merge.rc:2156
#, c-format
@@ -3864,8 +3885,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"Plik\n"
+"%1\n"
+"znikn\xB9\xB3. Prosz\xEA zapisa\xE6 kopi\xEA pliku, aby kontynuowa\xE6."
#: Merge.rc:2164
#, c-format
@@ -4138,17 +4165,17 @@
#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Czy na pewno przenie\x9C\xE6:"
#: Merge.rc:2242
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Czy na pewno przenie\x9C\xE6 %d element\xF3w:"
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Potwierd\x9F przenoszenie"
#: Merge.rc:2250
#, c-format
@@ -4213,12 +4240,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Lewe menu shella"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Prawe menu shella"
#: Merge.rc:2274
#, c-format
@@ -4429,7 +4456,7 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Katalogi s\xB9 r\xF3\xBFne"
#: Merge.rc:2339
#, c-format
@@ -4449,12 +4476,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "Pliki tekstowe s\xB9 identyczne"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "Pliki tekstowe s\xB9 r\xF3\xBFne"
#: Merge.rc:2354
#, c-format
@@ -5362,22 +5389,22 @@
#: Merge.rc:2654
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Typ"
#: Merge.rc:2656
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Program rozpakowuj\xB9cy"
#: Merge.rc:2657
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "R\xF3\xBFnicowanie wst\xEApne"
#: Merge.rc:2658
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Skrypt edytora"
#: Merge.rc:2665
#, c-format
@@ -5402,12 +5429,12 @@
#: Merge.rc:2669
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Zmie\xF1 lewemu pliku/katalogu stan tylko do odczytu"
#: Merge.rc:2670
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Zmie\xF1 prawemu pliku/katalogu stan tylko do odczytu"
#: Merge.rc:2671
#, c-format
@@ -5786,7 +5813,7 @@
#: Merge.rc:2755
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Wy\x9Cwietl list\xEA dost\xEApnych wtyczek"
#: Merge.rc:2756
#, c-format
@@ -5972,7 +5999,7 @@
#: Merge.rc:2825
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Bez pod\x9Cwietlenia"
#: Merge.rc:2826
#, c-format
@@ -6127,7 +6154,7 @@
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2857
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-30 20:02:29
|
Revision: 6617
http://winmerge.svn.sourceforge.net/winmerge/?rev=6617&view=rev
Author: kimmov
Date: 2009-03-30 20:02:20 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
PATCH: [ 2714968 ] Disable tree-view by default
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/OptionsInit.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-29 17:04:31 UTC (rev 6616)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-30 20:02:20 UTC (rev 6617)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.12.2
+ Disable folder compare tree-view by default (#2714968)
Bugfix: Filename extension column was empty for files (#2670046)
Bugfix: Crash when selecting backup folder (#2686382)
bugfix: Swapping panes did not update statusbar (#2661838)
Modified: branches/R2_12/Src/OptionsInit.cpp
===================================================================
--- branches/R2_12/Src/OptionsInit.cpp 2009-03-29 17:04:31 UTC (rev 6616)
+++ branches/R2_12/Src/OptionsInit.cpp 2009-03-30 20:02:20 UTC (rev 6617)
@@ -95,7 +95,7 @@
m_pOptions->InitOption(OPT_IGNORE_SMALL_FILETIME, false);
m_pOptions->InitOption(OPT_ASK_MULTIWINDOW_CLOSE, false);
m_pOptions->InitOption(OPT_PRESERVE_FILETIMES, false);
- m_pOptions->InitOption(OPT_TREE_MODE, true);
+ m_pOptions->InitOption(OPT_TREE_MODE, false);
m_pOptions->InitOption(OPT_CMP_IGNORE_WHITESPACE, (int)0);
m_pOptions->InitOption(OPT_CMP_IGNORE_BLANKLINES, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-30 20:07:41
|
Revision: 6618
http://winmerge.svn.sourceforge.net/winmerge/?rev=6618&view=rev
Author: kimmov
Date: 2009-03-30 20:07:18 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
PATCH: [ 2712120 ] patch for Bug#2622196
Submitted by Matthias Mayer
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DiffTextBuffer.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-30 20:02:20 UTC (rev 6617)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-30 20:07:18 UTC (rev 6618)
@@ -10,6 +10,7 @@
bugfix: Swapping panes did not update statusbar (#2661838)
Bugfix: Says files are identical after making files different in another
application and re-loading them (#2672737)
+ Bugfix: Files with missing last EOL weren't merged correctly (#2712120)
Translation updates:
- Polish (#2717382)
Modified: branches/R2_12/Src/DiffTextBuffer.cpp
===================================================================
--- branches/R2_12/Src/DiffTextBuffer.cpp 2009-03-30 20:02:20 UTC (rev 6617)
+++ branches/R2_12/Src/DiffTextBuffer.cpp 2009-03-30 20:07:18 UTC (rev 6618)
@@ -211,7 +211,10 @@
{
int cchText = GetFullLineLength(nLineIndex);
if (cchText == 0)
+ {
+ strLine.Empty();
return FALSE;
+ }
LPTSTR pchText = strLine.GetBufferSetLength(cchText);
memcpy(pchText, GetLineChars(nLineIndex), cchText * sizeof(TCHAR));
return TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-31 18:32:17
|
Revision: 6622
http://winmerge.svn.sourceforge.net/winmerge/?rev=6622&view=rev
Author: kimmov
Date: 2009-03-31 18:32:07 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
PATCH: [ 2720875 ] Polish translation after Q&A
Submitted by Skiff
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Polish.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-31 18:23:48 UTC (rev 6621)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-31 18:32:07 UTC (rev 6622)
@@ -12,7 +12,7 @@
application and re-loading them (#2672737)
Bugfix: Files with missing last EOL weren't merged correctly (#2712120)
Translation updates:
- - Polish (#2717382)
+ - Polish (#2717382, #2720875)
WinMerge 2.12.0 - 2009-03-05 (r6542)
Remember last target folder for Copy/Move to in folder compare (#2659228)
Modified: branches/R2_12/Src/Languages/Polish.po
===================================================================
--- branches/R2_12/Src/Languages/Polish.po 2009-03-31 18:23:48 UTC (rev 6621)
+++ branches/R2_12/Src/Languages/Polish.po 2009-03-31 18:32:07 UTC (rev 6622)
@@ -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: \n"
-"PO-Revision-Date: 2009-03-27 17:38+0100\n"
-"Last-Translator: Micha\xB3 Trzebiatowski <hip...@ho...>\n"
+"POT-Creation-Date: 2009-02-10 22:14+0000\n"
+"PO-Revision-Date: 2009-03-29 15:39+0100\n"
+"Last-Translator: Skiff <skiffatsf at users.sourceforge.net>\n"
"Language-Team: Polish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1250\n"
@@ -42,13 +42,13 @@
#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
-msgstr "Kopiuj na praw\xB9"
+msgstr "Kopiuj na prawo"
#: Merge.rc:73
#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
-msgstr "Kopiuj na lew\xB9"
+msgstr "Kopiuj na lewo"
#: Merge.rc:75
#, c-format
@@ -196,14 +196,14 @@
#: Merge.rc:391
#, c-format
msgid "Select &Font..."
-msgstr "Zmi&e\xF1 czcionk\xEA..."
+msgstr "Wybierz czcionk\xEA..."
#: Merge.rc:130
#: Merge.rc:229
#: Merge.rc:392
#, c-format
msgid "Use Default F&ont"
-msgstr "Czcionka &domy\x9Clna"
+msgstr "Przywr\xF3\xE6 domy\x9Cln\xB9 czcionk\xEA"
#: Merge.rc:132
#: Merge.rc:231
@@ -245,7 +245,7 @@
#: Merge.rc:420
#, c-format
msgid "Ta&b Bar"
-msgstr "Pasek &zak\xB3adek"
+msgstr "Pasek &kart"
#: Merge.rc:141
#: Merge.rc:241
@@ -273,7 +273,7 @@
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
-msgstr "&Generuj patch..."
+msgstr "&Generuj \xB3atk\xEA..."
#: Merge.rc:148
#: Merge.rc:269
@@ -336,7 +336,7 @@
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
-msgstr "Ze&ruj opcje"
+msgstr "&Resetuj opcje"
#: Merge.rc:164
#: Merge.rc:285
@@ -448,13 +448,13 @@
#: Merge.rc:337
#, c-format
msgid "L&eft Read-only"
-msgstr "Lewa tylko &odczyt"
+msgstr "Lewa tylko do &odczytu"
#: Merge.rc:201
#: Merge.rc:338
#, c-format
msgid "Ri&ght Read-only"
-msgstr "Prawa t&ylko odczyt"
+msgstr "Prawa t&ylko do odczytu"
#: Merge.rc:203
#, c-format
@@ -465,32 +465,32 @@
#: Merge.rc:363
#, c-format
msgid "Select &All\tCtrl+A"
-msgstr "Wybierz &wszystkie\tCtrl+A"
+msgstr "Zaznacz &wszystkie\tCtrl+A"
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr "Poka\xBF &identyczne archiwa"
+msgstr "Poka\xBF &identyczne elementy"
#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
-msgstr "Poka\xBF &r\xF3\xBFne archiwa"
+msgstr "Poka\xBF &r\xF3\xBFne elementy"
#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
-msgstr "Poka\xBF &unikatowe dla lewej"
+msgstr "Poka\xBF &unikatowe po lewej"
#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr "Poka\xBF u&nikatowe dla prawej"
+msgstr "Poka\xBF u&nikatowe po prawej"
#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
-msgstr "Poka\xBF po&mini\xEAte"
+msgstr "Poka\xBF po&mini\xEAte elementy"
#: Merge.rc:220
#, c-format
@@ -505,17 +505,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr "&Tryb drzewa"
+msgstr "Tryb &drzewa"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr "&Rozwi\xF1 wszystkie podkatalogi"
+msgstr "Rozwi\xF1 wszystkie podfoldery"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr "&Zwi\xF1 wszystkie podkatalogi"
+msgstr "Zwi\xF1 wszystkie podfoldery"
#: Merge.rc:239
#, c-format
@@ -724,7 +724,7 @@
#: Merge.rc:2789
#, c-format
msgid "< Empty >"
-msgstr "< Pusty >"
+msgstr "< pusty >"
#: Merge.rc:373
#, c-format
@@ -734,7 +734,7 @@
#: Merge.rc:375
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr "&Kopuj z numerami wierszy\tCtrl+Shift+C"
+msgstr "&Kopiuj z numerami wierszy\tCtrl+Shift+C"
#: Merge.rc:378
#, c-format
@@ -984,7 +984,7 @@
#: Merge.rc:550
#, c-format
msgid "&Zip"
-msgstr "&Zip"
+msgstr "&Spakuj"
#: Merge.rc:552
#, c-format
@@ -1127,7 +1127,7 @@
#: Merge.rc:1030
#, c-format
msgid "Bro&wse..."
-msgstr "S&zukaj..."
+msgstr "&Przegl\xB9daj..."
#: Merge.rc:694
#: Merge.rc:1602
@@ -1155,12 +1155,12 @@
#: Merge.rc:1605
#, c-format
msgid "&Include Subfolders"
-msgstr "&Uwzgl\xEAdnij podkatalogi"
+msgstr "&Uwzgl\xEAdnij podfoldery"
#: Merge.rc:704
#, c-format
msgid "Status:"
-msgstr "Stan"
+msgstr "Stan:"
#: Merge.rc:706
#: Merge.rc:736
@@ -1299,12 +1299,12 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr "Pokazuj okno startowe \"Wybierz pliki lub katalogi\""
+msgstr "Poka\xBF okno \"Wybierz pliki lub foldery\" po uruchomieniu"
#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "Otw\xF3rz okno autouzupe\xB3niania:"
+msgstr "Autouzupe\xB3nianie okna otwierania:"
#: Merge.rc:779
#, c-format
@@ -1326,7 +1326,7 @@
#: Merge.rc:785
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge pozwala ukry\xE6 niekt\xF3re komunikaty. Naci\x9Cnij przycisk, aby wy\x9Cwietla\xE6 wszystkie komunikaty."
+msgstr "WinMerge pozwala ukry\xE6 niekt\xF3re komunikaty. Naci\x9Cnij przycisk Resetuj, aby wy\x9Cwietla\xE6 wszystkie komunikaty."
#: Merge.rc:787
#, c-format
@@ -1375,7 +1375,7 @@
#: Merge.rc:819
#, c-format
msgid "D&on't wrap end of file"
-msgstr "Nie zawijaj k&o\xF1ca linii"
+msgstr "Szukaj tylko do ko\xF1ca pliku"
#: Merge.rc:822
#, c-format
@@ -1411,7 +1411,7 @@
#: Merge.rc:849
#, c-format
msgid "&Don't wrap end of file"
-msgstr "&Nie zawijaj ko\xF1ca pliku"
+msgstr "Szukaj tylko do ko\xF1ca pliku"
#: Merge.rc:852
#, c-format
@@ -1421,7 +1421,7 @@
#: Merge.rc:853
#, c-format
msgid "&Selection"
-msgstr "&Selekcja"
+msgstr "&Zaznaczenie"
#: Merge.rc:855
#, c-format
@@ -1589,7 +1589,7 @@
#: Merge.rc:998
#, c-format
msgid "&Filter folder:"
-msgstr "&Filtruj folder:"
+msgstr "&Folder filtr\xF3w:"
#: Merge.rc:1000
#, c-format
@@ -1620,7 +1620,7 @@
#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
-msgstr "Generuj patch"
+msgstr "Generuj \xB3atk\xEA"
#: Merge.rc:1016
#, c-format
@@ -1745,7 +1745,7 @@
#: Merge.rc:1113
#, c-format
msgid " Folder Compare Progress"
-msgstr " Post\xEAp por\xF3wnania folder\xF3w"
+msgstr "Post\xEAp por\xF3wnania folder\xF3w"
#: Merge.rc:1116
#: Merge.rc:1894
@@ -1761,7 +1761,7 @@
#: Merge.rc:1122
#, c-format
msgid "Items compared:"
-msgstr "Elementy por\xF3wnane:"
+msgstr "Por\xF3wnano element\xF3w:"
#: Merge.rc:1123
#, c-format
@@ -1817,17 +1817,17 @@
#: Merge.rc:1154
#, c-format
msgid "&Compare"
-msgstr "Por\xF3wnaj &bia\xB3e znaki"
+msgstr "&Por\xF3wnaj"
#: Merge.rc:1156
#, c-format
msgid "&Ignore change"
-msgstr "P&omi\xF1 zmiany bia\xB3ych"
+msgstr "Ignoruj &zmiany"
#: Merge.rc:1158
#, c-format
msgid "I&gnore all"
-msgstr "Pomi\xF1 wszystkie bia\xB3e"
+msgstr "Ignoruj &wszystkie"
#: Merge.rc:1160
#, c-format
@@ -1842,7 +1842,7 @@
#: Merge.rc:1164
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "Ignoruj r\xF3\xBFnice przeniesienia karetki systemowej (Windows/Unix/Mac)"
+msgstr "Ignoruj r\xF3\xBFnice ko\xF1ca wiersza (Windows/Unix/Mac)"
#: Merge.rc:1167
#, c-format
@@ -1903,17 +1903,17 @@
#: Merge.rc:1197
#, c-format
msgid "&Tab size:"
-msgstr "&Wielko\x9C\xE6:"
+msgstr "&Rozmiar tabulatora:"
#: Merge.rc:1200
#, c-format
msgid "&Insert Tabs"
-msgstr "Wstaw tabulatory"
+msgstr "Wstawiaj tabulatory"
#: Merge.rc:1202
#, c-format
msgid "Insert &Spaces"
-msgstr "Wstaw spacje"
+msgstr "Wstawiaj spacje"
#: Merge.rc:1204
#, c-format
@@ -2015,12 +2015,12 @@
#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
-msgstr "Kodowanie domy\x9Clne"
+msgstr "Domy\x9Clna strona kodowa"
#: Merge.rc:1269
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "Wybierz domy\x9Clne kodowanie dla otwieranych plik\xF3w nie-Unicode:"
+msgstr "Wybierz domy\x9Clne kodowanie dla otwieranych plik\xF3w nie b\xEAd\xB9cych plikami Unicode:"
#: Merge.rc:1271
#, c-format
@@ -2028,8 +2028,8 @@
"Detect codepage info for these files: .html, .rc, .xml \n"
"need to restart session"
msgstr ""
-"Wykrywa informacje strony kodowej dla tych plik\xF3w: .html, .rc, .xml \n"
-"konieczne jest ponowne uruchomienie sesji"
+"Wykrywaj ston\xEA kodow\xB9 dla plik\xF3w: .html, .rc, .xml \n"
+"konieczny restart sesji"
#: Merge.rc:1274
#, c-format
@@ -2044,12 +2044,12 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr "Strona kodowa u\xBFytkownika:"
+msgstr "Inna strona kodowa:"
#: Merge.rc:1286
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr "WinMerge \x96 Obs\xB3uga archiw\xF3w wy\xB3\xB9czona"
+msgstr "WinMerge \x96 obs\xB3uga archiw\xF3w wy\xB3\xB9czona"
#: Merge.rc:1289
#, c-format
@@ -2268,7 +2268,7 @@
#: Merge.rc:1437
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr "Jaki rodzaj filtra chcesz utworzy\xE6 ?"
+msgstr "Jaki rodzaj filtra chcesz utworzy\xE6?"
#: Merge.rc:1439
#, c-format
@@ -2335,7 +2335,7 @@
#: Merge.rc:2341
#, c-format
msgid "Different"
-msgstr "R\xF3\xBFnych"
+msgstr "r\xF3\xBFnych"
#: Merge.rc:1476
#, c-format
@@ -2388,7 +2388,7 @@
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
-msgstr "(Dzia\xB3anie)"
+msgstr "(dzia\xB3anie)"
#: Merge.rc:1523
#, c-format
@@ -2409,7 +2409,7 @@
#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
-msgstr "&Zapis pliku:"
+msgstr "&Zapisywanie pliku:"
#: Merge.rc:1530
#, c-format
@@ -2430,7 +2430,7 @@
#: Merge.rc:1539
#, c-format
msgid "Test Filter"
-msgstr "Test filtra"
+msgstr "Testuj filtr"
#: Merge.rc:1542
#, c-format
@@ -2521,12 +2521,12 @@
#: Merge.rc:1616
#, c-format
msgid "Create backup files in:"
-msgstr "Tw\xF3rz kopie plik\xF3w w:"
+msgstr "Tw\xF3rz kopie plik\xF3w dla:"
#: Merge.rc:1621
#, c-format
msgid "Create backup files into:"
-msgstr "Tw\xF3rz pliki kopii w:"
+msgstr "Pliki kopii zapasowych tw\xF3rz w:"
#: Merge.rc:1622
#, c-format
@@ -2551,7 +2551,7 @@
#: Merge.rc:1631
#, c-format
msgid "A&ppend timestamp"
-msgstr "Dodaj znacznik czasu"
+msgstr "Dodaj czas utworzenia kopii"
#: Merge.rc:1638
#: Merge.rc:2243
@@ -2592,13 +2592,13 @@
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr "&W\xB3\xB9cz wtyczki"
+msgstr "W\xB3\xB9cz wtyczki"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr "Integracja shella"
+msgstr "Integracja z systemem"
#: Merge.rc:1674
#, c-format
@@ -2613,22 +2613,22 @@
#: Merge.rc:1677
#, c-format
msgid "In&clude subfolders by default"
-msgstr "Domy\x9C&lnie uwzgl\xEAdnij podkatalogi"
+msgstr "Domy\x9C&lnie uwzgl\xEAdnij podfoldery"
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr "&Dodaj do menu kontekstowego"
+msgstr "Dodaj do menu kontekstowego"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr "Por\xF3wnywanie katalog\xF3w"
+msgstr "Por\xF3wnywanie folder\xF3w"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr "Dodaj menu &shella do menu kontekstowego"
+msgstr "Dodaj menu &pow\xB3oki plik\xF3w do menu kontekstowego"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2645,7 +2645,7 @@
#: Merge.rc:1739
#, c-format
msgid "Ready"
-msgstr "Gotowe"
+msgstr "Gotowy"
#: Merge.rc:1745
#, c-format
@@ -2766,17 +2766,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr "Prze\xB3\xB9cz tryb drzewa"
+msgstr "W\xB3\xB9cz tryb drzewa"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr "Rozwi\xF1 wszystkie podkatalogi"
+msgstr "Rozwi\xF1 wszystkie podfoldery"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr "Zwi\xF1 wszystkie podkatalogi"
+msgstr "Zwi\xF1 wszystkie podfoldery"
#: Merge.rc:1778
#, c-format
@@ -2910,7 +2910,7 @@
"Copy the selection and put it on the Clipboard\n"
"Copy"
msgstr ""
-"Kopiuj selekcj\xEA i wstaw do schowka\n"
+"Kopiuj zaznaczenie i wstaw do schowka\n"
"Kopiuj"
#: Merge.rc:1832
@@ -2919,7 +2919,7 @@
"Cut the selection and put it on the Clipboard\n"
"Cut"
msgstr ""
-"Wytnij selekcj\xEA i wstaw do schowka\n"
+"Wytnij zaznaczenie i wstaw do schowka\n"
"Wytnij"
#: Merge.rc:1833
@@ -3009,8 +3009,8 @@
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-"Poka\xBF lub ukryj pasek zak\xB3adek\n"
-"W\xB3\xB9cz pasek zak\xB3adek"
+"Poka\xBF lub ukryj pasek kart\n"
+"W\xB3\xB9cz pasek kart"
#: Merge.rc:1848
#, c-format
@@ -3096,7 +3096,7 @@
"\n"
"\n"
"\n"
-"WinMerge.Por\xF3wnaniePlik\xF3w\n"
+"WinMerge.FileCompare\n"
"Por\xF3wnanie plik\xF3w WinMerge "
#: Merge.rc:1881
@@ -3115,7 +3115,7 @@
"\n"
"\n"
"\n"
-"WinMerge.Por\xF3wnanieFolder\xF3w\n"
+"WinMerge.FolderCompare\n"
"Por\xF3wnanie folder\xF3w WinMerge"
#: Merge.rc:1888
@@ -3300,7 +3300,7 @@
"\n"
"Please use values 1 - %1."
msgstr ""
-"Warto\x9C\xE6 w zak\xB3adce wielko\x9Cci nie mo\xBFe by\xE6 zaakceptowana przez WinMerge.\n"
+"Warto\x9C\xE6 w wielko\x9Cci tabulatora nie mo\xBFe by\xE6 zaakceptowana przez WinMerge.\n"
"\n"
"Prosz\xEA u\xBFy\xE6 warto\x9Cci 1 - %1."
@@ -3311,9 +3311,9 @@
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
-"Czy jeste\x9C pewien, \xBFe chcesz wyzerowa\xE6 wszystkie opcje WinMerge i przywr\xF3cic warto\x9Cci domy\x9Clne ?\n"
+"Czy na pewno przywr\xF3ci\xE6 wszystkie opcje WinMerge do domy\x9Clnych warto\x9Cci ?\n"
"\n"
-"Po wyzerowaniu konieczne b\xEAdzie ponowne uruchomienie programu."
+"Po przywr\xF3ceniu konieczne b\xEAdzie ponowne uruchomienie programu."
#: Merge.rc:1990
#, c-format
@@ -3338,7 +3338,7 @@
#: Merge.rc:1995
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
-msgstr "Pliki ustawie\xF1 (*.ini)|*.ini|All Files (*.*)|*.*||"
+msgstr "Pliki ustawie\xF1 (*.ini)|*.ini|Wszystkie pliki (*.*)|*.*||"
#: Merge.rc:2001
#, c-format
@@ -3435,7 +3435,7 @@
#: Merge.rc:2034
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr "Filtry plik\xF3w(*.flt)|*.flt|Wszystkie filtry (*.*)|*.*||"
+msgstr "Filtry plik\xF3w(*.flt)|*.flt|Wszystkie pliki (*.*)|*.*||"
#: Merge.rc:2036
#, c-format
@@ -3445,7 +3445,7 @@
"Please copy file %1 to WinMerge/Filters -folder:\n"
"%2."
msgstr ""
-"Nie mo\xBFna odnale\x9F\xE6 szablonu dla filtru por\xF3wna\xF1 plik\xF3w!\n"
+"Nie mo\xBFna odnale\x9F\xE6 szablonu dla filtru por\xF3wna\xF1 plik\xF3w!\n"
"\n"
"Prosz\xEA skopiowa\xE6 plik %1 do folderu WinMerge/Filters:\n"
"%2."
@@ -3520,19 +3520,19 @@
"\n"
"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
-"Filtry zosta\xB3y zaktualizowane. Czy chcesz od\x9Cwie\xBFy\xE6 wszystkie otwarte por\xF3wnywania katalog\xF3w?\n"
+"Filtry zosta\xB3y zakutalizowane. Czy chcesz od\x9Cwierzy\xE6 wszystkie okna por\xF3wnania folder\xF3w?\n"
"\n"
-"Je\x9Cli nie chcesz teraz od\x9Cwie\xBFy\xE6 wszystkich por\xF3wnywa\xF1, mo\xBFesz wybra\xE6 Nie i od\x9Cwie\xBFy\xE6 por\xF3wnania p\xF3\x9Fniej."
+"Je\xBFeli nie chcesz od\x9Cwierza\xE6 okien por\xF3wna\xF1 teraz, wybierz Nie i od\x9Cwie\xBF okna p\xF3\x9Fniej."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr "\x8Ccie\xBFka do &SS.EXE:"
+msgstr "\x8Ccie\xBFka do SS.EXE"
#: Merge.rc:2072
#, c-format
msgid "Folder Comparison Results"
-msgstr "Wyniki por\xF3wnania katalog\xF3w"
+msgstr "Wyniki por\xF3wnania folder\xF3w"
#: Merge.rc:2073
#, c-format
@@ -3612,12 +3612,12 @@
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr "Cofam ostatni\xB9 operacj\xEA..."
+msgstr "Cofanie ostatniej operacji..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr "Powtarzam poprzedni\xB9 operacj\xEA..."
+msgstr "Przywracanie ostatniej operacji..."
#: Merge.rc:2100
#, c-format
@@ -3647,7 +3647,7 @@
#: Merge.rc:2105
#, c-format
msgid "%1 Differences Found"
-msgstr "Znaleziono %1 r\xF3\xBFnic"
+msgstr "Znaleziono r\xF3\xBFnic: %1"
#: Merge.rc:2106
#, c-format
@@ -3673,7 +3673,7 @@
#: Merge.rc:2120
#, c-format
msgid "Select two existing folders or files to compare"
-msgstr "Wybierz dwa istniej\xB9ce katalogi lub pliki do por\xF3wnania"
+msgstr "Wybierz dwa istniej\xB9ce foldery lub pliki do por\xF3wnania"
#: Merge.rc:2121
#, c-format
@@ -3683,7 +3683,7 @@
#: Merge.rc:2122
#, c-format
msgid "Select two folders or two files to compare."
-msgstr "Wybierz dwa katalogi lub pliki do por\xF3wnania."
+msgstr "Wybierz dwa foldery lub pliki do por\xF3wnania."
#: Merge.rc:2123
#, c-format
@@ -3708,7 +3708,7 @@
#: Merge.rc:2127
#, c-format
msgid "Cannot compare file and folder!"
-msgstr "Nie mo\xBFna por\xF3wna\xE6 pliku i katalogu!"
+msgstr "Nie mo\xBFna por\xF3wna\xE6 pliku i folderu!"
#: Merge.rc:2133
#, c-format
@@ -3867,11 +3867,11 @@
"\n"
"Do you want to reload the file?"
msgstr ""
-"Inna aplikacja zaktualizowa\xB3a plik\n"
+"Inna aplikacja zmodyfikowa\xB3a plik\n"
"%1\n"
-"od ostatniego skanowania z WinMerge.\n"
+"od ostatniego otworzenia w WinMerge.\n"
"\n"
-"Czy chcesz od\x9Cwie\xBFy\xE6 plik?"
+"Czy prze\xB3adowa\xE6 plik?"
#: Merge.rc:2156
#, c-format
@@ -3892,7 +3892,7 @@
msgstr ""
"Plik\n"
"%1\n"
-"znikn\xB9\xB3. Prosz\xEA zapisa\xE6 kopi\xEA pliku, aby kontynuowa\xE6."
+"zosta\xB3 usuni\xEAty. Aby kontynuowa\xE6 prosz\xEA zapisa\xE6 jego kopi\xEA"
#: Merge.rc:2164
#, c-format
@@ -4100,7 +4100,7 @@
#: Merge.rc:2223
#, c-format
msgid "Select destination folder"
-msgstr "Wybierz katalog docelowy"
+msgstr "Wybierz folder docelowy"
#: Merge.rc:2228
#, c-format
@@ -4175,7 +4175,7 @@
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr "Potwierd\x9F przenoszenie"
+msgstr "Potwierdzenie przenoszenia"
#: Merge.rc:2250
#, c-format
@@ -4240,12 +4240,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr "Lewe menu shella"
+msgstr "Menu pow\xB3oki pliku po lewej"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr "Prawe menu shella"
+msgstr "Menu pow\xB3oki pliku po prawej"
#: Merge.rc:2274
#, c-format
@@ -4290,7 +4290,7 @@
#: Merge.rc:2289
#, c-format
msgid "Folder"
-msgstr "Katalog"
+msgstr "Folder"
#: Merge.rc:2290
#, c-format
@@ -4300,12 +4300,12 @@
#: Merge.rc:2291
#, c-format
msgid "Left Date"
-msgstr "Lewa data"
+msgstr "Data pliku po lewej"
#: Merge.rc:2292
#, c-format
msgid "Right Date"
-msgstr "Prawa data"
+msgstr "Data pliku po prawej"
#: Merge.rc:2293
#, c-format
@@ -4315,32 +4315,32 @@
#: Merge.rc:2294
#, c-format
msgid "Left Size"
-msgstr "Lewy rozmiar"
+msgstr "Rozmiar w lewym panelu"
#: Merge.rc:2295
#, c-format
msgid "Right Size"
-msgstr "Prawy rozmiar"
+msgstr "Rozmiar w prawym panelu"
#: Merge.rc:2296
#, c-format
msgid "Right Size (Short)"
-msgstr "Prawy rozmiar (kr\xF3tki)"
+msgstr "Rozmiar po prawej (kr\xF3tki)"
#: Merge.rc:2297
#, c-format
msgid "Left Size (Short)"
-msgstr "Lewy rozmiar (kr\xF3tki)"
+msgstr "Rozmiar po lewej (kr\xF3tki)"
#: Merge.rc:2303
#, c-format
msgid "Left Creation Time"
-msgstr "Lewy czas utworzenia"
+msgstr "Czas utworzenia po lewej"
#: Merge.rc:2304
#, c-format
msgid "Right Creation Time"
-msgstr "Prawy czas utworzenia"
+msgstr "Czas utworzenia po prawej"
#: Merge.rc:2305
#, c-format
@@ -4350,12 +4350,12 @@
#: Merge.rc:2306
#, c-format
msgid "Left File Version"
-msgstr "Wersja lewego pliku"
+msgstr "Wersja pliku po lewej"
#: Merge.rc:2307
#, c-format
msgid "Right File Version"
-msgstr "Wersja prawego pliku"
+msgstr "Wersja pliku po prawej"
#: Merge.rc:2308
#, c-format
@@ -4365,22 +4365,22 @@
#: Merge.rc:2309
#, c-format
msgid "Left Attributes"
-msgstr "Lewe atrybuty"
+msgstr "Atrybuty po lewej"
#: Merge.rc:2310
#, c-format
msgid "Right Attributes"
-msgstr "Prawe atrybuty"
+msgstr "Atrybuty pliku po prawej"
#: Merge.rc:2311
#, c-format
msgid "Left EOL"
-msgstr "Lewe EOL"
+msgstr "Lewe ZKL"
#: Merge.rc:2312
#, c-format
msgid "Right EOL"
-msgstr "Prawe EOL"
+msgstr "Prawe ZKL"
#: Merge.rc:2318
#, c-format
@@ -4426,17 +4426,17 @@
#: Merge.rc:2331
#, c-format
msgid "Folder skipped"
-msgstr "Katalog pomini\xEAty"
+msgstr "Folder pomini\xEAty"
#: Merge.rc:2332
#, c-format
msgid "Left only: %1"
-msgstr "Tylko lewa: %1"
+msgstr "Tylko po lewej: %1"
#: Merge.rc:2333
#, c-format
msgid "Right only: %1"
-msgstr "Tylko prawa: %1"
+msgstr "Tylko po prawej: %1"
#: Merge.rc:2334
#, c-format
@@ -4456,17 +4456,17 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr "Katalogi s\xB9 r\xF3\xBFne"
+msgstr "Foldery s\xB9 r\xF3\xBFne"
#: Merge.rc:2339
#, c-format
msgid "Left Only"
-msgstr "Tylko lewa"
+msgstr "Tylko po lewej"
#: Merge.rc:2340
#, c-format
msgid "Right Only"
-msgstr "Tylko prawa"
+msgstr "Tylko po prawej"
#: Merge.rc:2342
#, c-format
@@ -4481,7 +4481,7 @@
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr "Pliki tekstowe s\xB9 r\xF3\xBFne"
+msgstr "Pliki tekstowe nie s\xB9 identyczne"
#: Merge.rc:2354
#, c-format
@@ -4591,12 +4591,12 @@
#: Merge.rc:2385
#, c-format
msgid "Left side file EOL type"
-msgstr "Lewa strona pliku typu EOL"
+msgstr "Typ znak\xF3w ko\xF1ca linii z lewej"
#: Merge.rc:2386
#, c-format
msgid "Right side file EOL type"
-msgstr "Prawa strona pliku typu EOL"
+msgstr "Typ znak\xF3w ko\xF1ca linii z prawej"
#: Merge.rc:2392
#, c-format
@@ -4782,7 +4782,7 @@
#: Merge.rc:2442
#, c-format
msgid "Line difference"
-msgstr "Wiersz r\xF3\xBFnicy"
+msgstr "R\xF3\xBFnice wierszy"
#: Merge.rc:2448
#, c-format
@@ -4817,7 +4817,7 @@
#: Merge.rc:2469
#, c-format
msgid "Patch file successfully written."
-msgstr "Utworzono patch."
+msgstr "Utworzono \xB3atk\xEA.."
#: Merge.rc:2470
#, c-format
@@ -5429,12 +5429,12 @@
#: Merge.rc:2669
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr "Zmie\xF1 lewemu pliku/katalogu stan tylko do odczytu"
+msgstr "Prze\xB3\xB9cz lew\xB9 stron\xEA/folder na tylko do odczytu"
#: Merge.rc:2670
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr "Zmie\xF1 prawemu pliku/katalogu stan tylko do odczytu"
+msgstr "Prze\xB3\xB9cz praw\xB9 stron\xEA/folder na tylko do odczytu"
#: Merge.rc:2671
#, c-format
@@ -5733,7 +5733,7 @@
"Copy Right (Alt+Right)"
msgstr ""
"Kopiuj wybrany tekst do prawego pliku\n"
-"Kopiuj na prawo (Alt Right)"
+"Kopiuj na prawo (Alt+Prawo)"
#: Merge.rc:2734
#, c-format
@@ -5742,7 +5742,7 @@
"Copy Left (Alt+Left)"
msgstr ""
"Kopiuj wybrany tekst do lewego pliku\n"
-"Kopiuj na lewo (Alt Left)"
+"Kopiuj na lewo (Alt+Lewo)"
#: Merge.rc:2735
#, c-format
@@ -5751,7 +5751,7 @@
"Copy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
"Kopiuj r\xF3\xBFnic\xEA na prawo i przejd\x9F do nast\xEApnej\n"
-"Kopiuj na prawo i nast\xEApna (Ctrl+Alt+Right)"
+"Kopiuj na prawo i nast\xEApna (Ctrl+Alt+Prawo)"
#: Merge.rc:2736
#, c-format
@@ -5760,7 +5760,7 @@
"Copy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
"Kopiuj r\xF3\xBFnic\xEA na lewo i przejd\x9F do nast\xEApnej\n"
-"Kopiuj na lewo i nast\xEApna (Ctrl+Alt+Left)"
+"Kopiuj na lewo i nast\xEApna (Ctrl+Alt+Lewo)"
#: Merge.rc:2737
#, c-format
@@ -5798,7 +5798,7 @@
#: Merge.rc:2747
#, c-format
msgid "Generate a patch-file"
-msgstr "Generuj plik patch"
+msgstr "Generuj \xB3atk\xEA"
#: Merge.rc:2748
#, c-format
@@ -5813,7 +5813,7 @@
#: Merge.rc:2755
#, c-format
msgid "Shows a list of available plugins"
-msgstr "Wy\x9Cwietl list\xEA dost\xEApnych wtyczek"
+msgstr "Pokazuje list\xEA dost\xEApnych wtyczek"
#: Merge.rc:2756
#, c-format
@@ -5929,12 +5929,12 @@
#: Merge.rc:2791
#, c-format
msgid "<None>"
-msgstr "<Brak>"
+msgstr "<brak>"
#: Merge.rc:2792
#, c-format
msgid "<Automatic>"
-msgstr "<Automatycznie>"
+msgstr "<automatycznie>"
#: Merge.rc:2798
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-04-19 19:39:57
|
Revision: 6674
http://winmerge.svn.sourceforge.net/winmerge/?rev=6674&view=rev
Author: kimmov
Date: 2009-04-19 19:39:55 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
BUG: [ 2772646 ] left & right description is the same one
Submitted by black hero <bla...@us...>
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Contributors.txt
branches/R2_12/Src/MergeDoc.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-04-19 19:36:39 UTC (rev 6673)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-04-19 19:39:55 UTC (rev 6674)
@@ -3,6 +3,9 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
+WinMerge 2.12.4
+ Bugfix: Reports had same left/right descriptions (#2772646)
+
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Bugfix: Filename extension column was empty for files (#2670046)
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2009-04-19 19:36:39 UTC (rev 6673)
+++ branches/R2_12/Docs/Users/Contributors.txt 2009-04-19 19:39:55 UTC (rev 6674)
@@ -140,6 +140,7 @@
* Jim Fougeron
* Marvin Gouw
* Robert Grange
+* black hero <bla...@us...>
* Jan Hryz
* jwdevel
* Ed_K
Modified: branches/R2_12/Src/MergeDoc.cpp
===================================================================
--- branches/R2_12/Src/MergeDoc.cpp 2009-04-19 19:36:39 UTC (rev 6673)
+++ branches/R2_12/Src/MergeDoc.cpp 2009-04-19 19:39:55 UTC (rev 6674)
@@ -2934,7 +2934,7 @@
if (!m_strDesc[0].empty())
left = m_strDesc[0];
if (!m_strDesc[1].empty())
- right = m_strDesc[0];
+ right = m_strDesc[1];
}
// left and right title
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2009-04-19 22:11:45
|
Revision: 6675
http://winmerge.svn.sourceforge.net/winmerge/?rev=6675&view=rev
Author: sdottaka
Date: 2009-04-19 22:11:34 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
BUG: [ 2550412 ] When conflictfile saved trailing line-ending is lost
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/ConflictFileParser.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-04-19 19:39:55 UTC (rev 6674)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-04-19 22:11:34 UTC (rev 6675)
@@ -5,6 +5,7 @@
WinMerge 2.12.4
Bugfix: Reports had same left/right descriptions (#2772646)
+ Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/ConflictFileParser.cpp
===================================================================
--- branches/R2_12/Src/ConflictFileParser.cpp 2009-04-19 19:39:55 UTC (rev 6674)
+++ branches/R2_12/Src/ConflictFileParser.cpp 2009-04-19 22:11:34 UTC (rev 6675)
@@ -98,8 +98,6 @@
int state;
int iNestingLevel = 0;
bool bResult = false;
- bool bFirstLineNR = true;
- bool bFirstLineWC = true;
String revision = _T("none");
bNestedConflicts = false;
@@ -132,17 +130,11 @@
else
{
// we're in the common section, so write to both files
- if (!bFirstLineNR)
- newRevision.WriteString(eol);
- else
- bFirstLineNR = false;
newRevision.WriteString(line.c_str());
+ newRevision.WriteString(eol);
- if (!bFirstLineWC)
- workingCopy.WriteString(eol);
- else
- bFirstLineWC = false;
workingCopy.WriteString(line.c_str());
+ workingCopy.WriteString(eol);
}
break;
@@ -154,11 +146,8 @@
{
// nested conflict section starts
state = 3;
- if(!bFirstLineWC)
- workingCopy.WriteString(eol);
- else
- bFirstLineWC = false;
workingCopy.WriteString(line.c_str());
+ workingCopy.WriteString(eol);
}
else
{
@@ -168,11 +157,8 @@
line = line.substr(0, pos);
if (!line.empty())
{
- if (!bFirstLineWC)
- workingCopy.WriteString(eol);
- else
- bFirstLineWC = false;
workingCopy.WriteString(line.c_str());
+ workingCopy.WriteString(eol);
}
// new revision section
@@ -180,11 +166,8 @@
}
else
{
- if (!bFirstLineWC)
- workingCopy.WriteString(eol);
- else
- bFirstLineWC = false;
workingCopy.WriteString(line.c_str());
+ workingCopy.WriteString(eol);
}
}
break;
@@ -197,11 +180,8 @@
{
// nested conflict section starts
state = 4;
- if (!bFirstLineNR)
- newRevision.WriteString(eol);
- else
- bFirstLineNR = false;
newRevision.WriteString(line.c_str());
+ newRevision.WriteString(eol);
}
else
{
@@ -212,11 +192,8 @@
line = line.substr(0, pos);
if (!line.empty())
{
- if (!bFirstLineNR)
- newRevision.WriteString(eol);
- else
- bFirstLineNR = false;
newRevision.WriteString(line.c_str());
+ newRevision.WriteString(eol);
}
// common section
@@ -224,11 +201,8 @@
}
else
{
- if (!bFirstLineNR)
- newRevision.WriteString(eol);
- else
- bFirstLineNR = false;
newRevision.WriteString(line.c_str());
+ newRevision.WriteString(eol);
}
}
break;
@@ -258,11 +232,8 @@
}
}
}
- if (!bFirstLineWC)
- workingCopy.WriteString(eol);
- else
- bFirstLineWC = false;
workingCopy.WriteString(line.c_str());
+ workingCopy.WriteString(eol);
break;
// in nested section in new revision section
@@ -288,11 +259,8 @@
}
}
}
- if (!bFirstLineNR)
- newRevision.WriteString(eol);
- else
- bFirstLineNR = false;
newRevision.WriteString(line.c_str());
+ newRevision.WriteString(eol);
break;
}
} while (linesToRead);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-04-21 14:47:49
|
Revision: 6689
http://winmerge.svn.sourceforge.net/winmerge/?rev=6689&view=rev
Author: kimmov
Date: 2009-04-21 14:47:42 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
PATCH: [ 2776705 ] Add more types for CPP syntax highlight
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/editlib/cplusplus.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-04-21 14:42:36 UTC (rev 6688)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-04-21 14:47:42 UTC (rev 6689)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.12.4
+ Add more C/C++ types to syntax highlight (#2776705)
Bugfix: Reports had same left/right descriptions (#2772646)
Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
Modified: branches/R2_12/Src/editlib/cplusplus.cpp
===================================================================
--- branches/R2_12/Src/editlib/cplusplus.cpp 2009-04-21 14:42:36 UTC (rev 6688)
+++ branches/R2_12/Src/editlib/cplusplus.cpp 2009-04-21 14:47:42 UTC (rev 6689)
@@ -164,15 +164,28 @@
_T ("WCHAR"),
_T ("TCHAR"),
_T ("BYTE"),
+ _T ("PBYTE"),
+ _T ("LPBYTE"),
_T ("BOOL"),
+ _T ("PBOOL"),
+ _T ("LPBOOL"),
_T ("VOID"),
+ _T ("LPVOID"),
_T ("LONG"),
+ _T ("LPLONG"),
_T ("TRUE"),
_T ("FALSE"),
_T ("INT"),
+ _T ("PINT"),
+ _T ("LPINT"),
_T ("UINT"),
+ _T ("PUINT"),
_T ("WORD"),
+ _T ("PWORD"),
+ _T ("LPWORD"),
_T ("DWORD"),
+ _T ("PDWORD"),
+ _T ("LPDWORD"),
_T ("WPARAM"),
_T ("LPARAM"),
_T ("LRESULT"),
@@ -186,6 +199,26 @@
_T ("POSITION"),
_T ("LPRECT"),
_T ("HANDLE"),
+ _T ("INT8"),
+ _T ("PINT8"),
+ _T ("INT16"),
+ _T ("PINT16"),
+ _T ("INT32"),
+ _T ("PINT32"),
+ _T ("INT64"),
+ _T ("PINT64"),
+ _T ("UINT8"),
+ _T ("PUINT8"),
+ _T ("UINT16"),
+ _T ("PUINT16"),
+ _T ("UINT32"),
+ _T ("PUINT32"),
+ _T ("UINT64"),
+ _T ("PUINT64"),
+ _T ("ULONG32"),
+ _T ("PULONG32"),
+ _T ("DWORD32"),
+ _T ("PDWORD32"),
NULL
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-05-08 17:00:06
|
Revision: 6719
http://winmerge.svn.sourceforge.net/winmerge/?rev=6719&view=rev
Author: gerundt
Date: 2009-05-08 16:59:58 +0000 (Fri, 08 May 2009)
Log Message:
-----------
BUG: [ 2783477 ] Generated Report: Inaccurate DOCTYPE
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/MergeDoc.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-08 16:51:01 UTC (rev 6718)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-08 16:59:58 UTC (rev 6719)
@@ -7,6 +7,7 @@
Add more C/C++ types to syntax highlight (#2776705)
Bugfix: Reports had same left/right descriptions (#2772646)
Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
+ Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/MergeDoc.cpp
===================================================================
--- branches/R2_12/Src/MergeDoc.cpp 2009-05-08 16:51:01 UTC (rev 6718)
+++ branches/R2_12/Src/MergeDoc.cpp 2009-05-08 16:59:58 UTC (rev 6719)
@@ -2897,8 +2897,8 @@
String header =
Fmt(
- _T("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"\n")
- _T("\t\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n")
+ _T("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n")
+ _T("\t\"http://www.w3.org/TR/html4/loose.dtd\">\n")
_T("<html>\n")
_T("<head>\n")
_T("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2009-05-09 09:04:41
|
Revision: 6722
http://winmerge.svn.sourceforge.net/winmerge/?rev=6722&view=rev
Author: sdottaka
Date: 2009-05-09 09:04:30 +0000 (Sat, 09 May 2009)
Log Message:
-----------
BUG: [ 2789345 ] "##" in file filter pattern causes an infinite loop
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/FileFilterMgr.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-09 08:58:40 UTC (rev 6721)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-09 09:04:30 UTC (rev 6722)
@@ -8,6 +8,7 @@
Bugfix: Reports had same left/right descriptions (#2772646)
Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
+ Bugfix: "##" in file filter pattern caused an infinite loop (#2789345)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/FileFilterMgr.cpp
===================================================================
--- branches/R2_12/Src/FileFilterMgr.cpp 2009-05-09 08:58:40 UTC (rev 6721)
+++ branches/R2_12/Src/FileFilterMgr.cpp 2009-05-09 09:04:30 UTC (rev 6722)
@@ -191,7 +191,7 @@
// Find possible comment-separator '<whitespace>##'
while (pos > 0 && !_istspace(str[pos - 1]))
- pos = str.Find(commentLeader, pos);
+ pos = str.Find(commentLeader, pos + 1);
// Remove comment and whitespaces before it
if (pos > 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-05-11 15:53:09
|
Revision: 6731
http://winmerge.svn.sourceforge.net/winmerge/?rev=6731&view=rev
Author: kimmov
Date: 2009-05-11 15:52:59 +0000 (Mon, 11 May 2009)
Log Message:
-----------
BUG: [ 2787131 ] Prediffer plugins still selectable, if plugins disabled
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirView.cpp
branches/R2_12/Src/MainFrm.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-11 12:16:14 UTC (rev 6730)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-11 15:52:59 UTC (rev 6731)
@@ -9,6 +9,7 @@
Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
Bugfix: "##" in file filter pattern caused an infinite loop (#2789345)
+ Bugfix: Could select prediffer when plugins were disabled (#2787131)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/DirView.cpp
===================================================================
--- branches/R2_12/Src/DirView.cpp 2009-05-11 12:16:14 UTC (rev 6730)
+++ branches/R2_12/Src/DirView.cpp 2009-05-11 15:52:59 UTC (rev 6731)
@@ -2764,6 +2764,12 @@
void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI)
{
+ if (!GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
+ {
+ pCmdUI->Enable(FALSE);
+ return;
+ }
+
// we need one selected file, existing on both side
if (m_pList->GetSelectedCount() != 1)
pCmdUI->Enable(FALSE);
@@ -3013,6 +3019,11 @@
// as a group of files may be selected
// and they may not all have the same setting
// so I'm not trying this right now
+
+ if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
+ pCmdUI->Enable(TRUE);
+ else
+ pCmdUI->Enable(FALSE);
}
/**
Modified: branches/R2_12/Src/MainFrm.cpp
===================================================================
--- branches/R2_12/Src/MainFrm.cpp 2009-05-11 12:16:14 UTC (rev 6730)
+++ branches/R2_12/Src/MainFrm.cpp 2009-05-11 15:52:59 UTC (rev 6731)
@@ -2216,6 +2216,11 @@
void CMainFrame::OnUpdatePluginUnpackMode(CCmdUI* pCmdUI)
{
+ if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
+ pCmdUI->Enable(TRUE);
+ else
+ pCmdUI->Enable(FALSE);
+
if (pCmdUI->m_nID == ID_UNPACK_MANUAL)
pCmdUI->SetRadio(PLUGIN_MANUAL == g_bUnpackerMode);
if (pCmdUI->m_nID == ID_UNPACK_AUTO)
@@ -2227,7 +2232,10 @@
*/
void CMainFrame::OnUpdateReloadPlugins(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(TRUE);
+ if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
+ pCmdUI->Enable(TRUE);
+ else
+ pCmdUI->Enable(FALSE);
}
void CMainFrame::OnReloadPlugins()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-05-12 07:31:11
|
Revision: 6733
http://winmerge.svn.sourceforge.net/winmerge/?rev=6733&view=rev
Author: kimmov
Date: 2009-05-12 07:31:07 +0000 (Tue, 12 May 2009)
Log Message:
-----------
PATCH: [ 2789839 ] Write config log to My Documents/Documents
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/ConfigLog.cpp
branches/R2_12/Src/Constants.h
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-12 07:21:01 UTC (rev 6732)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-12 07:31:07 UTC (rev 6733)
@@ -5,6 +5,7 @@
WinMerge 2.12.4
Add more C/C++ types to syntax highlight (#2776705)
+ Create config log file to My Documents-folder (#2789839)
Bugfix: Reports had same left/right descriptions (#2772646)
Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
Modified: branches/R2_12/Src/ConfigLog.cpp
===================================================================
--- branches/R2_12/Src/ConfigLog.cpp 2009-05-12 07:21:01 UTC (rev 6732)
+++ branches/R2_12/Src/ConfigLog.cpp 2009-05-12 07:31:07 UTC (rev 6733)
@@ -26,6 +26,7 @@
#ifndef UNICODE
#include <mbctype.h>
#endif
+#include "Constants.h"
#include "version.h"
#include "dllver.h"
#include "DiffWrapper.h"
@@ -383,11 +384,10 @@
if (writing)
{
- m_sFileName = _T("WinMerge.txt");
+ String sFileName = paths_ConcatPath(env_GetMyDocuments(NULL), WinMergeDocumentsFolder);
+ sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt"));
+ m_sFileName = sFileName.c_str();
- // Get path to $temp/WinMerge.txt
- m_sFileName.Insert(0, env_GetTempPath());
-
if (!m_file.Open(m_sFileName, CFile::modeCreate | CFile::modeWrite))
{
TCHAR szError[1024];
Modified: branches/R2_12/Src/Constants.h
===================================================================
--- branches/R2_12/Src/Constants.h 2009-05-12 07:21:01 UTC (rev 6732)
+++ branches/R2_12/Src/Constants.h 2009-05-12 07:31:07 UTC (rev 6733)
@@ -37,9 +37,12 @@
/** @brief Release notes in HTML format. */
const TCHAR RelNotes[] = _T("\\Docs\\ReleaseNotes.html");
-/** @brief GLP Licence local file name. */
+/** @brief GPL Licence local file name. */
const TCHAR LicenseFile[] = _T("\\Copying");
+/** @brief WinMerge folder in My Folders-folder. */
+const TCHAR WinMergeDocumentsFolder[] = _T("WinMerge");
+
/**
* @brief Default relative path to "My Documents" for private filters.
* We want to use WinMerge folder as general user-file folder in future.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-05-14 13:59:44
|
Revision: 6749
http://winmerge.svn.sourceforge.net/winmerge/?rev=6749&view=rev
Author: kimmov
Date: 2009-05-14 13:58:53 +0000 (Thu, 14 May 2009)
Log Message:
-----------
PATCH: [ 2791402 ] Mainfrm.cpp
Submitted by Matthias Mayer
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/MainFrm.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-14 08:50:07 UTC (rev 6748)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-14 13:58:53 UTC (rev 6749)
@@ -11,6 +11,8 @@
Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
Bugfix: "##" in file filter pattern caused an infinite loop (#2789345)
Bugfix: Could select prediffer when plugins were disabled (#2787131)
+ Bugfix: Didn't show correct EOL chars if whitespace chars were turned off
+ and again on (#2791402)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/MainFrm.cpp
===================================================================
--- branches/R2_12/Src/MainFrm.cpp 2009-05-14 08:50:07 UTC (rev 6748)
+++ branches/R2_12/Src/MainFrm.cpp 2009-05-14 13:58:53 UTC (rev 6749)
@@ -1867,25 +1867,29 @@
{
pLeft->SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
pLeft->SetViewEols(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE),
- GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
+ GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
+ pLeft->GetDocument()->IsMixedEOL(pLeft->m_nThisPane));
}
if (pRight)
{
pRight->SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
pRight->SetViewEols(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE),
- GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
+ GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
+ pRight->GetDocument()->IsMixedEOL(pRight->m_nThisPane));
}
if (pLeftDetail)
{
pLeftDetail->SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
pLeftDetail->SetViewEols(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE),
- GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
+ GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
+ pLeft->GetDocument()->IsMixedEOL(pLeft->m_nThisPane));
}
if (pRightDetail)
{
pRightDetail->SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
pRightDetail->SetViewEols(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE),
- GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
+ GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
+ pRight->GetDocument()->IsMixedEOL(pRight->m_nThisPane));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-05-14 14:34:18
|
Revision: 6750
http://winmerge.svn.sourceforge.net/winmerge/?rev=6750&view=rev
Author: kimmov
Date: 2009-05-14 14:34:10 +0000 (Thu, 14 May 2009)
Log Message:
-----------
BUG: [ 2022312 ] Opening mixed-EOL file forces other side to be mixed
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DiffTextBuffer.cpp
branches/R2_12/Src/DiffTextBuffer.h
branches/R2_12/Src/MergeDiffDetailView.cpp
branches/R2_12/Src/MergeDoc.cpp
branches/R2_12/Src/MergeDoc.h
branches/R2_12/Src/MergeEditView.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-14 13:58:53 UTC (rev 6749)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-05-14 14:34:10 UTC (rev 6750)
@@ -11,6 +11,8 @@
Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
Bugfix: "##" in file filter pattern caused an infinite loop (#2789345)
Bugfix: Could select prediffer when plugins were disabled (#2787131)
+ Bugfix: Opening mixed-EOL file one side forced both files to be handled as
+ mixed-eol files (#2022312)
Bugfix: Didn't show correct EOL chars if whitespace chars were turned off
and again on (#2791402)
Modified: branches/R2_12/Src/DiffTextBuffer.cpp
===================================================================
--- branches/R2_12/Src/DiffTextBuffer.cpp 2009-05-14 13:58:53 UTC (rev 6749)
+++ branches/R2_12/Src/DiffTextBuffer.cpp 2009-05-14 14:34:10 UTC (rev 6750)
@@ -164,6 +164,7 @@
: m_pOwnerDoc(pDoc)
, m_nThisPane(pane)
, m_unpackerSubcode(0)
+, m_bMixedEOL(false)
{
}
Modified: branches/R2_12/Src/DiffTextBuffer.h
===================================================================
--- branches/R2_12/Src/DiffTextBuffer.h 2009-05-14 13:58:53 UTC (rev 6749)
+++ branches/R2_12/Src/DiffTextBuffer.h 2009-05-14 14:34:10 UTC (rev 6750)
@@ -27,6 +27,7 @@
int m_nThisPane; /**< Left/Right side */
String m_strTempPath; /**< Temporary files folder. */
int m_unpackerSubcode; /**< Plugin information. */
+ bool m_bMixedEOL; /**< EOL style of this buffer is mixed? */
/**
* @brief Unicode encoding from ucr::UNICODESET.
@@ -66,6 +67,8 @@
int getCodepage() const { return m_encoding.m_codepage; }
void setCodepage(int value) { m_encoding.m_codepage = value; }
const FileTextEncoding & getEncoding() const { return m_encoding; }
+ bool IsMixedEOL() const { return m_bMixedEOL; }
+ void SetMixedEOL(bool bMixed) { m_bMixedEOL = bMixed; }
// If line has text (excluding eol), set strLine to text (excluding eol)
BOOL GetLine(int nLineIndex, CString &strLine);
Modified: branches/R2_12/Src/MergeDiffDetailView.cpp
===================================================================
--- branches/R2_12/Src/MergeDiffDetailView.cpp 2009-05-14 13:58:53 UTC (rev 6749)
+++ branches/R2_12/Src/MergeDiffDetailView.cpp 2009-05-14 14:34:10 UTC (rev 6750)
@@ -819,7 +819,7 @@
SetTabSize(GetOptionsMgr()->GetInt(OPT_TAB_SIZE));
SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
BOOL bMixedEOL = GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
- GetDocument()->IsMixedEOL();
+ GetDocument()->IsMixedEOL(m_nThisPane);
SetViewEols(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE), bMixedEOL);
SetWordWrapping(FALSE);
}
Modified: branches/R2_12/Src/MergeDoc.cpp
===================================================================
--- branches/R2_12/Src/MergeDoc.cpp 2009-05-14 13:58:53 UTC (rev 6749)
+++ branches/R2_12/Src/MergeDoc.cpp 2009-05-14 14:34:10 UTC (rev 6750)
@@ -2045,7 +2045,7 @@
// If mixed EOLs are not enabled, enable them for this doc.
if (!GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL))
{
- m_bMixedEol = true;
+ pBuf->SetMixedEOL(true);
}
}
@@ -2705,6 +2705,17 @@
FlushAndRescan();
}
+/**
+ * @brief Check if given buffer has mixed EOL style.
+ * @param [in] nBuffer Buffer to check.
+ * @return true if buffer's EOL style is mixed, false otherwise.
+ */
+bool CMergeDoc::IsMixedEOL(int nBuffer) const
+{
+ CDiffTextBuffer *pBuf = m_ptBuf[nBuffer];
+ return pBuf->IsMixedEOL();
+}
+
void CMergeDoc::SetEditedAfterRescan(int nBuffer)
{
m_bEditAfterRescan[nBuffer] = true;
Modified: branches/R2_12/Src/MergeDoc.h
===================================================================
--- branches/R2_12/Src/MergeDoc.h 2009-05-14 13:58:53 UTC (rev 6749)
+++ branches/R2_12/Src/MergeDoc.h 2009-05-14 14:34:10 UTC (rev 6750)
@@ -233,7 +233,7 @@
bool GetMergingMode() const;
void SetMergingMode(bool bMergingMode);
void SetDetectMovedBlocks(bool bDetectMovedBlocks);
- bool IsMixedEOL() const { return m_bMixedEol; }
+ bool IsMixedEOL(int nBuffer) const;
// implementation methods
private:
Modified: branches/R2_12/Src/MergeEditView.cpp
===================================================================
--- branches/R2_12/Src/MergeEditView.cpp 2009-05-14 13:58:53 UTC (rev 6749)
+++ branches/R2_12/Src/MergeEditView.cpp 2009-05-14 14:34:10 UTC (rev 6750)
@@ -1803,7 +1803,7 @@
columns = CalculateActualOffset(nScreenLine, chars, true) + 1;
chars++;
if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
- GetDocument()->IsMixedEOL())
+ GetDocument()->IsMixedEOL(m_nThisPane))
{
sEol = GetTextBufferEol(nScreenLine);
}
@@ -2069,7 +2069,7 @@
void CMergeEditView::OnUpdateStatusLeftEOL(CCmdUI* pCmdUI)
{
if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
- GetDocument()->IsMixedEOL() )
+ GetDocument()->IsMixedEOL(0))
{
String eol = LoadResString(IDS_EOL_MIXED);
pCmdUI->SetText(eol.c_str());
@@ -2084,7 +2084,7 @@
void CMergeEditView::OnUpdateStatusRightEOL(CCmdUI* pCmdUI)
{
if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
- GetDocument()->IsMixedEOL())
+ GetDocument()->IsMixedEOL(1))
{
String eol = LoadResString(IDS_EOL_MIXED);
pCmdUI->SetText(eol.c_str());
@@ -2151,7 +2151,7 @@
}
if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
- GetDocument()->IsMixedEOL() ||
+ GetDocument()->IsMixedEOL(m_nThisPane) ||
nStyle != m_pTextBuffer->GetCRLFMode())
{
pCmdUI->SetRadio(false);
@@ -3106,8 +3106,8 @@
// SetTextType will revert to language dependent defaults for tab
SetTabSize(GetOptionsMgr()->GetInt(OPT_TAB_SIZE));
SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
- bool mixedEOLs = GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
- GetDocument()->IsMixedEOL();
+ const bool mixedEOLs = GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
+ GetDocument()->IsMixedEOL(m_nThisPane);
SetViewEols(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE), mixedEOLs);
SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP));
SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-01 16:53:07
|
Revision: 6808
http://winmerge.svn.sourceforge.net/winmerge/?rev=6808&view=rev
Author: kimmov
Date: 2009-06-01 16:52:57 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
BUG: [ 2791506 ] Wrong Timestamps in Generaged Patch
First patch and fix idea submitted by Liisachan (seelie at sourceforge)
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DiffWrapper.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-06-01 15:33:30 UTC (rev 6807)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-06-01 16:52:57 UTC (rev 6808)
@@ -15,6 +15,7 @@
mixed-eol files (#2022312)
Bugfix: Didn't show correct EOL chars if whitespace chars were turned off
and again on (#2791402)
+ Bugfix: Generated patch had wrong file time for UTF-16 files (#2791506)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/DiffWrapper.cpp
===================================================================
--- branches/R2_12/Src/DiffWrapper.cpp 2009-06-01 15:33:30 UTC (rev 6807)
+++ branches/R2_12/Src/DiffWrapper.cpp 2009-06-01 16:52:57 UTC (rev 6808)
@@ -25,6 +25,8 @@
// $Id$
#include "StdAfx.h"
+#include <sys/types.h>
+#include <sys/stat.h>
#include <string>
#include <map>
#include <shlwapi.h>
@@ -45,6 +47,7 @@
#include "FilterCommentsManager.h"
#include "Environment.h"
#include "AnsiConvert.h"
+#include "UnicodeString.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -1226,6 +1229,19 @@
inf_patch[0].name = ansiconvert_SystemCP(path1.c_str());
inf_patch[1].name = ansiconvert_SystemCP(path2.c_str());
+ // Fix timestamps for generated patch files
+ // If there are translations needed (e.g. when comparing UTF-16 files)
+ // then the stats in 'inf' are read from temp files. If the original
+ // file's and read timestamps differ, use original file's timestamps.
+ // See also sf.net bug item #2791506.
+ struct __stat64 st;
+ _tstat64(path1.c_str(), &st);
+ if (st.st_mtime != inf_patch[0].stat.st_mtime)
+ inf_patch[0].stat.st_mtime = st.st_mtime;
+ _tstat64(path2.c_str(), &st);
+ if (st.st_mtime != inf_patch[1].stat.st_mtime)
+ inf_patch[1].stat.st_mtime = st.st_mtime;
+
outfile = NULL;
if (!m_sPatchFile.IsEmpty())
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-02 04:41:49
|
Revision: 6810
http://winmerge.svn.sourceforge.net/winmerge/?rev=6810&view=rev
Author: kimmov
Date: 2009-06-02 04:41:46 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
PATCH: [ 2799149 ] export settings
Submitted by Matthias Mayer
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Common/PreferencesDlg.cpp
branches/R2_12/Src/Common/PropertyPageHost.cpp
branches/R2_12/Src/Common/PropertyPageHost.h
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-06-02 04:37:46 UTC (rev 6809)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-06-02 04:41:46 UTC (rev 6810)
@@ -16,6 +16,7 @@
Bugfix: Didn't show correct EOL chars if whitespace chars were turned off
and again on (#2791402)
Bugfix: Generated patch had wrong file time for UTF-16 files (#2791506)
+ Bugfix: Did not export changed options values (#2799149)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/Common/PreferencesDlg.cpp
===================================================================
--- branches/R2_12/Src/Common/PreferencesDlg.cpp 2009-06-02 04:37:46 UTC (rev 6809)
+++ branches/R2_12/Src/Common/PreferencesDlg.cpp 2009-06-02 04:41:46 UTC (rev 6810)
@@ -334,6 +334,10 @@
if (extension.empty())
settingsFile += _T(".ini");
+ // Save all new settings before exporting
+ m_pphost.UpdatePagesData();
+ SaveOptions();
+
if (m_pOptionsMgr->ExportOptions(settingsFile) == OPT_OK)
LangMessageBox(IDS_OPT_EXPORT_DONE, MB_ICONINFORMATION);
else
Modified: branches/R2_12/Src/Common/PropertyPageHost.cpp
===================================================================
--- branches/R2_12/Src/Common/PropertyPageHost.cpp 2009-06-02 04:37:46 UTC (rev 6809)
+++ branches/R2_12/Src/Common/PropertyPageHost.cpp 2009-06-02 04:41:46 UTC (rev 6810)
@@ -324,6 +324,24 @@
}
}
+/**
+ * @brief Update all PropertyPages.
+ */
+void CPropertyPageHost::UpdatePagesData()
+{
+ int nPage = m_aPages.GetSize();
+
+ while (nPage--)
+ {
+ CPropertyPage* pPage = m_aPages[nPage].pPage;
+
+ if (pPage && pPage->GetSafeHwnd())
+ {
+ pPage->UpdateData();
+ }
+ }
+}
+
int CPropertyPageHost::OnCreate(LPCREATESTRUCT lpCreateStruct)
{
if (CWnd::OnCreate(lpCreateStruct) == -1)
Modified: branches/R2_12/Src/Common/PropertyPageHost.h
===================================================================
--- branches/R2_12/Src/Common/PropertyPageHost.h 2009-06-02 04:37:46 UTC (rev 6809)
+++ branches/R2_12/Src/Common/PropertyPageHost.h 2009-06-02 04:41:46 UTC (rev 6810)
@@ -41,6 +41,7 @@
BOOL Create(LPRECT lpRect, CWnd* pParent, UINT uCtrlID = AFX_IDW_PANE_FIRST);
BOOL Create(UINT nRefCtrlID, CWnd* pParent, UINT uCtrlID = AFX_IDW_PANE_FIRST);
void OnOK();
+ void UpdatePagesData();
int GetActiveIndex();
CPropertyPage* GetActivePage();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-09 09:32:29
|
Revision: 6831
http://winmerge.svn.sourceforge.net/winmerge/?rev=6831&view=rev
Author: kimmov
Date: 2009-06-09 09:32:19 +0000 (Tue, 09 Jun 2009)
Log Message:
-----------
PATCH: [ 2802427 ] Foldercompare method changed
Submitted by Matthias Mayer, edited by Kimmo
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 2009-06-08 22:02:20 UTC (rev 6830)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-06-09 09:32:19 UTC (rev 6831)
@@ -17,6 +17,7 @@
and again on (#2791402)
Bugfix: Generated patch had wrong file time for UTF-16 files (#2791506)
Bugfix: Did not export changed options values (#2799149)
+ Bugfix: Reset the compare method to original if it was changed (#2802427)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Modified: branches/R2_12/Src/FolderCmp.cpp
===================================================================
--- branches/R2_12/Src/FolderCmp.cpp 2009-06-08 22:02:20 UTC (rev 6830)
+++ branches/R2_12/Src/FolderCmp.cpp 2009-06-09 09:32:19 UTC (rev 6831)
@@ -159,6 +159,7 @@
{
PluginsContext plugCtxt;
int nCompMethod = pCtxt->m_nCompMethod;
+ const int origCompMethod = pCtxt->m_nCompMethod;
m_pCtx = pCtxt;
// Reset text stats
@@ -333,6 +334,8 @@
di.errorDesc = _T("Bad compare type");
}
+ // Reset the compare method to original (could have been changed)
+ m_pCtx->GetCompareOptions(origCompMethod);
m_diffFileData.Reset();
if (pCtxt->m_bPluginsEnabled && (pCtxt->m_nCompMethod == CMP_CONTENT ||
pCtxt->m_nCompMethod == CMP_QUICK_CONTENT))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-06-13 15:34:30
|
Revision: 6847
http://winmerge.svn.sourceforge.net/winmerge/?rev=6847&view=rev
Author: gerundt
Date: 2009-06-13 15:34:28 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
PATCH: [ 2804979 ] Updated Dutch translation (+ ShellExtension)
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/ShellExtension/Languages/ShellExtensionDutch.rc
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-06-13 15:24:07 UTC (rev 6846)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-06-13 15:34:28 UTC (rev 6847)
@@ -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.12.6
+ Translation updates:
+ - Dutch (#2804979)
+
WinMerge 2.12.4 - 2009-06-09 (r6833)
Add more C/C++ types to syntax highlight (#2776705)
Create config log file to My Documents-folder (#2789839)
Modified: branches/R2_12/ShellExtension/Languages/ShellExtensionDutch.rc
===================================================================
--- branches/R2_12/ShellExtension/Languages/ShellExtensionDutch.rc 2009-06-13 15:24:07 UTC (rev 6846)
+++ branches/R2_12/ShellExtension/Languages/ShellExtensionDutch.rc 2009-06-13 15:34:28 UTC (rev 6847)
@@ -32,14 +32,14 @@
BEGIN
IDS_PROJNAME "ShellExtension"
IDS_CONTEXT_MENU "WinMerge"
- IDS_CONTEXT_HELP "Open with WinMerge"
- IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
- IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
- IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_CONTEXT_HELP "Openen met WinMerge"
+ IDS_CONTEXT_HELP_MANYITEMS "Gelieve niet meer dan 2 items te selecteren"
+ IDS_COMPARE "Vergelijken"
+ IDS_COMPARE_ELLIPSIS "Vergelijken..."
+ IDS_COMPARE_TO "Vergelijken met"
+ IDS_HELP_SAVETHIS "Dit pad opslaan. Selecteer een ander pad om te vergelijken met dit pad."
+ IDS_HELP_COMPARESAVED "Vergelijken met opgeslagen pad (%1)"
+ IDS_RESELECT_FIRST "Eerste opnieuw selecteren"
END
#endif // Dutch (Netherlands) resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-07 08:15:06
|
Revision: 6902
http://winmerge.svn.sourceforge.net/winmerge/?rev=6902&view=rev
Author: kimmov
Date: 2009-07-07 07:50:11 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
PATCH: [ 2817835 ] Ukrainian translation update
Submitted by Warrior
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Ukrainian.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-07 07:47:48 UTC (rev 6901)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-07 07:50:11 UTC (rev 6902)
@@ -6,6 +6,7 @@
WinMerge 2.12.6
Translation updates:
- Dutch (#2804979)
+ - Ukrainian (#2817835)
WinMerge 2.12.4 - 2009-06-09 (r6833)
Add more C/C++ types to syntax highlight (#2776705)
Modified: branches/R2_12/Src/Languages/Ukrainian.po
===================================================================
--- branches/R2_12/Src/Languages/Ukrainian.po 2009-07-07 07:47:48 UTC (rev 6901)
+++ branches/R2_12/Src/Languages/Ukrainian.po 2009-07-07 07:50:11 UTC (rev 6902)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-02-13 23:24+0200\n"
+"PO-Revision-Date: 2009-06-13 00:58+0200\n"
"Last-Translator: Warrior <wa...@ra...>\n"
"Language-Team: Ukrainian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Ukrainian\n"
"X-Poedit-SourceCharset: CP1251\n"
-"X-Poedit-Basepath: ../\n"
+"X-Poedit-Basepath: ../../Src/\n"
"X-Poedit-Country: UKRAINE\n"
#. LANGUAGE, SUBLANGUAGE
@@ -1708,12 +1708,12 @@
msgstr "³\xE4\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xE8 \xF1\xF2\xEE\xE2\xEF\xF7\xE8\xEA\xE8"
#: Merge.rc:1079
-#, fuzzy, c-format
+#, c-format
msgid "Move &Up"
msgstr "&\xC2\xE3\xEE\xF0\xF3"
#: Merge.rc:1080
-#, fuzzy, c-format
+#, c-format
msgid "Move &Down"
msgstr "\xC2&\xED\xE8\xE7"
@@ -2002,8 +2002,8 @@
#: Merge.rc:1258
#, c-format
-msgid "Discard All"
-msgstr "\xD1\xEA\xE0\xF1\xF3\xE2\xE0\xF2\xE8 \xE2\xF1\xE5"
+msgid "Disca&rd All"
+msgstr "\xD1\xEA\xE0\xF1\xF3&\xE2\xE0\xF2\xE8 \xE2\xF1\xE5"
#: Merge.rc:1265
#: Merge.rc:1513
@@ -2883,7 +2883,7 @@
"³\xEA\xED\xE0 \xEA\xE0\xF1\xEA\xE0\xE4\xEE\xEC"
#: Merge.rc:1824
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
"Tile Windows Horizontally"
@@ -2892,7 +2892,7 @@
"³\xEA\xED\xE0 \xF7\xE5\xF0\xE5\xEF\xE8\xF6\xE5\xFE"
#: Merge.rc:1825
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
"Tile Windows Vertically"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-07-25 17:20:04
|
Revision: 6927
http://winmerge.svn.sourceforge.net/winmerge/?rev=6927&view=rev
Author: gerundt
Date: 2009-07-25 17:19:56 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
PATCH: [ 2825132 ] ShellExtension - Turkish Translation
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Contributors.txt
branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-25 17:14:18 UTC (rev 6926)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-25 17:19:56 UTC (rev 6927)
@@ -6,6 +6,7 @@
WinMerge 2.12.6
Translation updates:
- Dutch (#2804979)
+ - Turkish (#2825132)
- Ukrainian (#2817835)
WinMerge 2.12.4 - 2009-06-09 (r6833)
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2009-07-25 17:14:18 UTC (rev 6926)
+++ branches/R2_12/Docs/Users/Contributors.txt 2009-07-25 17:19:56 UTC (rev 6927)
@@ -123,6 +123,7 @@
G\xF6ran H\xE5kansson <gor...@te...>
* Turkish:
+ Afyonlu <af...@us...>
Ozkan UNVER <tur...@us...>
* Ukranian
Modified: branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc
===================================================================
--- branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc 2009-07-25 17:14:18 UTC (rev 6926)
+++ branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc 2009-07-25 17:19:56 UTC (rev 6927)
@@ -15,7 +15,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Turkish (U.S.) resources
+// Turkish resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_TRK)
#ifdef _WIN32
@@ -32,14 +32,14 @@
BEGIN
IDS_PROJNAME "ShellExtension"
IDS_CONTEXT_MENU "WinMerge"
- IDS_CONTEXT_HELP "Open with WinMerge"
- IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
- IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
- IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_CONTEXT_HELP "WinMerge \xDDle A\xE7"
+ IDS_CONTEXT_HELP_MANYITEMS "L\xFCtfen \xD6ge Say\xFDs\xFD 2'yi Ge\xE7meyecek \xDEekilde Se\xE7im Yap\xFDn\xFDz"
+ IDS_COMPARE "Kar\xFE\xFDla\xFEt\xFDr"
+ IDS_COMPARE_ELLIPSIS "Kar\xFE\xFDla\xFEt\xFDr..."
+ IDS_COMPARE_TO "\xDEununla Kar\xFE\xFDla\xFEt\xFDr"
+ IDS_HELP_SAVETHIS "Bu Dizini Kaydet. Bu Dizinle Kar\xFE\xFDla\xFEt\xFDrmak \xDD\xE7in Ba\xFEka Bir Dizin Se\xE7."
+ IDS_HELP_COMPARESAVED "Kaydedilen Dizini Kar\xFE\xFDla\xFEt\xFDr (%1)"
+ IDS_RESELECT_FIRST "Birincisini Yeniden Se\xE7"
END
#endif // Turkish resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-07-28 07:11:37
|
Revision: 6938
http://winmerge.svn.sourceforge.net/winmerge/?rev=6938&view=rev
Author: gerundt
Date: 2009-07-28 07:11:29 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
PATCH: [ 2827817 ] Turkish Translation - NEW- (Stable Branch)
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Turkish.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-28 06:55:10 UTC (rev 6937)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-28 07:11:29 UTC (rev 6938)
@@ -6,7 +6,7 @@
WinMerge 2.12.6
Translation updates:
- Dutch (#2804979)
- - Turkish (#2825132)
+ - Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
WinMerge 2.12.4 - 2009-06-09 (r6833)
Modified: branches/R2_12/Src/Languages/Turkish.po
===================================================================
--- branches/R2_12/Src/Languages/Turkish.po 2009-07-28 06:55:10 UTC (rev 6937)
+++ branches/R2_12/Src/Languages/Turkish.po 2009-07-28 07:11:29 UTC (rev 6938)
@@ -2,6 +2,7 @@
# Released under the "GNU General Public License"
#
# Translators:
+# * Afyonlu <af...@us...>
# * Ozkan UNVER <turquaz37915 at users.sourceforge.net>
#
# ID line follows -- this is updated by SVN
@@ -12,8 +13,8 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2009-07-27 16:00+0200\n"
+"Last-Translator: Afyonlu <af...@us...>\n"
"Language-Team: Turkish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1254\n"
@@ -40,196 +41,196 @@
#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
-msgstr ""
+msgstr "Sa\xF0a Kopyala"
#: Merge.rc:73
#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
-msgstr ""
+msgstr "Sola Kopyala"
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr ""
+msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7"
#: Merge.rc:77
#, c-format
msgid "&Undo"
-msgstr ""
+msgstr "Geri Al"
#: Merge.rc:78
#, c-format
msgid "&Redo"
-msgstr ""
+msgstr "Yinele"
#: Merge.rc:80
#: Merge.rc:102
#, c-format
msgid "Cu&t"
-msgstr ""
+msgstr "Kes"
#: Merge.rc:81
#: Merge.rc:103
#: Merge.rc:508
#, c-format
msgid "&Copy"
-msgstr ""
+msgstr "Kopyala"
#: Merge.rc:82
#: Merge.rc:104
#, c-format
msgid "&Paste"
-msgstr ""
+msgstr "Yap\xFD\xFEt\xFDr"
#: Merge.rc:84
#: Merge.rc:589
#, c-format
msgid "&Goto..."
-msgstr ""
+msgstr "Git..."
#: Merge.rc:86
#, c-format
msgid "Op&en"
-msgstr ""
+msgstr "A\xE7"
#: Merge.rc:88
#: Merge.rc:531
#: Merge.rc:537
#, c-format
msgid "with &Registered Application"
-msgstr ""
+msgstr "Kay\xFDtl\xFD Uygulama \xDDle"
#: Merge.rc:89
#: Merge.rc:532
#: Merge.rc:538
#, c-format
msgid "with &External Editor"
-msgstr ""
+msgstr "Harici D\xFCzenleyici \xDDle"
#: Merge.rc:90
#: Merge.rc:533
#: Merge.rc:539
#, c-format
msgid "&with..."
-msgstr ""
+msgstr "Birlikte A\xE7..."
#: Merge.rc:110
#: Merge.rc:191
#: Merge.rc:312
#, c-format
msgid "&File"
-msgstr "&Dosya"
+msgstr "Dosya"
#: Merge.rc:112
#: Merge.rc:193
#: Merge.rc:314
#, c-format
msgid "&New\tCtrl+N"
-msgstr "&Yeni\tCtrl+N"
+msgstr "Yeni\tCtrl+N"
#: Merge.rc:113
#: Merge.rc:194
#: Merge.rc:315
#, c-format
msgid "&Open...\tCtrl+O"
-msgstr "&A\xE7...\tCtrl+O"
+msgstr "A\xE7...\tCtrl+O"
#: Merge.rc:114
#: Merge.rc:195
#: Merge.rc:316
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Fark Dosyas\xFD A\xE7..."
#: Merge.rc:116
#: Merge.rc:197
#: Merge.rc:318
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr ""
+msgstr "Proje A\xE7...\tCtrl+J"
#: Merge.rc:117
#: Merge.rc:198
#: Merge.rc:319
#, c-format
msgid "Sa&ve Project..."
-msgstr ""
+msgstr "Projeyi Kaydet..."
#: Merge.rc:119
#, c-format
msgid "Recent Projects"
-msgstr ""
+msgstr "Son Kullan\xFDlan Projeler"
#: Merge.rc:121
#: Merge.rc:205
#: Merge.rc:351
#, c-format
msgid "E&xit"
-msgstr "\xC7\xFDk\xFD&\xFE"
+msgstr "\xC7\xFDk\xFD\xFE"
#: Merge.rc:123
#: Merge.rc:207
#: Merge.rc:353
#, c-format
msgid "&Edit"
-msgstr "&D\xFCzen"
+msgstr "D\xFCzen"
#: Merge.rc:125
#: Merge.rc:211
#: Merge.rc:387
#, c-format
msgid "&Options..."
-msgstr "&Se\xE7enekler..."
+msgstr "Ayarlar..."
#: Merge.rc:127
#: Merge.rc:213
#: Merge.rc:389
#, c-format
msgid "&View"
-msgstr "&G\xF6r\xFCn\xFCm"
+msgstr "G\xF6r\xFCn\xFCm"
#: Merge.rc:129
#: Merge.rc:228
#: Merge.rc:391
#, c-format
msgid "Select &Font..."
-msgstr "Fo&nt Se\xE7"
+msgstr "Yaz\xFD Tipi Se\xE7..."
#: Merge.rc:130
#: Merge.rc:229
#: Merge.rc:392
#, c-format
msgid "Use Default F&ont"
-msgstr "&Varsay\xFDlan Fontu Kullan"
+msgstr "Varsay\xFDlan Yaz\xFD Tipini Kullan"
#: Merge.rc:132
#: Merge.rc:231
#: Merge.rc:413
#, c-format
msgid "&Toolbar"
-msgstr ""
+msgstr "Ara\xE7 \xC7ubu\xF0u"
#: Merge.rc:134
#: Merge.rc:233
#: Merge.rc:415
#, c-format
msgid "&None"
-msgstr ""
+msgstr "Yok"
#: Merge.rc:135
#: Merge.rc:234
#: Merge.rc:416
#, c-format
msgid "&Small"
-msgstr ""
+msgstr "K\xFC\xE7\xFCk"
#: Merge.rc:136
#: Merge.rc:235
#: Merge.rc:417
#, c-format
msgid "&Big"
-msgstr ""
+msgstr "B\xFCy\xFCk"
#: Merge.rc:138
#: Merge.rc:237
@@ -243,98 +244,98 @@
#: Merge.rc:420
#, c-format
msgid "Ta&b Bar"
-msgstr ""
+msgstr "Sekme \xC7ubu\xF0u"
#: Merge.rc:141
#: Merge.rc:241
#: Merge.rc:424
#, c-format
msgid "&Language..."
-msgstr "&Dil"
+msgstr "Dil..."
#: Merge.rc:143
#: Merge.rc:262
#: Merge.rc:446
#, c-format
msgid "&Tools"
-msgstr "&Ara\xE7lar"
+msgstr "Ara\xE7lar"
#: Merge.rc:145
#: Merge.rc:265
#: Merge.rc:448
#, c-format
msgid "&Filters..."
-msgstr "&Filtreler"
+msgstr "Filtreler..."
#: Merge.rc:146
#: Merge.rc:266
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
-msgstr "&Yama \xDCret..."
+msgstr "Yama Olu\xFEtur..."
#: Merge.rc:148
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Plugins"
-msgstr "&Eklentiler"
+msgstr "Eklentiler"
#: Merge.rc:150
#: Merge.rc:271
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "Listele..."
#: Merge.rc:152
#: Merge.rc:273
#: Merge.rc:456
-#, c-format
+#, fuzzy, c-format
msgid "&Manual Unpacking"
-msgstr "&Manuel A\xE7mak"
+msgstr "\xC7\xFDkart (Elle)"
#: Merge.rc:153
#: Merge.rc:274
#: Merge.rc:457
#, c-format
msgid "&Automatic Unpacking"
-msgstr "&Otomatik A\xE7mak"
+msgstr "\xC7\xFDkart (Otomatik)"
#: Merge.rc:155
#: Merge.rc:276
#: Merge.rc:459
#, c-format
msgid "&Edit with Unpacker"
-msgstr "&A\xE7\xFDc\xFDyla D\xFCzenler"
+msgstr "\xC7\xFDkartma Program\xFD \xDDle D\xFCzenle"
#: Merge.rc:157
#: Merge.rc:278
#: Merge.rc:466
#, c-format
msgid "&Reload plugins"
-msgstr "Eklentileri &Tekrar Y\xFCkle"
+msgstr "Eklentileri Tekrar Y\xFCkle"
#: Merge.rc:159
#: Merge.rc:280
#: Merge.rc:468
#, c-format
msgid "&Debug"
-msgstr ""
+msgstr "Hata Onar\xFDm\xFD"
#: Merge.rc:161
#: Merge.rc:282
#: Merge.rc:470
#, c-format
msgid "&Load Config..."
-msgstr ""
+msgstr "Ayarlar\xFD Y\xFCkle..."
#: Merge.rc:162
#: Merge.rc:283
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
-msgstr ""
+msgstr "S\xFDf\xFDrlama Se\xE7enekleri"
#: Merge.rc:164
#: Merge.rc:285
@@ -348,42 +349,42 @@
#: Merge.rc:475
#, c-format
msgid "Cl&ose"
-msgstr "&Kapat"
+msgstr "Kapat"
#: Merge.rc:167
#: Merge.rc:288
#: Merge.rc:476
#, c-format
msgid "Clo&se All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Kapat"
#: Merge.rc:169
#: Merge.rc:290
#: Merge.rc:478
#, c-format
msgid "Change &Pane\tF6"
-msgstr "&Pencere De\xF0itir\tF6"
+msgstr "Di\xF0er Paneli Aktifle\xFEtir\tF6"
#: Merge.rc:171
#: Merge.rc:292
#: Merge.rc:480
#, c-format
msgid "Tile &Horizontally"
-msgstr "&Yatay D\xF6\xFEe"
+msgstr "Yatay D\xF6\xFEe"
#: Merge.rc:172
#: Merge.rc:293
#: Merge.rc:481
#, c-format
msgid "Tile &Vertically"
-msgstr "&Dikey D\xF6\xFEe"
+msgstr "Dikey D\xF6\xFEe"
#: Merge.rc:173
#: Merge.rc:294
#: Merge.rc:482
#, c-format
msgid "&Cascade"
-msgstr "&S\xFDrala"
+msgstr "Basamakla"
#: Merge.rc:175
#: Merge.rc:296
@@ -391,332 +392,332 @@
#: Merge.rc:1933
#, c-format
msgid "&Help"
-msgstr "&Yard\xFDm"
+msgstr "Yard\xFDm"
#: Merge.rc:177
#: Merge.rc:298
#: Merge.rc:486
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "WinMerge Yard\xFDm\xFD\tF1"
#: Merge.rc:179
#: Merge.rc:300
#: Merge.rc:488
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "S\xFCr\xFCm Notlar\xFD"
#: Merge.rc:180
#: Merge.rc:301
#: Merge.rc:489
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "\xC7eviriler"
#: Merge.rc:181
#: Merge.rc:302
#: Merge.rc:490
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "Yap\xFDland\xFDrma Kayd\xFD"
#: Merge.rc:182
#: Merge.rc:303
#: Merge.rc:491
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Yedekleme Deste\xF0i Kapal\xFD"
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
#: Merge.rc:184
#: Merge.rc:305
#: Merge.rc:493
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "GNU General Public Lisans\xFD"
#: Merge.rc:185
#: Merge.rc:306
#: Merge.rc:494
#, c-format
msgid "&About WinMerge..."
-msgstr "&WinMerge Hakk\xFDnda..."
+msgstr "WinMerge Hakk\xFDnda..."
#: Merge.rc:200
#: Merge.rc:337
#, c-format
msgid "L&eft Read-only"
-msgstr "Salt Okunur S&ol"
+msgstr "Sol Taraf\xFD Salt Okunur Yap"
#: Merge.rc:201
#: Merge.rc:338
#, c-format
msgid "Ri&ght Read-only"
-msgstr "Salt Okunu&r Sa\xF0"
+msgstr "Sa\xF0 Taraf\xFD Salt Okunur Yap"
#: Merge.rc:203
#, c-format
msgid "File En&coding"
-msgstr ""
+msgstr "Dosya Kodlamas\xFD"
#: Merge.rc:209
#: Merge.rc:363
#, c-format
msgid "Select &All\tCtrl+A"
-msgstr "&T\xFCm\xFCn\xFC Se\xE7\tCtrl+A"
+msgstr "T\xFCm\xFCn\xFC Se\xE7\tCtrl+A"
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr ""
+msgstr "Ayn\xFD \xD6geleri G\xF6ster"
#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
-msgstr ""
+msgstr "Farkl\xFD \xD6geleri G\xF6ster"
#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
-msgstr ""
+msgstr "Soldaki Benzersiz \xD6geleri G\xF6ster"
#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr ""
+msgstr "Sa\xF0daki Benzersiz \xD6geleri G\xF6ster"
#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
-msgstr ""
+msgstr "Atlanan \xD6geleri G\xF6ster"
#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
-msgstr ""
+msgstr "Binary Dosyalar\xFDn\xFD G\xF6ster"
#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
-msgstr ""
+msgstr "Gizli \xD6geleri G\xF6ster"
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "A\xF0a\xE7 G\xF6r\xFCn\xFCm\xFC"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Geni\xFElet"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Daralt"
#: Merge.rc:239
#, c-format
msgid "Compa&re Statistics"
-msgstr ""
+msgstr "Say\xFDsal Verileri Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:243
#: Merge.rc:426
#, c-format
msgid "Refre&sh\tF5"
-msgstr "Ta&zele\tF5"
+msgstr "Tazele\tF5"
#: Merge.rc:244
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "Se\xE7ili Olan\xFD Tazele\tCtrl+F5"
#: Merge.rc:246
#: Merge.rc:428
#, c-format
msgid "&Merge"
-msgstr "&Birle\xFEtirme"
+msgstr "Birle\xFEtir"
#: Merge.rc:248
#, c-format
msgid "Co&mpare\tEnter"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\tEnter"
#: Merge.rc:250
#: Merge.rc:430
#, c-format
msgid "&Next Difference\tAlt+Down"
-msgstr "&Sonraki Fark\tAlt+Down"
+msgstr "Sonraki Fark\tAlt+Down"
#: Merge.rc:251
#: Merge.rc:431
#, c-format
msgid "&Previous Difference\tAlt+Up"
-msgstr "&\xD6nceki Fark\tAlt+Up"
+msgstr "\xD6nceki Fark\tAlt+Up"
#: Merge.rc:253
#: Merge.rc:433
#, c-format
msgid "&First Difference\tAlt+Home"
-msgstr "&\xDDlk Fark\tAlt+Home"
+msgstr "\xDDlk Fark\tAlt+Home"
#: Merge.rc:254
#: Merge.rc:434
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "&\xDEu Anki Fark\tAlt+Enter"
+msgstr "\xDEimdiki Fark\tAlt+Enter"
#: Merge.rc:255
#: Merge.rc:435
#, c-format
msgid "&Last Difference\tAlt+End"
-msgstr "S&on Fark\tAlt+End"
+msgstr "Son Fark\tAlt+End"
#: Merge.rc:257
#: Merge.rc:437
#, c-format
msgid "Copy to &Right\tAlt+Right"
-msgstr "S&a\xF0a Kopyala\tAlt+Right"
+msgstr "Sa\xF0a Kopyala\tAlt+Right"
#: Merge.rc:258
#: Merge.rc:438
#, c-format
msgid "Copy to L&eft\tAlt+Left"
-msgstr "So&la Kopyala\tAlt+Left"
+msgstr "Sola Kopyala\tAlt+Left"
#: Merge.rc:260
#, c-format
msgid "&Delete\tDel"
-msgstr ""
+msgstr "Sil"
#: Merge.rc:264
#: Merge.rc:562
#, c-format
msgid "&Customize Columns..."
-msgstr "Kolonlar\xFD &\xD6zelle\xFEtir"
+msgstr "S\xFCtunlar\xFD \xD6zelle\xFEtir..."
#: Merge.rc:267
#: Merge.rc:450
#, c-format
msgid "Generate &Report..."
-msgstr ""
+msgstr "Rapor Haz\xFDrla..."
#: Merge.rc:321
#, c-format
msgid "&Save\tCtrl+S"
-msgstr "&Kaydet\tCtrl+S"
+msgstr "Kaydet\tCtrl+S"
#: Merge.rc:322
#, c-format
msgid "Save &Left"
-msgstr "S&olu Kaydet "
+msgstr "Solu Kaydet "
#: Merge.rc:324
#: Merge.rc:329
#, c-format
msgid "&Save"
-msgstr "&Kaydet"
+msgstr "Kaydet"
#: Merge.rc:325
#: Merge.rc:330
#, c-format
msgid "Save &As..."
-msgstr "&Farkl\xFD Kaydet"
+msgstr "Farkl\xFD Kaydet..."
#: Merge.rc:327
#, c-format
msgid "Save &Right"
-msgstr "&Sa\xF0\xFD Kaydet"
+msgstr "Sa\xF0\xFD Kaydet"
#: Merge.rc:333
#, c-format
msgid "&Print..."
-msgstr ""
+msgstr "Yazd\xFDr..."
#: Merge.rc:334
#, c-format
msgid "Page Se&tup"
-msgstr ""
+msgstr "Sayfa Yap\xFDs\xFD"
#: Merge.rc:335
#, c-format
msgid "Print Previe&w"
-msgstr ""
+msgstr "Bask\xFD \xD6nizleme"
#: Merge.rc:340
#, c-format
msgid "&Convert Line Endings to"
-msgstr ""
+msgstr "Sat\xFDr Sonlar\xFDn\xFD D\xF6n\xFC\xFEt\xFCr"
#: 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
msgid "&Merge Mode\tF9"
-msgstr "Birle\xFEtirme &Durumu\tF9"
+msgstr "Birle\xFEtirme Durumu\tF9"
#: Merge.rc:349
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "Dosya Kodlamas\xFD..."
#: Merge.rc:355
#, c-format
msgid "&Undo\tCtrl+Z"
-msgstr "&Geri Al\tCtrl+Z"
+msgstr "Geri Al\tCtrl+Z"
#: Merge.rc:356
#, c-format
msgid "&Redo\tCtrl+Y"
-msgstr "&Geri Al\xFD Geri Al\tCtrl+Y"
+msgstr "\xDDleri Al\tCtrl+Y"
#: Merge.rc:358
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr "&Kes\tCtrl+X"
+msgstr "Kes\tCtrl+X"
#: Merge.rc:359
#, c-format
msgid "&Copy\tCtrl+C"
-msgstr "Ko&pyala\tCtrl+C"
+msgstr "Kopyala\tCtrl+C"
#: Merge.rc:360
#, c-format
msgid "&Paste\tCtrl+V"
-msgstr "&Yap\xFD\xFEt\xFDr\tCtrl+V"
+msgstr "Yap\xFD\xFEt\xFDr\tCtrl+V"
#: Merge.rc:362
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr ""
+msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7\tF4"
#: Merge.rc:365
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Bul...\tCtrl+F"
+msgstr "Bul...\tCtrl+F"
#: Merge.rc:366
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "&De\xF0i\xFEtir...\tCtrl+H"
+msgstr "De\xF0i\xFEtir...\tCtrl+H"
#: Merge.rc:368
#, c-format
msgid "&Scripts"
-msgstr "&Senaryolar(Scripts)"
+msgstr "Yaz\xFD D\xFCzeni"
#: Merge.rc:370
#: Merge.rc:2789
@@ -727,103 +728,103 @@
#: Merge.rc:373
#, c-format
msgid "Advanced"
-msgstr ""
+msgstr "Geli\xFEmi\xFE"
#: Merge.rc:375
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr ""
+msgstr "Sat\xFDr Numaralar\xFD \xDDle Kopyala\tCtrl+Shift+C"
#: Merge.rc:378
#, c-format
msgid "&Bookmarks"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar"
#: Merge.rc:380
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar\xFD A\xE7-Kapat\tCtrl+F2"
#: Merge.rc:381
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr ""
+msgstr "Sonraki S\xFDk Kullan\xFDlan\tF2"
#: Merge.rc:382
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr ""
+msgstr "\xD6nceki S\xFDk Kullan\xFDlan\tShift+F2"
#: Merge.rc:383
#, c-format
msgid "&Clear All Bookmarks"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar\xFD Temizle"
#: Merge.rc:385
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "&Git...\tCtrl+G"
+msgstr "Git...\tCtrl+G"
#: Merge.rc:393
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "Yak\xFDnla\xFEt\xFDr"
#: Merge.rc:395
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Yak\xFDnla\xFEt\xFDr\tCtrl++"
#: Merge.rc:396
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Uzakla\xFEt\xFDr\tCtrl+-"
#. Zoom to normal
#: Merge.rc:397
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "&Normal\tCtrl+*"
#: Merge.rc:399
#, c-format
msgid "Syntax Highlight"
-msgstr ""
+msgstr "S\xF6zdizimi Vurgusu"
#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "Panelleri Kilitle"
#: Merge.rc:405
#, c-format
msgid "&View Whitespace"
-msgstr "&Bo\xFEluklar\xFD G\xF6ster"
+msgstr "Bo\xFEluklar\xFD G\xF6ster"
#: Merge.rc:406
#, c-format
msgid "Vie&w Line Differences"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD G\xF6ster"
#: Merge.rc:407
#, c-format
msgid "View Line &Numbers"
-msgstr ""
+msgstr "Sat\xFDr Numaralar\xFDn\xFD G\xF6ster"
#: Merge.rc:408
#, c-format
msgid "View &Margins"
-msgstr ""
+msgstr "S\xFDn\xFDrlar\xFD G\xF6ster"
#: Merge.rc:409
#, c-format
msgid "W&rap Lines"
-msgstr ""
+msgstr "Sat\xFDrlar\xFD Kayd\xFDr"
#: Merge.rc:411
#, c-format
msgid "Sw&ap Panes"
-msgstr ""
+msgstr "Panelleri Yer De\xF0i\xFEtir"
#: Merge.rc:421
#, c-format
@@ -833,246 +834,246 @@
#: Merge.rc:422
#, c-format
msgid "Lo&cation Pane"
-msgstr "Pozisyon Penceresi"
+msgstr "Durum Penceresi"
#: Merge.rc:440
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "&Geli\xFEmi\xFE Sa\xF0a Kopyala\tAlt+Ctrl+Right"
+msgstr "Sa\xF0a Kopyala ve \xDDlerle\tAlt+Ctrl+Right"
#: Merge.rc:441
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "G&eli\xFEmi\xFE Sola Kopyala\tAlt+Ctrl+Left"
+msgstr "Sola Kopyala ve \xDDlerle\tAlt+Ctrl+Left"
#: Merge.rc:443
#, c-format
msgid "Copy &All to Right"
-msgstr "&T\xFCm\xFCn\xFC Sa\xF0a Kopyala"
+msgstr "T\xFCm\xFCn\xFC Sa\xF0a Kopyala"
#: Merge.rc:444
#, c-format
msgid "Cop&y All to Left"
-msgstr "T&\xFCm\xFCn\xFC Sola Kopyala"
+msgstr "T\xFCm\xFCn\xFC Sola Kopyala"
#: Merge.rc:461
-#, c-format
+#, fuzzy, c-format
msgid "&Prediffer"
-msgstr "&\xD6ncelikli Fark"
+msgstr "\xD6ncelikli Fark"
#: Merge.rc:502
#, c-format
msgid "Comp&are"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:503
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "\xD6zel Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:505
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:510
#, c-format
msgid "&Left to Right"
-msgstr ""
+msgstr "Solu Sa\xF0a"
#: Merge.rc:511
#, c-format
msgid "L&eft to..."
-msgstr ""
+msgstr "Solu \xDEuraya..."
#: Merge.rc:512
#, c-format
msgid "&Right to Left"
-msgstr ""
+msgstr "Sa\xF0\xFD Sola"
#: Merge.rc:513
#, c-format
msgid "R&ight to..."
-msgstr ""
+msgstr "Sa\xF0\xFD \xDEuraya..."
#: Merge.rc:515
#, c-format
msgid "&Move"
-msgstr ""
+msgstr "Ta\xFE\xFD"
#: Merge.rc:517
#, c-format
msgid "&Left to..."
-msgstr ""
+msgstr "Solu \xDEuraya..."
#: Merge.rc:518
#, c-format
msgid "&Right to..."
-msgstr ""
+msgstr "Sa\xF0\xFD \xDEuraya..."
#: Merge.rc:520
#, c-format
msgid "&Delete"
-msgstr ""
+msgstr "Sil"
#: Merge.rc:522
#: Merge.rc:1135
#: Merge.rc:1517
#, c-format
msgid "&Left"
-msgstr ""
+msgstr "Sol"
#: Merge.rc:523
#: Merge.rc:1137
#: Merge.rc:1520
#, c-format
msgid "&Right"
-msgstr ""
+msgstr "Sa\xF0"
#: Merge.rc:524
#, c-format
msgid "&Both"
-msgstr ""
+msgstr "Her \xDDkisi"
#: Merge.rc:526
#, c-format
msgid "Re&name"
-msgstr ""
+msgstr "Yeniden Adland\xFDr"
#: Merge.rc:527
#, c-format
msgid "&Hide Items"
-msgstr ""
+msgstr "\xD6geleri Gizle"
#: Merge.rc:529
#, c-format
msgid "&Open Left"
-msgstr ""
+msgstr "Sola A\xE7"
#: Merge.rc:535
#, c-format
msgid "O&pen Right"
-msgstr ""
+msgstr "Sa\xF0a A\xE7"
#: Merge.rc:542
#, c-format
msgid "Cop&y Pathnames"
-msgstr ""
+msgstr "Yol Adlar\xFDn\xFD Kopyala"
#: Merge.rc:544
#, c-format
msgid "&Left (%1 of %2)"
-msgstr ""
+msgstr "Soldaki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:545
#, c-format
msgid "&Right (%1 of %2)"
-msgstr ""
+msgstr "Sa\xF0daki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:546
#, c-format
msgid "&Both (%1 of %2)"
-msgstr ""
+msgstr "Her \xDDki Taraftaki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:548
#, c-format
msgid "Copy &Filenames"
-msgstr ""
+msgstr "Dosya Adlar\xFDn\xFD Kopyala"
#: Merge.rc:550
#, c-format
msgid "&Zip"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr (&Zip'le)"
#: Merge.rc:552
#, c-format
msgid "&Left... (%1 of %2)"
-msgstr ""
+msgstr "Soldakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:553
#, c-format
msgid "&Right... (%1 of %2)"
-msgstr ""
+msgstr "Sa\xF0dakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:554
#, c-format
msgid "&Both... (%1 of %2)"
-msgstr ""
+msgstr "Her \xDDki Taraftakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:555
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr ""
+msgstr "Farkl\xFD Olanlar\xFD... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:558
#, c-format
msgid "&Refresh"
-msgstr ""
+msgstr "Tazele"
#: Merge.rc:570
#, c-format
msgid "&Copy Full Path"
-msgstr ""
+msgstr "Tam Yolu Kopyala"
#: Merge.rc:571
#, c-format
msgid "Copy &Filename"
-msgstr ""
+msgstr "Dosya Ad\xFDn\xFD Kopyala"
#: Merge.rc:577
-#, c-format
+#, fuzzy, c-format
msgid "Prediffer Settings"
-msgstr ""
+msgstr "\xD6ncelikli Fark Ayarlar\xFD"
#: Merge.rc:579
-#, c-format
+#, fuzzy, c-format
msgid "&No prediffer"
-msgstr ""
+msgstr "\xD6ncelikli Fark Yok"
#: Merge.rc:580
-#, c-format
+#, fuzzy, c-format
msgid "Auto prediffer"
-msgstr ""
+msgstr "Otomatik \xD6ncelikli Fark"
#: Merge.rc:588
#, c-format
msgid "G&oto Diff"
-msgstr ""
+msgstr "Farka Git"
#: Merge.rc:591
#, c-format
msgid "&No Moved Blocks"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Blok Yok"
#: Merge.rc:592
#, c-format
msgid "&All Moved Blocks"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Bloklar\xFDn Hepsi"
#: Merge.rc:593
#, c-format
msgid "Moved Block for &Current Diff"
-msgstr ""
+msgstr "Ge\xE7erli Fark\xFDn Yerine Ta\xFE\xFDnan Blok"
#: Merge.rc:662
#, c-format
msgid "About WinMerge"
-msgstr ""
+msgstr "WinMerge Hakk\xFDnda"
#: Merge.rc:668
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(\xD6zel Yap\xFDm)"
#: Merge.rc:669
#, c-format
msgid "All rights reserved."
-msgstr ""
+msgstr "T\xFCm Haklar\xFD Sakl\xFDd\xFDr."
#: Merge.rc:670
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr ""
+msgstr "WinMerge Sitesini Ziyaret Ediniz."
#: Merge.rc:673
#: Merge.rc:705
@@ -1089,23 +1090,23 @@
#: Merge.rc:1665
#, c-format
msgid "OK"
-msgstr ""
+msgstr "TAMAM"
#: Merge.rc:674
#, c-format
msgid "Contributors"
-msgstr ""
+msgstr "Destekleyenler"
#: Merge.rc:681
#, c-format
msgid "Select Files or Folders"
-msgstr ""
+msgstr "Dosyalar\xFD veya Klas\xF6rleri Se\xE7"
#: Merge.rc:684
#: Merge.rc:1594
#, c-format
msgid "&Left:"
-msgstr ""
+msgstr "Sol:"
#: Merge.rc:688
#: Merge.rc:749
@@ -1113,52 +1114,52 @@
#: Merge.rc:1019
#, c-format
msgid "&Browse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:689
#: Merge.rc:1598
#, c-format
msgid "&Right:"
-msgstr ""
+msgstr "Sa\xF0:"
#: Merge.rc:693
#: Merge.rc:1030
#, c-format
msgid "Bro&wse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:694
#: Merge.rc:1602
#, c-format
msgid "&Filter:"
-msgstr ""
+msgstr "Filtre:"
#: Merge.rc:697
#: Merge.rc:1604
#, c-format
msgid "Select..."
-msgstr ""
+msgstr "Se\xE7..."
#: Merge.rc:698
#, c-format
msgid "&Unpacker:"
-msgstr ""
+msgstr "\xC7\xFDkart\xFDc\xFD:"
#: Merge.rc:701
#, c-format
msgid "&Select..."
-msgstr ""
+msgstr "Se\xE7..."
#: Merge.rc:702
#: Merge.rc:1605
#, c-format
msgid "&Include Subfolders"
-msgstr ""
+msgstr "Alt Klas\xF6rler Dahil"
#: Merge.rc:704
#, c-format
msgid "Status:"
-msgstr ""
+msgstr "Durum:"
#: Merge.rc:706
#: Merge.rc:736
@@ -1177,380 +1178,383 @@
#: Merge.rc:1666
#, c-format
msgid "Cancel"
-msgstr ""
+msgstr "\xDDptal"
#: Merge.rc:707
#: Merge.rc:1338
#, c-format
msgid "Help"
-msgstr ""
+msgstr "Yard\xFDm"
#: Merge.rc:708
#, c-format
msgid "Files or Folders to Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\xFDlacak Dosyalar veya Klas\xF6rler"
#: Merge.rc:715
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
#: Merge.rc:720
#, c-format
msgid "Database:"
-msgstr ""
+msgstr "Veritaban\xFD:"
#: Merge.rc:723
#, c-format
msgid "Project:"
-msgstr ""
+msgstr "Proje:"
#: Merge.rc:726
#, c-format
msgid "User:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD:"
#: Merge.rc:728
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "\xDEifre:"
#: Merge.rc:730
#, c-format
msgid "Link to Destination VSS project"
-msgstr ""
+msgstr "VSS Projesine Ba\xF0lant\xFD"
#: Merge.rc:732
#: Merge.rc:875
#, c-format
msgid "Apply to all items"
-msgstr ""
+msgstr "T\xFCm \xD6gelere Uygula"
#: Merge.rc:734
#, c-format
msgid "Check Out"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFC"
#: Merge.rc:735
#: Merge.rc:871
#, c-format
msgid "Save As..."
-msgstr ""
+msgstr "Farkl\xFD Kaydet..."
#: Merge.rc:741
#, c-format
msgid "Versioning System"
-msgstr ""
+msgstr "S\xFCr\xFCmleme Sistemi"
#: Merge.rc:744
#, c-format
msgid "&Versioning System:"
-msgstr ""
+msgstr "S\xFCr\xFCmleme Sistemi:"
#: Merge.rc:747
#: Merge.rc:2065
#, c-format
msgid "&Path to cleartool.exe:"
-msgstr ""
+msgstr "'cleartool.exe' Dizini:"
#: Merge.rc:754
#: Merge.rc:1941
#, c-format
msgid "General"
-msgstr ""
+msgstr "Genel"
#: Merge.rc:757
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr ""
+msgstr "Otomatik Olarak \xDDlk Farka Git"
#: Merge.rc:760
#, c-format
msgid "&Disable Splash Screen"
-msgstr ""
+msgstr "A\xE7\xFDl\xFDr Pencereyi \xDDptal Et"
#: Merge.rc:762
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr ""
+msgstr "Pencereleri ESC ile Kapat"
#: Merge.rc:764
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr ""
+msgstr "'A\xE7' \xDDleti\xFEim Kutusundaki Dizinleri Otomatik Do\xF0rula"
#: Merge.rc:767
-#, c-format
+#, fuzzy, c-format
msgid "All&ow only one instance to run"
-msgstr ""
+msgstr "Yaln\xFDzca Bir \xD6rne\xF0in \xC7al\xFD\xFEmas\xFDna \xDDzin Ver"
#: Merge.rc:769
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "\xC7ok Say\xFDda Pencere Kapat\xFDl\xFDrken Sor"
#: Merge.rc:771
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDr\xFDrken Dosya Zaman\xFDn\xFD Koru"
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Ba\xFElang\xFD\xE7ta \"Dosyalar\xFD veya Klas\xF6rleri Se\xE7\" Penceresini G\xF6ster"
#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr ""
+msgstr "'A\xE7' \xDD\xE7indeki Hedefi Otomatik Yaz:"
#: Merge.rc:779
#, c-format
msgid "Enable multiple compare windows for"
-msgstr ""
+msgstr "\xC7ok Say\xFDda Kar\xFE\xFDla\xFEt\xFDrma Penceresi Y\xFCkle"
#: Merge.rc:781
#: Merge.rc:1617
#, c-format
msgid "&Folder compare"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:783
#: Merge.rc:1619
#, c-format
msgid "Fil&e compare"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:785
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
+"\xC7ok kar\xFE\xFDla\xFE\xFDlan baz\xFD mesajlar\xFD gizleyebilirsiniz.\n"
+"T\xFCm mesajlar\xFD tekrar g\xF6r\xFCnebilir yapmak i\xE7in;\n"
+"'S\xFDf\xFDrla' d\xFC\xF0mesine bas\xFDn."
#: Merge.rc:787
#, c-format
msgid "Reset"
-msgstr ""
+msgstr "S\xFDf\xFDrla"
#: Merge.rc:794
#, c-format
msgid "Language"
-msgstr ""
+msgstr "Dil"
#: Merge.rc:801
#, c-format
msgid "Available languages:"
-msgstr ""
+msgstr "Y\xFCklenebilir Diller:"
#: Merge.rc:807
#, c-format
msgid "Find"
-msgstr ""
+msgstr "Bul"
#: Merge.rc:810
#: Merge.rc:837
#, c-format
msgid "Fi&nd what:"
-msgstr ""
+msgstr "Bul:"
#: Merge.rc:813
#: Merge.rc:843
#, c-format
msgid "Match &whole word only"
-msgstr ""
+msgstr "Tam S\xF6zc\xFC\xF0\xFC E\xFEle\xFEtir"
#: Merge.rc:815
#: Merge.rc:845
#, c-format
msgid "Match &case"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf E\xFEle\xFEtir"
#: Merge.rc:817
#: Merge.rc:847
#, c-format
msgid "Regular &expression"
-msgstr ""
+msgstr "Kurall\xFD \xDDfade"
#: Merge.rc:819
#, c-format
msgid "D&on't wrap end of file"
-msgstr ""
+msgstr "Dosyan\xFDn Sonuna Kayd\xFDrma!"
#: Merge.rc:822
#, c-format
msgid "Direction"
-msgstr ""
+msgstr "Y\xF6nerge"
#: Merge.rc:823
#, c-format
msgid "&Up"
-msgstr ""
+msgstr "Yukar\xFD"
#: Merge.rc:825
#, c-format
msgid "&Down"
-msgstr ""
+msgstr "A\xFEa\xF0\xFD"
#: Merge.rc:827
#: Merge.rc:857
#, c-format
msgid "&Find Next"
-msgstr ""
+msgstr "Sonrakini Bul"
#: Merge.rc:834
#, c-format
msgid "Replace"
-msgstr ""
+msgstr "De\xF0i\xFEtir"
#: Merge.rc:840
#, c-format
msgid "Re&place with:"
-msgstr ""
+msgstr "Yeni De\xF0er:"
#: Merge.rc:849
#, c-format
msgid "&Don't wrap end of file"
-msgstr ""
+msgstr "Dosyan\xFDn Sonuna Kayd\xFDrma!"
#: Merge.rc:852
#, c-format
msgid "Replace in"
-msgstr ""
+msgstr "Burada De\xF0i\xFEtir"
#: Merge.rc:853
#, c-format
msgid "&Selection"
-msgstr ""
+msgstr "Se\xE7im"
#: Merge.rc:855
#, c-format
msgid "Wh&ole file"
-msgstr ""
+msgstr "B\xFCt\xFCn Dosya"
#: Merge.rc:858
#, c-format
msgid "&Replace"
-msgstr ""
+msgstr "De\xF0i\xFEtir"
#: Merge.rc:859
#, c-format
msgid "Replace &All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC De\xF0i\xFEtir"
#: Merge.rc:866
#: Merge.rc:2187
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
#: Merge.rc:869
#, c-format
msgid "CheckOut"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFC"
#: Merge.rc:874
#: Merge.rc:1179
#, c-format
msgid "Comments"
-msgstr ""
+msgstr "A\xE7\xFDklamalar"
#: Merge.rc:877
#, c-format
msgid "CheckIn after checkout"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFCnden Sonra Giri\xFE Kontrol\xFC"
#: Merge.rc:883
#, c-format
msgid "Linefilters"
-msgstr ""
+msgstr "Sat\xFDr Filtreleri"
#: Merge.rc:886
#, c-format
msgid "Enable Line Filters"
-msgstr ""
+msgstr "A\xFEa\xF0\xFDdaki Sat\xFDr Filtreleri Y\xFCklensin"
#: Merge.rc:889
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr ""
+msgstr "Kurall\xFD \xDDfadeler (Bir Sat\xFDr Ba\xFE\xFDna D\xFC\xFEen):"
#: Merge.rc:896
#, c-format
msgid "Save"
-msgstr ""
+msgstr "Kaydet"
#: Merge.rc:897
#, c-format
msgid "New"
-msgstr ""
+msgstr "Yeni"
#: Merge.rc:898
#, c-format
msgid "Edit"
-msgstr ""
+msgstr "D\xFCzenle"
#: Merge.rc:899
#, c-format
msgid "Remove"
-msgstr ""
+msgstr "Kald\xFDr"
#: Merge.rc:904
#: Merge.rc:1944
#, c-format
msgid "Colors"
-msgstr ""
+msgstr "Renkler"
#: Merge.rc:907
#, c-format
msgid "Difference:"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk:"
#: Merge.rc:911
#, c-format
msgid "Selected Difference:"
-msgstr ""
+msgstr "Se\xE7ili Farkl\xFDl\xFDk:"
#: Merge.rc:915
#: Merge.rc:1569
#, c-format
msgid "Background"
-msgstr ""
+msgstr "Arka Plan"
#: Merge.rc:916
#, c-format
msgid "Deleted"
-msgstr ""
+msgstr "Silinen"
#: Merge.rc:929
#: Merge.rc:1364
#: Merge.rc:1570
#, c-format
msgid "Text"
-msgstr ""
+msgstr "Metin"
#: Merge.rc:933
#, c-format
msgid "Ignored Difference:"
-msgstr ""
+msgstr "Yok Say\xFDlan Farkl\xFDl\xFDk:"
#: Merge.rc:943
#, c-format
msgid "Moved:"
-msgstr ""
+msgstr "Ta\xFE\xFDnan:"
#: Merge.rc:953
#, c-format
msgid "Selected Moved:"
-msgstr ""
+msgstr "Se\xE7ili Ta\xFE\xFDnan:"
#: Merge.rc:960
#, c-format
msgid "Word Difference:"
-msgstr ""
+msgstr "S\xF6zc\xFCk Farkl\xFDl\xFD\xF0\xFD:"
#: Merge.rc:967
#, c-format
msgid "Selected Word Diff:"
-msgstr ""
+msgstr "Se\xE7ili S\xF6zc\xFCk Farkl\xFDl\xFD\xF0\xFD:"
#: Merge.rc:974
#: Merge.rc:1053
@@ -1559,496 +1563,500 @@
#: Merge.rc:1410
#, c-format
msgid "Defaults"
-msgstr ""
+msgstr "Varsay\xFDlan Ayarlar"
#: Merge.rc:980
#: Merge.rc:1352
#: Merge.rc:1558
#, c-format
msgid "Dialog"
-msgstr ""
+msgstr "\xDDleti\xFEim"
#: Merge.rc:990
#: Merge.rc:1947
#, c-format
msgid "System"
-msgstr ""
+msgstr "Sistem"
#: Merge.rc:993
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr ""
+msgstr "Silinen Dosyalar\xFD Geri D\xF6n\xFC\xFE\xFCm Kutusuna G\xF6nder"
#: Merge.rc:995
#, c-format
msgid "&External editor:"
-msgstr ""
+msgstr "Harici D\xFCzenleyici:"
#: Merge.rc:998
#, c-format
msgid "&Filter folder:"
-msgstr ""
+msgstr "Filtre Klas\xF6r\xFC:"
#: Merge.rc:1000
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1001
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "Ge\xE7ici Klas\xF6r Se\xE7iminizi Yap\xFDn\xFDz"
#: Merge.rc:1002
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "Ge\xE7ici Sistem Klas\xF6r\xFC"
#: Merge.rc:1004
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "\xD6zel Klas\xF6r:"
#: Merge.rc:1007
#: Merge.rc:1023
#, c-format
msgid "Br&owse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
-msgstr ""
+msgstr "Yama Olu\xFEtur"
#: Merge.rc:1016
#, c-format
msgid "File&1:"
-msgstr ""
+msgstr "Dosya &1:"
#: Merge.rc:1020
#, c-format
msgid "File&2:"
-msgstr ""
+msgstr "Dosya &2:"
#: Merge.rc:1024
#, c-format
msgid "&Swap"
-msgstr ""
+msgstr "Yer De\xF0i\xFEtir"
#: Merge.rc:1025
#, c-format
msgid "&Append to existing file"
-msgstr ""
+msgstr "Dosyaya Sonu\xE7 Ekle"
#: Merge.rc:1027
#, c-format
msgid "&Result:"
-msgstr ""
+msgstr "Sonu\xE7:"
#: Merge.rc:1031
#, c-format
msgid "&Format"
-msgstr ""
+msgstr "Bi\xE7im"
#: Merge.rc:1032
#, c-format
msgid "St&yle:"
-msgstr ""
+msgstr "T\xFCr:"
#: Merge.rc:1035
-#, c-format
+#, fuzzy, c-format
msgid "&Context:"
-msgstr ""
+msgstr "S\xFDn\xFDr:"
#: Merge.rc:1038
#, c-format
msgid "W&hitespaces"
-msgstr ""
+msgstr "Bo\xFEluklar"
#: Merge.rc:1039
#, c-format
msgid "Com&pare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:1041
#, c-format
msgid "I&gnore changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Yok Say"
#: Merge.rc:1043
#, c-format
msgid "Ig&nore all"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Yok Say"
#: Merge.rc:1045
#, c-format
msgid "Ignor&e blank lines"
-msgstr ""
+msgstr "Bo\xFE Sat\xFDrlar\xFD Yok Say"
#: Merge.rc:1047
#, c-format
msgid "Case sensi&tive"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf Duyarl\xFDl\xFD\xF0\xFD"
#: Merge.rc:1049
#, c-format
msgid "Inclu&de command line"
-msgstr ""
+msgstr "Komut Sat\xFDr\xFDn\xFD Dahil Et"
#: Merge.rc:1051
#, c-format
msgid "Open to e&xternal editor"
-msgstr ""
+msgstr "Harici D\xFCzenleyici \xDDle A\xE7"
#: Merge.rc:1073
#, c-format
msgid "Display Columns"
-msgstr ""
+msgstr "S\xFCtunlar\xFD G\xF6ster"
#: Merge.rc:1079
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "Yukar\xFD Ta\xFE\xFD"
#: Merge.rc:1080
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "A\xFEa\xF0\xFD Ta\xFE\xFD"
#: Merge.rc:1090
#, c-format
msgid "Select Unpacker"
-msgstr ""
+msgstr "\xC7\xFDkart\xFDc\xFD Se\xE7"
#: Merge.rc:1095
#, c-format
msgid "File unpacker:"
-msgstr ""
+msgstr "Dosya \xC7\xFDkart\xFDc\xFD:"
#: Merge.rc:1098
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr ""
+msgstr "Uzant\xFDs\xFDna Bakmadan T\xFCm \xC7\xFDkart\xFDc\xFDlar\xFD G\xF6ster"
#: Merge.rc:1101
#, c-format
msgid "Extensions list:"
-msgstr ""
+msgstr "Uzant\xFD Listesi:"
#: Merge.rc:1102
#, c-format
msgid "Description:"
-msgstr ""
+msgstr "Tan\xFDm:"
#: Merge.rc:1113
#, c-format
msgid " Folder Compare Progress"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDrma \xDD\xFElemi"
#: Merge.rc:1116
#: Merge.rc:1894
#, c-format
msgid "Stop"
-msgstr ""
+msgstr "Dur"
#: Merge.rc:1121
#, c-format
msgid "Comparing items..."
-msgstr ""
+msgstr "\xD6geler Kar\xFE\xFDla\xFEt\xFDr\xFDl\xFDyor..."
#: Merge.rc:1122
#, c-format
msgid "Items compared:"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\xFDlan \xD6geler:"
#: Merge.rc:1123
#, c-format
msgid "Items total:"
-msgstr ""
+msgstr "Toplam \xD6geler:"
#: Merge.rc:1129
#, c-format
msgid "Go To"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1132
#, c-format
msgid "G&oto:"
-msgstr ""
+msgstr "Git:"
#: Merge.rc:1134
#, c-format
msgid "File"
-msgstr ""
+msgstr "Dosya"
#: Merge.rc:1139
#, c-format
msgid "Goto what"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1140
#, c-format
msgid "Li&ne"
-msgstr ""
+msgstr "Sat\xFDr"
#: Merge.rc:1142
#, c-format
msgid "&Difference"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk"
#: Merge.rc:1144
#, c-format
msgid "&Go To"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1150
#: Merge.rc:1942
#, c-format
msgid "Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDrma"
#: Merge.rc:1153
#, c-format
msgid "Whitespace"
-msgstr ""
+msgstr "Bo\xFEluk"
#: Merge.rc:1154
#, c-format
msgid "&Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:1156
#, c-format
msgid "&Ignore change"
-msgstr ""
+msgstr "De\xF0i\xFEikli\xF0i Yok Say"
#: Merge.rc:1158
#, c-format
msgid "I&gnore all"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Yok Say"
#: Merge.rc:1160
#, c-format
msgid "Ignore blan&k lines"
-msgstr ""
+msgstr "Bo\xFE Sat\xFDrlar\xFD Yok Say"
#: Merge.rc:1162
#, c-format
msgid "Ignore &case"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf Umursama"
#: Merge.rc:1164
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Sat\xFDrba\xFE\xFD Farkl\xFDl\xFDklar\xFDn\xFD Yok Say (Windows/Unix/Mac)"
#: Merge.rc:1167
#, c-format
msgid "E&nable moved block detection"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Blok Tespitini Y\xFCkle"
#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
-msgstr ""
+msgstr "Benzer Sat\xFDrlar\xFD E\xFEle\xFEtir"
#: Merge.rc:1171
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
+msgstr "3 Saniyeden Az Zaman Farkl\xFDl\xFDklar\xFDn\xFD Yok Say"
#: Merge.rc:1174
#, c-format
msgid "&File Compare method:"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDrma Y\xF6ntemi:"
#: Merge.rc:1177
#, c-format
msgid "S&top after first difference"
-msgstr ""
+msgstr "\xDDlk Farkl\xFDl\xFDktan Sonra Dur"
#: Merge.rc:1180
#, c-format
msgid "Filter Comments"
-msgstr ""
+msgstr "Filtre A\xE7\xFDklamalar\xFD"
#: Merge.rc:1187
#: Merge.rc:1943
#, c-format
msgid "Editor"
-msgstr ""
+msgstr "D\xFCzenleyici"
#: Merge.rc:1190
#, c-format
msgid "&Highlight syntax"
-msgstr ""
+msgstr "S\xF6zdizimi Vurgusu"
#: Merge.rc:1192
#, c-format
msgid "&Automatic rescan"
-msgstr ""
+msgstr "Otomatik Olarak Yeniden Tara"
#: Merge.rc:1194
#, c-format
msgid "&Preserve original EOL chars"
-msgstr ""
+msgstr "Orijinal Sat\xFDr Sonu (K\xFDsaca SS) Karakterlerini Koru"
#: Merge.rc:1196
#, c-format
msgid "Tabs"
-msgstr ""
+msgstr "Girinti Ayarlar\xFD"
#: Merge.rc:1197
#, c-format
msgid "&Tab size:"
-msgstr ""
+msgstr "Sekme Geni\xFEli\xF0i:"
#: Merge.rc:1200
#, c-format
msgid "&Insert Tabs"
-msgstr ""
+msgstr "Sekme Ekle"
#: Merge.rc:1202
#, c-format
msgid "Insert &Spaces"
-msgstr ""
+msgstr "Bo\xFEluk Ekle"
#: Merge.rc:1204
#, c-format
msgid "Line Difference Coloring"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD Renklendir"
#: Merge.rc:1206
#, c-format
msgid "View line differences"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD G\xF6ster"
#: Merge.rc:1208
#, c-format
msgid "&Character level"
-msgstr ""
+msgstr "Karakter B\xF6l\xFCm\xFC"
#: Merge.rc:1210
#, c-format
msgid "&Word-level:"
-msgstr ""
+msgstr "S\xF6zc\xFCk B\xF6l\xFCm\xFC:"
#: Merge.rc:1225
#, c-format
msgid "Filefilters"
-msgstr ""
+msgstr "Dosya Filtreleri"
#: Merge.rc:1231
#, c-format
msgid "Test"
-msgstr ""
+msgstr "Dene"
#: Merge.rc:1232
#, c-format
msgid "Install..."
-msgstr ""
+msgstr "Y\xFCkle..."
#: Merge.rc:1233
#, c-format
msgid "New..."
-msgstr ""
+msgstr "Yeni..."
#: Merge.rc:1234
#, c-format
msgid "Edit..."
-msgstr ""
+msgstr "D\xFCzenle..."
#: Merge.rc:1235
#, c-format
msgid "Delete..."
-msgstr ""
+msgstr "Sil..."
#: Merge.rc:1241
#, c-format
msgid "Save modified files?"
-msgstr ""
+msgstr "Dosya De\xF0i\xFEiklikleri Kaydedilsin mi?"
#: Merge.rc:1244
#, c-format
msgid "Left side file"
-msgstr ""
+msgstr "Sol Taraftaki Dosya"
#: Merge.rc:1247
#, c-format
msgid "&Save changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Kaydet"
#: Merge.rc:1249
-#, c-format
+#, fuzzy, c-format
msgid "&Discard changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Se\xE7imden \xC7\xFDkart"
#: Merge.rc:1251
#, c-format
msgid "Right side file"
-msgstr ""
+msgstr "Sa\xF0 Taraftaki Dosya"
#: Merge.rc:1254
#, c-format
msgid "S&ave changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Kaydet"
#: Merge.rc:1256
-#, c-format
+#, fuzzy, c-format
msgid "Dis&card changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Se\xE7imden \xC7\xFDkart"
#: Merge.rc:1258
-#, c-format
+#, fuzzy, c-format
msgid "Discard All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Se\xE7im D\xFD\xFE\xFD B\xFDrak"
#: Merge.rc:1265
#: Merge.rc:1513
#: Merge.rc:1949
#, c-format
msgid "Codepage"
-msgstr ""
+msgstr "Kod Sayfas\xFD"
#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
-msgstr ""
+msgstr "Varsay\xFDlan Kod Sayfas\xFD"
#: Merge.rc:1269
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr ""
+msgstr "Unicode Olmayan Dosyalar Y\xFCklenirken Dikkate Al\xFDnacak Varsay\xFDlan Kod Sayfas\xFDn\xFD Se\xE7iniz:"
#: Merge.rc:1271
#, 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 ""
+"Bu Dosyalar \xDD\xE7in Kod Sayfas\xFD Bilgisi Ara: .html, .rc, .xml \n"
+"Oturumu Yeniden Ba\xFElatmak Gerekir"
#: Merge.rc:1274
#, c-format
msgid "System codepage"
-msgstr ""
+msgstr "Sistem Kod Sayfas\xFD"
#: Merge.rc:1276
#, c-format
msgid "According to WinMerge User Interface"
-msgstr ""
+msgstr "WinMerge Kullan\xFDc\xFD Aray\xFCz\xFC"
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "\xD6zel Kod Sayfas\xFD:"
#: Merge.rc:1286
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr ""
+msgstr "WinMerge - S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
#: Merge.rc:1289
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr ""
+msgstr "7-Zip Tespit Edilemedi (Ya da Y\xFCkl\xFC De\xF0il ?)"
#: Merge.rc:1292
#, c-format
@@ -2056,11 +2064,14 @@
"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 ""
+"S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i \xDD\xE7in;\n"
+"7-Zip'in 3.11 Ya da Daha \xDCst S\xFCr\xFCm\xFCn\xFCn Kurulu Olmas\xFD Gerekir,\n"
+"Veya Program Dizinine 7-Zip Temel Par\xE7alar\xFDn\xFD Kopyalaman\xFDz Gerekir."
#: Merge.rc:1294
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr ""
+msgstr "Orada Ayr\xFDca Bir Aray\xFCz Eklentisi (Merge7z*.dll) Olmal\xFDd\xFDr."
#: Merge.rc:1296
#, c-format
@@ -2068,11 +2079,13 @@
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
+"Aray\xFCz Eklentileri \xDD\xE7in Son S\xFCr\xFCmler Daha Uygun Oldu\xF0undan,\n"
+"L\xFCtfen A\xFEa\xF0\xFDda \xD6nerilen 7-Zip S\xFCr\xFCm\xFCn\xFC Kullan\xFDn\xFDz."
#: Merge.rc:1298
#, c-format
msgid "Version"
-msgstr ""
+msgstr "S\xFCr\xFCm"
#: Merge.rc:1300
#, c-format
@@ -2080,128 +2093,134 @@
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
+"Gereken Eklenti\n"
+"(dllbuild %04u)"
#: Merge.rc:1302
#, c-format
msgid "Recommended version of 7-Zip:"
-msgstr ""
+msgstr "\xD6nerilen 7-Zip S\xFCr\xFCm\xFC:"
#: Merge.rc:1305
#: Merge.rc:1308
#, c-format
msgid "present"
-msgstr ""
+msgstr "Mevcut"
#: Merge.rc:1306
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1309
#, c-format
msgid "7-Zip software installed on your computer:"
-msgstr ""
+msgstr "Bilgisayar\xFDn\xFDzda Y\xFCkl\xFC 7-Zip Yaz\xFDl\xFDm\xFD:"
#: Merge.rc:1311
#: Merge.rc:1316
#, c-format
msgid "none"
-msgstr ""
+msgstr "Yok"
#: Merge.rc:1313
#, c-format
msgid "missing"
-msgstr ""
+msgstr "Yok"
#: Merge.rc:1314
#, c-format
msgid "7-Zip components for standalone operation:"
-msgstr ""
+msgstr "7-Zip Temel Par\xE7alar\xFD:"
#: Merge.rc:1318
#, c-format
msgid "outdated"
-msgstr ""
+msgstr "Zaman\xFD Ge\xE7mi\xFE"
#: Merge.rc:1319
#, c-format
msgid "Plugins on path:"
-msgstr ""
+msgstr "Eklentilerin Oldu\xF0u Dizin:"
#: Merge.rc:1320
#, 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 ""
+"Bu Mesaj\xFD Tekrar G\xF6sterme!\n"
+"(Bu Mesaj\xFD Yeniden G\xF6rmek \xDD\xE7in Yard\xFDm Men\xFCs\xFCn\xFC Kullanabilirsiniz.)"
#: Merge.rc:1324
#, c-format
msgid "Plugin Download"
-msgstr ""
+msgstr "Eklenti \xDDndir"
#: Merge.rc:1333
#, c-format
msgid "Options"
-msgstr ""
+msgstr "Ayarlar"
#: Merge.rc:1344
#, c-format
msgid " Categories"
-msgstr ""
+msgstr " KATEGOR\xDDLER"
#: Merge.rc:1346
#, c-format
msgid "Import..."
-msgstr ""
+msgstr "\xDD\xE7e Aktar..."
#: Merge.rc:1347
#, c-format
msgid "Export..."
-msgstr ""
+msgstr "D\xFD\xFEa Aktar..."
#: Merge.rc:1355
#, c-format
msgid "Keywords:"
-msgstr ""
+msgstr "Anahtar S\xF6zc\xFCkler:"
#: Merge.rc:1356
#, c-format
msgid "Function names:"
-msgstr ""
+msgstr "Fonksiyon Adlar\xFD:"
#: Merge.rc:1357
#, c-format
msgid "Comments:"
-msgstr ""
+msgstr "A\xE7\xFDklamalar:"
#: Merge.rc:1358
#, c-format
msgid "Numbers:"
-msgstr ""
+msgstr "Numaralar:"
#: Merge.rc:1359
#, c-format
msgid "Operators:"
-msgstr ""
+msgstr "\xDD\xFElemciler:"
#: Merge.rc:1360
#, c-format
msgid "Strings:"
-msgstr ""
+msgstr "Dizgiler:"
#: Merge.rc:1361
#, c-format
msgid "Preprocessor:"
-msgstr ""
+msgstr "\xD6ni\xFElemci:"
#: Merge.rc:1362
#, c-format
msgid "User 1:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD 1:"
#: Merge.rc:1363
#, c-format
msgid "User 2:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD 2:"
#: Merge.rc:1368
#: Merge.rc:1373
@@ -2214,17 +2233,17 @@
#: Merge.rc:1408
#, c-format
msgid "Bold"
-msgstr ""
+msgstr "Kal\xFDn"
#: Merge.rc:1416
#, c-format
msgid "Folder Compare Report"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDrma Raporu"
#: Merge.rc:1419
#, c-format
msgid "Report &File:"
-msgstr ""
+msgstr "Rapor Dosyas\xFD:"
#: Merge.rc:1422
#: Merge.rc:1596
@@ -2232,387 +2251,387 @@
#: Merge.rc:1627
#, c-format
msgid "Browse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1423
#, c-format
msgid "&Style:"
-msgstr ""
+msgstr "Rapor T\xFCr\xFC:"
#: Merge.rc:1426
#, c-format
msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "Panoya Kopyala"
#: Merge.rc:1434
#, c-format
msgid "Shared or Private Filter"
-msgstr ""
+msgstr "\xD6zel Veya Ortak Filtre"
#: Merge.rc:1437
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr ""
+msgstr "Ne T\xFCr Filtre Haz\xFDrlamak \xDDstiyorsunuz?"
#: Merge.rc:1439
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr ""
+msgstr "Ortak Filtre (T\xFCm Kullan\xFDc\xFDlar \xDD\xE7in)"
#: Merge.rc:1441
#, c-format
msgid "Private Filter (only for current user)"
-msgstr ""
+msgstr "\xD6zel Filtre (Sadece Ge\xE7erli Kullan\xFDc\xFD \xDD\xE7in)"
#: Merge.rc:1449
#: Merge.rc:1950
#, c-format
msgid "Archive Support"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i"
#: Merge.rc:1452
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i \xDD\xE7in 7-Zip Eklentisi Kurulu Olmal\xFDd\xFDr:"
#: Merge.rc:1454
#, c-format
msgid "Download 7-zip Plugin"
-msgstr ""
+msgstr "7-Zip Eklentisi \xDDndir"
#: Merge.rc:1455
#, c-format
msgid "&Enable archive file support"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0ini Y\xFCkle"
#: Merge.rc:1457
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr ""
+msgstr "Varsa Kurulu 7-Zip Program\xFDn\xFD Kullan"
#: Merge.rc:1460
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
-msgstr ""
+msgstr "WinMerge Klas\xF6r\xFCndeki 7-Zip'i Kullan"
#: Merge.rc:1462
#, c-format
msgid "&Detect archive type from file signature"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDrma T\xFCr\xFCn\xFC Tespit Et"
#: Merge.rc:1470
#, c-format
msgid "Compare Statistics"
-msgstr ""
+msgstr "Say\xFDsal Verileri Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:1473
#, c-format
msgid "Folders:"
-msgstr ""
+msgstr "Klas\xF6rler:"
#: Merge.rc:1474
#, c-format
msgid "Files:"
-msgstr ""
+msgstr "Dosyalar:"
#: Merge.rc:1475
#: Merge.rc:2341
#, c-format
msgid "Different"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk"
#: Merge.rc:1476
#, c-format
msgid "Text:"
-msgstr ""
+msgstr "Metin:"
#: Merge.rc:1479
#: Merge.rc:1498
-#, c-format
+#, fuzzy, c-format
msgid "Binary:"
-msgstr ""
+msgstr "Binary:"
#: Merge.rc:1482
#, c-format
msgid "Unique"
-msgstr ""
+msgstr "Benzersiz"
#: Merge.rc:1483
#, c-format
msgid "Left:"
-msgstr ""
+msgstr "Sol:"
#: Merge.rc:1488
#, c-format
msgid "Right:"
-msgstr ""
+msgstr "Sa\xF0:"
#: Merge.rc:1493
#: Merge.rc:2335
#, c-format
msgid "Identical"
-msgstr ""
+msgstr "Ayn\xFD"
#: Merge.rc:1502
#, c-format
msgid "Total:"
-msgstr ""
+msgstr "Toplam:"
#: Merge.rc:1507
#, c-format
msgid "Close"
-msgstr ""
+msgstr "Kapat"
#: Merge.rc:1516
#, c-format
msgid "Affects"
-msgstr ""
+msgstr "Etkiler"
#: Merge.rc:1519
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
-msgstr ""
+msgstr "(Etkiler)"
#: Merge.rc:1523
#, c-format
msgid "Select Codepage for"
-msgstr ""
+msgstr "Kod Sayfas\xFD Se\xE7"
#: Merge.rc:1524
#, c-format
msgid "&File Loading:"
-msgstr ""
+msgstr "Dosya Y\xFCkleniyor:"
#: Merge.rc:1526
#: Merge.rc:1529
#, c-format
msgid "..."
-msgstr ""
+msgstr "..."
#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
-msgstr ""
+msgstr "Dosya Kaydediliyor:"
#: Merge.rc:1530
#, c-format
msgid "&Use same codepage for both"
-msgstr ""
+msgstr "\xDDkisi \xDD\xE7in Ayn\xFD Kod Sayfas\xFDn\xFD Kullan"
#: Merge.rc:1533
#, c-format
msgid "&Apply"
-msgstr ""
+msgstr "Uygula"
#: Merge.rc:1534
#: Merge.rc:1916
#, c-format
msgid "&Cancel"
-msgstr ""
+msgstr "\xDDptal"
#: Merge.rc:1539
#, c-format
msgid "Test Filter"
-msgstr ""
+msgstr "Filtreyi Dene"
#: Merge.rc:1542
#, c-format
msgid "Testing filter ..."
-msgstr ""
+msgstr "Filtre Deneniyor..."
#: Merge.rc:1544
#, c-format
msgid "&Enter text to test:"
-msgstr ""
+msgstr "Deneme Metni Giriniz:"
#: Merge.rc:1546
#, c-format
msgid "&Folder Name"
-msgstr ""
+msgstr "Klas\xF6r Ad\xFD"
#: Merge.rc:1548
#, c-format
msgid "Result:"
-msgstr ""
+msgstr "Sonu\xE7:"
#: Merge.rc:1552
#, c-format
msgid "&Test"
-msgstr ""
+msgstr "Dene"
#: Merge.rc:1553
#, c-format
msgid "&Close"
-msgstr ""
+msgstr "Kapat"
#: Merge.rc:1561
#, c-format
msgid "&Use customized text colors"
-msgstr ""
+msgstr "\xD6zel Metin Rengi Kullan"
#: Merge.rc:1564
#, c-format
msgid "Custom text colors"
-msgstr ""
+msgstr "\xD6zel Metin Renkleri"
#: Merge.rc:1566
#, c-format
msgid "Whitespace:"
-msgstr ""
+msgstr "Bo\xFEluk:"
#: Merge.rc:1567
#, c-format
msgid "Regular text:"
-msgstr ""
+msgstr "Normal Metin:"
#: Merge.rc:1568
#, c-format
msgid "Selection:"
-msgstr ""
+msgstr "Se\xE7im:"
#: Merge.rc:1591
#, c-format
msgid "Paths"
-msgstr ""
+msgstr "Dizinler"
#: Merge.rc:1597
#, c-format
msgid "R&ead-only"
-msgstr ""
+msgstr "Salt Okunur"
#: Merge.rc:1601
#, c-format
msgid "Re&ad-only"
-msgstr ""
+msgstr "Salt Okunur"
#: Merge.rc:1607
#, c-format
msgid "Open..."
-msgstr ""
+msgstr "A\xE7..."
#: Merge.rc:1608
#, c-format
msgid "Save..."
-msgstr ""
+msgstr "Kaydet..."
#: Merge.rc:1613
#: Merge.rc:1951
#, c-format
msgid "Backup Files"
-msgstr ""
+msgstr "Yedek Dosyalar\xFD"
#: Merge.rc:1616
#, c-format
msgid "Create backup files in:"
-msgstr ""
+msgstr "Yedek Al:"
#: Merge.rc:1621
#, c-format
msgid "Create backup files into:"
-msgstr ""
+msgstr "Yedek Dosyalar\xFDn\xFDn Olu\xFEturulaca\xF0\xFD Yer:"
#: Merge.rc:1622
#, c-format
msgid "&Original file's folder"
-msgstr ""
+msgstr "Orijinal Dosyan\xFDn Oldu\xF0u Klas\xF6r"
#: Merge.rc:1624
#, c-format
msgid "&Global backup folder:"
-msgstr ""
+msgstr "Yedekler \xDD\xE7in \xD6zel Bir Klas\xF6r Belirle:"
#: Merge.rc:1628
#, c-format
msgid "Backup filename:"
-msgstr ""
+msgstr "Yedek Dosyas\xFD Adland\xFDr\xFDl\xFDrken:"
#: Merge.rc:1629
#, c-format
msgid "&Append .bak -extension"
-msgstr ""
+msgstr "Sonuna '.bak' Uzant\xFDs\xFD Ekle"
#: Merge.rc:1631
#, c-format
msgid "A&ppend timestamp"
-msgstr ""
+msgstr "Sonuna Tarih Damgas\xFD Ekle"
#: Merge.rc:1638
#: Merge.rc:2243
#, c-format
msgid "Confirm Copy"
-msgstr ""
+msgstr "Kopyay\xFD Do\xF0rula"
#: Merge.rc:1642
#, c-format
msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "XXX \xD6gelerini Kopyalamak \xDDstedi\xF0inize Emin misiniz?"
#: Merge.rc:1644
#, c-format
msgid "From left"
-msgstr ""
+msgstr "Soldan"
#: Merge.rc:1647
#, c-format
msgid "To right"
-msgstr ""
+msgstr "Sa\xF0a"
#: Merge.rc:1650
#, c-format
msgid "Yes"
-msgstr ""
+msgstr "Evet"
#: Merge.rc:1651
#, c-format
msgid "No"
-msgstr ""
+msgstr "Hay\xFDr"
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Eklentiler"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "Eklentileri Y\xFCkle"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Sa\xF0 Tu\xFE Eklentisi"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "WinMerge'i Sa\xF0 Tu\xFEa Eklemek \xDDster misiniz?"
#: Merge.rc:1675
#, c-format
msgid "E&nable advanced menu"
-msgstr ""
+msgstr "Geli\xFEmi\xFE Men\xFCy\xFC Y\xFCkle"
#: Merge.rc:1677
#, c-format
msgid "In&clude subfolders by default"
-msgstr ""
+msgstr "Varsay\xFDlan Olarak Alt Klas\xF6rleri Dahil Et"
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "Sa\xF0 Tu\xFE Men\xFCs\xFCne Ekle"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "WinMerge'de Dosya veya Klas\xF6r Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "\xD6gelere T\xFDkland\xFD\xF0\xFDnda, (Windows) Sa\xF0 Tu\xFE Men\xFCs\xFC G\xF6ster"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2629,37 +2648,37 @@
#: Merge.rc:1739
#, c-format
msgid "Ready"
-msgstr ""
+msgstr "Haz\xFDr"
#: Merge.rc:1745
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
#: Merge.rc:1746
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
#: Merge.rc:1747
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
#: Merge.rc:1748
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
#: Merge.rc:1749
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
#: Merge.rc:1750
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
#: Merge.rc:1756
#, c-format
@@ -2667,6 +2686,8 @@
"Create empty documents\n"
"New Documents (Ctrl+N)"
msgstr ""
+"Bo\xFE Belgeler Olu\xFEtur\n"
+"Yeni Belgeler (Ctrl+N)"
#: Merge.rc:1757
#, c-format
@@ -2674,6 +2695,8 @@
"Open an existing document\n"
"Open (Ctrl+O)"
msgstr ""
+"Varolan Bir Belgeyi A\xE7\n"
+"A\xE7 (Ctrl+O)"
#: Merge.rc:1758
#, c-format
@@ -2681,6 +2704,8 @@
"Close the active document\n"
"Close"
msgstr ""
+"Aktif Belgeyi Kapat\n"
+"Kapat"
#: Merge.rc:1759
#, c-format
@@ -2688,6 +2713,8 @@
"Save the active document\n"
"Save (Ctrl+S)"
msgstr ""
+"Aktif Belgeyi Kaydet\n"
+"Kaydet (Ctrl+S)"
#: Merge.rc:1760
#, c-format
@@ -2695,6 +2722,8 @@
"Save the active document with a new name\n"
"Save As"
msgstr ""
+"Aktif Belgeyi Ba\xFEka Bir \xDDsimle Kaydet\n"
+"Farkl\xFD Kaydet"
#: Merge.rc:1761
#, c-format
@@ -2702,6 +2731,8 @@
"Change the printing options\n"
"Page Setup"
msgstr ""
+"Yazd\xFDrma Se\xE7eneklerini De\xF0i\xFEtir\n"
+"Sayfa Yap\xFDs\xFD"
#: Merge.rc:1762
#, c-format
@@ -2709,6 +2740,8 @@
"Change the printer and printing options\n"
"Print Setup"
msgstr ""
+"Yaz\xFDc\xFDy\xFD ve Yazd\xFDrma Se\xE7eneklerini De\xF0i\xFEtir\n"
+"Sayfa Yap\xFDs\xFD"
#: Merge.rc:1763
#, c-format
@@ -2716,6 +2749,8 @@
"Print the active document\n"
"Print"
msgstr ""
+"Aktif Belgeyi Yazd\xFDr\n"
+"Yazd\xFDr"
#: Merge.rc:1764
#, c-format
@@ -2723,26 +2758,28 @@
"Display full pages\n"
"Print Preview"
msgstr ""
+"Sayfalar\xFDn Tamam\xFDn\xFD G\xF6ster\n"
+"Bask\xFD \xD6nizleme"
#: Merge.rc:1769
#, c-format
msgid "Make all hidden items visible again"
-msgstr ""
+msgstr "T\xFCm Gizli \xD6geleri Tekrar G\xF6r\xFClebilir Yap"
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "A\xF0a\xE7 G\xF6r\xFCn\xFCm\xFCn\xFC A\xE7-Kapat"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Geni\xFElet"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Daralt"
#: Merge.rc:1778
#, c-format
@@ -2750,31 +2787,33 @@
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
+"Proje Dosyas\xFD A\xE7\n"
+"Proje Dosyas\xFD (Ctrl+J)"
#: Merge.rc:1779
#, c-format
msgid "Unknown error attempting to open project file"
-msgstr ""
+msgstr "Proje Dosyas\xFD A\xE7\xFDl\xFDrken Bilinmeyen Bir Hata \xDDle Kar\xFE\xFDla\xFE\xFDld\xFD"
#: Merge.rc:1780
#, c-format
msgid "Unknown error attempting to save project file"
-msgstr ""
+msgstr "Proje Dosyas\xFD Kaydedilirken Bilinmeyen Bir Hata \xDDle Kar\xFE\xFDla\xFE\xFDld\xFD"
#: Merge.rc:1781
#, c-format
msgid "Project File"
-msgstr ""
+msgstr "Proje Dosyas\xFD"
#: Merge.rc:1782
#, c-format
msgid "Project file successfully loaded."
-msgstr ""
+msgstr "Proje Dosyas\xFD Ba\xFEar\xFDyla Y\xFCklendi."
#: Merge.rc:1783
#, c-format
msgid "Project file successfully saved."
-msgstr ""
+msgstr "Proje Dosyas\xFD Ba\xFEar\xFDyla Kaydedildi."
#: Merge.rc:1784
#, c-format
@@ -2782,6 +2821,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
+"Proje Dosyas\xFDna \xDEimdiki Dizinleri ve Ayarlar\xFD Kaydet\n"
+"Proje Dosyas\xFDn\xFD Kaydet"
#: Merge.rc:1789
#, c-format
@@ -2789,6 +2830,8 @@
"Display program information, version number and copyright\n"
"About"
msgstr ""
+"Program Bilgisi, S\xFCr\xFCm Numaras\xFD ve Telif Haklar\xFDn\xFD G\xF6ster\n"
+"Hakk\xFDnda"
#: Merge.rc:1790
#, c-format
@@ -2796,6 +2839,8 @@
"Quit the application; prompts to save documents\n"
"Exit"
msgstr ""
+"Belgeler Kaydedilince Uygulamay\xFD Kapat\n"
+"\xC7\xFDk"
#: Merge.rc:1796
#: Merge.rc:1797
@@ -2815,7 +2860,7 @@
#: Merge.rc:1811
#, c-format
msgid "Open this document"
-msgstr ""
+msgstr "Bu Belgeyi A\...
[truncated message content] |
