Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/winmerge/winmerge
Browse files Browse the repository at this point in the history
  • Loading branch information
sdottaka committed Oct 8, 2019
2 parents 0bcd33b + 761941c commit d377ddf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Src/Merge.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Translations/WinMerge/Portuguese.po
Original file line number Diff line number Diff line change
Expand Up @@ -2191,7 +2191,7 @@ msgid "&Enable plugins"
msgstr "&Ativar plugins"

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

#, c-format
msgid "Shell Integration"
Expand Down

0 comments on commit d377ddf

Please sign in to comment.