Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/winmerge/winmerge

  • Loading branch information...
sdottaka committed Oct 8, 2019
2 parents 0bcd33b + 761941c commit d377ddf7c6203cd567b4f4ad8a8dcb8c29bb2048
Showing with 3 additions and 3 deletions.
  1. +2 −2 Src/Merge.rc
  2. +1 −1 Translations/WinMerge/Portuguese.po
@@ -1008,8 +1008,8 @@ BEGIN
CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,140,10
CONTROL "&Don't close this dialog box",IDC_FINDDLG_DONTCLOSE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,140,10
DEFPUSHBUTTON "Find &Prev",IDC_EDIT_FINDPREV,226,7,60,14,WS_GROUP
DEFPUSHBUTTON "&Find Next",IDOK,226,24,60,14,WS_GROUP
DEFPUSHBUTTON "&Find Next",IDOK,226,7,60,14,WS_GROUP
DEFPUSHBUTTON "Find &Prev",IDC_EDIT_FINDPREV,226,24,60,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,226,41,60,14
END

@@ -2191,7 +2191,7 @@ msgid "&Enable plugins"
msgstr "&Ativar plugins"

msgid "File filters:"
msgstr ""
msgstr "Filtros de ficheiros:"

#, c-format
msgid "Shell Integration"

0 comments on commit d377ddf

Please sign in to comment.
You can’t perform that action at this time.