From 6153df9127d5924b9d13eca568a04d194741b590 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 5 Jul 2017 19:55:06 +0200 Subject: [PATCH] TGitMerge: Don't use theirs/mine Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 64 +++++++++++++++++++-------------------- src/Resources/TortoiseMergeENG.rc | 24 +++++++-------- src/Resources/ribbon.mfcribbon-ms | 2 +- src/TortoiseMerge/MainFrm.cpp | 6 ++-- src/TortoiseMerge/WorkingFile.cpp | 12 ++++++-- src/TortoiseMerge/WorkingFile.h | 2 +- 6 files changed, 58 insertions(+), 52 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 18abded25..ca237fd50 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -10254,22 +10254,6 @@ msgstr "" msgid "Use &other text block" msgstr "" -#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, ID_EDIT_USEMYBLOCK - Ribbon name) -msgid "Use 'mine' text block" -msgstr "" - -#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, ID_EDIT_USEMINETHENTHEIRBLOCK - Ribbon name) -msgid "Use 'mine' text block then 'theirs'" -msgstr "" - -#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, ID_EDIT_USETHEIRBLOCK - Ribbon name) -msgid "Use 'theirs' text block" -msgstr "" - -#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, ID_EDIT_USETHEIRTHENMYBLOCK - Ribbon name) -msgid "Use 'theirs' text block then 'mine'" -msgstr "" - #. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1911) msgid "Use .mailmap" msgstr "" @@ -10350,6 +10334,14 @@ msgstr "" msgid "Use left file" msgstr "" +#. Resource IDs: (ID_EDIT_USETHEIRBLOCK - Menu, ID_EDIT_USETHEIRBLOCK - Ribbon name) +msgid "Use left text block" +msgstr "" + +#. Resource IDs: (ID_EDIT_USETHEIRTHENMYBLOCK - Menu, ID_EDIT_USETHEIRTHENMYBLOCK - Ribbon name) +msgid "Use left text block then right" +msgstr "" + #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 1762) msgid "Use local branch color for current branch" msgstr "" @@ -10366,6 +10358,14 @@ msgstr "" msgid "Use right block" msgstr "" +#. Resource IDs: (ID_EDIT_USEMYBLOCK - Menu, ID_EDIT_USEMYBLOCK - Ribbon name) +msgid "Use right text block" +msgstr "" + +#. Resource IDs: (ID_EDIT_USEMINETHENTHEIRBLOCK - Menu, ID_EDIT_USEMINETHENTHEIRBLOCK - Ribbon name) +msgid "Use right text block then left" +msgstr "" + #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1091) msgid "Use spaces" msgstr "" @@ -10374,36 +10374,36 @@ msgstr "" msgid "Use system locale for date/time" msgstr "" -#. Resource IDs: (IDS_VIEWCONTEXTMENU_USEYOURBLOCK) -msgid "Use text block from '&mine'" +#. Resource IDs: (IDS_VIEWCONTEXTMENU_USETHEIRBLOCK) +msgid "Use text block from &left" msgstr "" -#. Resource IDs: (IDS_VIEWCONTEXTMENU_USETHEIRBLOCK) -msgid "Use text block from '&theirs'" +#. Resource IDs: (IDS_VIEWCONTEXTMENU_USEYOURBLOCK) +msgid "Use text block from &right" msgstr "" -#. Resource IDs: (IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK) -msgid "Use text block from 'm&ine' before 'theirs'" +#. Resource IDs: (IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK) +msgid "Use text block from l&eft before right" msgstr "" -#. Resource IDs: (32822) -msgid "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'" +#. Resource IDs: (32821) +msgid "Use text block from left before right file\nUse left file text block then right" msgstr "" -#. Resource IDs: (32820) -msgid "Use text block from 'mine'\nUse 'mine' text block" +#. Resource IDs: (32819) +msgid "Use text block from left file\nUse left file text block" msgstr "" -#. Resource IDs: (IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK) -msgid "Use text block from 't&heirs' before 'mine'" +#. Resource IDs: (IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK) +msgid "Use text block from r&ight before left" msgstr "" -#. Resource IDs: (32821) -msgid "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'" +#. Resource IDs: (32822) +msgid "Use text block from right file before left\nUse right file text block then left" msgstr "" -#. Resource IDs: (32819) -msgid "Use text block from 'theirs'\nUse 'theirs' text block" +#. Resource IDs: (32820) +msgid "Use text block from right file\nUse right file text block" msgstr "" #. Resource IDs: (32855) diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc index 7ea3a8a0a..272dbe0e2 100644 --- a/src/Resources/TortoiseMergeENG.rc +++ b/src/Resources/TortoiseMergeENG.rc @@ -522,10 +522,10 @@ BEGIN MENUITEM "Use block from left before right", ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT MENUITEM "Use block from right before left", ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT MENUITEM SEPARATOR - MENUITEM "Use 'theirs' text block", ID_EDIT_USETHEIRBLOCK - MENUITEM "Use 'mine' text block", ID_EDIT_USEMYBLOCK - MENUITEM "Use 'theirs' text block then 'mine'", ID_EDIT_USETHEIRTHENMYBLOCK - MENUITEM "Use 'mine' text block then 'theirs'", ID_EDIT_USEMINETHENTHEIRBLOCK + MENUITEM "Use left text block", ID_EDIT_USETHEIRBLOCK + MENUITEM "Use right text block", ID_EDIT_USEMYBLOCK + MENUITEM "Use left text block then right", ID_EDIT_USETHEIRTHENMYBLOCK + MENUITEM "Use right text block then left", ID_EDIT_USEMINETHENTHEIRBLOCK MENUITEM SEPARATOR MENUITEM "Find", ID_EDIT_FIND MENUITEM "Goto Line", ID_EDIT_GOTOLINE @@ -885,12 +885,12 @@ END STRINGTABLE BEGIN IDS_VIEWCONTEXTMENU_USETHISBLOCK "Use th&is text block" - IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from '&theirs'" - IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from '&mine'" + IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from &left" + IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from &right" IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK - "Use text block from 't&heirs' before 'mine'" + "Use text block from l&eft before right" IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK - "Use text block from 'm&ine' before 'theirs'" + "Use text block from r&ight before left" IDS_VIEWCONTEXTMENU_USETHISFILE "Use this &whole file" IDS_VIEWCONTEXTMENU_USEOTHERBLOCK "Use &other text block" IDS_VIEWCONTEXTMENU_USEOTHERFILE "Use whole other &file" @@ -989,12 +989,12 @@ END STRINGTABLE BEGIN ID_VIEW_SHOWFILELIST "Hide/Show the patch file list\nHides or shows the patch file list" - ID_EDIT_USETHEIRBLOCK "Use text block from 'theirs'\nUse 'theirs' text block" - ID_EDIT_USEMYBLOCK "Use text block from 'mine'\nUse 'mine' text block" + ID_EDIT_USETHEIRBLOCK "Use text block from left file\nUse left file text block" + ID_EDIT_USEMYBLOCK "Use text block from right file\nUse right file text block" ID_EDIT_USETHEIRTHENMYBLOCK - "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'" + "Use text block from left before right file\nUse left file text block then right" ID_EDIT_USEMINETHENTHEIRBLOCK - "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'" + "Use text block from right file before left\nUse right file text block then left" ID_VIEW_INLINEDIFFWORD "Show Inline-Diff word by word\nInline diff word-wise" ID_EDIT_CREATEUNIFIEDDIFFFILE "Creates a patch file from the differences of the two files\nCreate patch file" diff --git a/src/Resources/ribbon.mfcribbon-ms b/src/Resources/ribbon.mfcribbon-ms index a1fe6eba2..a2c8e09cf 100644 --- a/src/Resources/ribbon.mfcribbon-ms +++ b/src/Resources/ribbon.mfcribbon-ms @@ -1 +1 @@ -
1
RibbonBarTRUETRUETRUETRUEFALSEIDB_RIBBONSMALL158Button_MainID_LOGOBUTTON32897TFALSEFALSE-1-1TRUEIDB_LOGO159Category_MainTortoiseGitMergeIDB_RIBBONSMALL158IDB_RIBBONLARGE157ButtonID_FILE_OPEN57601OpenOFALSEFALSE00TRUEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSEButtonID_FILE_SAVE_AS57604Save asAFALSEFALSE4343TRUEFALSESeparatorTRUEButtonID_EDIT_CREATEUNIFIEDDIFFFILE32828Create patch filePFALSEFALSE2626TRUEFALSESeparatorTRUEButtonID_VIEW_SHOWFILELIST32817Hide/Show the patch file listHFALSEFALSE3030TRUEFALSEButtonID_VIEW_OPTIONS32782SettingsSFALSEFALSE4242TRUEFALSEButton_Main_PanelID_APP_EXIT57665ExitXFALSEFALSE40-1TRUEFALSE300GroupButtonIDC_STYLEBUTTON10000StyleFALSEFALSE-1-1FALSEFALSEButtonID_VIEW_APPLOOK_WIN_200010003Windows 2000FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_XP10004Office XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN_XP10005Windows XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_200310006Office 2003FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200510007Visual Studio 2005FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200810002Visual Studio 2008FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN710001Windows 7FALSEFALSE-1-1TRUEFALSEButtonID_OFFICE200710008Office 2007FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLUE10009Blue StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLACK10010Black StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_SILVER10011Silver StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_AQUA10012Aqua StyleFALSEFALSE-1-1TRUEFALSEButtonID_HELP57670HelpFALSEFALSE41-1TRUEFALSEButtonID_APP_ABOUT57664AboutFALSEFALSE39-1TRUEFALSECategoryEditEIDB_RIBBONSMALL158IDB_RIBBONLARGE157PanelEditE43FALSEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSESeparatorFALSEButtonID_FILE_RELOAD32794ReloadRFALSEFALSE22FALSEFALSEButtonID_EDIT_UNDO57643UndoZFALSEFALSE3-1TRUEFALSEButtonID_EDIT_REDO57644RedoYFALSEFALSE58-1TRUEFALSEButtonID_EDIT_ENABLE32976Enable EditEFALSEFALSE44-1FALSEFALSESeparatorFALSEButtonID_EDIT_COPY57634CopyCFALSEFALSE2727TRUEFALSEButtonID_EDIT_PASTE57637PastePFALSEFALSE2828TRUEFALSESeparatorFALSEButtonID_EDIT_FIND57636FindFFALSEFALSE2424TRUEFALSEButtonID_EDIT_GOTOLINE32893Goto LineGFALSEFALSE2525TRUEFALSESeparatorFALSEButtonID_EDIT_MARKASRESOLVED32808Mark as resolvedFALSEFALSE2020TRUEFALSEPanelNavigateN7TRUEFALSEButtonID_NAVIGATE_PREVIOUSDIFFERENCE32780Previous differencePDFALSEFALSE66FALSEFALSEButtonID_NAVIGATE_NEXTDIFFERENCE32779Next differenceNDFALSEFALSE44FALSEFALSEButtonID_NAVIGATE_PREVIOUSCONFLICT32802Previous conflictPCFALSEFALSE1414FALSEFALSEButtonID_NAVIGATE_NEXTCONFLICT32804Next conflictNCFALSEFALSE1212FALSEFALSEButtonID_NAVIGATE_PREVINLINEDIFF32876Previous inline differencePIFALSEFALSE99TRUEFALSEButtonID_NAVIGATE_NEXTINLINEDIFF32875Next inline differenceNIFALSEFALSE1111TRUEFALSEPanelBlocks50FALSEFALSEButtonID_EDIT_USELEFTBLOCK32855Use left blockFALSEFALSE5050TRUEFALSEButtonID_EDIT_USELEFTFILE32856Use left fileFALSEFALSE51-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT32857Use block from left before rightFALSEFALSE52-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT32859Use block from right before leftFALSEFALSE53-1TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use 'theirs' text blockFALSEFALSE5555TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use 'theirs' text blockFALSEFALSE55-1TRUEFALSEButtonID_EDIT_USEMYBLOCK32820Use 'mine' text blockFALSEFALSE54-1TRUEFALSEButtonID_EDIT_USETHEIRTHENMYBLOCK32821Use 'theirs' text block then 'mine'FALSEFALSE57-1TRUEFALSEButtonID_EDIT_USEMINETHENTHEIRBLOCK32822Use 'mine' text block then 'theirs'FALSEFALSE56-1TRUEFALSEPanelWhitespaces23FALSEFALSEButtonID_VIEW_WHITESPACES32774Show WhitespacesWFALSEFALSE2323TRUEFALSESeparatorFALSEButtonID_VIEW_COMPAREWHITESPACES32871Compare whitespacesFALSEFALSE3535TRUEFALSEButtonID_VIEW_IGNOREWHITESPACECHANGES32872Ignore whitespace changesFALSEFALSE3636TRUEFALSEButtonID_VIEW_IGNOREALLWHITESPACECHANGES32873Ignore all whitespace changesFALSEFALSE3737TRUEFALSEPanelDiff30FALSEFALSEButtonID_VIEW_INLINEDIFF32889Inline diffFALSEFALSE3131TRUEFALSEButtonID_VIEW_INLINEDIFFWORD32825Inline diff word-wiseFALSEFALSE3232TRUEFALSEButton_GalleryID_REGEXFILTER500Regex FilterFALSEFALSE4747TRUEFALSETRUEFALSE00, 0ButtonID_VIEW_IGNORECOMMENTS32896Ignore CommentsFALSEFALSE4545TRUEFALSEPanelViewV59FALSEFALSEButtonID_VIEW_BARS32898View BarsFALSEFALSE5959FALSEFALSEButtonID_VIEW_LINEDIFFBAR32853Line diff barFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_LOCATORBAR32854Locator BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_STATUS_BAR59393Status BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_WRAPLONGLINES32881Wrap long linesLFALSEFALSE3838TRUEFALSESeparatorFALSEButtonID_VIEW_ONEWAYDIFF32775Switch between single and double pane viewFALSEFALSE3333TRUEFALSEButtonID_VIEW_SWITCHLEFT32811Switch left and right viewFALSEFALSE3434TRUEFALSEButtonID_VIEW_COLLAPSED32870CollapseFALSEFALSE2929TRUEFALSE \ No newline at end of file +
1
RibbonBarTRUETRUETRUETRUEFALSEIDB_RIBBONSMALL158Button_MainID_LOGOBUTTON32897TFALSEFALSE-1-1TRUEIDB_LOGO159Category_MainTortoiseGitMergeIDB_RIBBONSMALL158IDB_RIBBONLARGE157ButtonID_FILE_OPEN57601OpenOFALSEFALSE00TRUEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSEButtonID_FILE_SAVE_AS57604Save asAFALSEFALSE4343TRUEFALSESeparatorTRUEButtonID_EDIT_CREATEUNIFIEDDIFFFILE32828Create patch filePFALSEFALSE2626TRUEFALSESeparatorTRUEButtonID_VIEW_SHOWFILELIST32817Hide/Show the patch file listHFALSEFALSE3030TRUEFALSEButtonID_VIEW_OPTIONS32782SettingsSFALSEFALSE4242TRUEFALSEButton_Main_PanelID_APP_EXIT57665ExitXFALSEFALSE40-1TRUEFALSE300GroupButtonIDC_STYLEBUTTON10000StyleFALSEFALSE-1-1FALSEFALSEButtonID_VIEW_APPLOOK_WIN_200010003Windows 2000FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_XP10004Office XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN_XP10005Windows XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_200310006Office 2003FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200510007Visual Studio 2005FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200810002Visual Studio 2008FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN710001Windows 7FALSEFALSE-1-1TRUEFALSEButtonID_OFFICE200710008Office 2007FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLUE10009Blue StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLACK10010Black StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_SILVER10011Silver StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_AQUA10012Aqua StyleFALSEFALSE-1-1TRUEFALSEButtonID_HELP57670HelpFALSEFALSE41-1TRUEFALSEButtonID_APP_ABOUT57664AboutFALSEFALSE39-1TRUEFALSECategoryEditEIDB_RIBBONSMALL158IDB_RIBBONLARGE157PanelEditE43FALSEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSESeparatorFALSEButtonID_FILE_RELOAD32794ReloadRFALSEFALSE22FALSEFALSEButtonID_EDIT_UNDO57643UndoZFALSEFALSE3-1TRUEFALSEButtonID_EDIT_REDO57644RedoYFALSEFALSE58-1TRUEFALSEButtonID_EDIT_ENABLE32976Enable EditEFALSEFALSE44-1FALSEFALSESeparatorFALSEButtonID_EDIT_COPY57634CopyCFALSEFALSE2727TRUEFALSEButtonID_EDIT_PASTE57637PastePFALSEFALSE2828TRUEFALSESeparatorFALSEButtonID_EDIT_FIND57636FindFFALSEFALSE2424TRUEFALSEButtonID_EDIT_GOTOLINE32893Goto LineGFALSEFALSE2525TRUEFALSESeparatorFALSEButtonID_EDIT_MARKASRESOLVED32808Mark as resolvedFALSEFALSE2020TRUEFALSEPanelNavigateN7TRUEFALSEButtonID_NAVIGATE_PREVIOUSDIFFERENCE32780Previous differencePDFALSEFALSE66FALSEFALSEButtonID_NAVIGATE_NEXTDIFFERENCE32779Next differenceNDFALSEFALSE44FALSEFALSEButtonID_NAVIGATE_PREVIOUSCONFLICT32802Previous conflictPCFALSEFALSE1414FALSEFALSEButtonID_NAVIGATE_NEXTCONFLICT32804Next conflictNCFALSEFALSE1212FALSEFALSEButtonID_NAVIGATE_PREVINLINEDIFF32876Previous inline differencePIFALSEFALSE99TRUEFALSEButtonID_NAVIGATE_NEXTINLINEDIFF32875Next inline differenceNIFALSEFALSE1111TRUEFALSEPanelBlocks50FALSEFALSEButtonID_EDIT_USELEFTBLOCK32855Use left blockFALSEFALSE5050TRUEFALSEButtonID_EDIT_USELEFTFILE32856Use left fileFALSEFALSE51-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT32857Use block from left before rightFALSEFALSE52-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT32859Use block from right before leftFALSEFALSE53-1TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use left text blockFALSEFALSE5555TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use left text blockFALSEFALSE55-1TRUEFALSEButtonID_EDIT_USEMYBLOCK32820Use right text blockFALSEFALSE54-1TRUEFALSEButtonID_EDIT_USETHEIRTHENMYBLOCK32821Use left text block then rightFALSEFALSE57-1TRUEFALSEButtonID_EDIT_USEMINETHENTHEIRBLOCK32822Use right text block then leftFALSEFALSE56-1TRUEFALSEPanelWhitespaces23FALSEFALSEButtonID_VIEW_WHITESPACES32774Show WhitespacesWFALSEFALSE2323TRUEFALSESeparatorFALSEButtonID_VIEW_COMPAREWHITESPACES32871Compare whitespacesFALSEFALSE3535TRUEFALSEButtonID_VIEW_IGNOREWHITESPACECHANGES32872Ignore whitespace changesFALSEFALSE3636TRUEFALSEButtonID_VIEW_IGNOREALLWHITESPACECHANGES32873Ignore all whitespace changesFALSEFALSE3737TRUEFALSEPanelDiff30FALSEFALSEButtonID_VIEW_INLINEDIFF32889Inline diffFALSEFALSE3131TRUEFALSEButtonID_VIEW_INLINEDIFFWORD32825Inline diff word-wiseFALSEFALSE3232TRUEFALSEButton_GalleryID_REGEXFILTER500Regex FilterFALSEFALSE4747TRUEFALSETRUEFALSE00, 0ButtonID_VIEW_IGNORECOMMENTS32896Ignore CommentsFALSEFALSE4545TRUEFALSEPanelViewV59FALSEFALSEButtonID_VIEW_BARS32898View BarsFALSEFALSE5959FALSEFALSEButtonID_VIEW_LINEDIFFBAR32853Line diff barFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_LOCATORBAR32854Locator BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_STATUS_BAR59393Status BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_WRAPLONGLINES32881Wrap long linesLFALSEFALSE3838TRUEFALSESeparatorFALSEButtonID_VIEW_ONEWAYDIFF32775Switch between single and double pane viewFALSEFALSE3333TRUEFALSEButtonID_VIEW_SWITCHLEFT32811Switch left and right viewFALSEFALSE3434TRUEFALSEButtonID_VIEW_COLLAPSED32870CollapseFALSEFALSE2929TRUEFALSE \ No newline at end of file diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp index 23aaca043..8dd8e7882 100644 --- a/src/TortoiseMerge/MainFrm.cpp +++ b/src/TortoiseMerge/MainFrm.cpp @@ -1030,8 +1030,7 @@ bool CMainFrame::LoadViews(int line) m_pwndLeftView->m_pViewData = &m_Data.m_TheirBaseBoth; m_pwndLeftView->SetTextType(m_Data.m_arTheirFile.GetUnicodeType()); m_pwndLeftView->SetLineEndingStyle(m_Data.m_arTheirFile.GetLineEndings()); - m_pwndLeftView->m_sWindowName.LoadString(IDS_VIEWTITLE_THEIRS); - m_pwndLeftView->m_sWindowName += L" - " + m_Data.m_theirFile.GetWindowName(); + m_pwndLeftView->m_sWindowName = m_Data.m_theirFile.GetWindowName(IDS_VIEWTITLE_THEIRS); m_pwndLeftView->m_sFullFilePath = m_Data.m_theirFile.GetFilename(); m_pwndLeftView->m_sConvertedFilePath = m_Data.m_theirFile.GetConvertedFileName(); m_pwndLeftView->m_sReflectedName = m_Data.m_theirFile.GetReflectedName(); @@ -1040,8 +1039,7 @@ bool CMainFrame::LoadViews(int line) m_pwndRightView->m_pViewData = &m_Data.m_YourBaseBoth; m_pwndRightView->SetTextType(m_Data.m_arYourFile.GetUnicodeType()); m_pwndRightView->SetLineEndingStyle(m_Data.m_arYourFile.GetLineEndings()); - m_pwndRightView->m_sWindowName.LoadString(IDS_VIEWTITLE_MINE); - m_pwndRightView->m_sWindowName += L" - " + m_Data.m_yourFile.GetWindowName(); + m_pwndRightView->m_sWindowName = m_Data.m_yourFile.GetWindowName(IDS_VIEWTITLE_MINE); m_pwndRightView->m_sFullFilePath = m_Data.m_yourFile.GetFilename(); m_pwndRightView->m_sConvertedFilePath = m_Data.m_yourFile.GetConvertedFileName(); m_pwndRightView->m_sReflectedName = m_Data.m_yourFile.GetReflectedName(); diff --git a/src/TortoiseMerge/WorkingFile.cpp b/src/TortoiseMerge/WorkingFile.cpp index f2a6c82ac..0e05719ae 100644 --- a/src/TortoiseMerge/WorkingFile.cpp +++ b/src/TortoiseMerge/WorkingFile.cpp @@ -1,5 +1,6 @@ // TortoiseGitMerge - a Diff/Patch program +// Copyright (C) 2017 - TortoiseGit // Copyright (C) 2006-2007, 2011-2014 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -88,7 +89,7 @@ void CWorkingFile::TransferDetailsFrom(CWorkingFile& rightHandFile) m_attribs = rightHandFile.m_attribs; } -CString CWorkingFile::GetWindowName() const +CString CWorkingFile::GetWindowName(UINT type) const { CString sErrMsg; // TortoiseMerge allows non-existing files to be used in a merge @@ -102,7 +103,14 @@ CString CWorkingFile::GetWindowName() const { // We don't have a proper name - use the filename part of the path // return the filename part of the path. - return CPathUtils::GetFileNameFromPath(m_sFilename) + L' ' + sErrMsg; + CString ret; + if (type) + { + ret.LoadString(type); + ret += L" - "; + } + ret += CPathUtils::GetFileNameFromPath(m_sFilename) + L' ' + sErrMsg; + return ret; } else if (sErrMsg.IsEmpty()) { diff --git a/src/TortoiseMerge/WorkingFile.h b/src/TortoiseMerge/WorkingFile.h index b650ba6bc..23209cf25 100644 --- a/src/TortoiseMerge/WorkingFile.h +++ b/src/TortoiseMerge/WorkingFile.h @@ -41,7 +41,7 @@ public: void SetReflectedName(const CString& newReflectedName); CString GetReflectedName(); void CreateEmptyFile(); - CString GetWindowName() const; + CString GetWindowName(UINT type = 0) const; CString GetFilename() const { return m_sFilename; } void SetOutOfUse(); -- 2.11.4.GIT