mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Make some very similar translatable strings identical

Browse source 
Originally committed to SVN as r6658.
This commit is contained in:
Thomas Goyne 2012-04-04 16:46:02 +00:00
parent 4ed11dafca
commit 6e877b7dea
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/dialog_style_manager.cpp
View file

@ -413,7 +413,7 @@ void DialogStyleManager::OnCopyToStorage() {
wxString styleName = CurrentList->GetString(selections[i]); wxString styleName = CurrentList->GetString(selections[i]);
if (AssStyle *style = Store.GetStyle(styleName)) { if (AssStyle *style = Store.GetStyle(styleName)) {
if (wxYES == wxMessageBox(wxString::Format(_("There is already a style with the name \"%s\" in the current storage. Proceed and overwrite anyway?"),styleName), _("Style name collision."), wxYES_NO)) { if (wxYES == wxMessageBox(wxString::Format(_("There is already a style with the name \"%s\" in the current storage. Overwrite?"),styleName), _("Style name collision."), wxYES_NO)) {
*style = *styleMap.at(selections[i]); *style = *styleMap.at(selections[i]);
copied.push_back(styleName); copied.push_back(styleName);
} }
@ -442,7 +442,7 @@ void DialogStyleManager::OnCopyToCurrent() {
for (std::vector<AssStyle *>::iterator style = styleMap.begin(); style != styleMap.end(); ++style) { for (std::vector<AssStyle *>::iterator style = styleMap.begin(); style != styleMap.end(); ++style) {
if ((*style)->name.CmpNoCase(styleName) == 0) { if ((*style)->name.CmpNoCase(styleName) == 0) {
addStyle = false; addStyle = false;
if (wxYES == wxMessageBox(wxString::Format(_("There is already a style with the name \"%s\" in the current script. Proceed and overwrite anyway?"), styleName), _("Style name collision"), wxYES_NO)) { if (wxYES == wxMessageBox(wxString::Format(_("There is already a style with the name \"%s\" in the current script. Overwrite?"), styleName), _("Style name collision"), wxYES_NO)) {
**style = *Store[selections[i]]; **style = *Store[selections[i]];
copied.push_back(styleName); copied.push_back(styleName);
} }
@ -614,7 +614,7 @@ void DialogStyleManager::OnCurrentImport() {
int test = CurrentList->FindString(styles[selections[i]], false); int test = CurrentList->FindString(styles[selections[i]], false);
if (test != wxNOT_FOUND) { if (test != wxNOT_FOUND) {
int answer = wxMessageBox( int answer = wxMessageBox(
wxString::Format(_("There is already a style with the name \"%s\" on the current script. Overwrite?"), styles[selections[i]]), wxString::Format(_("There is already a style with the name \"%s\" in the current script. Overwrite?"), styles[selections[i]]),
_("Style name collision"), _("Style name collision"),
wxYES_NO); wxYES_NO);
if (answer == wxYES) { if (answer == wxYES) {