Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge similar but not quite identical translated strings.

Browse Source 
Some translated strings appeared several times in almost but not quite
identical form. Remove a few of them so that they don't have to be translated
multiple times.

Closes #13637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-27 19:49:43 +00:00
parent 167d0cb30b
commit b82f92a80c
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/aboutdlgg.cpp
View File

@@ -138,7 +138,7 @@ void wxAboutDialogInfo::SetVersion(const wxString& version,
bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* parent)
{
if ( !wxDialog::Create(parent, wxID_ANY, _("About ") + info.GetName(),
if ( !wxDialog::Create(parent, wxID_ANY, wxString::Format(_("About %s"), info.GetName()),
wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER|wxDEFAULT_DIALOG_STYLE) )
return false;

2
src/generic/dbgrptg.cpp
View File

@@ -228,7 +228,7 @@ void wxDumpOpenExternalDlg::OnBrowse(wxCommandEvent& )
fname.GetPathWithSep(),
fname.GetFullName()
#ifdef __WXMSW__
, _("Executable files (*.exe)|*.exe|All files (*.*)|*.*||")
, _("Executable files (*.exe)|*.exe|") + wxALL_FILES
#endif // __WXMSW__
);
if ( dlg.ShowModal() == wxID_OK )

2
src/generic/logg.cpp
View File

@@ -521,7 +521,7 @@ wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTi
wxMenuBar *pMenuBar = new wxMenuBar;
wxMenu *pMenu = new wxMenu;
#if CAN_SAVE_FILES
pMenu->Append(Menu_Save, _("&Save..."), _("Save log contents to file"));
pMenu->Append(Menu_Save, _("Save &As..."), _("Save log contents to file"));
#endif // CAN_SAVE_FILES
pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
pMenu->AppendSeparator();

8
src/generic/prntdlgg.cpp
View File

@@ -804,7 +804,7 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice()
wxComboBox *choice = new wxComboBox( this,
wxPRINTID_PAPERSIZE,
_("Paper Size"),
_("Paper size"),
wxDefaultPosition,
wxSize(width, wxDefaultCoord),
n, choices );
@@ -831,7 +831,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
wxPageSetupDialogData* data)
: wxPageSetupDialogBase( parent,
wxID_ANY,
_("Page Setup"),
_("Page setup"),
wxPoint(0,0),
wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
@@ -858,7 +858,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
m_paperTypeChoice = new wxComboBox( this,
wxPRINTID_PAPERSIZE,
_("Paper Size"),
_("Paper size"),
wxDefaultPosition,
wxSize(300, wxDefaultCoord),
n, choices );
@@ -1060,7 +1060,7 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
wxComboBox *choice = new wxComboBox( this,
wxPRINTID_PAPERSIZE,
_("Paper Size"),
_("Paper size"),
wxPoint(*x, *y),
wxSize(300, wxDefaultCoord),
n, choices );

2
src/html/helpwnd.cpp
View File

@@ -1557,7 +1557,7 @@ void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
#if wxUSE_LIBMSPACK
_("Compressed HTML Help file (*.chm)|*.chm|") +
#endif
_("All files (*.*)|*");
wxALL_FILES;
wxString s = wxFileSelector(_("Open HTML document"),
wxEmptyString,
wxEmptyString,

4
src/propgrid/props.cpp
View File

@@ -1703,7 +1703,7 @@ bool wxPGFileDialogAdapter::DoShowDialog( wxPropertyGrid* propGrid, wxPGProperty
property->GetAttribute(wxS("DialogTitle"), _("Choose a file")),
property->GetAttribute(wxS("InitialPath"), path),
wxEmptyString,
property->GetAttribute(wxPG_FILE_WILDCARD, _("All files (*.*)|*.*")),
property->GetAttribute(wxPG_FILE_WILDCARD, wxALL_FILES),
0,
wxDefaultPosition );
@@ -1732,7 +1732,7 @@ wxFileProperty::wxFileProperty( const wxString& label, const wxString& name,
{
m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
m_indFilter = -1;
SetAttribute( wxPG_FILE_WILDCARD, _("All files (*.*)|*.*") );
SetAttribute( wxPG_FILE_WILDCARD, wxALL_FILES);
SetValue(value);
}

2
src/univ/themes/win32.cpp
View File

@@ -3775,7 +3775,7 @@ void wxWin32FrameInputHandler::PopupSystemMenu(wxTopLevelWindow *window) const
if ( window->GetWindowStyle() & wxMAXIMIZE_BOX )
menu.Append(wxID_MAXIMIZE_FRAME , _("Ma&ximize"));
menu.AppendSeparator();
menu.Append(wxID_CLOSE_FRAME, _("Close\tAlt-F4"));
menu.Append(wxID_CLOSE_FRAME, _("&Close") + _T("\t") + _("Alt+") + _T("F4"));
if ( window->GetWindowStyle() & wxMAXIMIZE_BOX )
{

2
src/unix/threadpsx.cpp
View File

@@ -815,7 +815,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
int rc = pthread_setspecific(gs_keySelf, thread);
if ( rc != 0 )
{
wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
wxLogSysError(rc, _("Cannot start thread: error writing TLS."));
return (void *)-1;
}