From: Takashi Sawanaka Date: Sun, 12 Jun 2016 05:28:31 +0000 (+0900) Subject: Add [View]/[Toolbar]/[Huge] menu item X-Git-Tag: 2.16.4+-jp-10~678 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=48bc24e2859d69e4a348504865b2cb8954ab92f6;p=winmerge-jp%2Fwinmerge-jp.git Add [View]/[Toolbar]/[Huge] menu item --- diff --git a/Src/Common/Bitmap.cpp b/Src/Common/Bitmap.cpp index 33fc510ab..149efa2ca 100644 --- a/Src/Common/Bitmap.cpp +++ b/Src/Common/Bitmap.cpp @@ -127,3 +127,22 @@ CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap) dcMem.DeleteDC(); return pBitmapDarkened; } + +CBitmap *StretchBitmap(CBitmap *pBitmap, int cx, int cy) +{ + CDC dcMemSrc, dcMemDst, dcScreen; + dcScreen.Attach(::GetDC(NULL)); + BITMAP bm; + dcMemSrc.CreateCompatibleDC(&dcScreen); + dcMemDst.CreateCompatibleDC(&dcScreen); + CBitmap *pBitmapStretched = new CBitmap(); + pBitmap->GetObject(sizeof(bm), &bm); + pBitmapStretched->CreateCompatibleBitmap(&dcScreen, cx, cy); + CBitmap *pOldBitmapSrc = dcMemSrc.SelectObject(pBitmap); + CBitmap *pOldBitmapDst = dcMemDst.SelectObject(pBitmapStretched); + dcMemDst.StretchBlt(0, 0, cx, cy, &dcMemSrc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + dcMemSrc.SelectObject(pOldBitmapSrc); + dcMemDst.SelectObject(pOldBitmapDst); + ::ReleaseDC(NULL, dcScreen.Detach()); + return pBitmapStretched; +} diff --git a/Src/Common/Bitmap.h b/Src/Common/Bitmap.h index 8e4ccb5ff..2f2d5067a 100644 --- a/Src/Common/Bitmap.h +++ b/Src/Common/Bitmap.h @@ -13,3 +13,4 @@ class CRect; CBitmap *CopyRectToBitmap(CDC *pDC, const CRect & rect); void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap); CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap); +CBitmap *StretchBitmap(CBitmap *pBitmap, int cx, int cy); diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index ce8b722cb..ed621f054 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -79,6 +79,7 @@ #include "DropHandler.h" #include "LanguageSelect.h" #include "version.h" +#include "Bitmap.h" using std::vector; using boost::begin; @@ -98,7 +99,7 @@ using boost::end; #define new DEBUG_NEW #endif -static void LoadToolbarImageList(CMainFrame::TOOLBAR_SIZE size, UINT nIDResource, CImageList& ImgList); +static void LoadToolbarImageList(int imageWidth, UINT nIDResource, CImageList& ImgList); static CPtrList &GetDocList(CMultiDocTemplate *pTemplate); template DocClass * GetMergeDocForDiff(CMultiDocTemplate *pTemplate, CDirDoc *pDirDoc, int nFiles); @@ -227,12 +228,8 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd) ON_WM_TIMER() ON_WM_ACTIVATE() ON_WM_ACTIVATEAPP() - ON_COMMAND(ID_TOOLBAR_NONE, OnToolbarNone) - ON_UPDATE_COMMAND_UI(ID_TOOLBAR_NONE, OnUpdateToolbarNone) - ON_COMMAND(ID_TOOLBAR_SMALL, OnToolbarSmall) - ON_UPDATE_COMMAND_UI(ID_TOOLBAR_SMALL, OnUpdateToolbarSmall) - ON_COMMAND(ID_TOOLBAR_BIG, OnToolbarBig) - ON_UPDATE_COMMAND_UI(ID_TOOLBAR_BIG, OnUpdateToolbarBig) + ON_COMMAND_RANGE(ID_TOOLBAR_NONE, ID_TOOLBAR_HUGE, OnToolbarSize) + ON_UPDATE_COMMAND_UI_RANGE(ID_TOOLBAR_NONE, ID_TOOLBAR_HUGE, OnUpdateToolbarSize) ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText) ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText) ON_COMMAND(ID_HELP_CHECKFORUPDATES, OnHelpCheckForUpdates) @@ -2099,29 +2096,18 @@ BOOL CMainFrame::CreateToolbar() /** @brief Load toolbar images from the resource. */ void CMainFrame::LoadToolbarImages() { - int toolbarSize = GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE); + const int toolbarSize = 16 << GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE); CToolBarCtrl& BarCtrl = m_wndToolBar.GetToolBarCtrl(); m_ToolbarImages[TOOLBAR_IMAGES_ENABLED].DeleteImageList(); m_ToolbarImages[TOOLBAR_IMAGES_DISABLED].DeleteImageList(); CSize sizeButton(0, 0); - if (toolbarSize == 0) - { - LoadToolbarImageList(TOOLBAR_SIZE_16x16, IDB_TOOLBAR_ENABLED, - m_ToolbarImages[TOOLBAR_IMAGES_ENABLED]); - LoadToolbarImageList(TOOLBAR_SIZE_16x16, IDB_TOOLBAR_DISABLED, - m_ToolbarImages[TOOLBAR_IMAGES_DISABLED]); - sizeButton = CSize(24, 24); - } - else if (toolbarSize == 1) - { - LoadToolbarImageList(TOOLBAR_SIZE_32x32, IDB_TOOLBAR_ENABLED32, - m_ToolbarImages[TOOLBAR_IMAGES_ENABLED]); - LoadToolbarImageList(TOOLBAR_SIZE_32x32, IDB_TOOLBAR_DISABLED32, - m_ToolbarImages[TOOLBAR_IMAGES_DISABLED]); - sizeButton = CSize(40, 40); - } + LoadToolbarImageList(toolbarSize, toolbarSize <= 16 ? IDB_TOOLBAR_ENABLED : IDB_TOOLBAR_ENABLED32, + m_ToolbarImages[TOOLBAR_IMAGES_ENABLED]); + LoadToolbarImageList(toolbarSize, toolbarSize <= 16 ? IDB_TOOLBAR_DISABLED : IDB_TOOLBAR_DISABLED32, + m_ToolbarImages[TOOLBAR_IMAGES_DISABLED]); + sizeButton = CSize(toolbarSize + 8, toolbarSize + 8); BarCtrl.SetButtonSize(sizeButton); BarCtrl.SetImageList(&m_ToolbarImages[TOOLBAR_IMAGES_ENABLED]); @@ -2143,35 +2129,23 @@ void CMainFrame::LoadToolbarImages() */ static void LoadHiColImageList(UINT nIDResource, int nWidth, int nHeight, int nCount, CImageList& ImgList, COLORREF crMask = RGB(255,0,255)) { - CBitmap bm; + CBitmap bm, *pbmpStreched; VERIFY(bm.LoadBitmap(nIDResource)); + pbmpStreched = StretchBitmap(&bm, nWidth * nCount, nHeight); VERIFY(ImgList.Create(nWidth, nHeight, ILC_COLORDDB|ILC_MASK, nCount, 0)); - int nIndex = ImgList.Add(&bm, crMask); + int nIndex = ImgList.Add(pbmpStreched, crMask); ASSERT(-1 != nIndex); + delete pbmpStreched; } /** * @brief Load toolbar image list. */ -static void LoadToolbarImageList(CMainFrame::TOOLBAR_SIZE size, UINT nIDResource, +static void LoadToolbarImageList(int imageWidth, UINT nIDResource, CImageList& ImgList) { const int ImageCount = 22; - int imageWidth = 0; - int imageHeight = 0; - - switch (size) - { - case CMainFrame::TOOLBAR_SIZE_16x16: - imageWidth = 16; - imageHeight = 15; - break; - case CMainFrame::TOOLBAR_SIZE_32x32: - imageWidth = 32; - imageHeight = 31; - break; - } - + const int imageHeight = imageWidth - 1; LoadHiColImageList(nIDResource, imageWidth, imageHeight, ImageCount, ImgList); } @@ -2186,56 +2160,32 @@ void CMainFrame::OnUpdateFrameTitle(BOOL bAddToTitle) m_wndTabBar.UpdateTabs(); } -/** @brief Hide the toolbar. */ -void CMainFrame::OnToolbarNone() -{ - GetOptionsMgr()->SaveOption(OPT_SHOW_TOOLBAR, false); - CMDIFrameWnd::ShowControlBar(&m_wndToolBar, FALSE, 0); -} - -/** @brief Update menuitem for hidden toolbar. */ -void CMainFrame::OnUpdateToolbarNone(CCmdUI* pCmdUI) +/** @brief Show none/small/big/huge toolbar. */ +void CMainFrame::OnToolbarSize(UINT id) { - bool enabled = GetOptionsMgr()->GetBool(OPT_SHOW_TOOLBAR); - pCmdUI->SetRadio(!enabled); -} - -/** @brief Show small toolbar. */ -void CMainFrame::OnToolbarSmall() -{ - GetOptionsMgr()->SaveOption(OPT_SHOW_TOOLBAR, true); - GetOptionsMgr()->SaveOption(OPT_TOOLBAR_SIZE, 0); - - LoadToolbarImages(); - - CMDIFrameWnd::ShowControlBar(&m_wndToolBar, TRUE, 0); -} - -/** @brief Update menuitem for small toolbar. */ -void CMainFrame::OnUpdateToolbarSmall(CCmdUI* pCmdUI) -{ - bool enabled = GetOptionsMgr()->GetBool(OPT_SHOW_TOOLBAR); - int toolbar = GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE); - pCmdUI->SetRadio(enabled && toolbar == 0); -} - -/** @brief Show big toolbar. */ -void CMainFrame::OnToolbarBig() -{ - GetOptionsMgr()->SaveOption(OPT_SHOW_TOOLBAR, true); - GetOptionsMgr()->SaveOption(OPT_TOOLBAR_SIZE, 1); + if (id == ID_TOOLBAR_NONE) + { + GetOptionsMgr()->SaveOption(OPT_SHOW_TOOLBAR, false); + CMDIFrameWnd::ShowControlBar(&m_wndToolBar, false, 0); + } + else + { + GetOptionsMgr()->SaveOption(OPT_SHOW_TOOLBAR, true); + GetOptionsMgr()->SaveOption(OPT_TOOLBAR_SIZE, id - ID_TOOLBAR_SMALL); - LoadToolbarImages(); + LoadToolbarImages(); - CMDIFrameWnd::ShowControlBar(&m_wndToolBar, TRUE, 0); + CMDIFrameWnd::ShowControlBar(&m_wndToolBar, true, 0); + } } -/** @brief Update menuitem for big toolbar. */ -void CMainFrame::OnUpdateToolbarBig(CCmdUI* pCmdUI) +/** @brief Show none/small/big/huge toolbar. */ +void CMainFrame::OnUpdateToolbarSize(CCmdUI *pCmdUI) { - bool enabled = GetOptionsMgr()->GetBool(OPT_SHOW_TOOLBAR); - int toolbar = GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE); - pCmdUI->SetRadio(enabled && toolbar == 1); + if (!GetOptionsMgr()->GetBool(OPT_SHOW_TOOLBAR)) + pCmdUI->SetRadio(pCmdUI->m_nID == ID_TOOLBAR_NONE); + else + pCmdUI->SetRadio((pCmdUI->m_nID - ID_TOOLBAR_SMALL) == GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE)); } /** @brief Lang aware version of CFrameWnd::OnToolTipText() */ diff --git a/Src/MainFrm.h b/Src/MainFrm.h index adeb4f111..1252e1d49 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -141,13 +141,6 @@ public: BOOL m_bFirstTime; /**< If first time frame activated, get pos from reg */ BOOL m_bFlashing; /**< Window is flashing. */ - /** @brief Possible toolbar image sizes. */ - enum TOOLBAR_SIZE - { - TOOLBAR_SIZE_16x16, - TOOLBAR_SIZE_32x32, - }; - // Implementation data protected: @@ -253,12 +246,8 @@ protected: #else afx_msg void OnActivateApp(BOOL bActive, HTASK hTask); #endif - afx_msg void OnToolbarNone(); - afx_msg void OnUpdateToolbarNone(CCmdUI* pCmdUI); - afx_msg void OnToolbarSmall(); - afx_msg void OnUpdateToolbarSmall(CCmdUI* pCmdUI); - afx_msg void OnToolbarBig(); - afx_msg void OnUpdateToolbarBig(CCmdUI* pCmdUI); + afx_msg void OnToolbarSize(UINT id); + afx_msg void OnUpdateToolbarSize(CCmdUI* pCmdUI); afx_msg BOOL OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnHelpCheckForUpdates(); afx_msg void OnUpdateHelpCheckForUpdates(CCmdUI* pCmdUI); diff --git a/Src/Merge.rc b/Src/Merge.rc index b7e40271b..889d1a9d5 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -172,6 +172,7 @@ BEGIN MENUITEM "&None", ID_TOOLBAR_NONE MENUITEM "&Small", ID_TOOLBAR_SMALL MENUITEM "&Big", ID_TOOLBAR_BIG + MENUITEM "&Huge", ID_TOOLBAR_HUGE END MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR @@ -278,6 +279,7 @@ BEGIN MENUITEM "&None", ID_TOOLBAR_NONE MENUITEM "&Small", ID_TOOLBAR_SMALL MENUITEM "&Big", ID_TOOLBAR_BIG + MENUITEM "&Huge", ID_TOOLBAR_HUGE END MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR @@ -479,6 +481,7 @@ BEGIN MENUITEM "&None", ID_TOOLBAR_NONE MENUITEM "&Small", ID_TOOLBAR_SMALL MENUITEM "&Big", ID_TOOLBAR_BIG + MENUITEM "&Huge", ID_TOOLBAR_HUGE END MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR diff --git a/Src/resource.h b/Src/resource.h index 9ad21792f..762ff8f59 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -1118,7 +1118,8 @@ #define ID_TOOLBAR_NONE 33194 #define ID_TOOLBAR_SMALL 33195 #define ID_TOOLBAR_BIG 33196 -#define ID_VIEW_RESIZE_PANES 33197 +#define ID_TOOLBAR_HUGE 33197 +#define ID_VIEW_RESIZE_PANES 33198 #define ID_VIEW_ZOOMIN 33199 #define ID_VIEW_ZOOMOUT 33200 #define ID_VIEW_ZOOMNORMAL 33202 diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 6327b28fb..c73d2d35b 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -253,6 +253,11 @@ msgstr "&Txikia" msgid "&Big" msgstr "&Handia" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -353,7 +358,7 @@ msgstr "Eradonki &Zutia" msgid "&Cascade" msgstr "&Urjauzia" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Laguntza" @@ -1019,7 +1024,7 @@ msgstr "Eskuina Ezkerrera (%1 %2-tik)" msgid "Right to... (%1 of %2)" msgstr "Eskuina hona... (%1 %2-tik)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Mugitu" @@ -1029,7 +1034,7 @@ msgstr "&Mugitu" msgid "&Delete" msgstr "&Ezabatu" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "Ezker&ra" @@ -1044,7 +1049,7 @@ msgstr "" msgid "&Right" msgstr "&E&skuina" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Biak" @@ -1754,7 +1759,7 @@ msgstr "&1 Agiria:" msgid "File&2:" msgstr "&2 Agiria:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "A&ldaketa" @@ -2433,7 +2438,7 @@ msgstr "&Agiritegi Izena" msgid "Result:" msgstr "Emaitza:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Azterketa" @@ -2880,7 +2885,7 @@ msgstr "Ez gu&ztiari" msgid "&Continue" msgstr "&Jarraitu" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Jauzi" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index e06175a07..cf572e6d8 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -252,6 +252,11 @@ msgstr "&Pequeno" msgid "&Big" msgstr "&Grande" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -352,7 +357,7 @@ msgstr "Lado a Lado &Verticalmente" msgid "&Cascade" msgstr "&Em Cascata" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -1018,7 +1023,7 @@ msgstr "Direita para a Esquerda (%1 de %2)" msgid "Right to... (%1 of %2)" msgstr "Direita para... (%1 de %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Mover" @@ -1028,7 +1033,7 @@ msgstr "&Mover" msgid "&Delete" msgstr "&Apagar" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Esquerda" @@ -1043,7 +1048,7 @@ msgstr "" msgid "&Right" msgstr "&Direita" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Ambos" @@ -1753,7 +1758,7 @@ msgstr "Arquivo&1:" msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Trocar" @@ -2432,7 +2437,7 @@ msgstr "&Nome da Pasta" msgid "Result:" msgstr "Resultado:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Teste" @@ -2879,7 +2884,7 @@ msgstr "N msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Pular" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 9cb0a2891..614e71445 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -250,6 +250,11 @@ msgstr "& msgid "&Big" msgstr "&Ãîëÿì" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr " msgid "&Cascade" msgstr "Ïîäðåäè &êàñêàäíî" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Ïîìîù" @@ -1016,7 +1021,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "Äåñåí êúì... (%1 îò %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Ïðåìåñòè" @@ -1026,7 +1031,7 @@ msgstr "& msgid "&Delete" msgstr "&Èçòðèé" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Îò ëÿâî" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Îò äÿñíî" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Äâåòå" @@ -1751,7 +1756,7 @@ msgstr " msgid "File&2:" msgstr "Ôàéë&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Ðàçìåíè" @@ -2426,7 +2431,7 @@ msgstr "& msgid "Result:" msgstr "Ðåçóëòàò:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Òåñòâàé" @@ -2841,7 +2846,7 @@ msgstr " msgid "&Continue" msgstr "&Ïðîäúëæè" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Ïðåñêî÷è" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 64ed920cd..a7ffe42f7 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -249,6 +249,11 @@ msgstr "&Petita" msgid "&Big" msgstr "&Gran" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -349,7 +354,7 @@ msgstr "Finestres en mosaic &vertical" msgid "&Cascade" msgstr "Finestres en &cascada" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -1015,7 +1020,7 @@ msgstr "Dreta a esquerra (%1 de %2)" msgid "Right to... (%1 of %2)" msgstr "Dreta a... (%1 de %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Mou" @@ -1025,7 +1030,7 @@ msgstr "&Mou" msgid "&Delete" msgstr "&Suprimeix" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "De l'&esquerra" @@ -1040,7 +1045,7 @@ msgstr "" msgid "&Right" msgstr "De la &dreta" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "D'&ambdós costats" @@ -1750,7 +1755,7 @@ msgstr "Fitxer &1:" msgid "File&2:" msgstr "Fitxer &2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Inter&canvia" @@ -2425,7 +2430,7 @@ msgstr "&Nom de la carpeta" msgid "Result:" msgstr "Resultat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Prova" @@ -2840,7 +2845,7 @@ msgstr "No a t&ot" msgid "&Continue" msgstr "&Continua" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Omet" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index e2ad26797..4a5da04dd 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -250,6 +250,11 @@ msgstr "С(&S)" msgid "&Big" msgstr "´ó(&B)" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr " msgid "&Cascade" msgstr "²ãµþ(&C)" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "°ïÖú(&H)" @@ -1016,7 +1021,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "ÓҲൽ... (%1 ¹²%2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "Òƶ¯(&M)" @@ -1026,7 +1031,7 @@ msgstr " msgid "&Delete" msgstr "ɾ³ý(&D)" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "×ó²à(&L)" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "ÓÒ²à(&R)" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "Á½²à(&B)" @@ -1751,7 +1756,7 @@ msgstr " msgid "File&2:" msgstr "Îļþ&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "ÉÏϽ»»»(&S)" @@ -2426,7 +2431,7 @@ msgstr " msgid "Result:" msgstr "½á¹û:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "²âÊÔ(&T)" @@ -2841,7 +2846,7 @@ msgstr "È« msgid "&Continue" msgstr "¼ÌÐø(&C)" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Ìø¹ý(&S)" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 259b8ee70..638d9e7cc 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -250,6 +250,11 @@ msgstr " msgid "&Big" msgstr "¤j¹Ï¥Ü(&B)" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -352,7 +357,7 @@ msgstr " msgid "&Cascade" msgstr "Å|¸m(&C)" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "»¡©ú(&H)" @@ -1022,7 +1027,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "¥kÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "²¾°Ê(&M)" @@ -1032,7 +1037,7 @@ msgstr " msgid "&Delete" msgstr "§R°£(&D)" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "¥ªÃä(&L)" @@ -1047,7 +1052,7 @@ msgstr "" msgid "&Right" msgstr "¥kÃä(&R)" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "¨âÃä(&B)" @@ -1759,7 +1764,7 @@ msgstr " msgid "File&2:" msgstr "ÀÉ®×2(&2)¡G" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "¹ï½Õ(&S)" @@ -2439,7 +2444,7 @@ msgstr " msgid "Result:" msgstr "µ²ªG¡G" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "´ú¸Õ(&T)" @@ -2886,7 +2891,7 @@ msgstr " msgid "&Continue" msgstr "Ä~Äò(&C)" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "²¤¹L(&S)" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index ee7cbdf9b..f10550306 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -250,6 +250,11 @@ msgstr "&Male ikone" msgid "&Big" msgstr "&Velike ikone" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "Okna &okomito" msgid "&Cascade" msgstr "Okna &kaskadno" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Pomoæ" @@ -1016,7 +1021,7 @@ msgstr "Desno do lijevo (%1 od %2)" msgid "Right to... (%1 of %2)" msgstr "Desno do... (%1 od %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Pre&mjesti" @@ -1026,7 +1031,7 @@ msgstr "&Pre&mjesti" msgid "&Delete" msgstr "&Obriši" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&lijevu datoteku" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&desnu datoteku" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Obje" @@ -1751,7 +1756,7 @@ msgstr "&Lijeva dat." msgid "File&2:" msgstr "&Desna dat." -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Obrni D<->L" @@ -2430,7 +2435,7 @@ msgstr "&Naziv mape" msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Test" @@ -2877,7 +2882,7 @@ msgstr "Ne za s&ve" msgid "&Continue" msgstr "&Nastavi" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Izostavi" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index a0b6730c8..998ae0d44 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -250,6 +250,11 @@ msgstr "&Mal msgid "&Big" msgstr "&Velký" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "Vedle sebe &svisle" msgid "&Cascade" msgstr "&Na sebe" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "Nápo&vìda" @@ -1016,7 +1021,7 @@ msgstr "P&rav msgid "Right to... (%1 of %2)" msgstr "Pr&avé do... (%1 z %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "Pø&esunout" @@ -1026,7 +1031,7 @@ msgstr "P msgid "&Delete" msgstr "Odstran&it" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Levé" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "P&ravé" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "O&boje" @@ -1753,7 +1758,7 @@ msgstr "Soubor &1:" msgid "File&2:" msgstr "Soubor &2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Z&amìnit" @@ -2428,7 +2433,7 @@ msgstr "&N msgid "Result:" msgstr "Výsledek:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "Z&kusit" @@ -2843,7 +2848,7 @@ msgstr "Ne v msgid "&Continue" msgstr "Pok&raèovat" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Pøe&skoèit" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index feada2964..c2b5838ef 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -251,6 +251,11 @@ msgstr "&Lille" msgid "&Big" msgstr "&Stor" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -351,7 +356,7 @@ msgstr "&Vertikale vinduer" msgid "&Cascade" msgstr "&Kaskade" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Hjælp" @@ -1017,7 +1022,7 @@ msgstr "H msgid "Right to... (%1 of %2)" msgstr "Højre til... (%1 af %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Flyt" @@ -1027,7 +1032,7 @@ msgstr "&Flyt" msgid "&Delete" msgstr "&Slet" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Venstre" @@ -1042,7 +1047,7 @@ msgstr "" msgid "&Right" msgstr "&Højre" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Begge" @@ -1756,7 +1761,7 @@ msgstr "Fil&1:" msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Byt" @@ -2437,7 +2442,7 @@ msgstr "&Mappenavn" msgid "Result:" msgstr "Resultater:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Test" @@ -2892,7 +2897,7 @@ msgstr "Nej til a&lle" msgid "&Continue" msgstr "&Fortsæt" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Spring over" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index c0c74ac18..888ab35df 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -252,6 +252,11 @@ msgstr "Klein" msgid "&Big" msgstr "Groot" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -352,7 +357,7 @@ msgstr "&Verticaal verdelen" msgid "&Cascade" msgstr "&Trapsgewijs" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Help" @@ -1018,7 +1023,7 @@ msgstr "Van rechts naar links (%1 van %2)" msgid "Right to... (%1 of %2)" msgstr "Van rechts naar... (%1 van %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Verplaatsen" @@ -1028,7 +1033,7 @@ msgstr "&Verplaatsen" msgid "&Delete" msgstr "Ver&wijderen" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Links" @@ -1043,7 +1048,7 @@ msgstr "" msgid "&Right" msgstr "&Rechts" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Beide" @@ -1757,7 +1762,7 @@ msgstr "Bestand&1:" msgid "File&2:" msgstr "Bestand&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Wisselen" @@ -2438,7 +2443,7 @@ msgstr "Mapnaam" msgid "Result:" msgstr "Resultaat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Test" @@ -2893,7 +2898,7 @@ msgstr "Nee op a&lles" msgid "&Continue" msgstr "&Doorgaan" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Overslaan" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 978a954d5..5f4d4d16c 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2016-05-29 20:02+0000\n" +"POT-Creation-Date: 2016-06-12 12:11+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -246,6 +246,11 @@ msgstr "" msgid "&Big" msgstr "" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -346,7 +351,7 @@ msgstr "" msgid "&Cascade" msgstr "" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "" @@ -1012,7 +1017,7 @@ msgstr "" msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "" @@ -1022,7 +1027,7 @@ msgstr "" msgid "&Delete" msgstr "" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "" @@ -1037,7 +1042,7 @@ msgstr "" msgid "&Right" msgstr "" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "" @@ -1747,7 +1752,7 @@ msgstr "" msgid "File&2:" msgstr "" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "" @@ -2422,7 +2427,7 @@ msgstr "" msgid "Result:" msgstr "" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "" @@ -2837,7 +2842,7 @@ msgstr "" msgid "&Continue" msgstr "" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 618497e99..a45eb96a1 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -254,6 +254,11 @@ msgstr "&Petite" msgid "&Big" msgstr "&Grande" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -354,7 +359,7 @@ msgstr "Mosa msgid "&Cascade" msgstr "&Cascade" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "A&ide" @@ -1020,7 +1025,7 @@ msgstr "De droite msgid "Right to... (%1 of %2)" msgstr "De droite vers... (%1 de %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "Dé&placer" @@ -1030,7 +1035,7 @@ msgstr "D msgid "&Delete" msgstr "&Supprimer" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "à &gauche" @@ -1045,7 +1050,7 @@ msgstr "" msgid "&Right" msgstr "à &droite" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "des deu&x côtés" @@ -1755,7 +1760,7 @@ msgstr "Fichier&1:" msgid "File&2:" msgstr "Fichier&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Intervertir" @@ -2434,7 +2439,7 @@ msgstr "&Nom de r msgid "Result:" msgstr "Resultat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Tester" @@ -2881,7 +2886,7 @@ msgstr "Non pour t&out" msgid "&Continue" msgstr "&Continuer" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Ignorer" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index a5d4166cc..f31fd5021 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -250,6 +250,11 @@ msgstr "&Pequena" msgid "&Big" msgstr "&Grande" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "Ordenar &verticalmente" msgid "&Cascade" msgstr "&En fervenza" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Axuda" @@ -1016,7 +1021,7 @@ msgstr "Da dereita para a esquerda (%1 de %2)" msgid "Right to... (%1 of %2)" msgstr "Banda dereita a...(%1 de %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Mover" @@ -1026,7 +1031,7 @@ msgstr "&Mover" msgid "&Delete" msgstr "&Borrar" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Esquerda" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Dereita" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Ambos" @@ -1751,7 +1756,7 @@ msgstr "Arquivo&1:" msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Cambiar" @@ -2431,7 +2436,7 @@ msgstr "&Nome do cartafol" msgid "Result:" msgstr "Resultado:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Probar" @@ -2878,7 +2883,7 @@ msgstr "&Non a todo" msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Saltar" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index e26314e5c..c4debf08e 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -253,6 +253,11 @@ msgstr "K&lein" msgid "&Big" msgstr "&Groß" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -353,7 +358,7 @@ msgstr "&Nebeneinander" msgid "&Cascade" msgstr "Über&lappend" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Hilfe" @@ -1019,7 +1024,7 @@ msgstr "Rechts nach Links (%1 von %2)" msgid "Right to... (%1 of %2)" msgstr "Rechts nach... (%1 von %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Verschieben" @@ -1029,7 +1034,7 @@ msgstr "&Verschieben" msgid "&Delete" msgstr "&Löschen" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Links" @@ -1044,7 +1049,7 @@ msgstr "" msgid "&Right" msgstr "&Rechts" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Beide" @@ -1756,7 +1761,7 @@ msgstr "Datei &1:" msgid "File&2:" msgstr "Datei &2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Ver&tauschen" @@ -2435,7 +2440,7 @@ msgstr "&Ordnername" msgid "Result:" msgstr "Ergebnis:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Testen" @@ -2854,7 +2859,7 @@ msgstr "Nein zu a&llen" msgid "&Continue" msgstr "&Fortsetzen" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Über&springen" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 25d5e71c3..9ad84eb90 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -249,6 +249,11 @@ msgstr " msgid "&Big" msgstr "Ìå&ãÜëç" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -349,7 +354,7 @@ msgstr " msgid "&Cascade" msgstr "ÅðéêÜëõ&øç" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&ÂïÞèåéá" @@ -1015,7 +1020,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "Äåîéü óôï... (%1 áðü %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Ìåôáêßíçóç" @@ -1025,7 +1030,7 @@ msgstr "& msgid "&Delete" msgstr "&ÄéáãñáöÞ" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "Á&ñéóôåñü" @@ -1040,7 +1045,7 @@ msgstr "" msgid "&Right" msgstr "Äå&îéü" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "Áì&öüôåñá" @@ -1750,7 +1755,7 @@ msgstr " msgid "File&2:" msgstr "Áñ÷åßï&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "ÁíôéìåôÜ&èåóç" @@ -2425,7 +2430,7 @@ msgstr " msgid "Result:" msgstr "ÁðïôÝëåóìá:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&ÄïêéìÞ" @@ -2872,7 +2877,7 @@ msgstr " msgid "&Continue" msgstr "&ÓõíÝ÷åéá" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&ÐáñÜëåéøç" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 4b03566fd..488e4e0c2 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -250,6 +250,11 @@ msgstr "Kic&si" msgid "&Big" msgstr "Nagy" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "Elrendez msgid "&Cascade" msgstr "&Felosztás" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Súgó" @@ -1016,7 +1021,7 @@ msgstr "Jobbr msgid "Right to... (%1 of %2)" msgstr "Jobbról... (%1 of %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Áthelyezés" @@ -1026,7 +1031,7 @@ msgstr "& msgid "&Delete" msgstr "&Törlés" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Bal oldal" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Jobb oldal" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Mindkettõ" @@ -1751,7 +1756,7 @@ msgstr "F msgid "File&2:" msgstr "Fájl&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Megfordítás" @@ -2426,7 +2431,7 @@ msgstr "K msgid "Result:" msgstr "Eredmény:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "" @@ -2841,7 +2846,7 @@ msgstr "Nem m&indenre" msgid "&Continue" msgstr "&Folytatás" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Kihagy" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index ce558b425..3913a65e6 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -250,6 +250,11 @@ msgstr "&Piccola" msgid "&Big" msgstr "&Grande" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "Affianca &verticalmente" msgid "&Cascade" msgstr "&Sovrapponi" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&?" @@ -1016,7 +1021,7 @@ msgstr "Da Destra a Sinistra (%1 su %2)" msgid "Right to... (%1 of %2)" msgstr "Destra in... (%1 su %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Sposta" @@ -1026,7 +1031,7 @@ msgstr "&Sposta" msgid "&Delete" msgstr "&Elimina" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Sinistra" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Destra" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Entrambi" @@ -1751,7 +1756,7 @@ msgstr "File&1:" msgid "File&2:" msgstr "File&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Scambia" @@ -2426,7 +2431,7 @@ msgstr "&Nome cartella" msgid "Result:" msgstr "Risultato:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Prova" @@ -2866,7 +2871,7 @@ msgstr "No a t&utto" msgid "&Continue" msgstr "&Continua" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Salta" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index e38cf52c4..9ccf4d818 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -251,6 +251,11 @@ msgstr " msgid "&Big" msgstr "‘å(&B)" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "“Á‘å(&H)" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -351,7 +356,7 @@ msgstr " msgid "&Cascade" msgstr "d‚Ë‚Ä•\Ž¦(&C)" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "ƒwƒ‹ƒv(&H)" @@ -1017,7 +1022,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "‰E‚ð... (%1/%2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "ˆÚ“®(&M)" @@ -1027,7 +1032,7 @@ msgstr " msgid "&Delete" msgstr "íœ(&D)" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "¶(&L)" @@ -1042,7 +1047,7 @@ msgstr " msgid "&Right" msgstr "‰E(&R)" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "—¼‘¤(&B)" @@ -1760,7 +1765,7 @@ msgstr " msgid "File&2:" msgstr "ƒtƒ@ƒCƒ‹&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "ŒðŠ·(&S)" @@ -2445,7 +2450,7 @@ msgstr " msgid "Result:" msgstr "Œ‹‰Ê:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "ƒeƒXƒg(&T)" @@ -2920,7 +2925,7 @@ msgstr " msgid "&Continue" msgstr "‘±s(&C)" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "ƒXƒLƒbƒv(&S)" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 6ce3c49f4..cbf1186d3 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -251,6 +251,11 @@ msgstr " msgid "&Big" msgstr "Å©°Ô(&B)" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -351,7 +356,7 @@ msgstr " msgid "&Cascade" msgstr "°è´Ü½Ä Á¤·Ä(&C)" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "µµ¿ò¸»(&H)" @@ -1017,7 +1022,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "À̵¿(&M)" @@ -1027,7 +1032,7 @@ msgstr " msgid "&Delete" msgstr "»èÁ¦(&D)" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "¿ÞÂʸ¸(&L)" @@ -1042,7 +1047,7 @@ msgstr "" msgid "&Right" msgstr "¿À¸¥Âʸ¸(&R)" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "¸ðµÎ(&B)" @@ -1752,7 +1757,7 @@ msgstr " msgid "File&2:" msgstr "ÆÄÀÏ&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "¸Â¹Ù²Ù±â(&S)" @@ -2427,7 +2432,7 @@ msgstr " msgid "Result:" msgstr "°á°ú:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "½ÃÇè(&T)" @@ -2874,7 +2879,7 @@ msgstr " msgid "&Continue" msgstr "°è¼Ó(&C)" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "¹«½Ã(&S)" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 8dee2757e..48de2a1b4 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -250,6 +250,11 @@ msgstr "&Liten" msgid "&Big" msgstr "&Stor" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "&Vertikale vinduer" msgid "&Cascade" msgstr "&Overlappende" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Hjelp" @@ -1016,7 +1021,7 @@ msgstr "H msgid "Right to... (%1 of %2)" msgstr "Høyre til... (%1 av %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Flytt" @@ -1026,7 +1031,7 @@ msgstr "&Flytt" msgid "&Delete" msgstr "&Slett" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Venstre" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Høyre" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Begge" @@ -1751,7 +1756,7 @@ msgstr "Fil&1:" msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "B&ytt" @@ -2430,7 +2435,7 @@ msgstr "&Mappenavn" msgid "Result:" msgstr "Resultat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Test" @@ -2877,7 +2882,7 @@ msgstr "Nei til a<" msgid "&Continue" msgstr "&Fortsett" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Hopp over" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 4dc05982d..eb83305b9 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -249,6 +249,11 @@ msgstr "&S msgid "&Big" msgstr "&B ÈÒѐ" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -349,7 +354,7 @@ msgstr "&V msgid "&Cascade" msgstr "&C ÂÈÔÇÑí " -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&H ÑÇåäãÇ " @@ -1015,7 +1020,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr " ÑÇÓÊ Èå ... - %1 ÇÒ %2 " -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&M ÌÇÈÌÇ ˜ÑÏä " @@ -1025,7 +1030,7 @@ msgstr "&M msgid "&Delete" msgstr "&D ÍÐÝ " -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&L  " @@ -1040,7 +1045,7 @@ msgstr "" msgid "&Right" msgstr "&R ÑÇÓÊ " -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&B åÑ Ïæ " @@ -1750,7 +1755,7 @@ msgstr "&1 msgid "File&2:" msgstr "&2 ÑæäÏå : " -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&S ãÚÇæÖå " @@ -2429,7 +2434,7 @@ msgstr "&F msgid "Result:" msgstr " äÊíÌå : " -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&T ÂÒãÇíÔ " @@ -2876,7 +2881,7 @@ msgstr "&l msgid "&Continue" msgstr "&C ÇÏÇãå " -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&S ÑÔ " diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 1af9b7fc6..069345bd2 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -251,6 +251,11 @@ msgstr "&Ma msgid "&Big" msgstr "&Du¿y" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -351,7 +356,7 @@ msgstr "P&ionowo" msgid "&Cascade" msgstr "&Kaskadowo" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Pomoc" @@ -1017,7 +1022,7 @@ msgstr "Prawa na lew msgid "Right to... (%1 of %2)" msgstr "Prawa na... (%1 z %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "Prze&nieœ" @@ -1027,7 +1032,7 @@ msgstr "Prze&nie msgid "&Delete" msgstr "&Usuñ" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Lewa" @@ -1042,7 +1047,7 @@ msgstr "" msgid "&Right" msgstr "&Prawa" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Obie" @@ -1752,7 +1757,7 @@ msgstr "Plik&1:" msgid "File&2:" msgstr "Plik&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Za&mieñ" @@ -2431,7 +2436,7 @@ msgstr "Nazwa &folderu" msgid "Result:" msgstr "Wynik:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Testuj" @@ -2878,7 +2883,7 @@ msgstr "Nie na w&szystkie" msgid "&Continue" msgstr "&Kontynuuj" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Pom&iñ" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index c5ca3ad58..f99ccb90e 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -249,6 +249,11 @@ msgstr "" msgid "&Big" msgstr "" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -349,7 +354,7 @@ msgstr "Ordenar &verticalmente" msgid "&Cascade" msgstr "Cascata" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "A&juda" @@ -1015,7 +1020,7 @@ msgstr "Da direita para a esquerda (%1 de %2)" msgid "Right to... (%1 of %2)" msgstr "Da direita para... (%1 de %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "Mover" @@ -1025,7 +1030,7 @@ msgstr "Mover" msgid "&Delete" msgstr "Eliminar" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "Esquerda" @@ -1040,7 +1045,7 @@ msgstr "" msgid "&Right" msgstr "Direita" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "Ambos" @@ -1750,7 +1755,7 @@ msgstr "Ficheiro&1:" msgid "File&2:" msgstr "Ficheiro&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Trocar" @@ -2425,7 +2430,7 @@ msgstr "Nome do arquivo" msgid "Result:" msgstr "Resultado:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "Testar" @@ -2840,7 +2845,7 @@ msgstr "N msgid "&Continue" msgstr "Continuar" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Avançar" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 5ae5fd771..152d2ec3c 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -250,6 +250,11 @@ msgstr "&Mic" msgid "&Big" msgstr "Ma&re" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "Al msgid "&Cascade" msgstr "&Cascadã" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "A&jutor" @@ -1016,7 +1021,7 @@ msgstr "De la dreapta la st msgid "Right to... (%1 of %2)" msgstr "Dreapta la... (%1 din %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Mutã" @@ -1026,7 +1031,7 @@ msgstr "&Mut msgid "&Delete" msgstr "ª&terge" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "Stâ&nga" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "D&reapta" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "Am&bele" @@ -1751,7 +1756,7 @@ msgstr "&Fi msgid "File&2:" msgstr "F&iºier 2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Interschim&bã" @@ -2426,7 +2431,7 @@ msgstr "Nu&me director" msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Testeazã" @@ -2873,7 +2878,7 @@ msgstr "Nu la to&ate" msgid "&Continue" msgstr "&Continuã" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "O&mite" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index b0118486f..6cc6d1369 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -252,6 +252,11 @@ msgstr "& msgid "&Big" msgstr "&Áîëüøèå çíà÷êè" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -352,7 +357,7 @@ msgstr " msgid "&Cascade" msgstr "&Êàñêàä" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Ïîìîùü" @@ -1018,7 +1023,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "Ñïðàâà íà... (%1 èç %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Ïåðåìåñòèòü" @@ -1028,7 +1033,7 @@ msgstr "& msgid "&Delete" msgstr "Óäàëèòü" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "Ñëåâà" @@ -1043,7 +1048,7 @@ msgstr "" msgid "&Right" msgstr "Ñïðàâà" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "Îáà" @@ -1753,7 +1758,7 @@ msgstr " msgid "File&2:" msgstr "Ôàéë 2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Ïîìåíÿòü" @@ -2432,7 +2437,7 @@ msgstr " msgid "Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Òåñòèðîâàòü" @@ -2879,7 +2884,7 @@ msgstr " msgid "&Continue" msgstr "Ïðî&äîëæèòü" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Ï&ðîïóñòèòü" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index e8fa969aa..59a99d717 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -249,6 +249,11 @@ msgstr "& msgid "&Big" msgstr "&Âåëèêà" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -349,7 +354,7 @@ msgstr " msgid "&Cascade" msgstr "Ïðîçîðå ïîðå&àíî" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "Ïîìî&ž" @@ -1015,7 +1020,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "Äåñíà ó... (%1 îä %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "Ïî&ìåðè" @@ -1025,7 +1030,7 @@ msgstr " msgid "&Delete" msgstr "&Èçáðèøè" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Ëåâà" @@ -1040,7 +1045,7 @@ msgstr "" msgid "&Right" msgstr "&Äåñíà" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "Îáå " @@ -1750,7 +1755,7 @@ msgstr " msgid "File&2:" msgstr "Äàòîòåêà&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Çàìåíè" @@ -2429,7 +2434,7 @@ msgstr " msgid "Result:" msgstr "Èñõîä:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Ïðîâåðà" @@ -2876,7 +2881,7 @@ msgstr " msgid "&Continue" msgstr "Íàñòà&âè" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Èçî&ñòàâè" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index d10f59637..89cfd7f36 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -250,6 +250,11 @@ msgstr "&Mal msgid "&Big" msgstr "&Ve¾ký" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "Dla msgid "&Cascade" msgstr "&Kaskáda" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "Po&moc" @@ -1016,7 +1021,7 @@ msgstr "Sprava do msgid "Right to... (%1 of %2)" msgstr "Sprava... (%1 z %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Presunú" @@ -1026,7 +1031,7 @@ msgstr "&Presun msgid "&Delete" msgstr "&Zmaza" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "¼&avý" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Pravý" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Oba" @@ -1751,7 +1756,7 @@ msgstr "S msgid "File&2:" msgstr "Súbor&2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Vymeni navzájom" @@ -2426,7 +2431,7 @@ msgstr "&N msgid "Result:" msgstr "Výsledok:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Testova" @@ -2855,7 +2860,7 @@ msgstr "Nie pre &v msgid "&Continue" msgstr "Po&kraèova" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Pre&skoèi" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 978733c72..c8d0cdb6b 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -251,6 +251,11 @@ msgstr "&Male ikone" msgid "&Big" msgstr "&Velike ikone" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -351,7 +356,7 @@ msgstr "&Navpi msgid "&Cascade" msgstr "&Kaskadna okna" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Pomoè" @@ -1017,7 +1022,7 @@ msgstr "Z desne proti levi (%1 od %2)" msgid "Right to... (%1 of %2)" msgstr "Desna do ... (%1 od%2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Pre&makni" @@ -1027,7 +1032,7 @@ msgstr "&Pre&makni" msgid "&Delete" msgstr "&Izbriši" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&levi okvir" @@ -1042,7 +1047,7 @@ msgstr "" msgid "&Right" msgstr "&desni okvir" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Oboje" @@ -1754,7 +1759,7 @@ msgstr "Datoteka&1" msgid "File&2:" msgstr "Datoteka&2" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Zamenjaj" @@ -2433,7 +2438,7 @@ msgstr "&Ime mape" msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Test" @@ -2880,7 +2885,7 @@ msgstr "Ne za &vse" msgid "&Continue" msgstr "&Nadaljuj" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Preskoèi" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 65f71c195..0d6275a25 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -252,6 +252,11 @@ msgstr "&Peque msgid "&Big" msgstr "&Grande" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -352,7 +357,7 @@ msgstr "Ordenar &Verticalmente" msgid "&Cascade" msgstr "&Cascada" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "A&yuda" @@ -1018,7 +1023,7 @@ msgstr "Lado derecho a lado izquierdo (%1 de %2)" msgid "Right to... (%1 of %2)" msgstr "Lado derecho a... (%1 de %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Mover" @@ -1028,7 +1033,7 @@ msgstr "&Mover" msgid "&Delete" msgstr "&Eliminar" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Derecha" @@ -1043,7 +1048,7 @@ msgstr "" msgid "&Right" msgstr "&Izquierda" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Ambos" @@ -1753,7 +1758,7 @@ msgstr "Archivo &1:" msgid "File&2:" msgstr "Archivo &2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "&Intercambiar" @@ -2432,7 +2437,7 @@ msgstr "&Nombre de carpeta" msgid "Result:" msgstr "Resultado:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Probar" @@ -2879,7 +2884,7 @@ msgstr "No a &todo" msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Omitir" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 2558016d6..286817508 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -250,6 +250,11 @@ msgstr "&Liten" msgid "&Big" msgstr "&Stor" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "O&rdna vertikalt" msgid "&Cascade" msgstr "&Överlappande" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Hjälp" @@ -1016,7 +1021,7 @@ msgstr "H msgid "Right to... (%1 of %2)" msgstr "Höger till... (%1 av %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Flytta" @@ -1026,7 +1031,7 @@ msgstr "&Flytta" msgid "&Delete" msgstr "&Ta bort" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&Vänster" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Höger" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Båda" @@ -1751,7 +1756,7 @@ msgstr "Fil &1:" msgid "File&2:" msgstr "Fil &2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Byt" @@ -2430,7 +2435,7 @@ msgstr "&Katalognamn" msgid "Result:" msgstr "Resultat:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Testa" @@ -2877,7 +2882,7 @@ msgstr "Nej till a&llt" msgid "&Continue" msgstr "&Fortsätt" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Skippa" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 168038cbf..bf044c031 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -250,6 +250,11 @@ msgstr "K msgid "&Big" msgstr "&Büyük" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -350,7 +355,7 @@ msgstr "&Dikey D msgid "&Cascade" msgstr "&Basamakla" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "Ya&rdým" @@ -1016,7 +1021,7 @@ msgstr "Sa msgid "Right to... (%1 of %2)" msgstr "Saðdakini þuraya... (%1 / %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Taþý" @@ -1026,7 +1031,7 @@ msgstr "&Ta msgid "&Delete" msgstr "&Sil" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "So&l" @@ -1041,7 +1046,7 @@ msgstr "" msgid "&Right" msgstr "&Sað" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Her Ýkisi" @@ -1754,7 +1759,7 @@ msgstr "Dosya &1:" msgid "File&2:" msgstr "Dosya &2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Yer &Deðiþtir" @@ -2433,7 +2438,7 @@ msgstr "&Klas msgid "Result:" msgstr "Sonuç:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Sýna" @@ -2880,7 +2885,7 @@ msgstr "T msgid "&Continue" msgstr "&Devam" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "&Atla" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index d8c778acf..7bceafb5b 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -251,6 +251,11 @@ msgstr "& msgid "&Big" msgstr "&Âåëèê³ ï³êòîãðàìè" +#: Merge.rc:43017E48 +#, c-format +msgid "&Huge" +msgstr "" + #: Merge.rc:27AC6D7F #, c-format msgid "&Status Bar" @@ -351,7 +356,7 @@ msgstr " msgid "&Cascade" msgstr "&Êàñêàä" -#: Merge.rc:43017E48 +#: Merge.rc:43017E49 #, c-format msgid "&Help" msgstr "&Äîâ³äêà" @@ -1017,7 +1022,7 @@ msgstr " msgid "Right to... (%1 of %2)" msgstr "Ñïðàâà... (%1 ç %2)" -#: Merge.rc:43017E49 +#: Merge.rc:43017E4A #, c-format msgid "&Move" msgstr "&Ïåðåì³ñòèòè" @@ -1027,7 +1032,7 @@ msgstr "& msgid "&Delete" msgstr "&Âèëó÷èòè" -#: Merge.rc:43017E4A +#: Merge.rc:43017E4B #, c-format msgid "&Left" msgstr "&˳âîðó÷" @@ -1042,7 +1047,7 @@ msgstr "" msgid "&Right" msgstr "&Ïðàâîðó÷" -#: Merge.rc:43017E4B +#: Merge.rc:43017E4C #, c-format msgid "&Both" msgstr "&Îáèäâà" @@ -1752,7 +1757,7 @@ msgstr " msgid "File&2:" msgstr "Ôàéë 2:" -#: Merge.rc:43017E4C +#: Merge.rc:43017E4D #, c-format msgid "&Swap" msgstr "Ïîì³íÿòè" @@ -2431,7 +2436,7 @@ msgstr " msgid "Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:43017E4D +#: Merge.rc:43017E4E #, c-format msgid "&Test" msgstr "&Âèïðîáóâàòè" @@ -2878,7 +2883,7 @@ msgstr "ͳ msgid "&Continue" msgstr "Ïðî&äîâæèòè" -#: Merge.rc:43017E4E +#: Merge.rc:43017E4F #, c-format msgid "&Skip" msgstr "Ï&ðîïóñòèòè"