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;
+}
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);
#include "DropHandler.h"
#include "LanguageSelect.h"
#include "version.h"
+#include "Bitmap.h"
using std::vector;
using boost::begin;
#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<class DocClass>
DocClass * GetMergeDocForDiff(CMultiDocTemplate *pTemplate, CDirDoc *pDirDoc, int nFiles);
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)
/** @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]);
*/
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);
}
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() */
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:
#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);
MENUITEM "&None", ID_TOOLBAR_NONE\r
MENUITEM "&Small", ID_TOOLBAR_SMALL\r
MENUITEM "&Big", ID_TOOLBAR_BIG\r
+ MENUITEM "&Huge", ID_TOOLBAR_HUGE\r
END\r
MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR\r
MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR\r
MENUITEM "&None", ID_TOOLBAR_NONE\r
MENUITEM "&Small", ID_TOOLBAR_SMALL\r
MENUITEM "&Big", ID_TOOLBAR_BIG\r
+ MENUITEM "&Huge", ID_TOOLBAR_HUGE\r
END\r
MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR\r
MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR\r
MENUITEM "&None", ID_TOOLBAR_NONE\r
MENUITEM "&Small", ID_TOOLBAR_SMALL\r
MENUITEM "&Big", ID_TOOLBAR_BIG\r
+ MENUITEM "&Huge", ID_TOOLBAR_HUGE\r
END\r
MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR\r
MENUITEM "Ta&b Bar", ID_VIEW_TAB_BAR\r
#define ID_TOOLBAR_NONE 33194\r
#define ID_TOOLBAR_SMALL 33195\r
#define ID_TOOLBAR_BIG 33196\r
-#define ID_VIEW_RESIZE_PANES 33197\r
+#define ID_TOOLBAR_HUGE 33197\r
+#define ID_VIEW_RESIZE_PANES 33198\r
#define ID_VIEW_ZOOMIN 33199\r
#define ID_VIEW_ZOOMOUT 33200\r
#define ID_VIEW_ZOOMNORMAL 33202\r
msgid "&Big"
msgstr "&Handia"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Urjauzia"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Laguntza"
msgid "Right to... (%1 of %2)"
msgstr "Eskuina hona... (%1 %2-tik)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Mugitu"
msgid "&Delete"
msgstr "&Ezabatu"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "Ezker&ra"
msgid "&Right"
msgstr "&E&skuina"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Biak"
msgid "File&2:"
msgstr "&2 Agiria:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "A&ldaketa"
msgid "Result:"
msgstr "Emaitza:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Azterketa"
msgid "&Continue"
msgstr "&Jarraitu"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Jauzi"
msgid "&Big"
msgstr "&Grande"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Em Cascata"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Ajuda"
msgid "Right to... (%1 of %2)"
msgstr "Direita para... (%1 de %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Mover"
msgid "&Delete"
msgstr "&Apagar"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Esquerda"
msgid "&Right"
msgstr "&Direita"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Ambos"
msgid "File&2:"
msgstr "Arquivo&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Trocar"
msgid "Result:"
msgstr "Resultado:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Teste"
msgid "&Continue"
msgstr "&Continuar"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Pular"
msgid "&Big"
msgstr "&Ãîëÿì"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "Ïîäðåäè &êàñêàäíî"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Ïîìîù"
msgid "Right to... (%1 of %2)"
msgstr "Äåñåí êúì... (%1 îò %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Ïðåìåñòè"
msgid "&Delete"
msgstr "&Èçòðèé"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Îò ëÿâî"
msgid "&Right"
msgstr "&Îò äÿñíî"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Äâåòå"
msgid "File&2:"
msgstr "Ôàéë&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Ðàçìåíè"
msgid "Result:"
msgstr "Ðåçóëòàò:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Òåñòâàé"
msgid "&Continue"
msgstr "&Ïðîäúëæè"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Ïðåñêî÷è"
msgid "&Big"
msgstr "&Gran"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "Finestres en &cascada"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Ajuda"
msgid "Right to... (%1 of %2)"
msgstr "Dreta a... (%1 de %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Mou"
msgid "&Delete"
msgstr "&Suprimeix"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "De l'&esquerra"
msgid "&Right"
msgstr "De la &dreta"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "D'&ambdós costats"
msgid "File&2:"
msgstr "Fitxer &2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Inter&canvia"
msgid "Result:"
msgstr "Resultat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Prova"
msgid "&Continue"
msgstr "&Continua"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Omet"
msgid "&Big"
msgstr "´ó(&B)"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "²ãµþ(&C)"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "°ïÖú(&H)"
msgid "Right to... (%1 of %2)"
msgstr "ÓҲൽ... (%1 ¹²%2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "Òƶ¯(&M)"
msgid "&Delete"
msgstr "ɾ³ý(&D)"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "×ó²à(&L)"
msgid "&Right"
msgstr "ÓÒ²à(&R)"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "Á½²à(&B)"
msgid "File&2:"
msgstr "Îļþ&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "ÉÏϽ»»»(&S)"
msgid "Result:"
msgstr "½á¹û:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "²âÊÔ(&T)"
msgid "&Continue"
msgstr "¼ÌÐø(&C)"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Ìø¹ý(&S)"
msgid "&Big"
msgstr "¤j¹Ï¥Ü(&B)"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "Å|¸m(&C)"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "»¡©ú(&H)"
msgid "Right to... (%1 of %2)"
msgstr "¥kÃä¨ì... (%2 ¤§ %1)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "²¾°Ê(&M)"
msgid "&Delete"
msgstr "§R°£(&D)"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "¥ªÃä(&L)"
msgid "&Right"
msgstr "¥kÃä(&R)"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "¨âÃä(&B)"
msgid "File&2:"
msgstr "ÀÉ®×2(&2)¡G"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "¹ï½Õ(&S)"
msgid "Result:"
msgstr "µ²ªG¡G"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "´ú¸Õ(&T)"
msgid "&Continue"
msgstr "Ä~Äò(&C)"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "²¤¹L(&S)"
msgid "&Big"
msgstr "&Velike ikone"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "Okna &kaskadno"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Pomoæ"
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"
msgid "&Delete"
msgstr "&Obri\9ai"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&lijevu datoteku"
msgid "&Right"
msgstr "&desnu datoteku"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Obje"
msgid "File&2:"
msgstr "&Desna dat."
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Obrni D<->L"
msgid "Result:"
msgstr "Rezultat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Test"
msgid "&Continue"
msgstr "&Nastavi"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Izostavi"
msgid "&Big"
msgstr "&Velký"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Na sebe"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "Nápo&vìda"
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"
msgid "&Delete"
msgstr "Odstran&it"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Levé"
msgid "&Right"
msgstr "P&ravé"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "O&boje"
msgid "File&2:"
msgstr "Soubor &2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Z&amìnit"
msgid "Result:"
msgstr "Výsledek:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "Z&kusit"
msgid "&Continue"
msgstr "Pok&raèovat"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Pøe&skoèit"
msgid "&Big"
msgstr "&Stor"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Kaskade"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Hjælp"
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"
msgid "&Delete"
msgstr "&Slet"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Venstre"
msgid "&Right"
msgstr "&Højre"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Begge"
msgid "File&2:"
msgstr "Fil&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Byt"
msgid "Result:"
msgstr "Resultater:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Test"
msgid "&Continue"
msgstr "&Fortsæt"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Spring over"
msgid "&Big"
msgstr "Groot"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Trapsgewijs"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Help"
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"
msgid "&Delete"
msgstr "Ver&wijderen"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Links"
msgid "&Right"
msgstr "&Rechts"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Beide"
msgid "File&2:"
msgstr "Bestand&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Wisselen"
msgid "Result:"
msgstr "Resultaat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Test"
msgid "&Continue"
msgstr "&Doorgaan"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Overslaan"
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 <winmerge-translate@lists.sourceforge.net>\n"
msgid "&Big"
msgstr ""
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr ""
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr ""
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr ""
msgid "&Delete"
msgstr ""
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr ""
msgid "&Right"
msgstr ""
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr ""
msgid "File&2:"
msgstr ""
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr ""
msgid "Result:"
msgstr ""
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr ""
msgid "&Continue"
msgstr ""
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr ""
msgid "&Big"
msgstr "&Grande"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Cascade"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "A&ide"
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"
msgid "&Delete"
msgstr "&Supprimer"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "à &gauche"
msgid "&Right"
msgstr "à &droite"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "des deu&x côtés"
msgid "File&2:"
msgstr "Fichier&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Intervertir"
msgid "Result:"
msgstr "Resultat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Tester"
msgid "&Continue"
msgstr "&Continuer"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Ignorer"
msgid "&Big"
msgstr "&Grande"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&En fervenza"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Axuda"
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"
msgid "&Delete"
msgstr "&Borrar"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Esquerda"
msgid "&Right"
msgstr "&Dereita"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Ambos"
msgid "File&2:"
msgstr "Arquivo&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Cambiar"
msgid "Result:"
msgstr "Resultado:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Probar"
msgid "&Continue"
msgstr "&Continuar"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Saltar"
msgid "&Big"
msgstr "&Groß"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "Über&lappend"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Hilfe"
msgid "Right to... (%1 of %2)"
msgstr "Rechts nach... (%1 von %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Verschieben"
msgid "&Delete"
msgstr "&Löschen"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Links"
msgid "&Right"
msgstr "&Rechts"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Beide"
msgid "File&2:"
msgstr "Datei &2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Ver&tauschen"
msgid "Result:"
msgstr "Ergebnis:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Testen"
msgid "&Continue"
msgstr "&Fortsetzen"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Über&springen"
msgid "&Big"
msgstr "Ìå&ãÜëç"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "ÅðéêÜëõ&øç"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&ÂïÞèåéá"
msgid "Right to... (%1 of %2)"
msgstr "Äåîéü óôï... (%1 áðü %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Ìåôáêßíçóç"
msgid "&Delete"
msgstr "&ÄéáãñáöÞ"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "Á&ñéóôåñü"
msgid "&Right"
msgstr "Äå&îéü"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "Áì&öüôåñá"
msgid "File&2:"
msgstr "Áñ÷åßï&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "ÁíôéìåôÜ&èåóç"
msgid "Result:"
msgstr "ÁðïôÝëåóìá:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&ÄïêéìÞ"
msgid "&Continue"
msgstr "&ÓõíÝ÷åéá"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&ÐáñÜëåéøç"
msgid "&Big"
msgstr "Nagy"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Felosztás"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Súgó"
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"
msgid "&Delete"
msgstr "&Törlés"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Bal oldal"
msgid "&Right"
msgstr "&Jobb oldal"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Mindkettõ"
msgid "File&2:"
msgstr "Fájl&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Megfordítás"
msgid "Result:"
msgstr "Eredmény:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr ""
msgid "&Continue"
msgstr "&Folytatás"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Kihagy"
msgid "&Big"
msgstr "&Grande"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Sovrapponi"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&?"
msgid "Right to... (%1 of %2)"
msgstr "Destra in... (%1 su %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Sposta"
msgid "&Delete"
msgstr "&Elimina"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Sinistra"
msgid "&Right"
msgstr "&Destra"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Entrambi"
msgid "File&2:"
msgstr "File&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Scambia"
msgid "Result:"
msgstr "Risultato:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Prova"
msgid "&Continue"
msgstr "&Continua"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Salta"
msgid "&Big"
msgstr "\91å(&B)"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr "\93Á\91å(&H)"
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "\8fd\82Ë\82Ä\95\\8e¦(&C)"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "\83w\83\8b\83v(&H)"
msgid "Right to... (%1 of %2)"
msgstr "\89E\82ð... (%1/%2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "\88Ú\93®(&M)"
msgid "&Delete"
msgstr "\8dí\8f\9c(&D)"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "\8d¶(&L)"
msgid "&Right"
msgstr "\89E(&R)"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "\97¼\91¤(&B)"
msgid "File&2:"
msgstr "\83t\83@\83C\83\8b&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "\8cð\8a·(&S)"
msgid "Result:"
msgstr "\8c\8b\89Ê:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "\83e\83X\83g(&T)"
msgid "&Continue"
msgstr "\91±\8ds(&C)"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "\83X\83L\83b\83v(&S)"
msgid "&Big"
msgstr "Å©°Ô(&B)"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "°è´Ü½Ä Á¤·Ä(&C)"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "µµ¿ò¸»(&H)"
msgid "Right to... (%1 of %2)"
msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "À̵¿(&M)"
msgid "&Delete"
msgstr "»èÁ¦(&D)"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "¿ÞÂʸ¸(&L)"
msgid "&Right"
msgstr "¿À¸¥Âʸ¸(&R)"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "¸ðµÎ(&B)"
msgid "File&2:"
msgstr "ÆÄÀÏ&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "¸Â¹Ù²Ù±â(&S)"
msgid "Result:"
msgstr "°á°ú:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "½ÃÇè(&T)"
msgid "&Continue"
msgstr "°è¼Ó(&C)"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "¹«½Ã(&S)"
msgid "&Big"
msgstr "&Stor"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Overlappende"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Hjelp"
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"
msgid "&Delete"
msgstr "&Slett"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Venstre"
msgid "&Right"
msgstr "&Høyre"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Begge"
msgid "File&2:"
msgstr "Fil&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "B&ytt"
msgid "Result:"
msgstr "Resultat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Test"
msgid "&Continue"
msgstr "&Fortsett"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Hopp over"
msgid "&Big"
msgstr "&B ÈÒÑ\90"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&C ÂÈÔÇÑí "
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&H ÑÇåäãÇ "
msgid "Right to... (%1 of %2)"
msgstr " ÑÇÓÊ Èå ... - %1 ÇÒ %2 "
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&M ÌÇÈÌÇ \98ÑÏä "
msgid "&Delete"
msgstr "&D ÍÐÝ "
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&L \8d\81 "
msgid "&Right"
msgstr "&R ÑÇÓÊ "
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&B åÑ Ïæ "
msgid "File&2:"
msgstr "&2 \81ÑæäÏå : "
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&S ãÚÇæÖå "
msgid "Result:"
msgstr " äÊíÌå : "
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&T ÂÒãÇíÔ "
msgid "&Continue"
msgstr "&C ÇÏÇãå "
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&S \81ÑÔ "
msgid "&Big"
msgstr "&Du¿y"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Kaskadowo"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Pomoc"
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\9c"
msgid "&Delete"
msgstr "&Usuñ"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Lewa"
msgid "&Right"
msgstr "&Prawa"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Obie"
msgid "File&2:"
msgstr "Plik&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Za&mieñ"
msgid "Result:"
msgstr "Wynik:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Testuj"
msgid "&Continue"
msgstr "&Kontynuuj"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Pom&iñ"
msgid "&Big"
msgstr ""
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "Cascata"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "A&juda"
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"
msgid "&Delete"
msgstr "Eliminar"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "Esquerda"
msgid "&Right"
msgstr "Direita"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "Ambos"
msgid "File&2:"
msgstr "Ficheiro&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Trocar"
msgid "Result:"
msgstr "Resultado:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "Testar"
msgid "&Continue"
msgstr "Continuar"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Avançar"
msgid "&Big"
msgstr "Ma&re"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Cascadã"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "A&jutor"
msgid "Right to... (%1 of %2)"
msgstr "Dreapta la... (%1 din %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Mutã"
msgid "&Delete"
msgstr "ª&terge"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "Stâ&nga"
msgid "&Right"
msgstr "D&reapta"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "Am&bele"
msgid "File&2:"
msgstr "F&iºier 2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Interschim&bã"
msgid "Result:"
msgstr "Rezultat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Testeazã"
msgid "&Continue"
msgstr "&Continuã"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "O&mite"
msgid "&Big"
msgstr "&Áîëüøèå çíà÷êè"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Êàñêàä"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Ïîìîùü"
msgid "Right to... (%1 of %2)"
msgstr "Ñïðàâà íà... (%1 èç %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Ïåðåìåñòèòü"
msgid "&Delete"
msgstr "Óäàëèòü"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "Ñëåâà"
msgid "&Right"
msgstr "Ñïðàâà"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "Îáà"
msgid "File&2:"
msgstr "Ôàéë 2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Ïîìåíÿòü"
msgid "Result:"
msgstr "Ðåçóëüòàò:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Òåñòèðîâàòü"
msgid "&Continue"
msgstr "Ïðî&äîëæèòü"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Ï&ðîïóñòèòü"
msgid "&Big"
msgstr "&Âåëèêà"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "Ïðîçîðå ïîðå&\90àíî"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "Ïîìî&\9e"
msgid "Right to... (%1 of %2)"
msgstr "Äåñíà ó... (%1 îä %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "Ïî&ìåðè"
msgid "&Delete"
msgstr "&Èçáðèøè"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Ëåâà"
msgid "&Right"
msgstr "&Äåñíà"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "Îáå "
msgid "File&2:"
msgstr "Äàòîòåêà&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Çàìåíè"
msgid "Result:"
msgstr "Èñõîä:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Ïðîâåðà"
msgid "&Continue"
msgstr "Íàñòà&âè"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Èçî&ñòàâè"
msgid "&Big"
msgstr "&Ve¾ký"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Kaskáda"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "Po&moc"
msgid "Right to... (%1 of %2)"
msgstr "Sprava... (%1 z %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Presunú\9d"
msgid "&Delete"
msgstr "&Zmaza\9d"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "¼&avý"
msgid "&Right"
msgstr "&Pravý"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Oba"
msgid "File&2:"
msgstr "Súbor&2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Vymeni\9d navzájom"
msgid "Result:"
msgstr "Výsledok:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Testova\9d"
msgid "&Continue"
msgstr "Po&kraèova\9d"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Pre&skoèi\9d"
msgid "&Big"
msgstr "&Velike ikone"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Kaskadna okna"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Pomoè"
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"
msgid "&Delete"
msgstr "&Izbri\9ai"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&levi okvir"
msgid "&Right"
msgstr "&desni okvir"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Oboje"
msgid "File&2:"
msgstr "Datoteka&2"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Zamenjaj"
msgid "Result:"
msgstr "Rezultat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Test"
msgid "&Continue"
msgstr "&Nadaljuj"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Preskoèi"
msgid "&Big"
msgstr "&Grande"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Cascada"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "A&yuda"
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"
msgid "&Delete"
msgstr "&Eliminar"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Derecha"
msgid "&Right"
msgstr "&Izquierda"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Ambos"
msgid "File&2:"
msgstr "Archivo &2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "&Intercambiar"
msgid "Result:"
msgstr "Resultado:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Probar"
msgid "&Continue"
msgstr "&Continuar"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Omitir"
msgid "&Big"
msgstr "&Stor"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Överlappande"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Hjälp"
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"
msgid "&Delete"
msgstr "&Ta bort"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&Vänster"
msgid "&Right"
msgstr "&Höger"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Båda"
msgid "File&2:"
msgstr "Fil &2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Byt"
msgid "Result:"
msgstr "Resultat:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Testa"
msgid "&Continue"
msgstr "&Fortsätt"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Skippa"
msgid "&Big"
msgstr "&Büyük"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Basamakla"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "Ya&rdým"
msgid "Right to... (%1 of %2)"
msgstr "Saðdakini þuraya... (%1 / %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Taþý"
msgid "&Delete"
msgstr "&Sil"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "So&l"
msgid "&Right"
msgstr "&Sað"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Her Ýkisi"
msgid "File&2:"
msgstr "Dosya &2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Yer &Deðiþtir"
msgid "Result:"
msgstr "Sonuç:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Sýna"
msgid "&Continue"
msgstr "&Devam"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "&Atla"
msgid "&Big"
msgstr "&Âåëèê³ ï³êòîãðàìè"
+#: Merge.rc:43017E48
+#, c-format
+msgid "&Huge"
+msgstr ""
+
#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
msgid "&Cascade"
msgstr "&Êàñêàä"
-#: Merge.rc:43017E48
+#: Merge.rc:43017E49
#, c-format
msgid "&Help"
msgstr "&Äîâ³äêà"
msgid "Right to... (%1 of %2)"
msgstr "Ñïðàâà... (%1 ç %2)"
-#: Merge.rc:43017E49
+#: Merge.rc:43017E4A
#, c-format
msgid "&Move"
msgstr "&Ïåðåì³ñòèòè"
msgid "&Delete"
msgstr "&Âèëó÷èòè"
-#: Merge.rc:43017E4A
+#: Merge.rc:43017E4B
#, c-format
msgid "&Left"
msgstr "&˳âîðó÷"
msgid "&Right"
msgstr "&Ïðàâîðó÷"
-#: Merge.rc:43017E4B
+#: Merge.rc:43017E4C
#, c-format
msgid "&Both"
msgstr "&Îáèäâà"
msgid "File&2:"
msgstr "Ôàéë 2:"
-#: Merge.rc:43017E4C
+#: Merge.rc:43017E4D
#, c-format
msgid "&Swap"
msgstr "Ïîì³íÿòè"
msgid "Result:"
msgstr "Ðåçóëüòàò:"
-#: Merge.rc:43017E4D
+#: Merge.rc:43017E4E
#, c-format
msgid "&Test"
msgstr "&Âèïðîáóâàòè"
msgid "&Continue"
msgstr "Ïðî&äîâæèòè"
-#: Merge.rc:43017E4E
+#: Merge.rc:43017E4F
#, c-format
msgid "&Skip"
msgstr "Ï&ðîïóñòèòè"