From 9341cf1275a7ef69f476f832fb07dedd6d68b1c4 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Tue, 7 May 2019 00:24:28 +0900 Subject: [PATCH] Image Compare: Implement Insertion/Deletion Detection --- DownloadDeps.cmd | 2 +- Externals/hg_clone.cmd | 2 +- Externals/versions.txt | 2 +- Src/ImgMergeFrm.cpp | 25 +++++++-- Src/ImgMergeFrm.h | 2 + Src/Merge.rc | 6 ++ Src/OptionsDef.h | 1 + Src/OptionsInit.cpp | 1 + Src/WinIMergeLib.h | 12 ++++ Src/resource.h | 87 +++++++++++++++-------------- Translations/WinMerge/Basque.po | 44 +++++++++------ Translations/WinMerge/Brazilian.po | 44 +++++++++------ Translations/WinMerge/Bulgarian.po | 44 +++++++++------ Translations/WinMerge/Catalan.po | 44 +++++++++------ Translations/WinMerge/ChineseSimplified.po | 44 +++++++++------ Translations/WinMerge/ChineseTraditional.po | 44 +++++++++------ Translations/WinMerge/Croatian.po | 44 +++++++++------ Translations/WinMerge/Czech.po | 44 +++++++++------ Translations/WinMerge/Danish.po | 44 +++++++++------ Translations/WinMerge/Dutch.po | 44 +++++++++------ Translations/WinMerge/English.pot | 44 +++++++++------ Translations/WinMerge/Finnish.po | 44 +++++++++------ Translations/WinMerge/French.po | 44 +++++++++------ Translations/WinMerge/Galician.po | 44 +++++++++------ Translations/WinMerge/German.po | 44 +++++++++------ Translations/WinMerge/Greek.po | 44 +++++++++------ Translations/WinMerge/Hungarian.po | 44 +++++++++------ Translations/WinMerge/Italian.po | 44 +++++++++------ Translations/WinMerge/Japanese.po | 42 +++++++++----- Translations/WinMerge/Korean.po | 44 +++++++++------ Translations/WinMerge/Lithuanian.po | 42 +++++++++----- Translations/WinMerge/Norwegian.po | 44 +++++++++------ Translations/WinMerge/Persian.po | 44 +++++++++------ Translations/WinMerge/Polish.po | 44 +++++++++------ Translations/WinMerge/Portuguese.po | 44 +++++++++------ Translations/WinMerge/Romanian.po | 44 +++++++++------ Translations/WinMerge/Russian.po | 44 +++++++++------ Translations/WinMerge/Serbian.po | 44 +++++++++------ Translations/WinMerge/Sinhala.po | 44 +++++++++------ Translations/WinMerge/Slovak.po | 44 +++++++++------ Translations/WinMerge/Slovenian.po | 44 +++++++++------ Translations/WinMerge/Spanish.po | 44 +++++++++------ Translations/WinMerge/Swedish.po | 44 +++++++++------ Translations/WinMerge/Turkish.po | 44 +++++++++------ Translations/WinMerge/Ukrainian.po | 44 +++++++++------ 45 files changed, 1068 insertions(+), 608 deletions(-) diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 809bd72a4..eb9b42095 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -8,7 +8,7 @@ https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1900.1-win32.zip!Build https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1900.1-x64.zip!Build\X64 ^ https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-win32.zip!Build ^ https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-x64.zip!Build\X64 ^ -https://bitbucket.org/winmerge/winimerge/downloads/winimerge-1-0-9-0-exe.zip!Build ^ +https://bitbucket.org/winmerge/winimerge/downloads/winimerge-1-0-10-0-exe.zip!Build ^ https://bitbucket.org/winmerge/patch/downloads/patch-2.5.9-7-bin.zip!Build\GnuWin32 pushd "%~dp0" diff --git a/Externals/hg_clone.cmd b/Externals/hg_clone.cmd index e7c45b532..945ff75dc 100644 --- a/Externals/hg_clone.cmd +++ b/Externals/hg_clone.cmd @@ -1,6 +1,6 @@ set urls_revs=^ https://bitbucket.org/winmerge/freeimage!aa9fd20 ^ - https://bitbucket.org/winmerge/winimerge!1.0.9.0 ^ + https://bitbucket.org/winmerge/winimerge!1.0.10.0 ^ https://bitbucket.org/winmerge/sevenzip!e3aff09 ^ https://bitbucket.org/winmerge/frhed!7f942c2 ^ https://bitbucket.org/winmerge/patch!b0a7238 diff --git a/Externals/versions.txt b/Externals/versions.txt index 48927d02f..8cf51313e 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -7,7 +7,7 @@ POCO: 1.4.3p1 boost: 1.64.0 frhed: 0.10904.2017.1 freeimage: 3.18.0 -WinIMerge: 1.0.9.0 +WinIMerge: 1.0.10.0 Google C++ Testing Framework: 1.70 GnuWin32 Patch for Windows: 2.5.9-7 7-zip: 19.00 diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp index 55fad725d..f5f3a901d 100644 --- a/Src/ImgMergeFrm.cpp +++ b/Src/ImgMergeFrm.cpp @@ -135,6 +135,8 @@ BEGIN_MESSAGE_MAP(CImgMergeFrame, CMDIChildWnd) ON_UPDATE_COMMAND_UI_RANGE(ID_IMG_DIFFBLOCKSIZE_1, ID_IMG_DIFFBLOCKSIZE_32, OnUpdateImgDiffBlockSize) ON_COMMAND_RANGE(ID_IMG_THRESHOLD_0, ID_IMG_THRESHOLD_64, OnImgThreshold) ON_UPDATE_COMMAND_UI_RANGE(ID_IMG_THRESHOLD_0, ID_IMG_THRESHOLD_64, OnUpdateImgThreshold) + ON_COMMAND_RANGE(ID_IMG_INSERTIONDELETIONDETECTION_NONE, ID_IMG_INSERTIONDELETIONDETECTION_HORIZONTAL, OnImgInsertionDeletionDetectionMode) + ON_UPDATE_COMMAND_UI_RANGE(ID_IMG_INSERTIONDELETIONDETECTION_NONE, ID_IMG_INSERTIONDELETIONDETECTION_HORIZONTAL, OnUpdateImgInsertionDeletionDetectionMode) ON_COMMAND(ID_IMG_PREVPAGE, OnImgPrevPage) ON_UPDATE_COMMAND_UI(ID_IMG_PREVPAGE, OnUpdateImgPrevPage) ON_COMMAND(ID_IMG_NEXTPAGE, OnImgNextPage) @@ -431,7 +433,9 @@ BOOL CImgMergeFrame::OnCreateClient( LPCREATESTRUCT /*lpcs*/, COLORSETTINGS colors; Options::DiffColors::Load(GetOptionsMgr(), colors); m_pImgMergeWindow->SetDiffColor(colors.clrDiff); + m_pImgMergeWindow->SetDiffDeletedColor(colors.clrDiffDeleted); m_pImgMergeWindow->SetSelDiffColor(colors.clrSelDiff); + m_pImgMergeWindow->SetSelDiffDeletedColor(colors.clrSelDiffDeleted); m_pImgMergeWindow->AddEventListener(OnChildPaneEvent, this); LoadOptions(); @@ -584,6 +588,7 @@ void CImgMergeFrame::LoadOptions() m_pImgMergeWindow->SetDiffBlockSize(GetOptionsMgr()->GetInt(OPT_CMP_IMG_DIFFBLOCKSIZE)); m_pImgMergeWindow->SetDiffColorAlpha(GetOptionsMgr()->GetInt(OPT_CMP_IMG_DIFFCOLORALPHA) / 100.0); m_pImgMergeWindow->SetColorDistanceThreshold(GetOptionsMgr()->GetInt(OPT_CMP_IMG_THRESHOLD) / 1000.0); + m_pImgMergeWindow->SetInsertionDeletionDetectionMode(static_cast(GetOptionsMgr()->GetInt(OPT_CMP_IMG_INSERTIONDELETIONDETECTION_MODE))); } void CImgMergeFrame::SaveOptions() @@ -599,6 +604,7 @@ void CImgMergeFrame::SaveOptions() GetOptionsMgr()->SaveOption(OPT_CMP_IMG_DIFFBLOCKSIZE, m_pImgMergeWindow->GetDiffBlockSize()); GetOptionsMgr()->SaveOption(OPT_CMP_IMG_DIFFCOLORALPHA, static_cast(m_pImgMergeWindow->GetDiffColorAlpha() * 100.0)); GetOptionsMgr()->SaveOption(OPT_CMP_IMG_THRESHOLD, static_cast(m_pImgMergeWindow->GetColorDistanceThreshold() * 1000)); + GetOptionsMgr()->SaveOption(OPT_CMP_IMG_INSERTIONDELETIONDETECTION_MODE, static_cast(m_pImgMergeWindow->GetInsertionDeletionDetectionMode())); } /** * @brief Save coordinates of the frame, splitters, and bars @@ -1345,13 +1351,11 @@ void CImgMergeFrame::OnIdleUpdateCmdUI() UpdateHeaderPath(pane); m_wndFilePathBar.SetActive(pane, pane == m_pImgMergeWindow->GetActivePane()); + POINT ptReal; String text; - if (pt.x >= 0 && pt.y >= 0 && - pt.x < m_pImgMergeWindow->GetImageWidth(pane) && - pt.y < m_pImgMergeWindow->GetImageHeight(pane)) + if (m_pImgMergeWindow->ConvertToRealPos(pane, pt, ptReal)) { - POINT ptOffset = m_pImgMergeWindow->GetImageOffset(pane); - text += strutils::format(_T("Pt:(%d,%d) RGBA:(%d,%d,%d,%d) "), pt.x - ptOffset.x, pt.y - ptOffset.y, + text += strutils::format(_T("Pt:(%d,%d) RGBA:(%d,%d,%d,%d) "), ptReal.x, ptReal.y, color[pane].rgbRed, color[pane].rgbGreen, color[pane].rgbBlue, color[pane].rgbReserved); if (pane == 1 && m_pImgMergeWindow->GetPaneCount() == 3) text += strutils::format(_T("Dist:%g,%g "), colorDistance01, colorDistance12); @@ -1922,6 +1926,17 @@ void CImgMergeFrame::OnUpdateImgThreshold(CCmdUI* pCmdUI) pCmdUI->SetRadio((1 << (pCmdUI->m_nID - ID_IMG_THRESHOLD_2)) * 2 == m_pImgMergeWindow->GetColorDistanceThreshold() ); } +void CImgMergeFrame::OnImgInsertionDeletionDetectionMode(UINT nId) +{ + m_pImgMergeWindow->SetInsertionDeletionDetectionMode(static_cast(nId - ID_IMG_INSERTIONDELETIONDETECTION_NONE)); + SaveOptions(); +} + +void CImgMergeFrame::OnUpdateImgInsertionDeletionDetectionMode(CCmdUI* pCmdUI) +{ + pCmdUI->SetRadio(static_cast(m_pImgMergeWindow->GetInsertionDeletionDetectionMode() + ID_IMG_INSERTIONDELETIONDETECTION_NONE) == pCmdUI->m_nID); +} + void CImgMergeFrame::OnImgPrevPage() { m_pImgMergeWindow->SetCurrentPageAll(m_pImgMergeWindow->GetCurrentMaxPage() - 1); diff --git a/Src/ImgMergeFrm.h b/Src/ImgMergeFrm.h index 583db4289..71d028e86 100644 --- a/Src/ImgMergeFrm.h +++ b/Src/ImgMergeFrm.h @@ -209,6 +209,8 @@ private: afx_msg void OnUpdateImgDiffBlockSize(CCmdUI* pCmdUI); afx_msg void OnImgThreshold(UINT nId); afx_msg void OnUpdateImgThreshold(CCmdUI* pCmdUI); + afx_msg void OnImgInsertionDeletionDetectionMode(UINT nId); + afx_msg void OnUpdateImgInsertionDeletionDetectionMode(CCmdUI* pCmdUI); afx_msg void OnImgPrevPage(); afx_msg void OnUpdateImgPrevPage(CCmdUI* pCmdUI); afx_msg void OnImgNextPage(); diff --git a/Src/Merge.rc b/Src/Merge.rc index b0f71ed8c..ac99790b4 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -112,6 +112,12 @@ BEGIN MENUITEM "&32", ID_IMG_THRESHOLD_32 MENUITEM "64", ID_IMG_THRESHOLD_64 END + POPUP "Ins&ertion/Deletion Detection" + BEGIN + MENUITEM "&None", ID_IMG_INSERTIONDELETIONDETECTION_NONE + MENUITEM "&Vertical", ID_IMG_INSERTIONDELETIONDETECTION_VERTICAL + MENUITEM "&Horizontal", ID_IMG_INSERTIONDELETIONDETECTION_HORIZONTAL + END MENUITEM SEPARATOR MENUITEM "&Previous Page", ID_IMG_PREVPAGE MENUITEM "&Next Page", ID_IMG_NEXTPAGE diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h index 281960c1e..ea9441058 100644 --- a/Src/OptionsDef.h +++ b/Src/OptionsDef.h @@ -188,6 +188,7 @@ extern const String OPT_CMP_IMG_BACKCOLOR OP("Settings/ImageBackColor"); extern const String OPT_CMP_IMG_DIFFBLOCKSIZE OP("Settings/ImageDiffBlockSize"); extern const String OPT_CMP_IMG_DIFFCOLORALPHA OP("Settings/ImageDiffColorAlpha"); extern const String OPT_CMP_IMG_THRESHOLD OP("Settings/ImageColorDistanceThreshold"); +extern const String OPT_CMP_IMG_INSERTIONDELETIONDETECTION_MODE OP("Settings/ImageInsertionDeletionDetectionMode"); // Image Binary options extern const String OPT_CMP_BIN_FILEPATTERNS OP("Settings/BinaryFilePatterns"); diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp index 944a4becd..3e74e5e47 100644 --- a/Src/OptionsInit.cpp +++ b/Src/OptionsInit.cpp @@ -139,6 +139,7 @@ void Init(COptionsMgr *pOptions) pOptions->InitOption(OPT_CMP_IMG_DIFFBLOCKSIZE, 8); pOptions->InitOption(OPT_CMP_IMG_DIFFCOLORALPHA, 70); pOptions->InitOption(OPT_CMP_IMG_THRESHOLD, 0); + pOptions->InitOption(OPT_CMP_IMG_INSERTIONDELETIONDETECTION_MODE, 0); pOptions->InitOption(OPT_PROJECTS_PATH, _T("")); pOptions->InitOption(OPT_USE_SYSTEM_TEMP_PATH, true); diff --git a/Src/WinIMergeLib.h b/Src/WinIMergeLib.h index 718c5154c..1498f1646 100644 --- a/Src/WinIMergeLib.h +++ b/Src/WinIMergeLib.h @@ -21,6 +21,9 @@ struct IImgMergeWindow { + enum INSERTION_DELETION_DETECTION_MODE { + INSERTION_DELETION_DETECTION_NONE = 0, INSERTION_DELETION_DETECTION_VERTICAL, INSERTION_DELETION_DETECTION_HORIZONTAL + }; enum OVERLAY_MODE { OVERLAY_NONE = 0, OVERLAY_XOR, OVERLAY_ALPHABLEND, OVERLAY_ALPHABLEND_ANIM }; @@ -135,6 +138,14 @@ struct IImgMergeWindow virtual void AddEventListener(EventListenerFunc func, void *userdata) = 0; virtual DRAGGING_MODE GetDraggingMode() const = 0; virtual void SetDraggingMode(DRAGGING_MODE draggingMode) = 0; + virtual size_t GetMetadata(int pane, char *buf, size_t bufsize) const = 0; + virtual INSERTION_DELETION_DETECTION_MODE GetInsertionDeletionDetectionMode() const = 0; + virtual void SetInsertionDeletionDetectionMode(INSERTION_DELETION_DETECTION_MODE insertionDeletionDetectionMode) = 0; + virtual COLORREF GetDiffDeletedColor() const = 0; + virtual void SetDiffDeletedColor(COLORREF clrDiffDeletedColor) = 0; + virtual COLORREF GetSelDiffDeletedColor() const = 0; + virtual void SetSelDiffDeletedColor(COLORREF clrSelDiffDeletedColor) = 0; + virtual bool ConvertToRealPos(int pane, const POINT& pt, POINT& ptReal) const = 0; }; struct IImgToolWindow @@ -149,4 +160,5 @@ extern "C" bool WinIMerge_DestroyWindow(IImgMergeWindow *pImgMergeWindow); IImgToolWindow * WinIMerge_CreateToolWindow(HINSTANCE hInstance, HWND hWndParent, IImgMergeWindow *pImgMergeWindow); bool WinIMerge_DestroyToolWindow(IImgToolWindow *pImgToolWindow); + IImgMergeWindow * WinIMerge_CreateWindowless(); }; diff --git a/Src/resource.h b/Src/resource.h index 78eb57fb2..92004f0c3 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -1191,47 +1191,50 @@ #define ID_IMG_THRESHOLD_16 33379 #define ID_IMG_THRESHOLD_32 33380 #define ID_IMG_THRESHOLD_64 33381 -#define ID_IMG_DRAGGINGMODE_NONE 33382 -#define ID_IMG_DRAGGINGMODE_MOVE 33383 -#define ID_IMG_DRAGGINGMODE_ADJUST_OFFSET 33384 -#define IDC_COMPAREIMAGE_PATTERNS 33385 -#define IDC_COMPAREIMAGE_DEFAULTS 33386 -#define IDC_PLUGIN_SETTINGS 33387 -#define IDC_COMPAREBINARY_PATTERNS 33388 -#define IDC_COMPAREBINARY_VIEWSETTINGS 33389 -#define IDC_COMPAREBINARY_BINARYMODE 33390 -#define IDC_COMPAREBINARY_CHARACTERSET 33391 -#define IDC_COMPAREBINARY_DEFAULTS 33392 -#define ID_HELP_RELEASENOTES 33394 -#define ID_HELP_TRANSLATIONS 33395 -#define IDS_COMPMETHOD_FULL_CONTENTS 33398 -#define IDS_COMPMETHOD_QUICK_CONTENTS 33399 -#define IDS_COMPMETHOD_BINARY_CONTENTS 33400 -#define IDS_COMPMETHOD_MODDATE 33401 -#define IDS_COMPMETHOD_DATESIZE 33402 -#define IDS_COMPMETHOD_SIZE 33403 -#define IDS_UNPACK_AUTO 33494 -#define IDS_NO_PREDIFFER 33495 -#define IDS_SUGGESTED_PLUGINS 33496 -#define IDS_NOT_SUGGESTED_PLUGINS 33497 -#define IDS_PRIVATEBUILD_FMT 33501 -#define IDS_CHECKFORUPDATES_UPTODATE 33502 -#define IDS_CHECKFORUPDATES_NEWVERSION 33503 -#define IDS_CHECKFORUPDATES_FAILED 33504 -#define IDS_TITLE_PLUGINS_SETTINGS 33521 -#define IDS_NO_EDIT_SCRIPTS 33522 -#define IDS_NO_SCT_SCRIPTS 33523 -#define IDS_USERCHOICE_NONE 33524 -#define IDS_USERCHOICE_AUTOMATIC 33525 -#define IDS_CLOSE_LEFT_TABS 33541 -#define IDS_CLOSE_RIGHT_TABS 33542 -#define IDS_CLOSE_OTHER_TABS 33543 -#define IDS_TABBAR_AUTO_MAXWIDTH 33544 -#define ID_FILE_PROJECT_MRU_FIRST 33545 -#define ID_FILE_PROJECT_MRU_LAST 33644 -#define IDS_CREATE_FOLDER 33645 -#define IDS_CREATE_FOLDER_ERROR 33646 -#define ID_FILE_SHELLMENU 33648 +#define ID_IMG_INSERTIONDELETIONDETECTION_NONE 33382 +#define ID_IMG_INSERTIONDELETIONDETECTION_VERTICAL 33383 +#define ID_IMG_INSERTIONDELETIONDETECTION_HORIZONTAL 33384 +#define ID_IMG_DRAGGINGMODE_NONE 33385 +#define ID_IMG_DRAGGINGMODE_MOVE 33386 +#define ID_IMG_DRAGGINGMODE_ADJUST_OFFSET 33387 +#define IDC_COMPAREIMAGE_PATTERNS 33388 +#define IDC_COMPAREIMAGE_DEFAULTS 33389 +#define IDC_PLUGIN_SETTINGS 33390 +#define IDC_COMPAREBINARY_PATTERNS 33391 +#define IDC_COMPAREBINARY_VIEWSETTINGS 33392 +#define IDC_COMPAREBINARY_BINARYMODE 33394 +#define IDC_COMPAREBINARY_CHARACTERSET 33395 +#define IDC_COMPAREBINARY_DEFAULTS 33398 +#define ID_HELP_RELEASENOTES 33399 +#define ID_HELP_TRANSLATIONS 33400 +#define IDS_COMPMETHOD_FULL_CONTENTS 33401 +#define IDS_COMPMETHOD_QUICK_CONTENTS 33402 +#define IDS_COMPMETHOD_BINARY_CONTENTS 33403 +#define IDS_COMPMETHOD_MODDATE 33494 +#define IDS_COMPMETHOD_DATESIZE 33495 +#define IDS_COMPMETHOD_SIZE 33496 +#define IDS_UNPACK_AUTO 33497 +#define IDS_NO_PREDIFFER 33501 +#define IDS_SUGGESTED_PLUGINS 33502 +#define IDS_NOT_SUGGESTED_PLUGINS 33503 +#define IDS_PRIVATEBUILD_FMT 33504 +#define IDS_CHECKFORUPDATES_UPTODATE 33521 +#define IDS_CHECKFORUPDATES_NEWVERSION 33522 +#define IDS_CHECKFORUPDATES_FAILED 33523 +#define IDS_TITLE_PLUGINS_SETTINGS 33524 +#define IDS_NO_EDIT_SCRIPTS 33525 +#define IDS_NO_SCT_SCRIPTS 33541 +#define IDS_USERCHOICE_NONE 33542 +#define IDS_USERCHOICE_AUTOMATIC 33543 +#define IDS_CLOSE_LEFT_TABS 33544 +#define IDS_CLOSE_RIGHT_TABS 33545 +#define IDS_CLOSE_OTHER_TABS 33644 +#define IDS_TABBAR_AUTO_MAXWIDTH 33645 +#define ID_FILE_PROJECT_MRU_FIRST 33646 +#define ID_FILE_PROJECT_MRU_LAST 33656 +#define IDS_CREATE_FOLDER 33657 +#define IDS_CREATE_FOLDER_ERROR 33658 +#define ID_FILE_SHELLMENU 33659 // Next default values for new objects // @@ -1239,7 +1242,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 250 -#define _APS_NEXT_COMMAND_VALUE 33649 +#define _APS_NEXT_COMMAND_VALUE 33660 #define _APS_NEXT_CONTROL_VALUE 8829 #define _APS_NEXT_SYMED_VALUE 116 #endif diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 5de1d6827..790ca7fb4 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -132,6 +132,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Ezer ez" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -147,7 +164,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zooma" @@ -173,11 +190,6 @@ msgstr "&Normala\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Ezer ez" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -267,7 +279,7 @@ msgstr "Ir&ten" msgid "&Edit" msgstr "&Editatu" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Aukerak..." @@ -297,7 +309,7 @@ msgstr "&Handia" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Egoera Barra" @@ -312,7 +324,7 @@ msgstr "&Fitxa Barra" msgid "&Tools" msgstr "&Tresnak" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Iragazkiak..." @@ -672,7 +684,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "I&rarkitu..." @@ -866,7 +878,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Bl&okeatu Panelak" @@ -1161,7 +1173,7 @@ msgstr "" msgid "Re&name" msgstr "Birri&zendatu" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Ezkutatu Gaiak" @@ -1880,7 +1892,7 @@ msgstr "&Formatoa" msgid "St&yle:" msgstr "Estil&oa:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "Hitzi&ngurua:" @@ -1995,7 +2007,7 @@ msgstr "Joan &nora" msgid "Li&ne" msgstr "&Lerroa" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Ezberdintasuna" @@ -2807,7 +2819,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2976,7 +2988,7 @@ msgstr "&Ez" msgid "No to a&ll" msgstr "Ez gu&ztiari" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Jarraitu" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 76276993b..4364233c1 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -132,6 +132,23 @@ msgstr "Tamanho do &Bloco Diff" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "& Ignorar a Diferença de Cor (Limite da Distância da Cor)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Nenhum" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -147,7 +164,7 @@ msgstr "&Página Seguinte" msgid "&Active Pane" msgstr "&Painel Ativo" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -173,11 +190,6 @@ msgstr "&Zoom Normal\tCtrl+*" msgid "&Overlay" msgstr "&Sobreposição" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Nenhum" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -267,7 +279,7 @@ msgstr "S&air" msgid "&Edit" msgstr "&Editar" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Opções..." @@ -297,7 +309,7 @@ msgstr "&Grande" msgid "&Huge" msgstr "&Enorme" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Barra de Status" @@ -312,7 +324,7 @@ msgstr "Ba&rra das Abas" msgid "&Tools" msgstr "&Ferramentas" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtros..." @@ -672,7 +684,7 @@ msgstr "Salvar &o do Meio Como..." msgid "Save &Right As..." msgstr "Salvar &o da Direita Como..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Imprimir..." @@ -866,7 +878,7 @@ msgstr "&9 Linhas" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "&Ativar/Desativar Tudo e as Linhas de 0-9\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Trancar os Painéis" @@ -1161,7 +1173,7 @@ msgstr "&Tudo" msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Esconder os Itens" @@ -1880,7 +1892,7 @@ msgstr "&Formato" msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Contexto:" @@ -1995,7 +2007,7 @@ msgstr "Ir para o quê" msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Diferença" @@ -2811,7 +2823,7 @@ msgstr "Imagem" msgid "Image File &Patterns:" msgstr "Modelos dos Arquivos de &Imagens:" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "&Visualização Hex" @@ -3000,7 +3012,7 @@ msgstr "&Não" msgid "No to a&ll" msgstr "Não pra t&odos" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Continuar" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 24cbbf15b..93b539f37 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -129,6 +129,23 @@ msgstr "Размер на &блока с разлики" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Няма" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "&Следваща страница" msgid "&Active Pane" msgstr "&Активен панел" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Мащаб" @@ -170,11 +187,6 @@ msgstr "Нормален" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Няма" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Изход" msgid "&Edit" msgstr "&Редактиране" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Настройки..." @@ -294,7 +306,7 @@ msgstr "&Голям" msgid "&Huge" msgstr "&Огромен" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Лента на състоянието" @@ -309,7 +321,7 @@ msgstr "Таб лента" msgid "&Tools" msgstr "&Инструменти" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Филтри..." @@ -669,7 +681,7 @@ msgstr "Запази &Средната част като..." msgid "Save &Right As..." msgstr "Запази &Дясната част като..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Принтиране..." @@ -863,7 +875,7 @@ msgstr "&9 линии" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Заключи прозорците" @@ -1158,7 +1170,7 @@ msgstr "&Всички" msgid "Re&name" msgstr "&Преименувай" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Скрий" @@ -1877,7 +1889,7 @@ msgstr "&Формат" msgid "St&yle:" msgstr "Сти&л:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Контекст:" @@ -1992,7 +2004,7 @@ msgstr "Отиди на:" msgid "Li&ne" msgstr "Ре&д" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Разлика" @@ -2800,7 +2812,7 @@ msgstr "Изображения" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2939,7 +2951,7 @@ msgstr "&Не" msgid "No to a&ll" msgstr "Не за В&сички" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Продължи" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 9fbe980e7..9205fb1ec 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -128,6 +128,23 @@ msgstr "Mida del &bloc" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Cap" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -143,7 +160,7 @@ msgstr "Pàgina següe&nt" msgid "&Active Pane" msgstr "Plafó actiu" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -169,11 +186,6 @@ msgstr "" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Cap" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -263,7 +275,7 @@ msgstr "&Surt" msgid "&Edit" msgstr "E&dita" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "O&pcions..." @@ -293,7 +305,7 @@ msgstr "&Gran" msgid "&Huge" msgstr "Immens" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Barra d'est&at" @@ -308,7 +320,7 @@ msgstr "Barra de ta&bulacions" msgid "&Tools" msgstr "&Eines" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtres..." @@ -668,7 +680,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Imprimeix..." @@ -862,7 +874,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "" @@ -1157,7 +1169,7 @@ msgstr "" msgid "Re&name" msgstr "Canvia el &nom" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Amaga els elements" @@ -1876,7 +1888,7 @@ msgstr "Format" msgid "St&yle:" msgstr "E&stil:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "" @@ -1991,7 +2003,7 @@ msgstr "Anar a on" msgid "Li&ne" msgstr "&Línia" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Diferència" @@ -2799,7 +2811,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2938,7 +2950,7 @@ msgstr "" msgid "No to a&ll" msgstr "No a t&ot" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Continua" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index be03984dc..dd345d0bf 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -131,6 +131,23 @@ msgstr "差异块大小(&B)" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "忽略颜色差异 (色彩距离阈值) (&I)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "无(&N)" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -146,7 +163,7 @@ msgstr "下一页(&N)" msgid "&Active Pane" msgstr "活动窗格(&A)" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "缩放(&Z)" @@ -172,11 +189,6 @@ msgstr "正常大小(&N)\tCtrl+*" msgid "&Overlay" msgstr "遮罩(&O)" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "无(&N)" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -266,7 +278,7 @@ msgstr "退出(&X)" msgid "&Edit" msgstr "编辑(&E)" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "选项(&O)..." @@ -296,7 +308,7 @@ msgstr "大(&B)" msgid "&Huge" msgstr "超大(&H)" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "状态栏(&S)" @@ -311,7 +323,7 @@ msgstr "标签栏(&B)" msgid "&Tools" msgstr "工具(&T)" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "过滤器(&F)..." @@ -671,7 +683,7 @@ msgstr "另存为中间(&L)" msgid "Save &Right As..." msgstr "另存为右侧(&R)" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "打印(&P)..." @@ -865,7 +877,7 @@ msgstr "9行(&9)" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "切换全部行和 0-9 行\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "锁定窗格(&L)" @@ -1160,7 +1172,7 @@ msgstr "全部(&A)" msgid "Re&name" msgstr "改名(&N)" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "隐藏(&H)" @@ -1879,7 +1891,7 @@ msgstr "格式(&F)" msgid "St&yle:" msgstr "样式(&Y):" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "内容(&C):" @@ -1994,7 +2006,7 @@ msgstr "转到类别" msgid "Li&ne" msgstr "行(&N)" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "差异(&D)" @@ -2802,7 +2814,7 @@ msgstr "图片" msgid "Image File &Patterns:" msgstr "图片文件扩展名 (&P):" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "十六进制查看(&H)" @@ -2941,7 +2953,7 @@ msgstr "否(&N)" msgid "No to a&ll" msgstr "全部都否(&L)" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "继续(&C)" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 5c36785c2..aab24ed42 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -131,6 +131,23 @@ msgstr "差異區塊大小(&B)" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "忽略顏色差異(Color Distance Threshold)(&I)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "關閉(&N)" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -146,7 +163,7 @@ msgstr "後一頁(&N)" msgid "&Active Pane" msgstr "啟動框(&A)" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "拉近推遠(&Z)" @@ -172,11 +189,6 @@ msgstr "恢復原始(&N)\tCtrl+*" msgid "&Overlay" msgstr "覆蓋(&O)" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "關閉(&N)" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -266,7 +278,7 @@ msgstr "結束(&X)" msgid "&Edit" msgstr "編輯(&E)" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "選項(&O)..." @@ -296,7 +308,7 @@ msgstr "大圖示(&B)" msgid "&Huge" msgstr "超大圖示(&H)" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "狀態列(&S)" @@ -311,7 +323,7 @@ msgstr "頁籤列(&B)" msgid "&Tools" msgstr "工具(&T)" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "篩選器(&F)..." @@ -673,7 +685,7 @@ msgstr "儲存中間為(&M)..." msgid "Save &Right As..." msgstr "儲存右邊為(&R)..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "列印(&P)..." @@ -867,7 +879,7 @@ msgstr "9行(&9)" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "切換全部行和 0-9 行(&T)\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "鎖住窗格(&L)" @@ -1166,7 +1178,7 @@ msgstr "全部(&A)" msgid "Re&name" msgstr "重新命名(&N)" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "隱藏檔案(&H)" @@ -1887,7 +1899,7 @@ msgstr "格式(&F)" msgid "St&yle:" msgstr "樣式(&Y)：" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "上下文(&C)：" @@ -2002,7 +2014,7 @@ msgstr "移至" msgid "Li&ne" msgstr "行(&N)" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "差異區塊(&D)" @@ -2815,7 +2827,7 @@ msgstr "圖片" msgid "Image File &Patterns:" msgstr "圖片檔案副檔名(&P)" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "二進制顯示(&H)" @@ -2984,7 +2996,7 @@ msgstr "否(&N)" msgid "No to a&ll" msgstr "全部皆否(&L)" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "繼續(&C)" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index de440b506..e71b26267 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Nevidljiva" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Po&većaj" @@ -170,11 +187,6 @@ msgstr "&Izvorna veličina\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Nevidljiva" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "I&zlaz" msgid "&Edit" msgstr "&Uređivanje" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Pos&tavke..." @@ -294,7 +306,7 @@ msgstr "&Velike ikone" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Traka &statusa" @@ -309,7 +321,7 @@ msgstr "Traka &oznaka panela" msgid "&Tools" msgstr "&Alati" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtri..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Ispis" @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Za&ključaj panele" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "P&reimenuj" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Sakrij stavke" @@ -1877,7 +1889,7 @@ msgstr "&Način prikaza" msgid "St&yle:" msgstr "St&il" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Dubina:" @@ -1992,7 +2004,7 @@ msgstr "u datoteci" msgid "Li&ne" msgstr "&redak" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&razliku" @@ -2804,7 +2816,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2973,7 +2985,7 @@ msgstr "&Ne" msgid "No to a&ll" msgstr "Ne za s&ve" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Nastavi" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 847ba9b3b..7d4e99f67 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Skrýt" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Velikost písma" @@ -170,11 +187,6 @@ msgstr "&Normální\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Skrýt" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Konec" msgid "&Edit" msgstr "Úpr&avy" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Možnost&i..." @@ -294,7 +306,7 @@ msgstr "&Velký" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Stavový řádek" @@ -309,7 +321,7 @@ msgstr "Panel &záložek" msgid "&Tools" msgstr "&Nástroje" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtry..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Tisk..." @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Uzamknout panely" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "Přej&menovat" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Skrýt položky" @@ -1879,7 +1891,7 @@ msgstr "Formát" msgid "St&yle:" msgstr "Me&toda:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "O&bsah:" @@ -1994,7 +2006,7 @@ msgstr "Přejít na co" msgid "Li&ne" msgstr "Řá&dek" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Ro&zdíl" @@ -2802,7 +2814,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2941,7 +2953,7 @@ msgstr "&Ne" msgid "No to a&ll" msgstr "Ne vš&em" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Pok&račovat" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 255148b73..b24eb72ba 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -130,6 +130,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Ingen" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -145,7 +162,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -171,11 +188,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Ingen" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -265,7 +277,7 @@ msgstr "&Afslut" msgid "&Edit" msgstr "&Rediger" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "I&ndstillinger..." @@ -295,7 +307,7 @@ msgstr "&Stor" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "S&tatuslinje" @@ -310,7 +322,7 @@ msgstr "Fa&nelinje" msgid "&Tools" msgstr "Værk&tøjer" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtre..." @@ -670,7 +682,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Udskriv..." @@ -864,7 +876,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Lås vinduer" @@ -1159,7 +1171,7 @@ msgstr "" msgid "Re&name" msgstr "Om&døb" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Skjul emner" @@ -1882,7 +1894,7 @@ msgstr "&Format" msgid "St&yle:" msgstr "Sti&l:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Sammenhæng:" @@ -1997,7 +2009,7 @@ msgstr "Gå til hvad" msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Forskel" @@ -2811,7 +2823,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2987,7 +2999,7 @@ msgstr "&Nej" msgid "No to a&ll" msgstr "Nej til a&lle" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Fortsæt" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 950effcfe..b6c1ee4f0 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -131,6 +131,23 @@ msgstr "Grootte verschilblok" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "Kleurverschil negeren (kleurafstand-drempel)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "Geen" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -146,7 +163,7 @@ msgstr "Volgende pagina" msgid "&Active Pane" msgstr "Actief venster" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Zoomen" @@ -172,11 +189,6 @@ msgstr "Normaal\tCtrl+*" msgid "&Overlay" msgstr "Overlay" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "Geen" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -266,7 +278,7 @@ msgstr "Afsluiten" msgid "&Edit" msgstr "Bewerken" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Opties..." @@ -296,7 +308,7 @@ msgstr "Groot" msgid "&Huge" msgstr "Enorm" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Statusbalk" @@ -311,7 +323,7 @@ msgstr "Tab-balk" msgid "&Tools" msgstr "Gereedschap" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "Filters..." @@ -671,7 +683,7 @@ msgstr "Midden opslaan als..." msgid "Save &Right As..." msgstr "Rechts opslaan als..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "Afdrukken..." @@ -865,7 +877,7 @@ msgstr "9 regels" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Alle en 0-9 regels wisselen\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Vensters vergrendelen" @@ -1160,7 +1172,7 @@ msgstr "Alle" msgid "Re&name" msgstr "Naam wijzigen" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Items verbergen" @@ -1884,7 +1896,7 @@ msgstr "Formaat" msgid "St&yle:" msgstr "Stijl:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "Context:" @@ -1999,7 +2011,7 @@ msgstr "Gaan naar" msgid "Li&ne" msgstr "Regel" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Verschil" @@ -2821,7 +2833,7 @@ msgstr "Afbeelding" msgid "Image File &Patterns:" msgstr "Afbeeldingsbestand-patronen:" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "Hex-weergave" @@ -3016,7 +3028,7 @@ msgstr "Nee" msgid "No to a&ll" msgstr "Nee op alles" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Doorgaan" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 99a196446..30f49ab5e 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2019-04-21 22:56+0000\n" +"POT-Creation-Date: 2019-05-04 19:20+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -102,6 +102,22 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +msgid "&None" +msgstr "" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 msgid "&Previous Page" msgstr "" @@ -114,7 +130,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 msgid "&Zoom" msgstr "" @@ -135,10 +151,6 @@ msgstr "" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -msgid "&None" -msgstr "" - #: Merge.rc:4DE14272 msgid "&Alpha Blend" msgstr "" @@ -211,7 +223,7 @@ msgstr "" msgid "&Edit" msgstr "" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F msgid "&Options..." msgstr "" @@ -235,7 +247,7 @@ msgstr "" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 msgid "&Status Bar" msgstr "" @@ -247,7 +259,7 @@ msgstr "" msgid "&Tools" msgstr "" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 msgid "&Filters..." msgstr "" @@ -535,7 +547,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 msgid "&Print..." msgstr "" @@ -691,7 +703,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 msgid "&Lock Panes" msgstr "" @@ -936,7 +948,7 @@ msgstr "" msgid "Re&name" msgstr "" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 msgid "&Hide Items" msgstr "" @@ -1520,7 +1532,7 @@ msgstr "" msgid "St&yle:" msgstr "" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 msgid "&Context:" msgstr "" @@ -1612,7 +1624,7 @@ msgstr "" msgid "Li&ne" msgstr "" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 msgid "&Difference" msgstr "" @@ -2260,7 +2272,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A msgid "&Hex View" msgstr "" @@ -2372,7 +2384,7 @@ msgstr "" msgid "No to a&ll" msgstr "" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B msgid "&Continue" msgstr "" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index deff253d6..583c9c11b 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -126,6 +126,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "Ei mitään" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -141,7 +158,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Zoomaa" @@ -167,11 +184,6 @@ msgstr "&Normaali\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "Ei mitään" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -261,7 +273,7 @@ msgstr "Poistu" msgid "&Edit" msgstr "Muokkaa" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Asetukset..." @@ -291,7 +303,7 @@ msgstr "Iso" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Tilarivi" @@ -306,7 +318,7 @@ msgstr "Välilehdet" msgid "&Tools" msgstr "Työkalut" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "Suotimet..." @@ -666,7 +678,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "Tulosta..." @@ -859,7 +871,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Lukitse ruudut" @@ -1154,7 +1166,7 @@ msgstr "" msgid "Re&name" msgstr "Nimeä uudelleen" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Piilota kohteet" @@ -1874,7 +1886,7 @@ msgstr "Formaatti" msgid "St&yle:" msgstr "Tyyli" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "Konteksti:" @@ -1989,7 +2001,7 @@ msgstr "Siirry mihin" msgid "Li&ne" msgstr "Rivi" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Erilaisuus" @@ -2797,7 +2809,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2936,7 +2948,7 @@ msgstr "Ei" msgid "No to a&ll" msgstr "Ei kaikkiin" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Jatka" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 31ac1a9dd..0f21b58b5 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -133,6 +133,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Aucune" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -148,7 +165,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -174,11 +191,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Aucune" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -268,7 +280,7 @@ msgstr "&Quitter" msgid "&Edit" msgstr "&Edition" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Préférences..." @@ -298,7 +310,7 @@ msgstr "&Grande" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Barre d'&état" @@ -313,7 +325,7 @@ msgstr "Barre d'&onglets" msgid "&Tools" msgstr "&Outils" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtrer..." @@ -673,7 +685,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Imprimer..." @@ -867,7 +879,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Verrouiller les fenêtres" @@ -1162,7 +1174,7 @@ msgstr "" msgid "Re&name" msgstr "Re&nommer" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "D&issimuler l'élément(s)" @@ -1881,7 +1893,7 @@ msgstr "&Format" msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Contexte:" @@ -1996,7 +2008,7 @@ msgstr "Atteindre quoi" msgid "Li&ne" msgstr "&Ligne" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Di&fférence" @@ -2808,7 +2820,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2977,7 +2989,7 @@ msgstr "&Non" msgid "No to a&ll" msgstr "Non pour t&out" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Continuer" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 597698c75..f13669c22 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Ningunha" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -170,11 +187,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Ningunha" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "Saír" msgid "&Edit" msgstr "&Editar" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Opcións..." @@ -294,7 +306,7 @@ msgstr "&Grande" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Barra de estado" @@ -309,7 +321,7 @@ msgstr "&Barra de pestanas" msgid "&Tools" msgstr "&Ferramentas" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtros..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Imprimir..." @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "B&loquear Paneis" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Agochar elementos" @@ -1877,7 +1889,7 @@ msgstr "&Formato" msgid "St&yle:" msgstr "Est&ilo" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Contexto:" @@ -1992,7 +2004,7 @@ msgstr "Ir á" msgid "Li&ne" msgstr "Li&ña" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Diferenza" @@ -2805,7 +2817,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2974,7 +2986,7 @@ msgstr "&Non" msgid "No to a&ll" msgstr "&Non a todo" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Continuar" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 2e6010fb3..de9a889a3 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Keine" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "&Nächste Seite" msgid "&Active Pane" msgstr "&Aktiver Ausschnitt" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -170,11 +187,6 @@ msgstr "&Normal\tStrg+*" msgid "&Overlay" msgstr "&Überlagerung" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Keine" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Beenden" msgid "&Edit" msgstr "&Bearbeiten" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Einstellungen..." @@ -294,7 +306,7 @@ msgstr "&Groß" msgid "&Huge" msgstr "&Riesig" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "S&tatusleiste" @@ -309,7 +321,7 @@ msgstr "Ta&b-Leiste" msgid "&Tools" msgstr "&Tools" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filter..." @@ -669,7 +681,7 @@ msgstr "&Mitte speichern unter..." msgid "Save &Right As..." msgstr "&Rechts speichern unter..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Drucken..." @@ -863,7 +875,7 @@ msgstr "&9 Zeilen" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "&Wechsel Alle und 0-9 Zeilen\tStrg+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Ausschnitte &fixieren" @@ -1158,7 +1170,7 @@ msgstr "&Alle" msgid "Re&name" msgstr "&Umbenennen" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Objekte v&erstecken" @@ -1879,7 +1891,7 @@ msgstr "&Format" msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Context:" @@ -1994,7 +2006,7 @@ msgstr "Ziel" msgid "Li&ne" msgstr "&Zeile" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Unterschied" @@ -2810,7 +2822,7 @@ msgstr "Bild" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2999,7 +3011,7 @@ msgstr "&Nein" msgid "No to a&ll" msgstr "Nein zu a&llen" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Fortsetzen" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 177bb4818..61937c570 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -128,6 +128,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Απόκρυψη" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -143,7 +160,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Ζουμ" @@ -169,11 +186,6 @@ msgstr "&Κανονικό\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Απόκρυψη" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -263,7 +275,7 @@ msgstr "Έξοδο&ς" msgid "&Edit" msgstr "&Επεξεργασία" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Επιλ&ογές..." @@ -293,7 +305,7 @@ msgstr "Με&γάλη" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Γραμμή &Καταστάσεως" @@ -308,7 +320,7 @@ msgstr "Γραμμή Σε&λιδοδεικτών" msgid "&Tools" msgstr "Εργα&λεία" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Φίλτρα..." @@ -668,7 +680,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "Εκ&τύπωση..." @@ -862,7 +874,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Πάγωμα Πεδίων" @@ -1157,7 +1169,7 @@ msgstr "" msgid "Re&name" msgstr "Μετο&νομασία" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Απόκρυ&ψη Αντικειμένων" @@ -1876,7 +1888,7 @@ msgstr "Μορ&φή" msgid "St&yle:" msgstr "Στ&υλ:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Περιβ. Κείμ.:" @@ -1991,7 +2003,7 @@ msgstr "Μετάβαση σε" msgid "Li&ne" msgstr "&Γραμμή" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Διαφορά" @@ -2799,7 +2811,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2968,7 +2980,7 @@ msgstr "&Όχι" msgid "No to a&ll" msgstr "Όχι σε ό&λα" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Συνέχεια" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 93a878099..7fdf17e8a 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Nincs" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Nagyítás" @@ -170,11 +187,6 @@ msgstr "" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Nincs" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Kilépés" msgid "&Edit" msgstr "S&zerkesztés" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Beállítások..." @@ -294,7 +306,7 @@ msgstr "Nagy" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Állapotsor" @@ -309,7 +321,7 @@ msgstr "" msgid "&Tools" msgstr "&Eszközök" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Szűrők..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "Nyomtatás..." @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Pane&lek rögzítése" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "Át&nevezés" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Elemek &rejtése" @@ -1877,7 +1889,7 @@ msgstr "&Formátum" msgid "St&yle:" msgstr "St&ílus:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Környezet:" @@ -1992,7 +2004,7 @@ msgstr "Mire ugorjon:" msgid "Li&ne" msgstr "&Sorra" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Eltérésre" @@ -2800,7 +2812,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2939,7 +2951,7 @@ msgstr "&Nem" msgid "No to a&ll" msgstr "Nem m&indenre" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Folytatás" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index 1ecf91105..5c6ded8f1 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Nessuna" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "" @@ -170,11 +187,6 @@ msgstr "&Normale\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Nessuna" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Esci" msgid "&Edit" msgstr "&Modifica" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Op&zioni" @@ -294,7 +306,7 @@ msgstr "&Grande" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Barra di stato" @@ -309,7 +321,7 @@ msgstr "&Barra delle schede" msgid "&Tools" msgstr "&Strumenti" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtri..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "Stam&pa..." @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "B&locca pannelli" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "&Rinomina" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Nascondi elementi" @@ -1877,7 +1889,7 @@ msgstr "&Formato" msgid "St&yle:" msgstr "Sti&le:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Contesto:" @@ -1992,7 +2004,7 @@ msgstr "Vai a ..." msgid "Li&ne" msgstr "Li&nea" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Di&fferenza" @@ -2800,7 +2812,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2962,7 +2974,7 @@ msgstr "&No" msgid "No to a&ll" msgstr "No a t&utto" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Continua" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 3ec26a8b1..70f2daa37 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -109,6 +109,22 @@ msgstr "Diff ブロック サイズ(&B)" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "色の違いを無視する (色距離の閾値)(&I)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "挿入/削除検出(&E)" + +#: Merge.rc:43017E43 +msgid "&None" +msgstr "なし(&N)" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "垂直方向(&V)" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "水平方向(&H)" + #: Merge.rc:5A9A7139 msgid "&Previous Page" msgstr "前ページ(&P)" @@ -121,7 +137,7 @@ msgstr "次ページ(&N)" msgid "&Active Pane" msgstr "選択ペイン(&A)" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 msgid "&Zoom" msgstr "拡大(&Z)" @@ -142,10 +158,6 @@ msgstr "元に戻す(&N)\tCtrl+*" msgid "&Overlay" msgstr "重ね合わせ(&O)" -#: Merge.rc:43017E44 -msgid "&None" -msgstr "なし(&N)" - #: Merge.rc:4DE14272 msgid "&Alpha Blend" msgstr "アルファブレンド(&A)" @@ -218,7 +230,7 @@ msgstr "終了(&X)" msgid "&Edit" msgstr "編集(&E)" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F msgid "&Options..." msgstr "設定(&O)..." @@ -242,7 +254,7 @@ msgstr "大(&B)" msgid "&Huge" msgstr "特大(&H)" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 msgid "&Status Bar" msgstr "ステータス バー(&S)" @@ -254,7 +266,7 @@ msgstr "タブ バー(&B)" msgid "&Tools" msgstr "ツール(&T)" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 msgid "&Filters..." msgstr "フィルタ(&F)..." @@ -542,7 +554,7 @@ msgstr "名前を付けて中央のファイルを保存(&M)..." msgid "Save &Right As..." msgstr "名前を付けて右側のファイルを保存(&R)..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 msgid "&Print..." msgstr "印刷(&P)..." @@ -698,7 +710,7 @@ msgstr "&9 行" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "全行/0 ～ 9 行切替(&T)\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 msgid "&Lock Panes" msgstr "ペインをロック(&L)" @@ -943,7 +955,7 @@ msgstr "すべて(&A)" msgid "Re&name" msgstr "名前の変更(&N)" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 msgid "&Hide Items" msgstr "選択項目を非表示(&H)" @@ -1535,7 +1547,7 @@ msgstr "出力形式(&F)" msgid "St&yle:" msgstr "スタイル(&Y):" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 msgid "&Context:" msgstr "コンテキスト(&C):" @@ -1627,7 +1639,7 @@ msgstr "移動種別" msgid "Li&ne" msgstr "行(&N)" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 msgid "&Difference" msgstr "差異(&D)" @@ -2289,7 +2301,7 @@ msgstr "画像" msgid "Image File &Patterns:" msgstr "画像ファイルとして扱うパターン(&P):" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A msgid "&Hex View" msgstr "HEX 表示(&H)" @@ -2458,7 +2470,7 @@ msgstr "いいえ(&N)" msgid "No to a&ll" msgstr "すべていいえ(&L)" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B msgid "&Continue" msgstr "続行(&C)" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 05418f6f7..8435f58c9 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -133,6 +133,23 @@ msgstr "차이점 블럭 크기(&B)" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "색 차이(색 거리 임계값) 무시(&I)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "없음(&N)" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -148,7 +165,7 @@ msgstr "다음 페이지(&N)" msgid "&Active Pane" msgstr "활성 창(&A)" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "확대/축소(&Z)" @@ -174,11 +191,6 @@ msgstr "보통(&N)\tCtrl+*" msgid "&Overlay" msgstr "오버레이(&O)" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "없음(&N)" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -268,7 +280,7 @@ msgstr "종료(&X)" msgid "&Edit" msgstr "편집(&E)" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "옵션(&O)..." @@ -298,7 +310,7 @@ msgstr "크게(&B)" msgid "&Huge" msgstr "매우 크게(&H)" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "상태 표시줄(&S)" @@ -313,7 +325,7 @@ msgstr "탭 도구 모음(&B)" msgid "&Tools" msgstr "도구(&T)" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "필터(&F)" @@ -673,7 +685,7 @@ msgstr "가운데 저장(&M)..." msgid "Save &Right As..." msgstr "오른쪽 저장(&R)..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "인쇄(&P)..." @@ -867,7 +879,7 @@ msgstr "&9 줄" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "전체와 0-9 줄 토글\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "창 잠금(&L)" @@ -1162,7 +1174,7 @@ msgstr "전체(&A)" msgid "Re&name" msgstr "이름 바꾸기(&N)" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "항목 숨기기(&H)" @@ -1881,7 +1893,7 @@ msgstr "형식(&F)" msgid "St&yle:" msgstr "스타일(&Y):" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "차이점전후:" @@ -1996,7 +2008,7 @@ msgstr "이동 위치" msgid "Li&ne" msgstr "줄(&N)" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "차이점(&D)" @@ -2812,7 +2824,7 @@ msgstr "이미지" msgid "Image File &Patterns:" msgstr "이미지 파일 패턴(&P):" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "16진수 보기(&H)" @@ -3001,7 +3013,7 @@ msgstr "아니오(&N)" msgid "No to a&ll" msgstr "모두 아니오(&L)" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "계속(&C)" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 1762b5bc6..e1ba762d2 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -111,6 +111,22 @@ msgstr "Skirtumų &bloko dydis" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "&Ignoruoti spalvos skirtumus (Spalvų atstumo slenkstis)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +msgid "&None" +msgstr "&Nerodoma" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 msgid "&Previous Page" msgstr "&Praeitas puslapis" @@ -123,7 +139,7 @@ msgstr "&Kitas puslapis" msgid "&Active Pane" msgstr "&Aktyvus polangis" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 msgid "&Zoom" msgstr "&Keisti mastelį" @@ -144,10 +160,6 @@ msgstr "&Normalus\tCtrl+*" msgid "&Overlay" msgstr "&Perdengimas" -#: Merge.rc:43017E44 -msgid "&None" -msgstr "&Nerodoma" - #: Merge.rc:4DE14272 msgid "&Alpha Blend" msgstr "&Alfa sluoksnių suliejimas" @@ -220,7 +232,7 @@ msgstr "&Išeiti" msgid "&Edit" msgstr "R&edaguoti" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F msgid "&Options..." msgstr "Nu&ostatos..." @@ -244,7 +256,7 @@ msgstr "&Dideli mygtukai" msgid "&Huge" msgstr "&Milžiniški mygtukai" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 msgid "&Status Bar" msgstr "Bū&senos juosta" @@ -256,7 +268,7 @@ msgstr "&Kortelių juosta" msgid "&Tools" msgstr "Į&rankiai" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 msgid "&Filters..." msgstr "&Filtrai..." @@ -544,7 +556,7 @@ msgstr "Išsaugoti vidurinįjį &kaip..." msgid "Save &Right As..." msgstr "Išsaugoti &dešinįjį kaip..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 msgid "&Print..." msgstr "S&pausdinti..." @@ -700,7 +712,7 @@ msgstr "&9 eilutės" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Įjungti Visas ir 0-9 eilutes\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 msgid "&Lock Panes" msgstr "Užrakinti po&langius" @@ -945,7 +957,7 @@ msgstr "V&iską" msgid "Re&name" msgstr "Pervardi&nti" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 msgid "&Hide Items" msgstr "&Slėpti elementus" @@ -1529,7 +1541,7 @@ msgstr "&Formatas" msgid "St&yle:" msgstr "St&ilius:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 msgid "&Context:" msgstr "&Kontekstas:" @@ -1621,7 +1633,7 @@ msgstr "Pereiti į" msgid "Li&ne" msgstr "Ei&lutę" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 msgid "&Difference" msgstr "&Skirtumą" @@ -2277,7 +2289,7 @@ msgstr "Paveikslėlių" msgid "Image File &Patterns:" msgstr "&Paveikslėlių failų šablonai:" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A msgid "&Hex View" msgstr "Žiūrėti &Hex režimu" @@ -2440,7 +2452,7 @@ msgstr "&Ne" msgid "No to a&ll" msgstr "Ne vi&siems" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B msgid "&Continue" msgstr "Tę&sti" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 109ee7043..af0cce0d5 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Ingen" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -170,11 +187,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Ingen" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Avslutt" msgid "&Edit" msgstr "&Rediger" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Innstillinger..." @@ -294,7 +306,7 @@ msgstr "&Stor" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Stat&uslinje" @@ -309,7 +321,7 @@ msgstr "F&anelinje" msgid "&Tools" msgstr "&Verktøy" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filter..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Skriv ut..." @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Lås paneler" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "En&dre navn" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Skjul objekter" @@ -1877,7 +1889,7 @@ msgstr "&Format" msgid "St&yle:" msgstr "St&il:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Kontekst:" @@ -1992,7 +2004,7 @@ msgstr "Gå til hva" msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Forskjell" @@ -2804,7 +2816,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2973,7 +2985,7 @@ msgstr "&Nei" msgid "No to a&ll" msgstr "Nei til a<" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Fortsett" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index c5438baf7..6d272446d 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -130,6 +130,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&N هيچکدام " + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -145,7 +162,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Z بزرگنمايي " @@ -171,11 +188,6 @@ msgstr "&N معمولي \tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&N هيچکدام " - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -265,7 +277,7 @@ msgstr "&x خروج " msgid "&Edit" msgstr "&E ويرايش " -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&O خيارات ... " @@ -295,7 +307,7 @@ msgstr "&B بزرگ" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&S ميله وضعيت " @@ -310,7 +322,7 @@ msgstr "&b ميله جهش " msgid "&Tools" msgstr "&T ابزارها " -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&F صافيها ..." @@ -670,7 +682,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&P چاپ ... " @@ -864,7 +876,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&L قفل کردن چهارگوشها " @@ -1159,7 +1171,7 @@ msgstr "" msgid "Re&name" msgstr "&n تغيير نام " -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&H پنهان کردن موارد " @@ -1884,7 +1896,7 @@ msgstr "&F قالب بندي " msgid "St&yle:" msgstr "&y سبک : " -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&C متن : " @@ -1999,7 +2011,7 @@ msgstr " برو به چه " msgid "Li&ne" msgstr "&n خط " -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&D تفاوت " @@ -2813,7 +2825,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2988,7 +3000,7 @@ msgstr "&N خير " msgid "No to a&ll" msgstr "&l همگي خير " -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&C ادامه " diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index c57d53d8f..ce63e189b 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -130,6 +130,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Brak" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -145,7 +162,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Powiększenie" @@ -171,11 +188,6 @@ msgstr "&Rozmiar oryginalny\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Brak" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -265,7 +277,7 @@ msgstr "Zakończ" msgid "&Edit" msgstr "&Edycja" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Opcje..." @@ -295,7 +307,7 @@ msgstr "&Duży" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Pasek s&tanu" @@ -310,7 +322,7 @@ msgstr "Pasek &kart" msgid "&Tools" msgstr "&Narzędzia" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtry..." @@ -670,7 +682,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Drukuj..." @@ -864,7 +876,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Zablokuj panele" @@ -1159,7 +1171,7 @@ msgstr "" msgid "Re&name" msgstr "Zmień &nazwę" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "U&kryj elementy" @@ -1878,7 +1890,7 @@ msgstr "&Format" msgid "St&yle:" msgstr "St&yl:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Kontekst:" @@ -1993,7 +2005,7 @@ msgstr "Element docelowy" msgid "Li&ne" msgstr "&Wiersz" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Różnica" @@ -2805,7 +2817,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2974,7 +2986,7 @@ msgstr "&Nie" msgid "No to a&ll" msgstr "Nie na w&szystkie" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Kontynuuj" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 36b1eb055..33e321397 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -129,6 +129,23 @@ msgstr "Dividir Tamanho do &Bloco" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "&Ignorar Diferença de Cor (Distância Limite da Cor)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Nenhum" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "&Página Seguinte" msgid "&Active Pane" msgstr "Janela Ativa" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -170,11 +187,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "Sobreposição" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Nenhum" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Sair" msgid "&Edit" msgstr "&Editar" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Opções..." @@ -294,7 +306,7 @@ msgstr "&Grande" msgid "&Huge" msgstr "&Enorme" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Barra de Esta&do" @@ -309,7 +321,7 @@ msgstr "Barra de Separadores" msgid "&Tools" msgstr "&Ferramentas" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtros..." @@ -669,7 +681,7 @@ msgstr "Guardar &Meio Como..." msgid "Save &Right As..." msgstr "Guardar &Direita Como..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Imprimir..." @@ -863,7 +875,7 @@ msgstr "&9 Linhas" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Alternar tudo e linhas 0-9\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Trancar Janelas" @@ -1158,7 +1170,7 @@ msgstr "Tudo" msgid "Re&name" msgstr "Renomear" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Ocultar itens" @@ -1877,7 +1889,7 @@ msgstr "Formato" msgid "St&yle:" msgstr "Estilo:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "Contexto:" @@ -1992,7 +2004,7 @@ msgstr "Ir Para" msgid "Li&ne" msgstr "Linha" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Diferença" @@ -2800,7 +2812,7 @@ msgstr "Imagem" msgid "Image File &Patterns:" msgstr "&Padrão de Imagem do Ficheiro" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "Vista Hex" @@ -2939,7 +2951,7 @@ msgstr "Não" msgid "No to a&ll" msgstr "Não para todos" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Continuar" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 891b60d18..460b1722d 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Deloc" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Mărime te&xt" @@ -170,11 +187,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Deloc" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "Ieşir&e" msgid "&Edit" msgstr "&Editare" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Opţiuni..." @@ -294,7 +306,7 @@ msgstr "Ma&re" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Bară de &stare" @@ -309,7 +321,7 @@ msgstr "&Bara de tab-uri" msgid "&Tools" msgstr "Unel&te" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtre..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "Ti&părire..." @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "B&lochează panourile" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "Rede&numeşte" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Ascunde e&lementele" @@ -1877,7 +1889,7 @@ msgstr "&Format" msgid "St&yle:" msgstr "S&til:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Context:" @@ -1992,7 +2004,7 @@ msgstr "Anume" msgid "Li&ne" msgstr "Li&nie" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Diferenţă" @@ -2800,7 +2812,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2969,7 +2981,7 @@ msgstr "&Nu" msgid "No to a&ll" msgstr "Nu la to&ate" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Continuă" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index ca7b09f76..97d4a3dd7 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -132,6 +132,23 @@ msgstr "Сравнение размеров блока" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "Игнорировать отличие цвета (порог цветоразличения)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Нет" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -147,7 +164,7 @@ msgstr "Следующая страница" msgid "&Active Pane" msgstr "Активная панель" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Масштаб" @@ -173,11 +190,6 @@ msgstr "Обычный\tCtrl+*" msgid "&Overlay" msgstr "Оверлей (наложение)" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Нет" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -267,7 +279,7 @@ msgstr "В&ыход" msgid "&Edit" msgstr "&Правка" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Настройки..." @@ -297,7 +309,7 @@ msgstr "&Крупные значки" msgid "&Huge" msgstr "&Огромные значки" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Строка состояния" @@ -312,7 +324,7 @@ msgstr "Панель вкладок" msgid "&Tools" msgstr "&Инструменты" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Фильтры..." @@ -672,7 +684,7 @@ msgstr "Сохранить посередине как..." msgid "Save &Right As..." msgstr "Сохранить справа как..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Печать..." @@ -866,7 +878,7 @@ msgstr "&9 строк" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Переключить все и 0-9 строк\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Заблокировать панели" @@ -1161,7 +1173,7 @@ msgstr "Все" msgid "Re&name" msgstr "&Переименовать" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Скрыть" @@ -1880,7 +1892,7 @@ msgstr "Формат" msgid "St&yle:" msgstr "Стиль:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "Контекст:" @@ -1995,7 +2007,7 @@ msgstr "К чему" msgid "Li&ne" msgstr "&Строке" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Отличию" @@ -2807,7 +2819,7 @@ msgstr "Изображение" msgid "Image File &Patterns:" msgstr "Шаблоны файлов изображений:" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "Шестнадцатеричный вид" @@ -2976,7 +2988,7 @@ msgstr "&Нет" msgid "No to a&ll" msgstr "Нет д&ля всех" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Про&должить" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index bd176cc4b..fd8b172ce 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -128,6 +128,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Ништа" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -143,7 +160,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Повећај" @@ -169,11 +186,6 @@ msgstr "Изворно\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Ништа" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -263,7 +275,7 @@ msgstr "Изла&з" msgid "&Edit" msgstr "Ур&еди" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Изб&ор..." @@ -293,7 +305,7 @@ msgstr "&Велика" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Статусна трака" @@ -308,7 +320,7 @@ msgstr "Тра&ка језичака" msgid "&Tools" msgstr "Алатке" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Филтери..." @@ -668,7 +680,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Одштампај..." @@ -861,7 +873,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Закључај табле" @@ -1155,7 +1167,7 @@ msgstr "" msgid "Re&name" msgstr "Преиме&нуј" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Сакриј ставке" @@ -1862,7 +1874,7 @@ msgstr "&Облик" msgid "St&yle:" msgstr "На&чин" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "У &оквиру" @@ -1975,7 +1987,7 @@ msgstr "У датотеци" msgid "Li&ne" msgstr "Ре&д" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Раз&лика" @@ -2787,7 +2799,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2956,7 +2968,7 @@ msgstr "&Не" msgid "No to a&ll" msgstr "Не за с&ве" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Наста&ви" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index df3b7c4ea..f8a033bba 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -126,6 +126,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "කිසිත් නැත" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -141,7 +158,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "විශාල කරන්න" @@ -167,11 +184,6 @@ msgstr "සමාන්‍ය\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "කිසිත් නැත" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -261,7 +273,7 @@ msgstr " නික්මීම" msgid "&Edit" msgstr "&සංස්කරණය කරන්න" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&විකල්පයන්..." @@ -291,7 +303,7 @@ msgstr "විශාල" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Status Bar" @@ -306,7 +318,7 @@ msgstr "Ta&b Bar" msgid "&Tools" msgstr "මෙවලම්" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filters..." @@ -666,7 +678,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "මුද්‍රණය කරන්න..." @@ -860,7 +872,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Lock Panes" @@ -1155,7 +1167,7 @@ msgstr "" msgid "Re&name" msgstr "නැවත නම් කරන්න" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "D&issimuler l'élément(s)" @@ -1874,7 +1886,7 @@ msgstr "&සැකසීම" msgid "St&yle:" msgstr "විලාසය:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&පෙළ යෙදුම:" @@ -1989,7 +2001,7 @@ msgstr "කුමක් වෙත යන්නද" msgid "Li&ne" msgstr "පේළිය" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "වෙනස" @@ -2799,7 +2811,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2968,7 +2980,7 @@ msgstr "&නැත" msgid "No to a&ll" msgstr "සමස්ථයටම නැත" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&පවත්වාගෙන යන්න" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index a8a20ba79..e2a0f5d6e 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -129,6 +129,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "Žiad&ny" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -144,7 +161,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Priblíženie" @@ -170,11 +187,6 @@ msgstr "&Normálna veľkosť\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "Žiad&ny" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -264,7 +276,7 @@ msgstr "&Koniec" msgid "&Edit" msgstr "Úpr&avy" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Nastavenia" @@ -294,7 +306,7 @@ msgstr "&Veľký" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Stavový riadok" @@ -309,7 +321,7 @@ msgstr "Panel &záložiek" msgid "&Tools" msgstr "&Nástroje" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtre..." @@ -669,7 +681,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Tlačiť..." @@ -863,7 +875,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "&Zamknúť panely" @@ -1158,7 +1170,7 @@ msgstr "" msgid "Re&name" msgstr "Preme&novať" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Skryť položky" @@ -1877,7 +1889,7 @@ msgstr "&Formát" msgid "St&yle:" msgstr "Š&týl:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Kontext:" @@ -1992,7 +2004,7 @@ msgstr "Prejsť na..." msgid "Li&ne" msgstr "Riad&ok" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Rozdiel" @@ -2804,7 +2816,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2973,7 +2985,7 @@ msgstr "&Nie" msgid "No to a&ll" msgstr "Nie pre &všetky" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Po&kračovať" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 3150c5249..5c1d2f4fd 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -130,6 +130,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Brez" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -145,7 +162,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Po&večaj" @@ -171,11 +188,6 @@ msgstr "&Izvorna velikost\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Brez" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -265,7 +277,7 @@ msgstr "I&zhod" msgid "&Edit" msgstr "&Uredi" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Možnosti ..." @@ -295,7 +307,7 @@ msgstr "&Velike ikone" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Statusna vrstica" @@ -310,7 +322,7 @@ msgstr "Ta&bulatorska vrstica" msgid "&Tools" msgstr "&Orodja" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtri ..." @@ -670,7 +682,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Natisni ..." @@ -864,7 +876,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Za&kleni okvirja" @@ -1159,7 +1171,7 @@ msgstr "" msgid "Re&name" msgstr "P&reimenuj" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Skrij predmete" @@ -1880,7 +1892,7 @@ msgstr "&Format" msgid "St&yle:" msgstr "St&il" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Vsebina" @@ -1995,7 +2007,7 @@ msgstr "Pojdi na" msgid "Li&ne" msgstr "&Vrstica" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Razlika" @@ -2807,7 +2819,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2976,7 +2988,7 @@ msgstr "&Ne" msgid "No to a&ll" msgstr "Ne za &vse" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Nadaljuj" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index cd90165b3..b33d5cbe7 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -131,6 +131,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Ninguno" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -146,7 +163,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -172,11 +189,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Ninguno" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -266,7 +278,7 @@ msgstr "&Salir" msgid "&Edit" msgstr "&Editar" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Conf&iguración..." @@ -296,7 +308,7 @@ msgstr "&Grande" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Barra de &estado" @@ -311,7 +323,7 @@ msgstr "&Pestañas" msgid "&Tools" msgstr "&Herramientas" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Filtros..." @@ -671,7 +683,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Imprimir..." @@ -865,7 +877,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "B&loquear paneles" @@ -1160,7 +1172,7 @@ msgstr "" msgid "Re&name" msgstr "Re&nombrar" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Ocultar elementos" @@ -1879,7 +1891,7 @@ msgstr "&Formato" msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "&Contexto:" @@ -1994,7 +2006,7 @@ msgstr "Objetivo" msgid "Li&ne" msgstr "Lí&nea" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Diferencia" @@ -2806,7 +2818,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2975,7 +2987,7 @@ msgstr "&No" msgid "No to a&ll" msgstr "No a &todo" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Continuar" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index dfe5ba0d9..0026bd316 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -131,6 +131,23 @@ msgstr "SkillnadsBlockStorlek" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "Åsidosätt FärgSkillnader (FärgSkillnadsTröskel)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "Ingen" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -146,7 +163,7 @@ msgstr "Nästa Sida" msgid "&Active Pane" msgstr "Gällande Ruta" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Zoom" @@ -172,11 +189,6 @@ msgstr "Normal\tCtrl+*" msgid "&Overlay" msgstr "Överlägg" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "Ingen" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -266,7 +278,7 @@ msgstr "Avsluta" msgid "&Edit" msgstr "Redigera" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "Inställningar ..." @@ -296,7 +308,7 @@ msgstr "Stor" msgid "&Huge" msgstr "Enorm" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Statusfält" @@ -311,7 +323,7 @@ msgstr "Filrad" msgid "&Tools" msgstr "Verktyg" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "Filter ..." @@ -671,7 +683,7 @@ msgstr "Spara Mitter som ..." msgid "Save &Right As..." msgstr "Spara Höger som ..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "Skriv ut ..." @@ -865,7 +877,7 @@ msgstr "9 Rader" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Växla Samtliga/0-9 Rader\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Lås Placering" @@ -1160,7 +1172,7 @@ msgstr "Samtliga" msgid "Re&name" msgstr "Byt namn" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Dölj objekt" @@ -1882,7 +1894,7 @@ msgstr "Format" msgid "St&yle:" msgstr "Typ:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "Sammanh.:" @@ -1997,7 +2009,7 @@ msgstr "Gå till vad" msgid "Li&ne" msgstr "Rad" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "Skillnad" @@ -2815,7 +2827,7 @@ msgstr "Avbild" msgid "Image File &Patterns:" msgstr "AvbildsFilmönster:" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "Hex Visning" @@ -3005,7 +3017,7 @@ msgstr "Nej" msgid "No to a&ll" msgstr "Nej till allt" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Fortsätt" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 937a674fd..a4b5ac08b 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -130,6 +130,23 @@ msgstr "Farklılık &Bloğu Boyutu" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "&Renk Farkı Yok Sayılsın (Renk Farkı Eşiği)" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "&Yok" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -145,7 +162,7 @@ msgstr "So&nraki Sayfa" msgid "&Active Pane" msgstr "Etkin S&ayfa" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "&Yakınlaştır" @@ -171,11 +188,6 @@ msgstr "&Normal\tCtrl+*" msgid "&Overlay" msgstr "&Kaplama" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "&Yok" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -265,7 +277,7 @@ msgstr "Çı&kış" msgid "&Edit" msgstr "Düz&enle" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Ayarlar..." @@ -295,7 +307,7 @@ msgstr "&Büyük" msgid "&Huge" msgstr "Çok &Büyük" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "&Durum Çubuğu" @@ -310,7 +322,7 @@ msgstr "&Sekme Çubuğu" msgid "&Tools" msgstr "&Araçlar" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Süzgeçler..." @@ -670,7 +682,7 @@ msgstr "&Ortayı Farklı Kaydet..." msgid "Save &Right As..." msgstr "Sağı Fa&rklı Kaydet..." -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Yazdır..." @@ -864,7 +876,7 @@ msgstr "&9 Satır" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "&Tümünü ve 0-9 Satırları Değiştir\tCtrl+D" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "Pano&lar Kilitlensin" @@ -1159,7 +1171,7 @@ msgstr "&Tümü" msgid "Re&name" msgstr "Ye&niden Adlandır" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "Ögeleri &Gizle" @@ -1880,7 +1892,7 @@ msgstr "&Biçim" msgid "St&yle:" msgstr "Biç&em:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "B&ağlam:" @@ -1995,7 +2007,7 @@ msgstr "Şuna Git" msgid "Li&ne" msgstr "&Satır" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Farklılık" @@ -2807,7 +2819,7 @@ msgstr "Görsel" msgid "Image File &Patterns:" msgstr "Görsel Dosyası &Uzantıları:" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "Onaltılık &Görünüm" @@ -2983,7 +2995,7 @@ msgstr "&Hayır" msgid "No to a&ll" msgstr "Tü&müne Hayır" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "&Devam" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index de3f4ade5..1b16baff5 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -130,6 +130,23 @@ msgstr "" msgid "&Ignore Color Difference (Color Distance Threshold)" msgstr "" +#: Merge.rc:1A002B9B +msgid "Ins&ertion/Deletion Detection" +msgstr "" + +#: Merge.rc:43017E43 +#, c-format +msgid "&None" +msgstr "Вим&кнути" + +#: Merge.rc:4DB19837 +msgid "&Vertical" +msgstr "" + +#: Merge.rc:27AC6D7E +msgid "&Horizontal" +msgstr "" + #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" @@ -145,7 +162,7 @@ msgstr "" msgid "&Active Pane" msgstr "" -#: Merge.rc:43017E43 +#: Merge.rc:43017E44 #, c-format msgid "&Zoom" msgstr "Ма&сштаб" @@ -171,11 +188,6 @@ msgstr "&Звичайний\tCtrl+*" msgid "&Overlay" msgstr "" -#: Merge.rc:43017E44 -#, c-format -msgid "&None" -msgstr "Вим&кнути" - #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" @@ -265,7 +277,7 @@ msgstr "В&ихід" msgid "&Edit" msgstr "&Редакція" -#: Merge.rc:27AC6D7E +#: Merge.rc:27AC6D7F #, c-format msgid "&Options..." msgstr "&Налаштування..." @@ -295,7 +307,7 @@ msgstr "&Великі піктограми" msgid "&Huge" msgstr "" -#: Merge.rc:27AC6D7F +#: Merge.rc:27AC6D80 #, c-format msgid "&Status Bar" msgstr "Ря&док стану" @@ -310,7 +322,7 @@ msgstr "Панель &закладок" msgid "&Tools" msgstr "&Сервіс" -#: Merge.rc:27AC6D80 +#: Merge.rc:27AC6D81 #, c-format msgid "&Filters..." msgstr "&Фільтри..." @@ -670,7 +682,7 @@ msgstr "" msgid "Save &Right As..." msgstr "" -#: Merge.rc:4DB19837 +#: Merge.rc:4DB19838 #, c-format msgid "&Print..." msgstr "&Друк..." @@ -864,7 +876,7 @@ msgstr "" msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "" -#: Merge.rc:27AC6D81 +#: Merge.rc:27AC6D82 #, c-format msgid "&Lock Panes" msgstr "За&блокувати панелі" @@ -1159,7 +1171,7 @@ msgstr "" msgid "Re&name" msgstr "&Перейменувати" -#: Merge.rc:27AC6D82 +#: Merge.rc:27AC6D83 #, c-format msgid "&Hide Items" msgstr "&Сховати" @@ -1878,7 +1890,7 @@ msgstr "Формат" msgid "St&yle:" msgstr "Стиль:" -#: Merge.rc:4DB19838 +#: Merge.rc:4DB19839 #, c-format msgid "&Context:" msgstr "Контекст:" @@ -1993,7 +2005,7 @@ msgstr "До чого" msgid "Li&ne" msgstr "&Рядок" -#: Merge.rc:27AC6D83 +#: Merge.rc:27AC6D84 #, c-format msgid "&Difference" msgstr "&Відмінність" @@ -2805,7 +2817,7 @@ msgstr "" msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:4DB19839 +#: Merge.rc:4DB1983A #, c-format msgid "&Hex View" msgstr "" @@ -2974,7 +2986,7 @@ msgstr "&Ні" msgid "No to a&ll" msgstr "Ні д&ля всіх" -#: Merge.rc:4DB1983A +#: Merge.rc:4DB1983B #, c-format msgid "&Continue" msgstr "Про&довжити" -- 2.11.0