Implement issue #772: Add preference option to clear "Don't ask this question again" CompareLargeFiles choice
{
const String& key = it->first;
if (key.find(strPath) == 0 && key.length() > strPath.length() && key[strPath.length()] == '/')
+ {
+ m_iniFileKeyValues.erase(key);
it = m_optionsMap.erase(it);
+ }
else
++it;
}
}
}
+CString CMessageBoxDialog::GenerateRegistryKey(UINT nMessageID, UINT nHelpID)
+{
+ CMessageBoxDialog dlg{ nullptr, nMessageID, 0, 0, nHelpID };
+ return dlg.GenerateRegistryKey();
+}
+
//////////////////////////////////////////////////////////////////////////////
// Methods for handling common window functions.
// Method for resetting the message boxes stored in the registry.
static void ResetMessageBoxes ( );
+ static CString GenerateRegistryKey (UINT nMessageID, UINT nHelpID);
public:
, m_pSyntaxColors(colors)
, m_pageGeneral(regOptions)
, m_pageCompare(regOptions)
+, m_pageMessageBoxes(regOptions)
, m_pageColorSchemes(regOptions)
, m_pageMergeColors(regOptions)
, m_pageTextColors(regOptions, colors)
AddPage(&m_pageCompareTable, IDS_OPTIONSPG_COMPARE, IDS_OPTIONSPG_TABLECOMPARE);
AddPage(&m_pageCompareBinary, IDS_OPTIONSPG_COMPARE, IDS_OPTIONSPG_BINARYCOMPARE);
AddPage(&m_pageCompareImage, IDS_OPTIONSPG_COMPARE, IDS_OPTIONSPG_IMAGECOMPARE);
+ AddPage(&m_pageMessageBoxes, IDS_OPTIONSPG_MESSAGEBOXES);
AddPage(&m_pageEditor, IDS_OPTIONSPG_EDITOR, IDS_OPTIONSPG_GENEDITOR);
AddPage(&m_pageEditorSyntax, IDS_OPTIONSPG_EDITOR, IDS_OPTIONSPG_EDITOR_SYNTAX);
AddPage(&m_pageColorSchemes, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_COLOR_SCHEMES);
m_pageCompareTable.ReadOptions();
m_pageCompareBinary.ReadOptions();
m_pageCompareImage.ReadOptions();
+ m_pageMessageBoxes.ReadOptions();
m_pageEditor.ReadOptions();
m_pageEditorSyntax.ReadOptions();
m_pageCodepage.ReadOptions();
SafeUpdatePage(&m_pageCompareTable, false);
SafeUpdatePage(&m_pageCompareBinary, false);
SafeUpdatePage(&m_pageCompareImage, false);
+ SafeUpdatePage(&m_pageMessageBoxes, false);
SafeUpdatePage(&m_pageEditor, false);
SafeUpdatePage(&m_pageEditorSyntax, false);
SafeUpdatePage(&m_pageCodepage, false);
m_pageCompareTable.WriteOptions();
m_pageCompareBinary.WriteOptions();
m_pageCompareImage.WriteOptions();
+ m_pageMessageBoxes.WriteOptions();
m_pageEditor.WriteOptions();
m_pageEditorSyntax.WriteOptions();
m_pageColorSchemes.WriteOptions();
#include "TrDialogs.h"
#include "PropGeneral.h"
#include "PropCompare.h"
+#include "PropMessageBoxes.h"
#include "PropEditor.h"
#include "PropEditorSyntax.h"
#include "PropRegistry.h"
PropGeneral m_pageGeneral;
PropCompare m_pageCompare;
+ PropMessageBoxes m_pageMessageBoxes;
PropEditor m_pageEditor;
PropEditorSyntax m_pageEditorSyntax;
PropRegistry m_pageSystem;
{
int overWrite = LangMessageBox(IDS_REPORT_FILEOVERWRITE,
MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN,
- IDS_DIFF_FILEOVERWRITE);
+ IDS_REPORT_FILEOVERWRITE);
if (overWrite == IDNO)
return;
}
{
if (m_pDirView == nullptr)
return;
- if (AfxMessageBox(_("Do you want to move to the next file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the next file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_NEXTFILE) == IDYES)
{
pMergeDoc->CloseNow();
m_pDirView->OpenNextDiff();
{
if (m_pDirView == nullptr)
return;
- if (AfxMessageBox(_("Do you want to move to the previous file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the previous file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_PREVFILE) == IDYES)
{
pMergeDoc->CloseNow();
m_pDirView->OpenPrevDiff();
{
if (m_pDirView == nullptr)
return;
- if (AfxMessageBox(_("Do you want to move to the first file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the first file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_FIRSTFILE) == IDYES)
{
pMergeDoc->CloseNow();
m_pDirView->OpenFirstFile();
{
if (m_pDirView == nullptr)
return;
- if (AfxMessageBox(_("Do you want to move to the next file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the next file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_NEXTFILE) == IDYES)
{
pMergeDoc->CloseNow();
m_pDirView->OpenNextFile();
{
if (m_pDirView == nullptr)
return;
- if (AfxMessageBox(_("Do you want to move to the previous file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the previous file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_PREVFILE) == IDYES)
{
pMergeDoc->CloseNow();
m_pDirView->OpenPrevFile();
{
if (m_pDirView == nullptr)
return;
- if (AfxMessageBox(_("Do you want to move to the last file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the last file?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_LASTFILE) == IDYES)
{
pMergeDoc->CloseNow();
m_pDirView->OpenLastFile();
}
}
}
- CMessageBoxDialog dlg(
- m_pDirView ? m_pDirView->GetParentFrame() : nullptr,
- msg.c_str(), _T(""),
- MB_YESNOCANCEL | MB_ICONQUESTION | MB_DONT_ASK_AGAIN, 0U,
- _T("CompareLargeFiles"));
- INT_PTR ans = dlg.DoModal();
+ INT_PTR ans = AfxMessageBox(msg.c_str(), MB_YESNOCANCEL | MB_ICONQUESTION | MB_DONT_ASK_AGAIN, IDS_COMPARE_LARGE_FILES);
if (ans == IDCANCEL)
return true;
else if (ans == IDNO)
strutils::format_string1(
_("The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"),
path);
- int res = AfxMessageBox(message.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN);
+ int res = AfxMessageBox(message.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CREATE_PAIR_FOLDER);
if (res == IDYES)
created = paths::CreateIfNeeded(path);
}
if (m_pView[pane]->IsFileChangedOnDisk(m_filePaths[pane].c_str()) == FileChange::Changed)
{
String msg = strutils::format_string1(_("Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"), m_filePaths[pane]);
- if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING) == IDYES)
+ if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_FILECHANGED_RESCAN) == IDYES)
{
OnFileReload();
}
if (IsFileChangedOnDisk(pane) == FileChange::Changed)
{
String msg = strutils::format_string1(_("Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"), m_filePaths[pane]);
- if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING) == IDYES)
+ if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_FILECHANGED_RESCAN) == IDYES)
{
OnFileReload();
}
m_pImgMergeWindow->NextDiff();
else if (m_pImgMergeWindow->GetCurrentMaxPage() != m_pImgMergeWindow->GetMaxPageCount() - 1)
{
- if (AfxMessageBox(_("Do you want to move to the next page?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the next page?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_NEXTPAGE) == IDYES)
{
m_pImgMergeWindow->SetCurrentPageAll(m_pImgMergeWindow->GetCurrentMaxPage() + 1);
UpdateLastCompareResult();
}
else if (m_pImgMergeWindow->GetCurrentMaxPage() != 0)
{
- if (AfxMessageBox(_("Do you want to move to the previous page?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN) == IDYES)
+ if (AfxMessageBox(_("Do you want to move to the previous page?").c_str(), MB_YESNO | MB_DONT_ASK_AGAIN, IDS_MOVE_TO_PREVPAGE) == IDYES)
{
m_pImgMergeWindow->SetCurrentPageAll(m_pImgMergeWindow->GetCurrentMaxPage() - 1);
UpdateLastCompareResult();
String msg = strutils::format_string1(
_("Unable to backup original file:\n%1\n\nContinue anyway?"),
pszPath);
- if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN) != IDYES)
+ if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_BACKUP_FAILED_PROMPT) != IDYES)
return false;
}
return true;
bool bMergingMode = GetMergingMode();
if (!bMergingMode)
- LangMessageBox(IDS_MERGE_MODE, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN);
+ LangMessageBox(IDS_MERGE_MODE, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN, IDS_MERGE_MODE);
SetMergingMode(!bMergingMode);
}
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,159,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
LTEXT "Language:",IDC_STATIC,7,175,240,10\r
COMBOBOX IDC_LANGUAGE_LIST,7,187,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again.",IDC_STATIC,7,207,240,30\r
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,161,228,88,14,NOT WS_TABSTOP\r
END\r
\r
IDD_EDIT_FIND DIALOGEX 30, 73, 324, 96\r
PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 161, 228, 88, 14\r
END\r
\r
+IDD_PROPPAGE_MESSAGEBOXES DIALOGEX 0, 0, 255, 242\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+ LTEXT "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again.",IDC_STATIC,7,7,240,30\r
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,161,28,88,14,NOT WS_TABSTOP\r
+ CONTROL "",IDC_MESSAGEBOX_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 47, 241, 195\r
+END\r
+\r
IDD_MESSAGE_BOX DIALOGEX 0, 0, 186, 95\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
100, 0, 0, 0\r
END\r
\r
+IDD_PROPPAGE_MESSAGEBOXES AFX_DIALOG_LAYOUT\r
+BEGIN\r
+ 0,\r
+ 0, 0, 100, 0,\r
+ 100, 0, 0, 0\r
+ 0, 0, 100, 0,\r
+END\r
+\r
IDD_PROPPAGE_SYSTEM AFX_DIALOG_LAYOUT\r
BEGIN\r
0,\r
IDS_MESSAGEBOX_DONT_ASK_AGAIN \r
"Don't ask this &question again."\r
IDS_MESSAGEBOX_CHECKBOX_TOOLTIP \r
- "To make this message box visible again, press the Reset button on the General page of the Options dialog."\r
+ "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."\r
END\r
\r
// Options-dialog page captions\r
IDS_OPTIONSPG_SHELL "Shell Integration"\r
IDS_OPTIONSPG_MERGECOLORS "Differences"\r
IDS_OPTIONSPG_GENCOMPARE "General"\r
+ IDS_OPTIONSPG_MESSAGEBOXES "Message Boxes"\r
END\r
\r
STRINGTABLE\r
IDS_SYNTAXTABLE_EXTENSION "Extension"\r
END\r
\r
+// MESSAGEBOX OPTIONS\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_MESSAGEBOX_MESSAGE "Message"\r
+ IDS_MESSAGEBOX_ANSWER "Answer"\r
+END\r
+\r
// FILTER OPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_MUST_SPECIFY_OUTPUT "Specify an output file."\r
IDS_CANNOT_CREATE_BINARYPATCH \r
"Cannot create a patch file from binary files."\r
- IDS_CANNOT_CREATE_DIRPATCH "Cannot create a patch file from directories."\r
IDS_SAVEFILES_FORPATCH "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."\r
IDS_FOLDER_NOTEXIST "Folder does not exist."\r
END\r
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
</ClCompile>\r
+ <ClCompile Include="PropMessageBoxes.cpp" />\r
<ClCompile Include="SubstitutionFiltersList.cpp">\r
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
<ClInclude Include="Common\Bitmap.h" />\r
<ClInclude Include="charsets.h" />\r
<ClInclude Include="DirSelectFilesDlg.h" />\r
+ <ClInclude Include="PropMessageBoxes.h" />\r
<ClInclude Include="SubstitutionFiltersList.h" />\r
<ClInclude Include="MergeFrameCommon.h" />\r
<ClInclude Include="MergeEditFrm.h" />\r
<ClCompile Include="InternalPlugins.cpp">\r
<Filter>Source Files</Filter>\r
</ClCompile>\r
+ <ClCompile Include="PropMessageBoxes.cpp">\r
+ <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="charsets.h">\r
<ClInclude Include="WinMergePluginBase.h">\r
<Filter>Header Files</Filter>\r
</ClInclude>\r
+ <ClInclude Include="PropMessageBoxes.h">\r
+ <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
<ItemGroup>\r
<None Include="res\binarydiff.ico">\r
BEGIN_MESSAGE_MAP(PropGeneral, OptionsPanel)
//{{AFX_MSG_MAP(PropGeneral)
- ON_BN_CLICKED(IDC_RESET_ALL_MESSAGE_BOXES, OnResetAllMessageBoxes)
ON_MESSAGE(WM_APP, OnLoadLanguages)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
}
}
-/**
- * @brief Called when user wants to see all messageboxes again.
- */
-void PropGeneral::OnResetAllMessageBoxes()
-{
- CMessageBoxDialog::ResetMessageBoxes();
- // The "don't show again" checkbox of the Confirm Copy dialog uses the same registry key
- // as CMessageBoxDialog does, so its state will also be reset
- AfxMessageBox(_("All message boxes are now displayed again.").c_str(), MB_ICONINFORMATION);
-}
-
LRESULT PropGeneral::OnLoadLanguages(WPARAM, LPARAM)
{
for (auto&& i : m_asyncLanguagesLoader.Get())
// Generated message map functions
//{{AFX_MSG(PropGeneral)
- afx_msg void OnResetAllMessageBoxes();
afx_msg LRESULT OnLoadLanguages(WPARAM, LPARAM);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
--- /dev/null
+/**
+ * @file PropMessageBoxes.cpp
+ *
+ * @brief Implementation of PropMessageBoxes propertysheet
+ */
+
+#include "stdafx.h"
+#include "PropMessageBoxes.h"
+#include "MessageBoxDialog.h"
+#include "OptionsPanel.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+static struct MessageBox
+{
+ int nID;
+ int nHelpID;
+ int type;
+} MessageBoxes[] =
+{
+ // folder compare window
+ { IDS_CREATE_PAIR_FOLDER, IDS_CREATE_PAIR_FOLDER, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
+ // file compare window
+ { IDS_COMPARE_LARGE_FILES, IDS_COMPARE_LARGE_FILES, MB_YESNOCANCEL | MB_ICONQUESTION | MB_DONT_ASK_AGAIN},
+ { IDS_FILESSAME, IDS_FILESSAME, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN},
+ { IDS_FILE_TO_ITSELF, IDS_FILE_TO_ITSELF, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN},
+ { IDS_NUM_REPLACED, IDS_NUM_REPLACED, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN },
+ { IDS_SAVEREADONLY_MULTI, IDS_SAVEREADONLY_MULTI, MB_YESNOCANCEL | MB_ICONWARNING | MB_DEFBUTTON3 | MB_DONT_ASK_AGAIN | MB_YES_TO_ALL },
+ { IDS_SAVEREADONLY_FMT, IDS_SAVEREADONLY_FMT, MB_YESNOCANCEL | MB_ICONWARNING | MB_DEFBUTTON3 | MB_DONT_ASK_AGAIN | MB_YES_TO_ALL },
+ { IDS_MERGE_MODE, IDS_MERGE_MODE, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN },
+ { IDS_FILECHANGED_RESCAN, IDS_FILECHANGED_RESCAN, MB_YESNO | MB_ICONWARNING },
+ { IDS_BACKUP_FAILED_PROMPT, IDS_BACKUP_FAILED_PROMPT, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
+ { IDS_SUGGEST_IGNOREEOL, IDS_SUGGEST_IGNOREEOL, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
+ { IDS_MOVE_TO_NEXTFILE, IDS_MOVE_TO_NEXTFILE, MB_YESNO | MB_DONT_ASK_AGAIN },
+ { IDS_MOVE_TO_PREVFILE, IDS_MOVE_TO_PREVFILE, MB_YESNO | MB_DONT_ASK_AGAIN },
+ { IDS_MOVE_TO_FIRSTFILE, IDS_MOVE_TO_FIRSTFILE, MB_YESNO | MB_DONT_ASK_AGAIN },
+ { IDS_MOVE_TO_LASTFILE, IDS_MOVE_TO_LASTFILE, MB_YESNO | MB_DONT_ASK_AGAIN },
+ { IDS_MOVE_TO_NEXTPAGE, IDS_MOVE_TO_NEXTPAGE, MB_YESNO | MB_DONT_ASK_AGAIN },
+ { IDS_MOVE_TO_PREVPAGE, IDS_MOVE_TO_PREVPAGE, MB_YESNO | MB_DONT_ASK_AGAIN },
+ // report dialog
+ { IDS_REPORT_FILEOVERWRITE, IDS_REPORT_FILEOVERWRITE, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
+ // patch dialog
+ { IDS_CANNOT_CREATE_BINARYPATCH, IDS_CANNOT_CREATE_BINARYPATCH, MB_ICONWARNING | MB_DONT_DISPLAY_AGAIN },
+ { IDS_DIFF_FILEOVERWRITE, IDS_DIFF_FILEOVERWRITE, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
+ { IDS_DIFF_SUCCEEDED, IDS_DIFF_SUCCEEDED, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN },
+};
+
+static std::vector<String> Answers;
+static std::vector<std::vector<String>> DropdownList;
+
+/**
+ * @brief Constructor.
+ * @param [in] optionsMgr Pointer to options manager for handling options.
+ */
+PropMessageBoxes::PropMessageBoxes(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropMessageBoxes::IDD)
+{
+ Answers = {
+ _T(""),
+ _("OK"),
+ _("Cancel"),
+ _("Abort"),
+ _("Retry"),
+ _("Ignore"),
+ _("Yes"),
+ _("No"),
+ _("Close"),
+ _("Help"),
+ _("Try Again"),
+ _("Continue"),
+ };
+
+ DropdownList = {
+ { _("OK") },
+ { _("OK"), _("Cancel") },
+ { _("Abort"), _("Retry"), _("Ignore") },
+ { _("Yes"), _("No"), _("Cancel") },
+ { _("Yes"), _("No") },
+ { _("Retry"), _("Cancel") },
+ { _("Cancel"), _("Try Again"), _("Continue") },
+ };
+}
+
+static int AnswerStringtoID(const String& text)
+{
+ auto it = std::find(Answers.begin(), Answers.end(), text);
+ return static_cast<int>(it - Answers.begin());
+}
+
+/**
+ * @brief Function handling dialog data exchange between GUI and variables.
+ */
+void PropMessageBoxes::DoDataExchange(CDataExchange* pDX)
+{
+ CDialog::DoDataExchange(pDX);
+
+ //{{AFX_DATA_MAP(PropEditor)
+ DDX_Control(pDX, IDC_MESSAGEBOX_LIST, m_list);
+ //}}AFX_DATA_MAP
+ if (m_list.GetItemCount() > 0)
+ {
+ if (!pDX->m_bSaveAndValidate)
+ {
+ for (unsigned i = 0; i < static_cast<unsigned>(std::size(MessageBoxes)); i++)
+ {
+ int ans = m_answers[i];
+ m_list.SetCheck(i, ans != -1);
+ m_list.SetItemText(i, 1, (ans < 0 || ans >= Answers.size()) ? _T("") : Answers[ans].c_str());
+ }
+ }
+ else
+ {
+ for (unsigned i = 0; i < static_cast<unsigned>(std::size(MessageBoxes)); i++)
+ {
+ m_answers[i] = -1;
+ if (m_list.GetCheck(i))
+ {
+ int ans = AnswerStringtoID(String{ m_list.GetItemText(i, 1) });
+ if (ans >= IDOK && ans <= IDCONTINUE)
+ m_answers[i] = ans;
+ }
+ }
+ }
+ }
+}
+
+BEGIN_MESSAGE_MAP(PropMessageBoxes, OptionsPanel)
+ //{{AFX_MSG_MAP(PropEditor)
+ ON_NOTIFY(LVN_ITEMCHANGED, IDC_MESSAGEBOX_LIST, OnLVNItemChanged)
+ ON_BN_CLICKED(IDC_RESET_ALL_MESSAGE_BOXES, OnResetAllMessageBoxes)
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/**
+ * @brief Reads options values from storage to UI.
+ */
+void PropMessageBoxes::ReadOptions()
+{
+ m_answers.clear();
+ for (unsigned i = 0; i < static_cast<unsigned>(std::size(MessageBoxes)); i++)
+ {
+ CString key = CMessageBoxDialog::GenerateRegistryKey(
+ MessageBoxes[i].nID, MessageBoxes[i].nHelpID);
+ m_answers.push_back(AfxGetApp()->GetProfileInt(_T("MessageBoxes"), key, -1));
+ }
+}
+
+/**
+ * @brief Writes options values from UI to storage.
+ */
+void PropMessageBoxes::WriteOptions()
+{
+ CMessageBoxDialog::ResetMessageBoxes();
+ for (unsigned i = 0; i < static_cast<unsigned>(std::size(MessageBoxes)); i++)
+ {
+ CString key = CMessageBoxDialog::GenerateRegistryKey(
+ MessageBoxes[i].nID, MessageBoxes[i].nHelpID);
+ int ans = m_answers[i];
+ if (ans >= IDOK && ans <= IDCONTINUE)
+ AfxGetApp()->WriteProfileInt(_T("MessageBoxes"), key, ans);
+ }
+}
+
+/**
+ * @brief Called before propertysheet is drawn.
+ */
+BOOL PropMessageBoxes::OnInitDialog()
+{
+ OptionsPanel::OnInitDialog();
+
+ m_list.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
+ const int lpx = CClientDC(this).GetDeviceCaps(LOGPIXELSX);
+ auto pointToPixel = [lpx](int point) { return MulDiv(point, lpx, 72); };
+
+ String title = _("Message");
+ m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, pointToPixel(170));
+ title = _("Answer");
+ m_list.InsertColumn(1, title.c_str(), LVCFMT_LEFT, pointToPixel(70));
+
+ m_list.SetReadOnlyColumn(0);
+ m_list.SetEditStyle(1, CSubeditList::EditStyle::DROPDOWN_LIST);
+
+ for (unsigned i = 0; i < static_cast<unsigned>(std::size(MessageBoxes)); i++)
+ {
+ String str = LoadResString(MessageBoxes[i].nID);
+ m_list.InsertItem(i, str.c_str());
+ unsigned type = MessageBoxes[i].type & 0xf;
+ m_list.SetDropdownList(i, 1, (type >= DropdownList.size()) ? std::vector<String>{} : DropdownList[type]);
+ }
+
+ UpdateData(false);
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void PropMessageBoxes::OnLVNItemChanged(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ NMLISTVIEW* pnmv = reinterpret_cast<NMLISTVIEW *>(pNMHDR);
+ int iItem = pnmv->iItem;
+ if (m_list.GetCheck(iItem))
+ {
+ if (m_list.GetItemText(iItem, 1).IsEmpty())
+ m_list.SetItemText(iItem, 1, m_list.GetDropdownList(iItem, 1)[0].c_str());
+ }
+ else
+ {
+ if (!m_list.GetItemText(iItem, 1).IsEmpty())
+ m_list.SetItemText(iItem, 1, _T(""));
+ }
+}
+
+/**
+ * @brief Called when user wants to see all messageboxes again.
+ */
+void PropMessageBoxes::OnResetAllMessageBoxes()
+{
+ CMessageBoxDialog::ResetMessageBoxes();
+ ReadOptions();
+ UpdateData(false);
+ // The "don't show again" checkbox of the Confirm Copy dialog uses the same registry key
+ // as CMessageBoxDialog does, so its state will also be reset
+ AfxMessageBox(_("All message boxes are now displayed again.").c_str(), MB_ICONINFORMATION);
+}
--- /dev/null
+/**
+ * @file PropMessageBoxes.h
+ *
+ * @brief Declaration file for PropMessageBoxes propertyheet
+ *
+ */
+#pragma once
+
+#include "OptionsPanel.h"
+#include "UnicodeString.h"
+#include "SubeditList.h"
+
+class COptionsMgr;
+
+/**
+ * @brief Property page to set file type extension options for WinMerge.
+ */
+class PropMessageBoxes : public OptionsPanel
+{
+// Construction
+public:
+ explicit PropMessageBoxes(COptionsMgr *optionsMgr);
+
+// Implement IOptionsPanel
+ virtual void ReadOptions() override;
+ virtual void WriteOptions() override;
+
+// Dialog Data
+ //{{AFX_DATA(PropEditor)
+ enum { IDD = IDD_PROPPAGE_MESSAGEBOXES};
+ CSubeditList m_list;
+ std::vector<int> m_answers;
+ //}}AFX_DATA
+
+private:
+
+// Implementation methods
+
+// Overrides
+ // ClassWizard generated virtual function overrides
+ //{{AFX_VIRTUAL(PropEditor)
+ protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+ // Generated message map functions
+ //{{AFX_MSG(PropEditor)
+ afx_msg BOOL OnInitDialog() override;
+ afx_msg void OnLVNItemChanged(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnResetAllMessageBoxes();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+};
return (text.Compare(_T("true")) == 0 || text.Compare(_T("\u2611")) == 0);
}
+bool CSubeditList::IsValidCol(int nSubItem) const
+{
+ CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
+ int nColumnCount = pHeader->GetItemCount();
+ if (nSubItem < 0 || nSubItem >= nColumnCount)
+ return false;
+ return true;
+}
+
+bool CSubeditList::IsValidRowCol(int nItem, int nSubItem) const
+{
+ int nItemCount = GetItemCount();
+ if (nItem < 0 || nItem >= nItemCount)
+ return false;
+
+ return IsValidCol(nSubItem);
+}
+
/**
* @brief Get the edit style for the specified column.
* @param [in] nCol Column to get edit style
*/
CSubeditList::EditStyle CSubeditList::GetEditStyle(int nCol) const
{
- CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
- int nColumnCount = pHeader->GetItemCount();
-
- if (nCol < 0 || nCol >= nColumnCount)
- return EditStyle::EDIT_BOX;
-
- if (static_cast<size_t>(nCol) >= m_editStyle.size())
+ if (!IsValidCol(nCol) || static_cast<size_t>(nCol) >= m_editStyle.size())
return EditStyle::EDIT_BOX;
return m_editStyle.at(nCol);
*/
void CSubeditList::SetEditStyle(int nCol, EditStyle style)
{
- CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
- int nColumnCount = pHeader->GetItemCount();
- if (nCol < 0 || nCol >= nColumnCount)
+ if (!IsValidCol(nCol))
return;
for (size_t i = m_editStyle.size(); i <= static_cast<size_t>(nCol); i++)
*/
int CSubeditList::GetLimitTextSize(int nCol) const
{
- CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
- int nColumnCount = pHeader->GetItemCount();
-
- if (nCol < 0 || nCol >= nColumnCount)
- return 0;
-
// Currently, this setting is valid only for columns whose edit style is EditStyle::WILDCARD_DROPLIST.
- if (GetEditStyle(nCol) != EditStyle::WILDCARD_DROP_LIST)
- return 0;
-
- if (static_cast<size_t>(nCol) >= m_limitTextSize.size())
+ if (!IsValidCol(nCol) || GetEditStyle(nCol) != EditStyle::WILDCARD_DROP_LIST)
return 0;
return m_limitTextSize.at(nCol);
*/
void CSubeditList::SetLimitTextSize(int nCol, int nLimitTextSize)
{
- CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
- int nColumnCount = pHeader->GetItemCount();
- if (nCol < 0 || nCol >= nColumnCount)
- return;
-
- // Currently, this setting is valid only for columns whose edit style is EditStyle::WILDCARD_DROPLIST.
- if (GetEditStyle(nCol) != EditStyle::WILDCARD_DROP_LIST)
+ if (!IsValidCol(nCol) || GetEditStyle(nCol) != EditStyle::WILDCARD_DROP_LIST)
return;
for (size_t i = m_limitTextSize.size(); i <= static_cast<size_t>(nCol); i++)
*/
String CSubeditList::GetDropListFixedPattern(int nItem, int nSubItem) const
{
- int nItemCount = GetItemCount();
- if (nItem < 0 || nItem >= nItemCount)
- return _T("");
-
- CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
- int nColumnCount = pHeader->GetItemCount();
- if (nSubItem < 0 || nSubItem >= nColumnCount)
- return _T("");
-
// This setting is valid only for columns whose edit style is EditStyle::WILDCARD_DROPLIST.
- if (GetEditStyle(nSubItem) != EditStyle::WILDCARD_DROP_LIST)
+ if (!IsValidRowCol(nItem, nSubItem) || GetEditStyle(nSubItem) != EditStyle::WILDCARD_DROP_LIST)
return _T("");
if (static_cast<size_t>(nItem) < m_dropListFixedPattern.size())
*/
void CSubeditList::SetDropListFixedPattern(int nItem, int nSubItem, const String& fixedPattern)
{
- int nItemCount = GetItemCount();
- if (nItem < 0 || nItem >= nItemCount)
- return;
-
- CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
- int nColumnCount = pHeader->GetItemCount();
- if (nSubItem < 0 || nSubItem >= nColumnCount)
- return;
-
// This setting is valid only for columns whose edit style is EditStyle::WILDCARD_DROPLIST.
- if (GetEditStyle(nSubItem) != EditStyle::WILDCARD_DROP_LIST)
+ if (!IsValidRowCol(nItem, nSubItem) || GetEditStyle(nSubItem) != EditStyle::WILDCARD_DROP_LIST)
return;
for (size_t i = m_dropListFixedPattern.size(); i <= static_cast<size_t>(nItem); i++)
m_dropListFixedPattern[nItem][nSubItem] = fixedPattern;
}
+/**
+ * @brief Get the dropdown list data for the specified cell.
+ * @param [in] nItem The row index to get dropdown list data
+ * @param [in] nSubItem The column to get dropdown list data
+ * @return dropdown list data for the specified cell
+ */
+std::vector<String> CSubeditList::GetDropdownList(int nItem, int nSubItem) const
+{
+ // This setting is valid only for columns whose edit style is EditStyle::DROPDOWN_LIST.
+ if (!IsValidRowCol(nItem, nSubItem) || GetEditStyle(nSubItem) != EditStyle::DROPDOWN_LIST)
+ return {};
+
+ if (static_cast<size_t>(nItem) < m_dropList.size())
+ if (static_cast<size_t>(nSubItem) < m_dropList[nItem].size())
+ return m_dropList[nItem][nSubItem];
+
+ return {};
+}
+
+/**
+ * @brief Set the drop list data for the specified cell.
+ * @param [in] nItem The row index to set dropdown list data
+ * @param [in] nSubItem The column to set dropdown list data
+ * @param [in] list dropdown list data to set
+ */
+void CSubeditList::SetDropdownList(int nItem, int nSubItem, const std::vector<String>& list)
+{
+ // This setting is valid only for columns whose edit style is EditStyle::DROPDOWN_LIST.
+ if (!IsValidRowCol(nItem, nSubItem) || GetEditStyle(nSubItem) != EditStyle::DROPDOWN_LIST)
+ return;
+
+ for (size_t i = m_dropList.size(); i <= static_cast<size_t>(nItem); i++)
+ m_dropList.push_back({});
+
+ for (size_t i = m_dropList[nItem].size(); i <= static_cast<size_t>(nSubItem); i++)
+ m_dropList[nItem].push_back({});
+
+ m_dropList[nItem][nSubItem] = list;
+}
+
// HitTestEx - Determine the row index and column index for a point
// Returns - the row index or -1 if point is not over a row
// point - point to be tested.
if( rect.right > rcClient.right) rect.right = rcClient.right;
dwStyle |= WS_BORDER|WS_CHILD|WS_VISIBLE|ES_AUTOHSCROLL;
- CInPlaceEdit *pEdit = new CInPlaceEdit(nItem, nCol, GetItemText( nItem, nCol ));
+ CInPlaceEdit *pEdit = new CInPlaceEdit(nItem, nCol, GetItemText(nItem, nCol));
pEdit->Create( dwStyle, rect, this, IDC_IPEDIT );
return pEdit;
}
/**
+ * @brief Start edit of a sub item label with dropdown list.
+ * @param [in] nItem The row index of the item to edit
+ * @param [in] nCol The column of the sub item
+ */
+void CSubeditList::EditSubLabelDropdownList( int nItem, int nCol )
+{
+ // Make sure that the item is visible
+ if( !EnsureVisible( nItem, TRUE ) ) return;
+
+ // Make sure that nCol is valid
+ CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
+ int nColumnCount = pHeader->GetItemCount();
+ if( nCol >= nColumnCount || GetColumnWidth(nCol) < 5 )
+ return;
+
+ if (GetEditStyle(nCol) != EditStyle::DROPDOWN_LIST)
+ return;
+
+ // Get the column offset
+ int offset = 0;
+ for( int i = 0; i < nCol; i++ )
+ offset += GetColumnWidth( i );
+
+ CRect rect;
+ GetItemRect( nItem, &rect, LVIR_BOUNDS );
+
+ // Now scroll if we need to expose the column
+ CRect rcClient;
+ GetClientRect( &rcClient );
+ if( offset + rect.left < 0 || offset + rect.left > rcClient.right )
+ {
+ CSize size;
+ size.cx = offset + rect.left;
+ size.cy = 0;
+ Scroll( size );
+ rect.left -= size.cx;
+ }
+
+ // Get Column alignment
+ LV_COLUMN lvcol;
+ lvcol.mask = LVCF_FMT;
+ GetColumn( nCol, &lvcol );
+ DWORD dwStyle = 0;
+
+ rect.left += offset+4;
+ rect.right = rect.left + GetColumnWidth( nCol ) - 3 ;
+ if( rect.right > rcClient.right) rect.right = rcClient.right;
+
+ dwStyle |= WS_BORDER|WS_CHILD|WS_VISIBLE|CBS_DROPDOWNLIST|CBS_AUTOHSCROLL;
+ CInPlaceComboBox *pComboBox = new CInPlaceComboBox(nItem, nCol, GetItemText(nItem, nCol), GetDropdownList(nItem, nCol));
+ pComboBox->Create( dwStyle, rect, this, IDC_IPEDIT );
+}
+
+/**
* @brief Start edit of a sub item label with wilcard drop list.
* @param [in] nItem The row index of the item to edit
* @param [in] nCol The column of the sub item
case EditStyle::EDIT_BOX:
EditSubLabel(index, colnum);
break;
+ case EditStyle::DROPDOWN_LIST:
+ EditSubLabelDropdownList(index, colnum);
+ break;
case EditStyle::WILDCARD_DROP_LIST:
EditSubLabelWildcardDropList(index, colnum);
break;
SetSel( 0, -1 );
return 0;
}
+
+/////////////////////////////////////////////////////////////////////////////
+// CInPlaceComboBox
+
+CInPlaceComboBox::CInPlaceComboBox(int iItem, int iSubItem, CString sInitText, const std::vector<String>& list)
+: m_sInitText( sInitText )
+, m_list(list)
+{
+ m_iItem = iItem;
+ m_iSubItem = iSubItem;
+ m_bESC = FALSE;
+}
+
+CInPlaceComboBox::~CInPlaceComboBox()
+{
+}
+
+
+BEGIN_MESSAGE_MAP(CInPlaceComboBox, CComboBox)
+ //{{AFX_MSG_MAP(CInPlaceComboBox)
+ ON_WM_KILLFOCUS()
+ ON_WM_NCDESTROY()
+ ON_WM_CREATE()
+ ON_WM_LBUTTONDOWN()
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CInPlaceComboBox message handlers
+
+BOOL CInPlaceComboBox::PreTranslateMessage(MSG* pMsg)
+{
+ if( pMsg->message == WM_KEYDOWN )
+ {
+ if(pMsg->wParam == VK_RETURN
+ || pMsg->wParam == VK_DELETE
+ || pMsg->wParam == VK_ESCAPE
+ || GetKeyState( VK_CONTROL)
+ )
+ {
+ ::TranslateMessage(pMsg);
+ ::DispatchMessage(pMsg);
+ return TRUE; // DO NOT process further
+ }
+ }
+
+ return CComboBox::PreTranslateMessage(pMsg);
+}
+
+void CInPlaceComboBox::OnKillFocus(CWnd* pNewWnd)
+{
+ CComboBox::OnKillFocus(pNewWnd);
+
+ CString str;
+ GetWindowText(str);
+ static_cast<CListCtrl*>(GetParent())->SetItemText(m_iItem, m_iSubItem, str);
+
+ DestroyWindow();
+}
+
+void CInPlaceComboBox::OnNcDestroy()
+{
+ CComboBox::OnNcDestroy();
+
+ delete this;
+}
+
+int CInPlaceComboBox::OnCreate(LPCREATESTRUCT lpCreateStruct)
+{
+ if (CComboBox::OnCreate(lpCreateStruct) == -1)
+ return -1;
+
+ // Set the proper font
+ CFont* font = GetParent()->GetFont();
+ SetFont(font);
+
+ int sel = -1;
+ for (int i = 0; i < static_cast<int>(m_list.size()); ++i)
+ {
+ AddString(m_list[i].c_str());
+ if (m_sInitText == m_list[i].c_str())
+ sel = i;
+ }
+ if (sel >= 0)
+ SetCurSel(sel);
+ SetFocus();
+ return 0;
+}
BOOL m_bESC; // To indicate whether ESC key was pressed
};
+class CInPlaceComboBox : public CComboBox
+{
+// Construction
+public:
+ CInPlaceComboBox(int iItem, int iSubItem, CString sInitText, const std::vector<String>& list);
+
+// Attributes
+public:
+
+// Operations
+public:
+
+// Overrides
+ // ClassWizard generated virtual function overrides
+ //{{AFX_VIRTUAL(CInPlaceComboBox)
+ public:
+ virtual BOOL PreTranslateMessage(MSG* pMsg);
+ //}}AFX_VIRTUAL
+
+// Implementation
+public:
+ virtual ~CInPlaceComboBox();
+
+ // Generated message map functions
+protected:
+ //{{AFX_MSG(CInPlaceComboBox)
+ afx_msg void OnKillFocus(CWnd* pNewWnd);
+ afx_msg void OnNcDestroy();
+ afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+ //}}AFX_MSG
+
+ DECLARE_MESSAGE_MAP()
+private:
+ int m_iItem;
+ int m_iSubItem;
+ CString m_sInitText;
+ std::vector<String> m_list;
+ BOOL m_bESC; // To indicate whether ESC key was pressed
+};
+
class CSubeditList : public CListCtrl
{
public:
enum class EditStyle
{
EDIT_BOX,
+ DROPDOWN_LIST,
WILDCARD_DROP_LIST,
};
std::vector<EditStyle> m_editStyle; /**< Edit style for each column */
std::vector<int> m_limitTextSize; /**< Character limit for each column */
std::vector<std::vector<String>> m_dropListFixedPattern; /**< Wildcard drop list fixed pattern for each cell */
+ std::vector<std::vector<std::vector<String>>> m_dropList; /**< dropdown list data for each cell */
// Operations
public:
void SetLimitTextSize(int nCol, int nLimitTextSize);
String GetDropListFixedPattern(int nItem, int nSubItem) const;
void SetDropListFixedPattern(int nItem, int nSubItem, const String& fixedPattern);
+ std::vector<String> GetDropdownList(int nItem, int nSubItem) const;
+ void SetDropdownList(int nItem, int nSubItem, const std::vector<String>& list);
// Overrides
// ClassWizard generated virtual function overrides
CInPlaceEdit *EditSubLabel(int nItem, int nCol);
void EditSubLabelWildcardDropList(int nItem, int nCol);
+ void EditSubLabelDropdownList(int nItem, int nCol);
+private:
+ bool IsValidCol(int nSubItem) const;
+ bool IsValidRowCol(int nItem, int nSubItem) const;
+public:
// Generated message map functions
//protected:
//{{AFX_MSG(CSubeditList)
#define IDD_PROPPAGE_GENERAL 276\r
#define IDD_PROPPAGE_SHELL 277\r
#define IDD_PROPPAGE_SYSTEM 278\r
+#define IDD_PROPPAGE_MESSAGEBOXES 279\r
#define IDD_EDIT_FIND 280\r
#define IDD_EDIT_MARKER 281\r
#define IDD_EDIT_REPLACE 282\r
#define IDC_FLDCONFIRM_DONTASKAGAIN 1418\r
#define IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES 1419\r
#define IDC_LFILTER_CLEARBTN 1420\r
+#define IDC_MESSAGEBOX_LIST 1421\r
#define IDC_EXPAND_SUBDIRS 1600\r
#define IDC_FILEENCODING 1601\r
#define IDC_PLUGIN 1602\r
#define IDS_OPTIONSPG_TABLECOMPARE 39061\r
#define IDS_OPTIONSPG_GENEDITOR 39062\r
#define IDS_OPTIONSPG_EDITOR_SYNTAX 39063\r
+#define IDS_OPTIONSPG_MESSAGEBOXES 39064\r
#define IDS_TO 40000\r
#define IDS_FROM_LEFT 40001\r
#define IDS_TO_LEFT 40002\r
#define IDS_PATH_NOT_ABSOLUTE 42410\r
#define IDS_MUST_SPECIFY_OUTPUT 42411\r
#define IDS_CANNOT_CREATE_BINARYPATCH 42412\r
-#define IDS_CANNOT_CREATE_DIRPATCH 42413\r
#define IDS_SAVEFILES_FORPATCH 42414\r
#define IDS_FOLDER_NOTEXIST 42415\r
#define IDS_NO_ZIP_SUPPORT 42449\r
#define IDS_SYNTAXTABLE_FILETYPE 43496\r
#define IDS_SYNTAXTABLE_EXTENSION 43497\r
#define IDS_UNPACK_AUTO 43498\r
+#define IDS_MESSAGEBOX_MESSAGE 43499\r
+#define IDS_MESSAGEBOX_ANSWER 43500\r
#define IDS_NO_PREDIFFER 43501\r
#define IDS_SUGGESTED_PLUGINS 43502\r
#define IDS_NOT_SUGGESTED_PLUGINS 43503\r
</head>
<body>
<h1>Translations Status</h1>
-<p>Status from <strong>2021-07-04</strong>:</p>
+<p>Status from <strong>2021-07-07</strong>:</p>
<h2>WinMerge</h2>
<table class="status">
<tr>
</tr>
<tr>
<td class="left">Arabic</td>
- <td class="right">1075</td>
- <td class="right translated">908</td>
+ <td class="right">1077</td>
+ <td class="right translated">906</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">167</td>
+ <td class="right untranslated">171</td>
<td class="right">84 %</td>
<td class="center">2019-12-30</td>
</tr>
<tr>
<td class="left">Basque</td>
- <td class="right">1075</td>
- <td class="right translated">644</td>
+ <td class="right">1077</td>
+ <td class="right translated">643</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">431</td>
+ <td class="right untranslated">434</td>
<td class="right">60 %</td>
<td class="center">2013-02-03</td>
</tr>
<tr>
<td class="left">Brazilian</td>
- <td class="right">1075</td>
- <td class="right translated">1024</td>
+ <td class="right">1077</td>
+ <td class="right translated">1022</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">51</td>
+ <td class="right untranslated">55</td>
<td class="right">95 %</td>
<td class="center">2021-02-14</td>
</tr>
<tr>
<td class="left">Bulgarian</td>
- <td class="right">1075</td>
- <td class="right translated">972</td>
+ <td class="right">1077</td>
+ <td class="right translated">970</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">103</td>
+ <td class="right untranslated">107</td>
<td class="right">90 %</td>
<td class="center">2021-06-28</td>
</tr>
<tr>
<td class="left">Catalan</td>
- <td class="right">1075</td>
- <td class="right translated">570</td>
+ <td class="right">1077</td>
+ <td class="right translated">569</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">505</td>
+ <td class="right untranslated">508</td>
<td class="right">53 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">ChineseSimplified</td>
- <td class="right">1075</td>
- <td class="right translated">981</td>
+ <td class="right">1077</td>
+ <td class="right translated">979</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">94</td>
+ <td class="right untranslated">98</td>
<td class="right">91 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">ChineseTraditional</td>
- <td class="right">1075</td>
- <td class="right translated">861</td>
+ <td class="right">1077</td>
+ <td class="right translated">859</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">214</td>
+ <td class="right untranslated">218</td>
<td class="right">80 %</td>
<td class="center">2010-02-19</td>
</tr>
<tr>
<td class="left">Croatian</td>
- <td class="right">1075</td>
- <td class="right translated">635</td>
+ <td class="right">1077</td>
+ <td class="right translated">634</td>
<td class="right fuzzy">1</td>
- <td class="right untranslated">439</td>
+ <td class="right untranslated">442</td>
<td class="right">59 %</td>
<td class="center">2009-02-13</td>
</tr>
<tr>
<td class="left">Czech</td>
- <td class="right">1075</td>
- <td class="right translated">610</td>
+ <td class="right">1077</td>
+ <td class="right translated">609</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">465</td>
+ <td class="right untranslated">468</td>
<td class="right">57 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">Danish</td>
- <td class="right">1075</td>
- <td class="right translated">644</td>
+ <td class="right">1077</td>
+ <td class="right translated">643</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">431</td>
+ <td class="right untranslated">434</td>
<td class="right">60 %</td>
<td class="center">2013-01-13</td>
</tr>
<tr>
<td class="left">Dutch</td>
- <td class="right">1075</td>
- <td class="right translated">1070</td>
+ <td class="right">1077</td>
+ <td class="right translated">1068</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">5</td>
- <td class="right">100 %</td>
+ <td class="right untranslated">9</td>
+ <td class="right">99 %</td>
<td class="center">2018-09-06</td>
</tr>
<tr>
<td class="left">English</td>
- <td class="right">1076</td>
- <td class="right translated">1076</td>
+ <td class="right">1078</td>
+ <td class="right translated">1078</td>
<td class="right fuzzy">0</td>
<td class="right untranslated">0</td>
<td class="right">100 %</td>
- <td class="center">2021-07-03</td>
+ <td class="center">2021-07-07</td>
</tr>
<tr>
<td class="left">Finnish</td>
- <td class="right">1075</td>
- <td class="right translated">908</td>
+ <td class="right">1077</td>
+ <td class="right translated">906</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">167</td>
+ <td class="right untranslated">171</td>
<td class="right">84 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">French</td>
- <td class="right">1075</td>
- <td class="right translated">1025</td>
+ <td class="right">1077</td>
+ <td class="right translated">1023</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">50</td>
+ <td class="right untranslated">54</td>
<td class="right">95 %</td>
<td class="center">2021-04-29</td>
</tr>
<tr>
<td class="left">Galician</td>
- <td class="right">1075</td>
- <td class="right translated">1025</td>
+ <td class="right">1077</td>
+ <td class="right translated">1023</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">50</td>
+ <td class="right untranslated">54</td>
<td class="right">95 %</td>
<td class="center">2021-04-18</td>
</tr>
<tr>
<td class="left">German</td>
- <td class="right">1075</td>
- <td class="right translated">1025</td>
+ <td class="right">1077</td>
+ <td class="right translated">1073</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">50</td>
- <td class="right">95 %</td>
- <td class="center">2021-04-24</td>
+ <td class="right untranslated">4</td>
+ <td class="right">100 %</td>
+ <td class="center">2021-07-04</td>
</tr>
<tr>
<td class="left">Greek</td>
- <td class="right">1075</td>
- <td class="right translated">608</td>
+ <td class="right">1077</td>
+ <td class="right translated">607</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">467</td>
- <td class="right">57 %</td>
+ <td class="right untranslated">470</td>
+ <td class="right">56 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">Hungarian</td>
- <td class="right">1075</td>
- <td class="right translated">1073</td>
+ <td class="right">1077</td>
+ <td class="right translated">1071</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">2</td>
- <td class="right">100 %</td>
+ <td class="right untranslated">6</td>
+ <td class="right">99 %</td>
<td class="center">2021-03-15</td>
</tr>
<tr>
<td class="left">Italian</td>
- <td class="right">1075</td>
- <td class="right translated">911</td>
+ <td class="right">1077</td>
+ <td class="right translated">909</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">164</td>
- <td class="right">85 %</td>
+ <td class="right untranslated">168</td>
+ <td class="right">84 %</td>
<td class="center">2019-07-12</td>
</tr>
<tr>
<td class="left">Japanese</td>
- <td class="right">1075</td>
- <td class="right translated">1075</td>
+ <td class="right">1077</td>
+ <td class="right translated">1076</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">0</td>
+ <td class="right untranslated">1</td>
<td class="right">100 %</td>
- <td class="center">2021-06-26</td>
+ <td class="center">2021-07-06</td>
</tr>
<tr>
<td class="left">Korean</td>
- <td class="right">1075</td>
- <td class="right translated">993</td>
+ <td class="right">1077</td>
+ <td class="right translated">991</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">82</td>
+ <td class="right untranslated">86</td>
<td class="right">92 %</td>
<td class="center">2021-03-30</td>
</tr>
<tr>
<td class="left">Lithuanian</td>
- <td class="right">1075</td>
- <td class="right translated">1073</td>
+ <td class="right">1077</td>
+ <td class="right translated">1071</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">2</td>
- <td class="right">100 %</td>
+ <td class="right untranslated">6</td>
+ <td class="right">99 %</td>
<td class="center">2021-06-28</td>
</tr>
<tr>
<td class="left">Norwegian</td>
- <td class="right">1075</td>
- <td class="right translated">636</td>
+ <td class="right">1077</td>
+ <td class="right translated">635</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">439</td>
+ <td class="right untranslated">442</td>
<td class="right">59 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">Persian</td>
- <td class="right">1075</td>
- <td class="right translated">647</td>
+ <td class="right">1077</td>
+ <td class="right translated">646</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">428</td>
+ <td class="right untranslated">431</td>
<td class="right">60 %</td>
<td class="center">2013-08-15</td>
</tr>
<tr>
<td class="left">Polish</td>
- <td class="right">1075</td>
- <td class="right translated">1015</td>
+ <td class="right">1077</td>
+ <td class="right translated">1013</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">60</td>
+ <td class="right untranslated">64</td>
<td class="right">94 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">Portuguese</td>
- <td class="right">1075</td>
- <td class="right translated">1071</td>
+ <td class="right">1077</td>
+ <td class="right translated">1069</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">4</td>
- <td class="right">100 %</td>
+ <td class="right untranslated">8</td>
+ <td class="right">99 %</td>
<td class="center">2021-06-25</td>
</tr>
<tr>
<td class="left">Romanian</td>
- <td class="right">1075</td>
- <td class="right translated">565</td>
+ <td class="right">1077</td>
+ <td class="right translated">564</td>
<td class="right fuzzy">44</td>
- <td class="right untranslated">466</td>
- <td class="right">57 %</td>
+ <td class="right untranslated">469</td>
+ <td class="right">56 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">Russian</td>
- <td class="right">1075</td>
- <td class="right translated">1051</td>
+ <td class="right">1077</td>
+ <td class="right translated">1049</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">24</td>
- <td class="right">98 %</td>
+ <td class="right untranslated">28</td>
+ <td class="right">97 %</td>
<td class="center">2021-06-25</td>
</tr>
<tr>
<td class="left">Serbian</td>
- <td class="right">1075</td>
- <td class="right translated">635</td>
+ <td class="right">1077</td>
+ <td class="right translated">634</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">440</td>
+ <td class="right untranslated">443</td>
<td class="right">59 %</td>
<td class="center"></td>
</tr>
<tr>
<td class="left">Sinhala</td>
- <td class="right">1075</td>
- <td class="right translated">569</td>
+ <td class="right">1077</td>
+ <td class="right translated">568</td>
<td class="right fuzzy">59</td>
- <td class="right untranslated">447</td>
+ <td class="right untranslated">450</td>
<td class="right">58 %</td>
<td class="center">2010-12-12</td>
</tr>
<tr>
<td class="left">Slovak</td>
- <td class="right">1075</td>
- <td class="right translated">981</td>
+ <td class="right">1077</td>
+ <td class="right translated">979</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">94</td>
+ <td class="right untranslated">98</td>
<td class="right">91 %</td>
<td class="center">2020-11-02</td>
</tr>
<tr>
<td class="left">Slovenian</td>
- <td class="right">1075</td>
- <td class="right translated">1075</td>
+ <td class="right">1077</td>
+ <td class="right translated">1073</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">0</td>
+ <td class="right untranslated">4</td>
<td class="right">100 %</td>
<td class="center">2021-07-04</td>
</tr>
<tr>
<td class="left">Spanish</td>
- <td class="right">1075</td>
- <td class="right translated">877</td>
+ <td class="right">1077</td>
+ <td class="right translated">875</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">198</td>
- <td class="right">82 %</td>
+ <td class="right untranslated">202</td>
+ <td class="right">81 %</td>
<td class="center">2020-04-03</td>
</tr>
<tr>
<td class="left">Swedish</td>
- <td class="right">1075</td>
- <td class="right translated">1024</td>
+ <td class="right">1077</td>
+ <td class="right translated">1022</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">51</td>
+ <td class="right untranslated">55</td>
<td class="right">95 %</td>
<td class="center">2021-04-10</td>
</tr>
<tr>
<td class="left">Turkish</td>
- <td class="right">1075</td>
- <td class="right translated">1070</td>
+ <td class="right">1077</td>
+ <td class="right translated">1068</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">5</td>
- <td class="right">100 %</td>
+ <td class="right untranslated">9</td>
+ <td class="right">99 %</td>
<td class="center">2021-06-25</td>
</tr>
<tr>
<td class="left">Ukrainian</td>
- <td class="right">1075</td>
- <td class="right translated">641</td>
+ <td class="right">1077</td>
+ <td class="right translated">640</td>
<td class="right fuzzy">0</td>
- <td class="right untranslated">434</td>
- <td class="right">60 %</td>
+ <td class="right untranslated">437</td>
+ <td class="right">59 %</td>
<td class="center">2009-06-13</td>
</tr>
</table>
# Translations Status
-Status from **2021-07-04**:
+Status from **2021-07-07**:
## WinMerge
| Language | Total | Translated | Fuzzy | Untranslated | Complete | Last Update |
|:---------------------|------:|-----------:|------:|-------------:|---------:|:-----------:|
-| Arabic | 1075 | 908 | 0 | 167 | 84 % | 2019-12-30 |
-| Basque | 1075 | 644 | 0 | 431 | 60 % | 2013-02-03 |
-| Brazilian | 1075 | 1024 | 0 | 51 | 95 % | 2021-02-14 |
-| Bulgarian | 1075 | 972 | 0 | 103 | 90 % | 2021-06-28 |
-| Catalan | 1075 | 570 | 0 | 505 | 53 % | |
-| ChineseSimplified | 1075 | 981 | 0 | 94 | 91 % | |
-| ChineseTraditional | 1075 | 861 | 0 | 214 | 80 % | 2010-02-19 |
-| Croatian | 1075 | 635 | 1 | 439 | 59 % | 2009-02-13 |
-| Czech | 1075 | 610 | 0 | 465 | 57 % | |
-| Danish | 1075 | 644 | 0 | 431 | 60 % | 2013-01-13 |
-| Dutch | 1075 | 1070 | 0 | 5 | 100 % | 2018-09-06 |
-| English | 1076 | 1076 | 0 | 0 | 100 % | 2021-07-03 |
-| Finnish | 1075 | 908 | 0 | 167 | 84 % | |
-| French | 1075 | 1025 | 0 | 50 | 95 % | 2021-04-29 |
-| Galician | 1075 | 1025 | 0 | 50 | 95 % | 2021-04-18 |
-| German | 1075 | 1025 | 0 | 50 | 95 % | 2021-04-24 |
-| Greek | 1075 | 608 | 0 | 467 | 57 % | |
-| Hungarian | 1075 | 1073 | 0 | 2 | 100 % | 2021-03-15 |
-| Italian | 1075 | 911 | 0 | 164 | 85 % | 2019-07-12 |
-| Japanese | 1075 | 1075 | 0 | 0 | 100 % | 2021-06-26 |
-| Korean | 1075 | 993 | 0 | 82 | 92 % | 2021-03-30 |
-| Lithuanian | 1075 | 1073 | 0 | 2 | 100 % | 2021-06-28 |
-| Norwegian | 1075 | 636 | 0 | 439 | 59 % | |
-| Persian | 1075 | 647 | 0 | 428 | 60 % | 2013-08-15 |
-| Polish | 1075 | 1015 | 0 | 60 | 94 % | |
-| Portuguese | 1075 | 1071 | 0 | 4 | 100 % | 2021-06-25 |
-| Romanian | 1075 | 565 | 44 | 466 | 57 % | |
-| Russian | 1075 | 1051 | 0 | 24 | 98 % | 2021-06-25 |
-| Serbian | 1075 | 635 | 0 | 440 | 59 % | |
-| Sinhala | 1075 | 569 | 59 | 447 | 58 % | 2010-12-12 |
-| Slovak | 1075 | 981 | 0 | 94 | 91 % | 2020-11-02 |
-| Slovenian | 1075 | 1075 | 0 | 0 | 100 % | 2021-07-04 |
-| Spanish | 1075 | 877 | 0 | 198 | 82 % | 2020-04-03 |
-| Swedish | 1075 | 1024 | 0 | 51 | 95 % | 2021-04-10 |
-| Turkish | 1075 | 1070 | 0 | 5 | 100 % | 2021-06-25 |
-| Ukrainian | 1075 | 641 | 0 | 434 | 60 % | 2009-06-13 |
+| Arabic | 1077 | 906 | 0 | 171 | 84 % | 2019-12-30 |
+| Basque | 1077 | 643 | 0 | 434 | 60 % | 2013-02-03 |
+| Brazilian | 1077 | 1022 | 0 | 55 | 95 % | 2021-02-14 |
+| Bulgarian | 1077 | 970 | 0 | 107 | 90 % | 2021-06-28 |
+| Catalan | 1077 | 569 | 0 | 508 | 53 % | |
+| ChineseSimplified | 1077 | 979 | 0 | 98 | 91 % | |
+| ChineseTraditional | 1077 | 859 | 0 | 218 | 80 % | 2010-02-19 |
+| Croatian | 1077 | 634 | 1 | 442 | 59 % | 2009-02-13 |
+| Czech | 1077 | 609 | 0 | 468 | 57 % | |
+| Danish | 1077 | 643 | 0 | 434 | 60 % | 2013-01-13 |
+| Dutch | 1077 | 1068 | 0 | 9 | 99 % | 2018-09-06 |
+| English | 1078 | 1078 | 0 | 0 | 100 % | 2021-07-07 |
+| Finnish | 1077 | 906 | 0 | 171 | 84 % | |
+| French | 1077 | 1023 | 0 | 54 | 95 % | 2021-04-29 |
+| Galician | 1077 | 1023 | 0 | 54 | 95 % | 2021-04-18 |
+| German | 1077 | 1073 | 0 | 4 | 100 % | 2021-07-04 |
+| Greek | 1077 | 607 | 0 | 470 | 56 % | |
+| Hungarian | 1077 | 1071 | 0 | 6 | 99 % | 2021-03-15 |
+| Italian | 1077 | 909 | 0 | 168 | 84 % | 2019-07-12 |
+| Japanese | 1077 | 1076 | 0 | 1 | 100 % | 2021-07-06 |
+| Korean | 1077 | 991 | 0 | 86 | 92 % | 2021-03-30 |
+| Lithuanian | 1077 | 1071 | 0 | 6 | 99 % | 2021-06-28 |
+| Norwegian | 1077 | 635 | 0 | 442 | 59 % | |
+| Persian | 1077 | 646 | 0 | 431 | 60 % | 2013-08-15 |
+| Polish | 1077 | 1013 | 0 | 64 | 94 % | |
+| Portuguese | 1077 | 1069 | 0 | 8 | 99 % | 2021-06-25 |
+| Romanian | 1077 | 564 | 44 | 469 | 56 % | |
+| Russian | 1077 | 1049 | 0 | 28 | 97 % | 2021-06-25 |
+| Serbian | 1077 | 634 | 0 | 443 | 59 % | |
+| Sinhala | 1077 | 568 | 59 | 450 | 58 % | 2010-12-12 |
+| Slovak | 1077 | 979 | 0 | 98 | 91 % | 2020-11-02 |
+| Slovenian | 1077 | 1073 | 0 | 4 | 100 % | 2021-07-04 |
+| Spanish | 1077 | 875 | 0 | 202 | 81 % | 2020-04-03 |
+| Swedish | 1077 | 1022 | 0 | 55 | 95 % | 2021-04-10 |
+| Turkish | 1077 | 1068 | 0 | 9 | 99 % | 2021-06-25 |
+| Ukrainian | 1077 | 640 | 0 | 437 | 59 % | 2009-06-13 |
## ShellExtension
<?xml version="1.0" encoding="UTF-8"?>
<status>
- <update>2021-07-04</update>
+ <update>2021-07-07</update>
<translations project="WinMerge">
<translation>
<language>Arabic</language>
<file>Arabic.po</file>
<update>2019-12-30</update>
<strings>
- <count>1075</count>
- <translated>908</translated>
+ <count>1077</count>
+ <translated>906</translated>
<fuzzy>0</fuzzy>
- <untranslated>167</untranslated>
+ <untranslated>171</untranslated>
</strings>
</translation>
<translation>
<file>Basque.po</file>
<update>2013-02-03</update>
<strings>
- <count>1075</count>
- <translated>644</translated>
+ <count>1077</count>
+ <translated>643</translated>
<fuzzy>0</fuzzy>
- <untranslated>431</untranslated>
+ <untranslated>434</untranslated>
</strings>
<translators>
<translator>
<file>Brazilian.po</file>
<update>2021-02-14</update>
<strings>
- <count>1075</count>
- <translated>1024</translated>
+ <count>1077</count>
+ <translated>1022</translated>
<fuzzy>0</fuzzy>
- <untranslated>51</untranslated>
+ <untranslated>55</untranslated>
</strings>
<translators>
<translator>
<file>Bulgarian.po</file>
<update>2021-06-28</update>
<strings>
- <count>1075</count>
- <translated>972</translated>
+ <count>1077</count>
+ <translated>970</translated>
<fuzzy>0</fuzzy>
- <untranslated>103</untranslated>
+ <untranslated>107</untranslated>
</strings>
<translators>
<translator>
<file>Catalan.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>570</translated>
+ <count>1077</count>
+ <translated>569</translated>
<fuzzy>0</fuzzy>
- <untranslated>505</untranslated>
+ <untranslated>508</untranslated>
</strings>
<translators>
<translator>
<file>ChineseSimplified.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>981</translated>
+ <count>1077</count>
+ <translated>979</translated>
<fuzzy>0</fuzzy>
- <untranslated>94</untranslated>
+ <untranslated>98</untranslated>
</strings>
<translators>
<translator>
<file>ChineseTraditional.po</file>
<update>2010-02-19</update>
<strings>
- <count>1075</count>
- <translated>861</translated>
+ <count>1077</count>
+ <translated>859</translated>
<fuzzy>0</fuzzy>
- <untranslated>214</untranslated>
+ <untranslated>218</untranslated>
</strings>
<translators>
<translator>
<file>Croatian.po</file>
<update>2009-02-13</update>
<strings>
- <count>1075</count>
- <translated>635</translated>
+ <count>1077</count>
+ <translated>634</translated>
<fuzzy>1</fuzzy>
- <untranslated>439</untranslated>
+ <untranslated>442</untranslated>
</strings>
<translators>
<translator>
<file>Czech.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>610</translated>
+ <count>1077</count>
+ <translated>609</translated>
<fuzzy>0</fuzzy>
- <untranslated>465</untranslated>
+ <untranslated>468</untranslated>
</strings>
<translators>
<translator>
<file>Danish.po</file>
<update>2013-01-13</update>
<strings>
- <count>1075</count>
- <translated>644</translated>
+ <count>1077</count>
+ <translated>643</translated>
<fuzzy>0</fuzzy>
- <untranslated>431</untranslated>
+ <untranslated>434</untranslated>
</strings>
<translators>
<translator>
<file>Dutch.po</file>
<update>2018-09-06</update>
<strings>
- <count>1075</count>
- <translated>1070</translated>
+ <count>1077</count>
+ <translated>1068</translated>
<fuzzy>0</fuzzy>
- <untranslated>5</untranslated>
+ <untranslated>9</untranslated>
</strings>
<translators>
<translator>
<translation template="1">
<language>English</language>
<file>English.pot</file>
- <update>2021-07-03</update>
+ <update>2021-07-07</update>
<strings>
- <count>1076</count>
- <translated>1076</translated>
+ <count>1078</count>
+ <translated>1078</translated>
<fuzzy>0</fuzzy>
<untranslated>0</untranslated>
</strings>
<file>Finnish.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>908</translated>
+ <count>1077</count>
+ <translated>906</translated>
<fuzzy>0</fuzzy>
- <untranslated>167</untranslated>
+ <untranslated>171</untranslated>
</strings>
</translation>
<translation>
<file>French.po</file>
<update>2021-04-29</update>
<strings>
- <count>1075</count>
- <translated>1025</translated>
+ <count>1077</count>
+ <translated>1023</translated>
<fuzzy>0</fuzzy>
- <untranslated>50</untranslated>
+ <untranslated>54</untranslated>
</strings>
<translators>
<translator maintainer="1">
<file>Galician.po</file>
<update>2021-04-18</update>
<strings>
- <count>1075</count>
- <translated>1025</translated>
+ <count>1077</count>
+ <translated>1023</translated>
<fuzzy>0</fuzzy>
- <untranslated>50</untranslated>
+ <untranslated>54</untranslated>
</strings>
<translators>
<translator>
<translation>
<language>German</language>
<file>German.po</file>
- <update>2021-04-24</update>
+ <update>2021-07-04</update>
<strings>
- <count>1075</count>
- <translated>1025</translated>
+ <count>1077</count>
+ <translated>1073</translated>
<fuzzy>0</fuzzy>
- <untranslated>50</untranslated>
+ <untranslated>4</untranslated>
</strings>
<translators>
<translator maintainer="1">
<file>Greek.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>608</translated>
+ <count>1077</count>
+ <translated>607</translated>
<fuzzy>0</fuzzy>
- <untranslated>467</untranslated>
+ <untranslated>470</untranslated>
</strings>
<translators>
<translator>
<file>Hungarian.po</file>
<update>2021-03-15</update>
<strings>
- <count>1075</count>
- <translated>1073</translated>
+ <count>1077</count>
+ <translated>1071</translated>
<fuzzy>0</fuzzy>
- <untranslated>2</untranslated>
+ <untranslated>6</untranslated>
</strings>
<translators>
<translator>
<file>Italian.po</file>
<update>2019-07-12</update>
<strings>
- <count>1075</count>
- <translated>911</translated>
+ <count>1077</count>
+ <translated>909</translated>
<fuzzy>0</fuzzy>
- <untranslated>164</untranslated>
+ <untranslated>168</untranslated>
</strings>
<translators>
<translator>
<translation>
<language>Japanese</language>
<file>Japanese.po</file>
- <update>2021-06-26</update>
+ <update>2021-07-06</update>
<strings>
- <count>1075</count>
- <translated>1075</translated>
+ <count>1077</count>
+ <translated>1076</translated>
<fuzzy>0</fuzzy>
- <untranslated>0</untranslated>
+ <untranslated>1</untranslated>
</strings>
<translators>
<translator>
<file>Korean.po</file>
<update>2021-03-30</update>
<strings>
- <count>1075</count>
- <translated>993</translated>
+ <count>1077</count>
+ <translated>991</translated>
<fuzzy>0</fuzzy>
- <untranslated>82</untranslated>
+ <untranslated>86</untranslated>
</strings>
<translators>
<translator>
<file>Lithuanian.po</file>
<update>2021-06-28</update>
<strings>
- <count>1075</count>
- <translated>1073</translated>
+ <count>1077</count>
+ <translated>1071</translated>
<fuzzy>0</fuzzy>
- <untranslated>2</untranslated>
+ <untranslated>6</untranslated>
</strings>
<translators>
<translator>
<file>Norwegian.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>636</translated>
+ <count>1077</count>
+ <translated>635</translated>
<fuzzy>0</fuzzy>
- <untranslated>439</untranslated>
+ <untranslated>442</untranslated>
</strings>
<translators>
<translator>
<file>Persian.po</file>
<update>2013-08-15</update>
<strings>
- <count>1075</count>
- <translated>647</translated>
+ <count>1077</count>
+ <translated>646</translated>
<fuzzy>0</fuzzy>
- <untranslated>428</untranslated>
+ <untranslated>431</untranslated>
</strings>
<translators>
<translator>
<file>Polish.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>1015</translated>
+ <count>1077</count>
+ <translated>1013</translated>
<fuzzy>0</fuzzy>
- <untranslated>60</untranslated>
+ <untranslated>64</untranslated>
</strings>
<translators>
<translator>
<file>Portuguese.po</file>
<update>2021-06-25</update>
<strings>
- <count>1075</count>
- <translated>1071</translated>
+ <count>1077</count>
+ <translated>1069</translated>
<fuzzy>0</fuzzy>
- <untranslated>4</untranslated>
+ <untranslated>8</untranslated>
</strings>
<translators>
<translator>
<file>Romanian.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>565</translated>
+ <count>1077</count>
+ <translated>564</translated>
<fuzzy>44</fuzzy>
- <untranslated>466</untranslated>
+ <untranslated>469</untranslated>
</strings>
<translators>
<translator>
<file>Russian.po</file>
<update>2021-06-25</update>
<strings>
- <count>1075</count>
- <translated>1051</translated>
+ <count>1077</count>
+ <translated>1049</translated>
<fuzzy>0</fuzzy>
- <untranslated>24</untranslated>
+ <untranslated>28</untranslated>
</strings>
<translators>
<translator>
<file>Serbian.po</file>
<update></update>
<strings>
- <count>1075</count>
- <translated>635</translated>
+ <count>1077</count>
+ <translated>634</translated>
<fuzzy>0</fuzzy>
- <untranslated>440</untranslated>
+ <untranslated>443</untranslated>
</strings>
<translators>
<translator>
<file>Sinhala.po</file>
<update>2010-12-12</update>
<strings>
- <count>1075</count>
- <translated>569</translated>
+ <count>1077</count>
+ <translated>568</translated>
<fuzzy>59</fuzzy>
- <untranslated>447</untranslated>
+ <untranslated>450</untranslated>
</strings>
<translators>
<translator>
<file>Slovak.po</file>
<update>2020-11-02</update>
<strings>
- <count>1075</count>
- <translated>981</translated>
+ <count>1077</count>
+ <translated>979</translated>
<fuzzy>0</fuzzy>
- <untranslated>94</untranslated>
+ <untranslated>98</untranslated>
</strings>
<translators>
<translator>
<file>Slovenian.po</file>
<update>2021-07-04</update>
<strings>
- <count>1075</count>
- <translated>1075</translated>
+ <count>1077</count>
+ <translated>1073</translated>
<fuzzy>0</fuzzy>
- <untranslated>0</untranslated>
+ <untranslated>4</untranslated>
</strings>
<translators>
<translator>
<file>Spanish.po</file>
<update>2020-04-03</update>
<strings>
- <count>1075</count>
- <translated>877</translated>
+ <count>1077</count>
+ <translated>875</translated>
<fuzzy>0</fuzzy>
- <untranslated>198</untranslated>
+ <untranslated>202</untranslated>
</strings>
<translators>
<translator>
<file>Swedish.po</file>
<update>2021-04-10</update>
<strings>
- <count>1075</count>
- <translated>1024</translated>
+ <count>1077</count>
+ <translated>1022</translated>
<fuzzy>0</fuzzy>
- <untranslated>51</untranslated>
+ <untranslated>55</untranslated>
</strings>
<translators>
<translator>
<file>Turkish.po</file>
<update>2021-06-25</update>
<strings>
- <count>1075</count>
- <translated>1070</translated>
+ <count>1077</count>
+ <translated>1068</translated>
<fuzzy>0</fuzzy>
- <untranslated>5</untranslated>
+ <untranslated>9</untranslated>
</strings>
<translators>
<translator>
<file>Ukrainian.po</file>
<update>2009-06-13</update>
<strings>
- <count>1075</count>
- <translated>641</translated>
+ <count>1077</count>
+ <translated>640</translated>
<fuzzy>0</fuzzy>
- <untranslated>434</untranslated>
+ <untranslated>437</untranslated>
</strings>
<translators>
<translator>
msgid "Language:"
msgstr "اللغة:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-"يقوم WinMerge بإخفاء بعض الرسائل العامة. إضغط على زر إعادة التعيين لجعل كافة "
-"الرسائل ظاهرة مجددا."
-
-msgid "Reset"
-msgstr "إعادة تعيين"
-
msgid "Find"
msgstr "البحث"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+"يقوم WinMerge بإخفاء بعض الرسائل العامة. إضغط على زر إعادة التعيين لجعل كافة "
+"الرسائل ظاهرة مجددا."
+
+msgid "Reset"
+msgstr "إعادة تعيين"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "لا تع&رض هذه الرسالة مجددا."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"لإعادة تفعيل عرض الرسالة مجددا، قم بالضغط على زر إعادة التعيين من صفحة \"عام"
-"\" في قائمة الخيارات."
msgid "Syntax"
msgstr "اللغة"
msgid "Differences"
msgstr "الاختلافات"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "إلى:"
msgid "Extension"
msgstr "الإمتداد"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "الاسم"
msgid "Cannot create a patch file from binary files."
msgstr "لا يمكن إنشاء ملف تصحيح من ملفات ثنائية."
-msgid "Cannot create a patch file from directories."
-msgstr "لا يمكن إنشاء ملف تصحيح (patch) من المجلدات."
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMergek mezu-kutxatila arrunt batzuk ezkutatzea ahalbidetzen du. Sakatu Birrezarri botoia mezu-kutxatila guztiak berriro ere ikusgarri egiteko."
-
-#, c-format
-msgid "Reset"
-msgstr "Birrezarri"
-
#, c-format
msgid "Find"
msgstr "Bilatu"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMergek mezu-kutxatila arrunt batzuk ezkutatzea ahalbidetzen du. Sakatu Birrezarri botoia mezu-kutxatila guztiak berriro ere ikusgarri egiteko."
+
+#, c-format
+msgid "Reset"
+msgstr "Birrezarri"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Ez erakutsi &mezu hau berriro."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Ezberdintasunak"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Hona:"
msgid "Extension"
msgstr "Luzapena"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Izena"
msgstr "Ezin da eranski agiria sortu agiri binarioetatik."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Ezin da eranskina agiria sortu zuzenbideetatik"
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Idioma:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "O WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o botão Resetar pra tornar todas as caixas de mensagens visíveis de novo."
-
-#, c-format
-msgid "Reset"
-msgstr "Resetar"
-
#, c-format
msgid "Find"
msgstr "Achar"
msgid "&Rendering Mode:"
msgstr "Modo de &Renderização:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "O WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o botão Resetar pra tornar todas as caixas de mensagens visíveis de novo."
+
+#, c-format
+msgid "Reset"
+msgstr "Resetar"
+
msgid "File Filters"
msgstr "Filtros de Arquivo"
msgid "Don't display this &message again."
msgstr "Não exibir esta &mensagem de novo."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Pra tornar esta caixa de mensagem visível de novo pressione o botão Resetar na página Geral do diálogo das Opções."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Diferenças"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Para:"
msgid "Extension"
msgstr "Extensão"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Nome"
msgstr "Não pode criar um arquivo de patch a partir dos arquivos binários."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Não pode criar um arquivo de patch a partir dos diretórios."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Език:"
-msgid ""
-"WinMerge allows hiding some common message boxes. Press the Reset button to "
-"make all message boxes visible again."
-msgstr ""
-"WinMerge позволява скриване на някои съобщения. Натиснете бутона Отменяне за "
-"повторно показване на тези съобщения."
-
-msgid "Reset"
-msgstr "Отменяне"
-
msgid "Find"
msgstr "Търсене"
msgid "&Rendering Mode:"
msgstr "&Режим на изчертаване:"
+msgid ""
+"WinMerge allows hiding some common message boxes. Press the Reset button to "
+"make all message boxes visible again."
+msgstr ""
+"WinMerge позволява скриване на някои съобщения. Натиснете бутона Отменяне за "
+"повторно показване на тези съобщения."
+
+msgid "Reset"
+msgstr "Отменяне"
+
msgid "File Filters"
msgstr "Филтри за файлове"
msgid "Don't display this &message again."
msgstr "Без &повторно показване на това съобщение."
-msgid ""
-"To make this message box visible again, press the Reset button on the "
-"General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"За да видите отново това съобщение, натиснете бутона Отменяне на страницата "
-"„Общи“ в Настройки."
msgid "Syntax"
msgstr "Синтаксис"
msgid "Differences"
msgstr "Различия"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "В:"
msgid "Extension"
msgstr "Разширение"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Име"
msgid "Cannot create a patch file from binary files."
msgstr "Не може да се създаде пач от двоични файлове."
-msgid "Cannot create a patch file from directories."
-msgstr "Не може да се създаде пач от директории."
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el botó de Reinicialització per a fer visibles tots els quadres de missatges altre cop."
-
-#, c-format
-msgid "Reset"
-msgstr "Reinicialitza"
-
#, c-format
msgid "Find"
msgstr "Cerca"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el botó de Reinicialització per a fer visibles tots els quadres de missatges altre cop."
+
+#, c-format
+msgid "Reset"
+msgstr "Reinicialitza"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "No tornis amostrar aquest missatge."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Diferències"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "A:"
msgid "Extension"
msgstr "Extensió"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Nom"
msgstr "No es pot crear un pedaç de fitxers binaris."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "No es pot crear un pedaç de directoris."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "语言:"
-msgid ""
-"WinMerge allows hiding some common message boxes. Press the Reset button to "
-"make all message boxes visible again."
-msgstr ""
-"WinMerge 允许隐藏一些常见的提示框。点“重置”按钮可以恢复显示隐藏的消息框。"
-
-msgid "Reset"
-msgstr "重置"
-
msgid "Find"
msgstr "查找"
msgid "&Rendering Mode:"
msgstr "渲染模式(&R)"
+msgid ""
+"WinMerge allows hiding some common message boxes. Press the Reset button to "
+"make all message boxes visible again."
+msgstr ""
+"WinMerge 允许隐藏一些常见的提示框。点“重置”按钮可以恢复显示隐藏的消息框。"
+
+msgid "Reset"
+msgstr "重置"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "不再显示此消息(&M)"
-msgid ""
-"To make this message box visible again, press the Reset button on the "
-"General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"如需重新显示这些提示框，请在“选项”对话框的“常规”选项卡中点击“重置”按钮。"
msgid "Syntax"
msgstr "语法"
msgid "Differences"
msgstr "差异"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "到:"
msgid "Extension"
msgstr "扩展名"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "名称"
msgid "Cannot create a patch file from binary files."
msgstr "无法为二进制文件创建补丁。"
-msgid "Cannot create a patch file from directories."
-msgstr "无法为文件夹创建补丁。"
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "語言"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge 允許隱藏某些共同訊息盒。按重設鍵以再次顯示所有訊息盒。"
-
-#, c-format
-msgid "Reset"
-msgstr "重設"
-
#, c-format
msgid "Find"
msgstr "尋找"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge 允許隱藏某些共同訊息盒。按重設鍵以再次顯示所有訊息盒。"
+
+#, c-format
+msgid "Reset"
+msgstr "重設"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "不要再顯示這個訊息(&M)"
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "如果要再顯示這個訊息，請在選項對話視窗內的一般頁面點擊重設按鈕"
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "差異"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "到："
msgid "Extension"
msgstr "副檔名"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "名稱"
msgstr "無法從二進制檔建補綴檔。"
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "無法從目錄建補綴檔。"
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge omogućuje skrivanje uobičajenih poruka. Pritisnite 'Poništi' da poruke opet budu vidljive."
-
-#, c-format
-msgid "Reset"
-msgstr "Poništi"
-
#, c-format
msgid "Find"
msgstr "Nađi"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge omogućuje skrivanje uobičajenih poruka. Pritisnite 'Poništi' da poruke opet budu vidljive."
+
+#, c-format
+msgid "Reset"
+msgstr "Poništi"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Ne prikazuj više ovu poruku."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Razlike"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Do:"
msgid "Extension"
msgstr "Tip"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Naziv"
msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka"
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Ne mogu stvoriti datoteku razlika mapa."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-"Některá obecná okna se zprávami je možno skrýt.\n"
-"Po stisknutí tlačítka Vrátit se všechna tato okna opět budou objevovat."
-
-#, c-format
-msgid "Reset"
-msgstr "V&rátit"
-
#, c-format
msgid "Find"
msgstr "Najít"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+"Některá obecná okna se zprávami je možno skrýt.\n"
+"Po stisknutí tlačítka Vrátit se všechna tato okna opět budou objevovat."
+
+#, c-format
+msgid "Reset"
+msgstr "V&rátit"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "T&uto zprávu již příště nezobrazovat."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Rozdíly"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Do:"
msgid "Extension"
msgstr "Přípona"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Název"
msgstr "Nelze vytvořit opravný soubor z binárních souborů."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Nelze vytvořit opravný soubor ze složek."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-"WinMerge kan gemme almene beskedvinduer. Brug Reset knappen for at vise "
-"disse vinduer igen."
-
-#, c-format
-msgid "Reset"
-msgstr "Nulstil"
-
#, c-format
msgid "Find"
msgstr "Søg"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+"WinMerge kan gemme almene beskedvinduer. Brug Reset knappen for at vise "
+"disse vinduer igen."
+
+#, c-format
+msgid "Reset"
+msgstr "Nulstil"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Vis ikke denne &besked igen."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Forskelle"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Til:"
msgid "Extension"
msgstr "Udvidelse"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Navn"
msgstr "Kan ikke lave patch filer fra binære filer."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Kan ikke lave patch filer fra mapper."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Language:"
-msgid ""
-"WinMerge allows hiding some common message boxes. Press the Reset button to "
-"make all message boxes visible again."
-msgstr ""
-"WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden."
-" Druk op de herstellen-knop om alle berichtvensters terug zichtbaar te "
-"maken."
-
-msgid "Reset"
-msgstr "Herstellen"
-
msgid "Find"
msgstr "Zoeken"
msgid "&Rendering Mode:"
msgstr "Rendermodus:"
+msgid ""
+"WinMerge allows hiding some common message boxes. Press the Reset button to "
+"make all message boxes visible again."
+msgstr ""
+"WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden."
+" Druk op de herstellen-knop om alle berichtvensters terug zichtbaar te "
+"maken."
+
+msgid "Reset"
+msgstr "Herstellen"
+
msgid "File Filters"
msgstr "Bestandsfilters"
msgid "Don't display this &message again."
msgstr "Dit bericht niet meer weergeven."
-msgid ""
-"To make this message box visible again, press the Reset button on the "
-"General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"Druk op de herstellen-knop op de pagina \"algemeen\" van het venster "
-"\"opties\" om dit berichtvenster opnieuw zichtbaar te maken."
msgid "Syntax"
msgstr "Syntax"
msgid "Differences"
msgstr "Verschillen"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "Naar:"
msgid "Extension"
msgstr "Extensie"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Naam"
msgid "Cannot create a patch file from binary files."
msgstr "Kan geen patch-bestand aanmaken van binaire bestanden."
-msgid "Cannot create a patch file from directories."
-msgstr "Kan geen patch-bestand maken van mappen."
-
msgid ""
"Please save all files first.\n"
"\n"
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-07-03 13:37+0000\n"
+"POT-Creation-Date: 2021-07-07 08:21+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-
-msgid "Reset"
-msgstr ""
-
msgid "Find"
msgstr ""
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr ""
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
msgid "Syntax"
msgid "Differences"
msgstr ""
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr ""
msgid "Extension"
msgstr ""
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr ""
msgid "Cannot create a patch file from binary files."
msgstr ""
-msgid "Cannot create a patch file from directories."
-msgstr ""
-
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr ""
msgid "Language:"
msgstr "Kieli:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge sallii joidenkin yleisten viestiruutujen kätkemisen. Paina Palauta tehdäksesi kaikki viestiruudut uudelleen näkyviksi."
-
-#, c-format
-msgid "Reset"
-msgstr "Palauta"
-
#, c-format
msgid "Find"
msgstr "Etsi"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge sallii joidenkin yleisten viestiruutujen kätkemisen. Paina Palauta tehdäksesi kaikki viestiruudut uudelleen näkyviksi."
+
+#, c-format
+msgid "Reset"
+msgstr "Palauta"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Älä näytä tätä ilmoitusta uudestaan."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Jos haluat, että tämä sanomaruutu on jälleen näkyvissä, paina Asetukset-ikkunan Yleiset-sivun Palauta-painiketta."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Erilaisuudet"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Mihin:"
msgid "Extension"
msgstr "Pääte"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Nimi"
msgstr "Paikkaustiedostoa ei voi luoda binääritiedostoista."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Paikkaustiedostoa ei voi luoda kansioista."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Langage :"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge permet de masquer certaines boîtes de message. Appuyer sur ce bouton pour les rendre visibles à nouveau."
-
-#, c-format
-msgid "Reset"
-msgstr "Rétablir"
-
#, c-format
msgid "Find"
msgstr "Rechercher"
msgid "&Rendering Mode:"
msgstr "Mode de &rendu :"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge permet de masquer certaines boîtes de message. Appuyer sur ce bouton pour les rendre visibles à nouveau."
+
+#, c-format
+msgid "Reset"
+msgstr "Rétablir"
+
msgid "File Filters"
msgstr "Filtres de fichier"
msgid "Don't display this &message again."
msgstr "Ne plus afficher ce &message."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Pour que cette boîte de message soit à nouveau visible, appuyez sur le bouton Réinitialiser de la page Général de la boîte de dialogue Options."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Différences"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Vers :"
msgid "Extension"
msgstr "Extension"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Nom"
msgstr "Ne peut créer un fichier de retouche depuis un fichier binaire."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Ne peut créer un fichier de retouche depuis des répertoires."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Idioma:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge permite ocultar algunhas caixas de mensaxes de uso frecuente. Preme o botón Restaurar para facer visibles todas as mensaxes outra vez."
-
-#, c-format
-msgid "Reset"
-msgstr "Restaurar"
-
#, c-format
msgid "Find"
msgstr "Buscar"
msgid "&Rendering Mode:"
msgstr "Modo de &renderizado:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge permite ocultar algunhas caixas de mensaxes de uso frecuente. Preme o botón Restaurar para facer visibles todas as mensaxes outra vez."
+
+#, c-format
+msgid "Reset"
+msgstr "Restaurar"
+
msgid "File Filters"
msgstr "Filtros de arquivo"
msgid "Don't display this &message again."
msgstr "Non amosar esta &mensaxe de novo."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Para a ver esta caixa de mensaxe outra vez, preme no botón Restaurar na páxina Xeral do diálogo de Opcións."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Diferenzas"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "A:"
msgid "Extension"
msgstr "Extensión"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Nome"
msgstr "Non se pode crear un arquivo Patch desde arquivos binarios."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Non se pode crear un arquivo Patch desde un cartafol."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "&Sprache:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge erlaubt das Verstecken von einigen häufigen Meldungen.\nDrücken Sie 'Zurücksetzen', um alle Meldungen wieder sichtbar zu machen."
-
-#, c-format
-msgid "Reset"
-msgstr "Zurücksetzen"
-
#, c-format
msgid "Find"
msgstr "Suchen"
msgid "&Rendering Mode:"
msgstr "&Darstellungsmodus:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge erlaubt das Verstecken von einigen häufigen Meldungen.\nDrücken Sie 'Zurücksetzen', um alle Meldungen wieder sichtbar zu machen."
+
+#, c-format
+msgid "Reset"
+msgstr "Zurücksetzen"
+
msgid "File Filters"
msgstr "Dateifilter"
msgid "Don't display this &message again."
msgstr "Diese &Meldung nicht erneut anzeigen."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Um diese Meldung wieder sichtbar zu machen, drücken Sie 'Zurücksetzen' in Einstellungen/Allgemein."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Unterschiede"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Nach:"
msgid "Extension"
msgstr "Erweiterung"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Name"
msgstr "Kann keine Patchdatei von Binärdateien erzeugen."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Kann keine Patchdatei von Ordnern erzeugen."
-
-#, c-format
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr "Bitte speichern Sie zuerst alle Dateien.\n\nDas Erzeugen eines Patches erfordert, dass es keine ungespeicherten Änderungen in den Dateien gibt."
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "Το WinMerge επιτρέπει την απόκρυψη ορισμένων κοινών πλαισίων μηνυμάτων. Πατήστε το κουμπί Επαναφορά για να ξανακάνετε όλα τα μηνύματα ορατά."
-
-#, c-format
-msgid "Reset"
-msgstr "Επαναφορά"
-
#, c-format
msgid "Find"
msgstr "Αναζήτηση"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "Το WinMerge επιτρέπει την απόκρυψη ορισμένων κοινών πλαισίων μηνυμάτων. Πατήστε το κουμπί Επαναφορά για να ξανακάνετε όλα τα μηνύματα ορατά."
+
+#, c-format
+msgid "Reset"
+msgstr "Επαναφορά"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Να μην εμφανισθεί ξανά αυτό το &Μήνυμα."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Διαφορές"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Προς:"
msgid "Extension"
msgstr "Επέκταση"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Όνομα"
msgstr "Η δημιουργία αρχείου patch από δυαδικά αρχεία δεν είναι δυνατή."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Η δημιουργία αρχείου patch από φακέλους δεν είναι δυνατή."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Nyelv:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "A WinMerge lehetővé teszi általános üzenetablakok elrejtését. A Visszaállítás gombbal minden üzenetablak újra láthatóvá tehető."
-
-#, c-format
-msgid "Reset"
-msgstr "Visszaállítás"
-
#, c-format
msgid "Find"
msgstr "Keresés"
msgid "&Rendering Mode:"
msgstr "Renderelési mód:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "A WinMerge lehetővé teszi általános üzenetablakok elrejtését. A Visszaállítás gombbal minden üzenetablak újra láthatóvá tehető."
+
+#, c-format
+msgid "Reset"
+msgstr "Visszaállítás"
+
msgid "File Filters"
msgstr "Fájlszűrők"
msgid "Don't display this &message again."
msgstr "&Ne jelenjen meg többet ez az üzenet."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Ahhoz, hogy ez az üzenetablak újra látható legyen, nyomd meg a Visszaállítás gombot a Beállítások Általános aloldalán."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Eltérések"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Ehhez:"
msgid "Extension"
msgstr "Kiterjesztés"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Név"
msgstr "Nem lehet patch fájlt létrehozni bináris fájlokból."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Nem lehet patch fájlt létrehozni könyvtárakból."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Lingua:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-"WinMerge permette di nascondere alcuni messaggi comuni. Premere il pulsante "
-"Ripristina per rendere di nuovo visibili tutti i messaggi."
-
-msgid "Reset"
-msgstr "Ripristina"
-
msgid "Find"
msgstr "Trova"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+"WinMerge permette di nascondere alcuni messaggi comuni. Premere il pulsante "
+"Ripristina per rendere di nuovo visibili tutti i messaggi."
+
+msgid "Reset"
+msgstr "Ripristina"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Non visualizzare più questo &messaggio."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"Per visualizzare nuovamente questa finestra di dialogo seleziona il pulsante "
-"'Ripristina' nella scheda Generale della finestra delle opzioni."
msgid "Syntax"
msgstr "Sintassi"
msgid "Differences"
msgstr "Differenze"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "A:"
msgid "Extension"
msgstr "Estensione"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Nome"
msgid "Cannot create a patch file from binary files."
msgstr "Impossibile creare un file di patch da file binari."
-msgid "Cannot create a patch file from directories."
-msgstr "Impossibile creare un file di patch da cartelle."
-
msgid ""
"Please save all files first.\n"
"\n"
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
"POT-Creation-Date: 2020-12-05 22:07+0000\n"
-"PO-Revision-Date: 2021-06-26 17:03+0900\n"
+"PO-Revision-Date: 2021-07-06 23:16+0900\n"
"Last-Translator: Takashi Sawanaka <sawanaka@d1.dion.ne.jp>\n"
"Language-Team: Japanese <winmerge-translate@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
msgid "Language:"
msgstr "言語:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge は、いくつかの共通メッセージボックスを非表示にできます。すべてのメッセージボックスを再び表示させるには、[リセット] ボタンを押してください。"
-
-msgid "Reset"
-msgstr "リセット"
-
msgid "Find"
msgstr "検索"
msgid "&Rendering Mode:"
msgstr "レンダリングモード(&R):"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge は、いくつかの共通メッセージボックスを非表示にできます。すべてのメッセージボックスを再び表示させるには、[リセット] ボタンを押してください。"
+
+msgid "Reset"
+msgstr "リセット"
+
msgid "File Filters"
msgstr "ファイルフィルター"
msgid "Don't display this &message again."
msgstr "再びこのメッセージを表示しない(&M)"
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "このメッセージボックスを再度表示させたい場合は、[オプション] ダイアログの一般ページで [リセット] ボタンを押してください。"
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr "このメッセージボックスを再度表示させたい場合は、[オプション] ダイアログのメッセージボックスページで [リセット] ボタンを押してください。"
msgid "Syntax"
msgstr "シンタックス"
msgid "Differences"
msgstr "差異"
+msgid "Message Boxes"
+msgstr "メッセージボックス"
+
msgid "To:"
msgstr "To:"
msgid "Extension"
msgstr "拡張子"
+msgid "Message"
+msgstr "メッセージ"
+
+msgid "Answer"
+msgstr "回答"
+
msgid "Name"
msgstr "名前"
msgid "Cannot create a patch file from binary files."
msgstr "バイナリ ファイルからパッチ ファイルは生成できません。"
-msgid "Cannot create a patch file from directories."
-msgstr "フォルダーからパッチ ファイルは生成できません。"
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "언어:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge의 일부 메시지 상자는 감출 수 있습니다. 초기화 버튼을 눌러 전체 메시지 상자를 다시 볼 수 있습니다."
-
-#, c-format
-msgid "Reset"
-msgstr "초기화"
-
#, c-format
msgid "Find"
msgstr "찾기"
msgid "&Rendering Mode:"
msgstr "렌더링 모드(&R)"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge의 일부 메시지 상자는 감출 수 있습니다. 초기화 버튼을 눌러 전체 메시지 상자를 다시 볼 수 있습니다."
+
+#, c-format
+msgid "Reset"
+msgstr "초기화"
+
msgid "File Filters"
msgstr "파일 필터"
msgid "Don't display this &message again."
msgstr "이 메시지를 다시 표시하지 않음(&M)"
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "이 메시지 상자를 다시 표시하려면, 옵션 대화상자의 일반 페이지에서 초기화 버튼을 누르세요."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "차이점"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "->"
msgid "Extension"
msgstr "확장자"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "이름"
msgstr "바이너리 파일에서는 패치 파일을 만들 수 없습니다."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "폴더에서는 패치 파일을 만들 수 없습니다."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Kalba:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "„WinMerge“ leidžia paslėpti kai kuriuos bendrus pranešimus. Paspauskite mygtuką „Atkurti“, kad visi pranešimai vėl būtų matomi."
-
-msgid "Reset"
-msgstr "Atkurti"
-
msgid "Find"
msgstr "Rasti"
msgid "&Rendering Mode:"
msgstr "Atvaizdavimo &režimas:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "„WinMerge“ leidžia paslėpti kai kuriuos bendrus pranešimus. Paspauskite mygtuką „Atkurti“, kad visi pranešimai vėl būtų matomi."
+
+msgid "Reset"
+msgstr "Atkurti"
+
msgid "File Filters"
msgstr "Failo filtrai"
msgid "Don't display this &message again."
msgstr "Daugiau nerodyti šio praneši&mo."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Kad šis pranešimas vėl būtų matomas, paspauskite Nuostatų ekrano dalyje „Bendros“ esantį mygtuką „Atkurti“."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
msgid "Syntax"
msgstr "Sintaksės"
msgid "Differences"
msgstr "Skirtumų"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "Į:"
msgid "Extension"
msgstr "Plėtinys"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Pavadinimas"
msgid "Cannot create a patch file from binary files."
msgstr "Negalima kurti pataisų failo iš binarinių failų."
-msgid "Cannot create a patch file from directories."
-msgstr "Negalima kurti pataisų failo iš katalogų."
-
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr "Pirmiausia išsaugokite visus failus.\n\nPataisos kūrimui reikia, kad failuose nebūtų neišsaugotų pakeitimų."
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge tillater å skjule noen vanlige meldingsbokser. Trykk tilbakestill-knappen for å gjøre alle meldingsboksene synlige igjen."
-
-#, c-format
-msgid "Reset"
-msgstr "Tilbakestill"
-
#, c-format
msgid "Find"
msgstr "Søk"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge tillater å skjule noen vanlige meldingsbokser. Trykk tilbakestill-knappen for å gjøre alle meldingsboksene synlige igjen."
+
+#, c-format
+msgid "Reset"
+msgstr "Tilbakestill"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Ikke vis denne &meldingen igjen."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Forskjeller"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Til:"
msgid "Extension"
msgstr "Filtype"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Navn"
msgstr "Kan ikke opprette en patch-fil fra binære filer."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Kan ikke opprette en patch-fil fra mapper."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-" وينمرج به شما اجازه مي دهد تا بعضي از جعبه پيام معمولي را پنهان نماييد. "
-"کليد بازنشاني / ريست را بفشاريد تا تمام جعبه پيام دوباره آشکار شوند "
-
-#, c-format
-msgid "Reset"
-msgstr " بازنشاني "
-
#, c-format
msgid "Find"
msgstr " يافتن "
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+" وينمرج به شما اجازه مي دهد تا بعضي از جعبه پيام معمولي را پنهان نماييد. "
+"کليد بازنشاني / ريست را بفشاريد تا تمام جعبه پيام دوباره آشکار شوند "
+
+#, c-format
+msgid "Reset"
+msgstr " بازنشاني "
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "&m دوباره اين پيام را نمايش نده "
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr " تفاوتها "
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr " به : "
msgid "Extension"
msgstr " توسعه "
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr " نام "
msgstr " نمي توان يک وصله پرونده از پرونده هاي دودويي تهيه نمود "
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr " نمي توان يک وصله پرونده از فهرستهاي راهنما ايجاد نمود "
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Język:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge pozwala ukryć niektóre komunikaty. Naciśnij przycisk Resetuj, aby ponownie wyświetlać wszystkie komunikaty."
-
-msgid "Reset"
-msgstr "Resetuj"
-
msgid "Find"
msgstr "Znajdź"
msgid "&Rendering Mode:"
msgstr "&Tryb renderowania:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge pozwala ukryć niektóre komunikaty. Naciśnij przycisk Resetuj, aby ponownie wyświetlać wszystkie komunikaty."
+
+msgid "Reset"
+msgstr "Resetuj"
+
msgid "File Filters"
msgstr "Filtry plików"
msgid "Don't display this &message again."
msgstr "Nie wyświetlaj ponownie tego komunikatu."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Aby ponownie wyświetlić ten komunikat, naciśnij przycisk Resetuj na stronie Ogólne w oknie dialogowym Opcje."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
msgid "Syntax"
msgstr "Składnia"
msgid "Differences"
msgstr "Różnice"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "Do:"
msgid "Extension"
msgstr "Rozszerzenie"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Nazwa"
msgid "Cannot create a patch file from binary files."
msgstr "Nie można utworzyć łatki z plików binarnych."
-msgid "Cannot create a patch file from directories."
-msgstr "Nie można utworzyć łatki z katalogów."
-
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr "Proszę najpierw zapisać wszystkie pliki.\n\nTworzenie łatki wymaga zapisania wszystkich zmian w plikach."
msgid "Language:"
msgstr "Idioma:"
-msgid ""
-"WinMerge allows hiding some common message boxes. Press the Reset button to "
-"make all message boxes visible again."
-msgstr ""
-"WinMerge permite ocultar mensagens predefinidas. Prima o botão Repor para "
-"visualizar novamente todas as mensagens."
-
-msgid "Reset"
-msgstr "Repor"
-
msgid "Find"
msgstr "Localizar"
msgid "&Rendering Mode:"
msgstr "Modo de &renderização:"
+msgid ""
+"WinMerge allows hiding some common message boxes. Press the Reset button to "
+"make all message boxes visible again."
+msgstr ""
+"WinMerge permite ocultar mensagens predefinidas. Prima o botão Repor para "
+"visualizar novamente todas as mensagens."
+
+msgid "Reset"
+msgstr "Repor"
+
msgid "File Filters"
msgstr "Filtros de ficheiro"
msgid "Don't display this &message again."
msgstr "Não voltar a exibir esta mensagem."
-msgid ""
-"To make this message box visible again, press the Reset button on the "
-"General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"Para tornar esta caixa de mensagem visível novamente, pressione o botão "
-"Redefinir na página Geral da caixa de diálogo Opções."
msgid "Syntax"
msgstr "Syntax"
msgid "Differences"
msgstr "Diferenças"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "Para:"
msgid "Extension"
msgstr "Extensão"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Nome"
msgid "Cannot create a patch file from binary files."
msgstr "Não é possível criar um ficheiro patch a partir de ficheiros binários."
-msgid "Cannot create a patch file from directories."
-msgstr "Não é possível criar um ficheiro patch a partir de diretorias."
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge permite ascunderea unor casete de mesaj. Apasă butonul Revenire pentru a face ca toate casetele de mesaj să apară din nou."
-
-#, c-format
-msgid "Reset"
-msgstr "Revenire"
-
#, c-format
msgid "Find"
msgstr "Găseşte"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge permite ascunderea unor casete de mesaj. Apasă butonul Revenire pentru a face ca toate casetele de mesaj să apară din nou."
+
+#, c-format
+msgid "Reset"
+msgstr "Revenire"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Nu afişa acest &mesaj din nou."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Diferenţe"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Către:"
msgid "Extension"
msgstr "Extensie"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Nume"
msgid "Cannot create a patch file from binary files."
msgstr "Nu s-a reuşit crearea unui fişier petic din fişiere binare."
-#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Nu s-a reuşit crearea unui fişier petic din directoare."
-
#, fuzzy, c-format
msgid ""
"Please save all files first.\n"
msgid "Language:"
msgstr "Язык:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge позволяет скрывать некоторые сообщения. Нажмите кнопку Сброс, чтобы показывать все сообщения."
-
-msgid "Reset"
-msgstr "Сброс"
-
msgid "Find"
msgstr "Найти"
msgid "&Rendering Mode:"
msgstr "Режим отрисовки:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge позволяет скрывать некоторые сообщения. Нажмите кнопку Сброс, чтобы показывать все сообщения."
+
+msgid "Reset"
+msgstr "Сброс"
+
msgid "File Filters"
msgstr "Фильтры файлов"
msgid "Don't display this &message again."
msgstr "Не показывать &больше."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Чтобы снова показывать это сообщение, нажмите кнопку Сброс на странице настроек Общие."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
msgid "Syntax"
msgstr "Синтаксис"
msgid "Differences"
msgstr "Отличия"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "На:"
msgid "Extension"
msgstr "Расширение"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Имя"
msgid "Cannot create a patch file from binary files."
msgstr "Не удается создать патч из двоичных файлов."
-msgid "Cannot create a patch file from directories."
-msgstr "Не удается создать патч из папок."
-
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr "Сначала сохраните все файлы.\n\nДля создания патча необходимо, чтобы в файлах не было несохраненных изменений."
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge омогућава скривање неких уобичајених порука.Притисните 'Почетни'да поруке опет буду видљиве"
-
-#, c-format
-msgid "Reset"
-msgstr "Почетни"
-
#, c-format
msgid "Find"
msgstr "Нађи"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge омогућава скривање неких уобичајених порука.Притисните 'Почетни'да поруке опет буду видљиве"
+
+#, c-format
+msgid "Reset"
+msgstr "Почетни"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Не приказуј ову поруку поново"
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Разлике"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "До:"
msgid "Extension"
msgstr "Наставак"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Име"
msgstr "Не може створити датотеку разлика из бинарних датотека"
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Не може поправити датотеку из фасцикли"
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-
-#, c-format
-msgid "Reset"
-msgstr "යලි පිහිටුවීමට"
-
#, c-format
msgid "Find"
msgstr "සොයන්න"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+
+#, c-format
+msgid "Reset"
+msgstr "යලි පිහිටුවීමට"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "මෙම පණිවිඩය නැවත දර්ශනය නොකරන්න."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "වෙනස්කම්"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "දක්වා:"
msgid "Extension"
msgstr "දිගුව"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "නම"
msgstr "Cannot create a patch file from binary files."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Cannot create a patch file from directories."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Jazyk:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-"WinMerge umožňuje skryť niektoré bežné okienka so správami. Stlačením "
-"tlačidla Obnoviť znova zviditeľníte všetky okienka správ."
-
-msgid "Reset"
-msgstr "Vynulovať"
-
msgid "Find"
msgstr "Hľadať"
msgid "&Rendering Mode:"
msgstr "&Režim vytvárania prevodu:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+"WinMerge umožňuje skryť niektoré bežné okienka so správami. Stlačením "
+"tlačidla Obnoviť znova zviditeľníte všetky okienka správ."
+
+msgid "Reset"
+msgstr "Vynulovať"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Už túto správu nezobrazovať."
-msgid ""
-"To make this message box visible again, press the Reset button on the "
-"General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"Ak chcete, aby sa toto okno so správami znova zobrazilo, stlačte tlačidlo "
-"Reset na stránke Všeobecné v dialógovom okne Možnosti."
msgid "Syntax"
msgstr "Syntax"
msgid "Differences"
msgstr "Rozdiely"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "Do:"
msgid "Extension"
msgstr "Prípona"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Názov"
msgid "Cannot create a patch file from binary files."
msgstr "Nemožno vytvoriť súbor so záplatou z binárnych súborov."
-msgid "Cannot create a patch file from directories."
-msgstr "Nemožno vytvoriť súbor so záplatou z priečinkov."
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Jezik:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge omogoča skrivanje nekaterih skupnih sporočilnih oken. Pritisnite 'Ponastavi', da bodo postala vsa sporočilna okna spet vidna."
-
-#, c-format
-msgid "Reset"
-msgstr "Ponastavi"
-
#, c-format
msgid "Find"
msgstr "Najdi"
msgid "&Rendering Mode:"
msgstr "Način upodab&ljanja:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge omogoča skrivanje nekaterih skupnih sporočilnih oken. Pritisnite 'Ponastavi', da bodo postala vsa sporočilna okna spet vidna."
+
+#, c-format
+msgid "Reset"
+msgstr "Ponastavi"
+
msgid "File Filters"
msgstr "Filtri datotek"
msgid "Don't display this &message again."
msgstr "Tega sporočila ne kaži več."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "Za ponovni prikaz tega sporočila, pritisnite 'Ponastavi' na strani 'Splošno' pogovornega okna 'Možnosti'."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Razlike"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Na:"
msgid "Extension"
msgstr "Končnica"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Ime"
msgstr "Iz dvojiških datotek ni mogoče ustvariti datoteke s popravki."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Iz map ni mogoče ustvariti datoteke s popravki."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Idioma:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr ""
-"WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para "
-"hacer todos los mensajes visibles de nuevo."
-
-msgid "Reset"
-msgstr "Restablecer"
-
msgid "Find"
msgstr "Buscar"
msgid "&Rendering Mode:"
msgstr "Modo de &Renderizado:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr ""
+"WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para "
+"hacer todos los mensajes visibles de nuevo."
+
+msgid "Reset"
+msgstr "Restablecer"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "No mostrar este &mensaje de nuevo."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"Para volver a hacer visible este cuadro de dialogo, presione el botón "
-"Restablecer en la página General del cuadro de diálogo Opciones."
msgid "Syntax"
msgstr "Sintaxis"
msgid "Differences"
msgstr "Diferencias"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "A:"
msgid "Extension"
msgstr "Extensión"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Nombre"
msgstr ""
"No se puede crear un archivo de corrección a partir de un archivo binario."
-msgid "Cannot create a patch file from directories."
-msgstr "No se puede crear un archivo de corrección a partir de una carpeta."
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Språk:"
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge tillåter att vissa MedelandeDialog döljs. Klicka på ''Återställ'' för att göra samtliga synliga igen."
-
-#, c-format
-msgid "Reset"
-msgstr "Återställ"
-
#, c-format
msgid "Find"
msgstr "Sök"
msgid "&Rendering Mode:"
msgstr "Alstringsläge:"
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge tillåter att vissa MedelandeDialog döljs. Klicka på ''Återställ'' för att göra samtliga synliga igen."
+
+#, c-format
+msgid "Reset"
+msgstr "Återställ"
+
msgid "File Filters"
msgstr "Filfilter"
msgid "Don't display this &message again."
msgstr "Visa inte detta meddelande igen."
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
-msgstr "För att återmöjliggöra denna MedelandeDialog så tryck på ''Återställ'' knappen i Allmänt i InställningsDialogen."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
+msgstr ""
#, c-format
msgid "Syntax"
msgid "Differences"
msgstr "Skillnader"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "Till:"
msgid "Extension"
msgstr "Filsuffix"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Namn"
msgstr "Kan inte skapa en patchfil från binära filer."
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Kan inte skapa en patchfil från mappar."
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr "Dil:"
-msgid ""
-"WinMerge allows hiding some common message boxes. Press the Reset button to "
-"make all message boxes visible again."
-msgstr ""
-"WinMerge sık karşılaşın iletilerin gizlenmesine izin verir. Tüm iletileri "
-"yeniden görünür yapmak için Sıfırla düğmesine tıklayın."
-
-msgid "Reset"
-msgstr "Sıfırla"
-
msgid "Find"
msgstr "Bul"
msgid "&Rendering Mode:"
msgstr "Gö&rüntüleme Kipi:"
+msgid ""
+"WinMerge allows hiding some common message boxes. Press the Reset button to "
+"make all message boxes visible again."
+msgstr ""
+"WinMerge sık karşılaşın iletilerin gizlenmesine izin verir. Tüm iletileri "
+"yeniden görünür yapmak için Sıfırla düğmesine tıklayın."
+
+msgid "Reset"
+msgstr "Sıfırla"
+
msgid "File Filters"
msgstr "Dosya süzgeçleri"
msgid "Don't display this &message again."
msgstr "Bu ileti ¥iden görüntülenmesin."
-msgid ""
-"To make this message box visible again, press the Reset button on the "
-"General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
-"Bu ileti kutusunun yeniden görüntülenmesi için Ayarlar bölümünde Genel grubu "
-"altındaki Sıfırla düğmesine tıklayın."
msgid "Syntax"
msgstr "Söz dizimi"
msgid "Differences"
msgstr "Farklar"
+msgid "Message Boxes"
+msgstr ""
+
msgid "To:"
msgstr "Kime:"
msgid "Extension"
msgstr "Uzantı"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
msgid "Name"
msgstr "Ad"
msgid "Cannot create a patch file from binary files."
msgstr "Binary dosyalarından, yama dosyası hazırlanamaz."
-msgid "Cannot create a patch file from directories."
-msgstr "Klasörlerden yama dosyası hazırlanamaz."
-
msgid ""
"Please save all files first.\n"
"\n"
msgid "Language:"
msgstr ""
-msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
-msgstr "WinMerge не показує деякі повідомлення. Натисніть Скинути, щоб демонструвалися всі повідомлення."
-
-#, c-format
-msgid "Reset"
-msgstr "Скинути"
-
#, c-format
msgid "Find"
msgstr "Знайти"
msgid "&Rendering Mode:"
msgstr ""
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
+msgstr "WinMerge не показує деякі повідомлення. Натисніть Скинути, щоб демонструвалися всі повідомлення."
+
+#, c-format
+msgid "Reset"
+msgstr "Скинути"
+
msgid "File Filters"
msgstr ""
msgid "Don't display this &message again."
msgstr "Не показувати &це повідомлення знову "
-msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
msgstr ""
#, c-format
msgid "Differences"
msgstr "Відмінності"
+msgid "Message Boxes"
+msgstr ""
+
#, c-format
msgid "To:"
msgstr "На:"
msgid "Extension"
msgstr "Розширення"
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
#, c-format
msgid "Name"
msgstr "Ім'я"
msgstr "Неможливо створити латку з бінарних файлів"
#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Неможливо створити латку з тек"
-
-#, c-format
msgid ""
"Please save all files first.\n"
"\n"
OSDN Git Service
