\r
STRINGTABLE\r
BEGIN\r
+ IDS_VIEW_WRAP_TEXT "W&rap Text"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
IDS_FRHED_NOTINSTALLED "Frhed is not installed."\r
END\r
\r
*/
void CMergeEditView::OnViewWordWrap()
{
- GetOptionsMgr()->SaveOption(OPT_WORDWRAP, !m_bWordWrap);
+ GetOptionsMgr()->SaveOption(
+ GetDocument()->m_ptBuf[0]->GetTableEditing() ? OPT_WORDWRAP_TABLE : OPT_WORDWRAP,
+ !m_bWordWrap);
// Call CMergeDoc RefreshOptions() to refresh *both* views
CMergeDoc *pDoc = GetDocument();
{
pCmdUI->Enable(true);
pCmdUI->SetCheck(m_bWordWrap);
+ pCmdUI->SetText((GetDocument()->m_ptBuf[0]->GetTableEditing() ?
+ _("W&rap Text") : _("W&rap Lines")).c_str());
}
void CMergeEditView::OnViewWhitespace()
const bool mixedEOLs = GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
GetDocument()->IsMixedEOL(m_nThisPane);
SetViewEols(GetOptionsMgr()->GetBool(OPT_VIEW_EOL), mixedEOLs);
- SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP));
+ SetWordWrapping(GetOptionsMgr()->GetBool(GetDocument()->m_ptBuf[m_nThisPane]->GetTableEditing() ?
+ OPT_WORDWRAP_TABLE : OPT_WORDWRAP));
SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS));
SetSelectionMargin(GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN));
inline const String OPT_TAB_SIZE {_T("Settings/TabSize"s)};
inline const String OPT_TAB_TYPE {_T("Settings/TabType"s)};
inline const String OPT_WORDWRAP {_T("Settings/WordWrap"s)};
+inline const String OPT_WORDWRAP_TABLE {_T("Settings/WordWrapTable"s)};
inline const String OPT_VIEW_LINENUMBERS {_T("Settings/ViewLineNumbers"s)};
inline const String OPT_VIEW_FILEMARGIN {_T("Settings/ViewFileMargin"s)};
inline const String OPT_VIEW_TOPMARGIN {_T("Settings/ViewTopMargin"s)};
pOptions->InitOption(OPT_SYNTAX_HIGHLIGHT, true);
pOptions->InitOption(OPT_WORDWRAP, false);
+ pOptions->InitOption(OPT_WORDWRAP_TABLE, false);
pOptions->InitOption(OPT_VIEW_LINENUMBERS, false);
pOptions->InitOption(OPT_VIEW_WHITESPACE, false);
pOptions->InitOption(OPT_VIEW_EOL, false);
#define IDS_EOL_CONFLICT 43247\r
#define IDS_IMAGE_MENU 43352\r
#define IDS_WEBPAGE_MENU 43353\r
+#define IDS_VIEW_WRAP_TEXT 43354\r
#define IDS_EOL_DOS 43400\r
#define IDS_EOL_MAC 43401\r
#define IDS_EOL_UNIX 43402\r
{ OPT_TAB_SIZE, varprop::VT_INT, {1, 2, 4, 8, 128}, {} },
{ OPT_TAB_TYPE, varprop::VT_INT, {0, 1}, {} },
{ OPT_WORDWRAP, varprop::VT_BOOL, {}, {} },
+ { OPT_WORDWRAP_TABLE, varprop::VT_BOOL, {}, {} },
{ OPT_VIEW_LINENUMBERS, varprop::VT_BOOL, {}, {} },
{ OPT_VIEW_FILEMARGIN, varprop::VT_BOOL, {}, {} },
{ OPT_DIFF_CONTEXT, varprop::VT_INT, {0, 1, 3, 5, 7, 9}, {} },
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "المحرر Frhed غير مثبت."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr "Página Web"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "O Frhed não está instalado."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed не е инсталиран."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "L'aplicació Frhed no està instal·lada."
msgid "We&bpage"
msgstr "网页(&B)"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed 未安装。"
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed 未安裝。"
msgid "We&bpage"
msgstr "Pagina we&b"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed ùn hè micca installatu."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Fhred is niet geïnstalleerd"
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-02-19 08:57+0000\n"
+"POT-Creation-Date: 2023-03-12 11:58+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr "Ver&kkosivu"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed ei ole asennettu."
msgid "We&bpage"
msgstr "Page &web"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed n'est pas installé."
msgid "We&bpage"
msgstr "Páxina we&b"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed non está instalado."
msgid "We&bpage"
msgstr "We&bseite"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed ist nicht installiert."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr "Weboldal"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Az Frhed hexa szerkesztő nincs telepítve."
msgid "We&bpage"
msgstr "Pagina we&b"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed non è installato."
msgid "We&bpage"
msgstr "Webページ(&B)"
+msgid "W&rap Text"
+msgstr "折り返して全体を表示(&R)"
+
msgid "Frhed is not installed."
msgstr "Frhed がインストールされていません。"
msgid "We&bpage"
msgstr "웹페이지(&B)"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed가 설치되지 않았습니다."
msgid "We&bpage"
msgstr "Ti&nklapiai"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "„Frhed“ neįdiegtas."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr "Strona internetowa"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Free Hex Editor nie został zainstalowany."
msgid "We&bpage"
msgstr "&Página web"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "O Frhed não está instalado."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr "Веб-страница"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed не установлен."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed nie je nainštalovaný."
msgid "We&bpage"
msgstr "&Spletna stran"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed ni nameščen."
msgid "We&bpage"
msgstr "We&bpage"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed no está instalado."
msgid "We&bpage"
msgstr "Websida"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed är inte installerad."
msgid "We&bpage"
msgstr "We&b sayfası"
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr "Frhed kurulmamış."
msgid "We&bpage"
msgstr ""
+msgid "W&rap Text"
+msgstr ""
+
msgid "Frhed is not installed."
msgstr ""