IOM: Localization/String improvements
* Switching mis-used B_TRANSLATE_CONTEXT to B_TRANSLATE_COMMENT * Use B_TRANSLATE_SYSTEM_NAME for "Icon-O-Matic" * Remove remnants of old localization system * Rename "Control Points" to vertex/vertices * Add a ":" after Undo/Redo * Sentence casing * Avoid Yes/No buttons in BAlert Change-Id: Ibb299925bce1f6ca1cf03216a36df7c44f10bdc6 Reviewed-on: https://review.haiku-os.org/c/haiku/+/6704 Reviewed-by: Adrien Destugues <[email protected]> Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
@@ -194,7 +194,7 @@ MainWindow::MessageReceived(BMessage* message)
|
|||||||
continue;
|
continue;
|
||||||
char name[30];
|
char name[30];
|
||||||
sprintf(name,
|
sprintf(name,
|
||||||
B_TRANSLATE_CONTEXT("Color (#%02x%02x%02x)",
|
B_TRANSLATE_COMMENT("Color (#%02x%02x%02x)",
|
||||||
"Style name after dropping a color"),
|
"Style name after dropping a color"),
|
||||||
color->red, color->green, color->blue);
|
color->red, color->green, color->blue);
|
||||||
Style* style = new (nothrow) Style(*color);
|
Style* style = new (nothrow) Style(*color);
|
||||||
@@ -395,8 +395,10 @@ MainWindow::MessageReceived(BMessage* message)
|
|||||||
case MSG_UNDO_STACK_CHANGED:
|
case MSG_UNDO_STACK_CHANGED:
|
||||||
{
|
{
|
||||||
// relable Undo item and update enabled status
|
// relable Undo item and update enabled status
|
||||||
BString label(B_TRANSLATE("Undo"));
|
BString label(B_TRANSLATE("Undo: %action%"));
|
||||||
fUndoMI->SetEnabled(fDocument->CommandStack()->GetUndoName(label));
|
BString temp;
|
||||||
|
fUndoMI->SetEnabled(fDocument->CommandStack()->GetUndoName(temp));
|
||||||
|
label.ReplaceFirst("%action%", temp);
|
||||||
if (fUndoMI->IsEnabled())
|
if (fUndoMI->IsEnabled())
|
||||||
fUndoMI->SetLabel(label.String());
|
fUndoMI->SetLabel(label.String());
|
||||||
else {
|
else {
|
||||||
@@ -405,8 +407,10 @@ MainWindow::MessageReceived(BMessage* message)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// relable Redo item and update enabled status
|
// relable Redo item and update enabled status
|
||||||
label.SetTo(B_TRANSLATE("Redo"));
|
label.SetTo(B_TRANSLATE("Redo: %action%"));
|
||||||
fRedoMI->SetEnabled(fDocument->CommandStack()->GetRedoName(label));
|
temp.SetTo("");
|
||||||
|
fRedoMI->SetEnabled(fDocument->CommandStack()->GetRedoName(temp));
|
||||||
|
label.ReplaceFirst("%action%", temp);
|
||||||
if (fRedoMI->IsEnabled())
|
if (fRedoMI->IsEnabled())
|
||||||
fRedoMI->SetLabel(label.String());
|
fRedoMI->SetLabel(label.String());
|
||||||
else {
|
else {
|
||||||
@@ -743,9 +747,9 @@ MainWindow::Open(const entry_ref& ref, bool append)
|
|||||||
BString helper(B_TRANSLATE("Opening the document failed!"));
|
BString helper(B_TRANSLATE("Opening the document failed!"));
|
||||||
helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
|
helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
|
||||||
BAlert* alert = new BAlert(
|
BAlert* alert = new BAlert(
|
||||||
B_TRANSLATE_CONTEXT("bad news", "Title of error alert"),
|
B_TRANSLATE_CONTEXT("Bad news", "Title of error alert"),
|
||||||
helper.String(),
|
helper.String(),
|
||||||
B_TRANSLATE_CONTEXT("Bummer",
|
B_TRANSLATE_COMMENT("Bummer",
|
||||||
"Cancel button - error alert"),
|
"Cancel button - error alert"),
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
// launch alert asynchronously
|
// launch alert asynchronously
|
||||||
@@ -822,9 +826,9 @@ MainWindow::Open(const BMessenger& externalObserver, const uint8* data,
|
|||||||
BString helper(B_TRANSLATE("Opening the icon failed!"));
|
BString helper(B_TRANSLATE("Opening the icon failed!"));
|
||||||
helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
|
helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
|
||||||
BAlert* alert = new BAlert(
|
BAlert* alert = new BAlert(
|
||||||
B_TRANSLATE_CONTEXT("bad news", "Title of error alert"),
|
B_TRANSLATE_CONTEXT("Bad news", "Title of error alert"),
|
||||||
helper.String(),
|
helper.String(),
|
||||||
B_TRANSLATE_CONTEXT("Bummer",
|
B_TRANSLATE_COMMENT("Bummer",
|
||||||
"Cancel button - error alert"),
|
"Cancel button - error alert"),
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
// launch alert asynchronously
|
// launch alert asynchronously
|
||||||
|
|||||||
@@ -83,17 +83,19 @@ SetPropertiesCommand::GetName(BString& name)
|
|||||||
{
|
{
|
||||||
if (fOldProperties->CountProperties() > 1) {
|
if (fOldProperties->CountProperties() > 1) {
|
||||||
if (fObjectCount > 1)
|
if (fObjectCount > 1)
|
||||||
name << B_TRANSLATE("Multi Paste Properties");
|
name << B_TRANSLATE("Multi-paste properties");
|
||||||
else
|
else
|
||||||
name << B_TRANSLATE("Paste Properties");
|
name << B_TRANSLATE("Paste properties");
|
||||||
} else {
|
} else {
|
||||||
BString property = name_for_id(
|
BString property = name_for_id(
|
||||||
fOldProperties->PropertyAt(0)->Identifier());
|
fOldProperties->PropertyAt(0)->Identifier());
|
||||||
if (fObjectCount > 1)
|
if (fObjectCount > 1) {
|
||||||
name << B_TRANSLATE_CONTEXT("Multi Set ",
|
name << B_TRANSLATE_COMMENT("Multi-set %property%",
|
||||||
"Multi Set (property name)") << property;
|
"Don't translate %property%");
|
||||||
else
|
} else {
|
||||||
name << B_TRANSLATE_CONTEXT("Set ", "Set (property name)")
|
name << B_TRANSLATE_COMMENT("Set %property%",
|
||||||
<< property;
|
"Don't translate %property%");
|
||||||
|
}
|
||||||
|
name.ReplaceFirst("%property%", property);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ void
|
|||||||
AddCommand<Type>::GetName(BString& name)
|
AddCommand<Type>::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
||||||
"one{Item} other{Items}}"));
|
"one{item} other{items}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
#endif // ADD_COMMAND_H
|
#endif // ADD_COMMAND_H
|
||||||
|
|||||||
@@ -194,7 +194,7 @@ void
|
|||||||
MoveCommand<Type>::GetName(BString& name)
|
MoveCommand<Type>::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
||||||
"one{Item} other{Items}}"));
|
"one{item} other{items}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
#endif // MOVE_COMMAND_H
|
#endif // MOVE_COMMAND_H
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ void
|
|||||||
RemoveCommand<Type>::GetName(BString& name)
|
RemoveCommand<Type>::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
||||||
"one{Item} other{Items}}"));
|
"one{item} other{items}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
#endif // REMOVE_COMMAND_H
|
#endif // REMOVE_COMMAND_H
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ name_for_id(int32 id)
|
|||||||
name = B_TRANSLATE("Joins");
|
name = B_TRANSLATE("Joins");
|
||||||
break;
|
break;
|
||||||
case PROPERTY_MITER_LIMIT:
|
case PROPERTY_MITER_LIMIT:
|
||||||
name = B_TRANSLATE("Miter Limit");
|
name = B_TRANSLATE("Miter limit");
|
||||||
break;
|
break;
|
||||||
case PROPERTY_STROKE_SHORTEN:
|
case PROPERTY_STROKE_SHORTEN:
|
||||||
name = B_TRANSLATE("Shorten");
|
name = B_TRANSLATE("Shorten");
|
||||||
@@ -94,7 +94,7 @@ name_for_id(int32 id)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case PROPERTY_DETECT_ORIENTATION:
|
case PROPERTY_DETECT_ORIENTATION:
|
||||||
name = B_TRANSLATE("Detect Orient.");
|
name = B_TRANSLATE("Detect orient.");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -351,26 +351,6 @@ PropertyListView::SetMenu(BMenu* menu)
|
|||||||
_CheckMenuStatus();
|
_CheckMenuStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateStrings
|
|
||||||
void
|
|
||||||
PropertyListView::UpdateStrings()
|
|
||||||
{
|
|
||||||
// if (fSelectM) {
|
|
||||||
// LanguageManager* m = LanguageManager::Default();
|
|
||||||
//
|
|
||||||
// fSelectM->Superitem()->SetLabel(m->GetString(PROPERTY_SELECTION, "Select"));
|
|
||||||
// fSelectAllMI->SetLabel(m->GetString(SELECT_ALL_PROPERTIES, "All"));
|
|
||||||
// fSelectNoneMI->SetLabel(m->GetString(SELECT_NO_PROPERTIES, "None"));
|
|
||||||
// fInvertSelectionMI->SetLabel(m->GetString(INVERT_SELECTION, "Invert Selection"));
|
|
||||||
//
|
|
||||||
// fPropertyM->Superitem()->SetLabel(m->GetString(PROPERTY, "Property"));
|
|
||||||
// fCopyMI->SetLabel(m->GetString(COPY, "Copy"));
|
|
||||||
// if (IsEditingMultipleObjects())
|
|
||||||
// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi Paste"));
|
|
||||||
// else
|
|
||||||
// fPasteMI->SetLabel(m->GetString(PASTE, "Paste"));
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
// ScrollView
|
// ScrollView
|
||||||
::ScrollView*
|
::ScrollView*
|
||||||
@@ -737,12 +717,9 @@ PropertyListView::_CheckMenuStatus()
|
|||||||
}
|
}
|
||||||
|
|
||||||
fPasteMI->SetEnabled(clipboardHasData);
|
fPasteMI->SetEnabled(clipboardHasData);
|
||||||
// LanguageManager* m = LanguageManager::Default();
|
|
||||||
if (IsEditingMultipleObjects())
|
if (IsEditingMultipleObjects())
|
||||||
// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi paste"));
|
fPasteMI->SetLabel(B_TRANSLATE("Multi-paste"));
|
||||||
fPasteMI->SetLabel(B_TRANSLATE("Multi paste"));
|
|
||||||
else
|
else
|
||||||
// fPasteMI->SetLabel(m->GetString(PASTE, "Paste"));
|
|
||||||
fPasteMI->SetLabel(B_TRANSLATE("Paste"));
|
fPasteMI->SetLabel(B_TRANSLATE("Paste"));
|
||||||
|
|
||||||
bool enableMenu = fPropertyObject;
|
bool enableMenu = fPropertyObject;
|
||||||
|
|||||||
@@ -67,7 +67,6 @@ class PropertyListView : public BView,
|
|||||||
|
|
||||||
void SetMenu(BMenu* menu);
|
void SetMenu(BMenu* menu);
|
||||||
::ScrollView* ScrollView() const;
|
::ScrollView* ScrollView() const;
|
||||||
void UpdateStrings();
|
|
||||||
|
|
||||||
// interface for Property framework
|
// interface for Property framework
|
||||||
void UpdateObject(uint32 propertyID);
|
void UpdateObject(uint32 propertyID);
|
||||||
|
|||||||
@@ -59,12 +59,12 @@ IconObjectListView::Draw(BRect updateRect)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// display helpful messages
|
// display helpful messages
|
||||||
const char* message1 = B_TRANSLATE_CONTEXT(
|
const char* message1 = B_TRANSLATE_COMMENT(
|
||||||
"Click on an object in", "Empty property list - 1st line");
|
"Click on an object in", "Empty property list - 1st line");
|
||||||
const char* message2 = B_TRANSLATE_CONTEXT(
|
const char* message2 = B_TRANSLATE_COMMENT(
|
||||||
"any of the other lists to", "Empty property list - 2nd line");
|
"any of the other lists to", "Empty property list - 2nd line");
|
||||||
const char* message3 = B_TRANSLATE_CONTEXT(
|
const char* message3 = B_TRANSLATE_COMMENT(
|
||||||
"edit it's properties here.", "Empty property list - 3rd line");
|
"edit its properties here.", "Empty property list - 3rd line");
|
||||||
|
|
||||||
// Dark Themes
|
// Dark Themes
|
||||||
rgb_color lowColor = LowColor();
|
rgb_color lowColor = LowColor();
|
||||||
|
|||||||
@@ -205,12 +205,13 @@ SavePanel::SetExportMode(bool exportMode)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// adjust window title and enable format menu
|
// adjust window title and enable format menu
|
||||||
BString title("Icon-O-Matic: ");
|
BString title(B_TRANSLATE_SYSTEM_NAME("Icon-O-Matic"));
|
||||||
|
title << ": ";
|
||||||
if (exportMode) {
|
if (exportMode) {
|
||||||
fFormatMF->SetEnabled(true);
|
fFormatMF->SetEnabled(true);
|
||||||
SetExportMode(fExportMode);
|
SetExportMode(fExportMode);
|
||||||
_EnableSettings();
|
_EnableSettings();
|
||||||
title << B_TRANSLATE_CONTEXT("Export icon", "Dialog title");
|
title << B_TRANSLATE_COMMENT("Export icon", "Dialog title");
|
||||||
} else {
|
} else {
|
||||||
fExportMode = ExportMode();
|
fExportMode = ExportMode();
|
||||||
// does not overwrite fExportMode in case we already were
|
// does not overwrite fExportMode in case we already were
|
||||||
@@ -219,7 +220,7 @@ SavePanel::SetExportMode(bool exportMode)
|
|||||||
|
|
||||||
fFormatMF->SetEnabled(false);
|
fFormatMF->SetEnabled(false);
|
||||||
fSettingsB->SetEnabled(false);
|
fSettingsB->SetEnabled(false);
|
||||||
title << B_TRANSLATE_CONTEXT("Save icon", "Dialog title");
|
title << B_TRANSLATE_COMMENT("Save icon", "Dialog title");
|
||||||
}
|
}
|
||||||
|
|
||||||
window->SetTitle(title);
|
window->SetTitle(title);
|
||||||
@@ -412,7 +413,7 @@ SavePanel::_BuildMenu()
|
|||||||
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_RDEF);
|
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_RDEF);
|
||||||
fFormatM->AddItem(fRDefMI);
|
fFormatM->AddItem(fRDefMI);
|
||||||
|
|
||||||
fSourceMI = new SaveItem(B_TRANSLATE("HVIF Source Code"),
|
fSourceMI = new SaveItem(B_TRANSLATE("HVIF source code"),
|
||||||
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_SOURCE);
|
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_SOURCE);
|
||||||
fFormatM->AddItem(fSourceMI);
|
fFormatM->AddItem(fSourceMI);
|
||||||
|
|
||||||
@@ -437,17 +438,17 @@ SavePanel::_BuildMenu()
|
|||||||
new BMessage(MSG_FORMAT), EXPORT_MODE_BITMAP_64);
|
new BMessage(MSG_FORMAT), EXPORT_MODE_BITMAP_64);
|
||||||
fFormatM->AddItem(fBitmap64MI);
|
fFormatM->AddItem(fBitmap64MI);
|
||||||
|
|
||||||
fBitmapSetMI = new SaveItem(B_TRANSLATE("PNG Set"),
|
fBitmapSetMI = new SaveItem(B_TRANSLATE("PNG set"),
|
||||||
new BMessage(MSG_FORMAT), EXPORT_MODE_BITMAP_SET);
|
new BMessage(MSG_FORMAT), EXPORT_MODE_BITMAP_SET);
|
||||||
fFormatM->AddItem(fBitmapSetMI);
|
fFormatM->AddItem(fBitmapSetMI);
|
||||||
|
|
||||||
fFormatM->AddSeparatorItem();
|
fFormatM->AddSeparatorItem();
|
||||||
|
|
||||||
fIconAttrMI = new SaveItem(B_TRANSLATE("BEOS:ICON Attribute"),
|
fIconAttrMI = new SaveItem(B_TRANSLATE("BEOS:ICON attribute"),
|
||||||
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_ATTR);
|
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_ATTR);
|
||||||
fFormatM->AddItem(fIconAttrMI);
|
fFormatM->AddItem(fIconAttrMI);
|
||||||
|
|
||||||
fIconMimeAttrMI = new SaveItem(B_TRANSLATE("META:ICON Attribute"),
|
fIconMimeAttrMI = new SaveItem(B_TRANSLATE("META:ICON attribute"),
|
||||||
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_MIME_ATTR);
|
new BMessage(MSG_FORMAT), EXPORT_MODE_ICON_MIME_ATTR);
|
||||||
|
|
||||||
fFormatM->AddItem(fIconMimeAttrMI);
|
fFormatM->AddItem(fIconMimeAttrMI);
|
||||||
|
|||||||
@@ -139,9 +139,9 @@ TransformerListView::Draw(BRect updateRect)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// display helpful messages
|
// display helpful messages
|
||||||
const char* message1 = B_TRANSLATE_CONTEXT("Click on a shape above",
|
const char* message1 = B_TRANSLATE_COMMENT("Click on a shape above",
|
||||||
"Empty transformers list - 1st line");
|
"Empty transformers list - 1st line");
|
||||||
const char* message2 = B_TRANSLATE_CONTEXT("to attach transformers.",
|
const char* message2 = B_TRANSLATE_COMMENT("to attach transformers.",
|
||||||
"Empty transformers list - 2nd line");
|
"Empty transformers list - 2nd line");
|
||||||
|
|
||||||
// Dark Themes
|
// Dark Themes
|
||||||
|
|||||||
@@ -111,9 +111,9 @@ Exporter::_ExportThread()
|
|||||||
// inform user of failure at this point
|
// inform user of failure at this point
|
||||||
BString helper(B_TRANSLATE("Saving your document failed!"));
|
BString helper(B_TRANSLATE("Saving your document failed!"));
|
||||||
helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
|
helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
|
||||||
BAlert* alert = new BAlert(B_TRANSLATE("bad news"), helper.String(),
|
BAlert* alert = new BAlert(B_TRANSLATE_CONTEXT("Bad news", "Title of error alert"),
|
||||||
B_TRANSLATE_CONTEXT("Bleep!",
|
helper.String(),
|
||||||
"Exporter - Continue in error dialog"),
|
B_TRANSLATE_COMMENT("Bleep!", "Exporter - Continue in error dialog"),
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
// launch alert asynchronously
|
// launch alert asynchronously
|
||||||
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
|
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs)
|
|||||||
BAlert* alert = new BAlert(B_TRANSLATE("Text too long"),
|
BAlert* alert = new BAlert(B_TRANSLATE("Text too long"),
|
||||||
B_TRANSLATE("The text you are trying to import is quite long, "
|
B_TRANSLATE("The text you are trying to import is quite long, "
|
||||||
"are you sure?"),
|
"are you sure?"),
|
||||||
B_TRANSLATE("Yes"), B_TRANSLATE("No"), NULL,
|
B_TRANSLATE("Import text"), B_TRANSLATE("Cancel"), NULL,
|
||||||
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
||||||
if (alert->Go())
|
if (alert->Go())
|
||||||
return B_CANCELED;
|
return B_CANCELED;
|
||||||
@@ -370,7 +370,8 @@ StyledTextImporter::_AddStyle(Icon *icon, text_run *run)
|
|||||||
if (style == NULL)
|
if (style == NULL)
|
||||||
return B_NO_MEMORY;
|
return B_NO_MEMORY;
|
||||||
char name[30];
|
char name[30];
|
||||||
sprintf(name, B_TRANSLATE("Color (#%02x%02x%02x)"),
|
sprintf(name, B_TRANSLATE_COMMENT("Color (#%02x%02x%02x)",
|
||||||
|
"Style name after dropping a color"),
|
||||||
color.red, color.green, color.blue);
|
color.red, color.green, color.blue);
|
||||||
style->SetName(name);
|
style->SetName(name);
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ SVGImporter::Import(Icon* icon, const entry_ref* ref)
|
|||||||
char error[1024];
|
char error[1024];
|
||||||
sprintf(error, B_TRANSLATE("Failed to open the file '%s' as "
|
sprintf(error, B_TRANSLATE("Failed to open the file '%s' as "
|
||||||
"an SVG document.\n\n"), ref->name);
|
"an SVG document.\n\n"), ref->name);
|
||||||
BAlert* alert = new BAlert(B_TRANSLATE("load error"),
|
BAlert* alert = new BAlert(B_TRANSLATE("Load error"),
|
||||||
error, B_TRANSLATE("OK"), NULL, NULL,
|
error, B_TRANSLATE("OK"), NULL, NULL,
|
||||||
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
||||||
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
|
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
|
||||||
|
|||||||
@@ -775,7 +775,7 @@ PathManipulator::ShowContextMenu(BPoint where)
|
|||||||
|
|
||||||
if (fCurrentPathPoint < 0) {
|
if (fCurrentPathPoint < 0) {
|
||||||
message = new BMessage(B_SELECT_ALL);
|
message = new BMessage(B_SELECT_ALL);
|
||||||
item = new BMenuItem(B_TRANSLATE("Select All"), message, 'A');
|
item = new BMenuItem(B_TRANSLATE("Select all"), message, 'A');
|
||||||
menu->AddItem(item);
|
menu->AddItem(item);
|
||||||
|
|
||||||
menu->AddSeparatorItem();
|
menu->AddSeparatorItem();
|
||||||
|
|||||||
@@ -36,9 +36,9 @@ void
|
|||||||
AddPathsCommand::GetName(BString& name)
|
AddPathsCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat addFormat(B_TRANSLATE("Add {0, plural, "
|
static BStringFormat addFormat(B_TRANSLATE("Add {0, plural, "
|
||||||
"one{Path} other{Paths}}"));
|
"one{path} other{paths}}"));
|
||||||
static BStringFormat assignFormat(B_TRANSLATE("Assign {0, plural, "
|
static BStringFormat assignFormat(B_TRANSLATE("Assign {0, plural, "
|
||||||
"one{Path} other{Paths}}"));
|
"one{path} other{paths}}"));
|
||||||
if (fOwnsItems)
|
if (fOwnsItems)
|
||||||
addFormat.Format(name, fCount);
|
addFormat.Format(name, fCount);
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -103,6 +103,5 @@ AddPointCommand::Redo()
|
|||||||
void
|
void
|
||||||
AddPointCommand::GetName(BString& name)
|
AddPointCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
// name << _GetString(ADD_CONTROL_POINT, "Add Control Point");
|
name << B_TRANSLATE("Add vertex");
|
||||||
name << B_TRANSLATE("Add Control Point");
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ void
|
|||||||
AddShapesCommand::GetName(BString& name)
|
AddShapesCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
||||||
"one{Shape} other{Shapes}}"));
|
"one{shape} other{shapes}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ void
|
|||||||
AddTransformersCommand::GetName(BString& name)
|
AddTransformersCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
||||||
"one{Transformer} other{Transformers}}"));
|
"one{transformer} other{transformers}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -125,6 +125,5 @@ ChangePointCommand::Redo()
|
|||||||
void
|
void
|
||||||
ChangePointCommand::GetName(BString& name)
|
ChangePointCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
// name << _GetString(MODIFY_CONTROL_POINT, "Modify Control Point");
|
name << B_TRANSLATE("Modify vertex");
|
||||||
name << B_TRANSLATE("Modify Control Point");
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,5 +56,5 @@ CleanUpPathCommand::Undo()
|
|||||||
void
|
void
|
||||||
CleanUpPathCommand::GetName(BString& name)
|
CleanUpPathCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
name << B_TRANSLATE("Clean Up Path");
|
name << B_TRANSLATE("Clean up path");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ void
|
|||||||
FlipPointsCommand::GetName(BString& name)
|
FlipPointsCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Flip {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Flip {0, plural, "
|
||||||
"one{Control Point} other{Control Points}}"));
|
"one{vertex} other{vertices}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ void
|
|||||||
FreezeTransformationCommand::GetName(BString& name)
|
FreezeTransformationCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Freeze {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Freeze {0, plural, "
|
||||||
"one{Shape} other{Shapes}}"));
|
"one{shape} other{shapes}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,6 @@ InsertPointCommand::Redo()
|
|||||||
void
|
void
|
||||||
InsertPointCommand::GetName(BString& name)
|
InsertPointCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
// name << _GetString(INSERT_CONTROL_POINT, "Insert Control Point");
|
name << B_TRANSLATE("Insert vertex");
|
||||||
name << B_TRANSLATE("Insert Control Point");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ void
|
|||||||
MovePathsCommand::GetName(BString& name)
|
MovePathsCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
||||||
"one{Path} other{Paths}}"));
|
"one{path} other{paths}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ void
|
|||||||
MoveShapesCommand::GetName(BString& name)
|
MoveShapesCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
||||||
"one{Shape} other{Shapes}}"));
|
"one{shape} other{shapes}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ void
|
|||||||
MoveTransformersCommand::GetName(BString& name)
|
MoveTransformersCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
||||||
"one{Transformer} other{Transformers}}"));
|
"one{transformer} other{transformers}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ static BString
|
|||||||
_GetName(int32 count)
|
_GetName(int32 count)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Nudge {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Nudge {0, plural, "
|
||||||
"one{Control Point} other{Control Points}}"));
|
"one{vertex} other{vertices}}"));
|
||||||
BString name;
|
BString name;
|
||||||
format.Format(name, count);
|
format.Format(name, count);
|
||||||
return name;
|
return name;
|
||||||
|
|||||||
@@ -120,6 +120,6 @@ void
|
|||||||
RemovePathsCommand::GetName(BString& name)
|
RemovePathsCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
||||||
"one{Path} other{Paths}}"));
|
"one{path} other{paths}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ void
|
|||||||
RemovePointsCommand::GetName(BString& name)
|
RemovePointsCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
||||||
"one{Control Point} other{Control Points}}"));
|
"one{vertex} other{vertices}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ void
|
|||||||
RemoveShapesCommand::GetName(BString& name)
|
RemoveShapesCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
||||||
"one{Shape} other{Shapes}}"));
|
"one{shape} other{shapes}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,6 @@ void
|
|||||||
RemoveTransformersCommand::GetName(BString& name)
|
RemoveTransformersCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
||||||
"one{Transformer} other{Transformers}}"));
|
"one{transformer} other{transformers}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,5 +51,5 @@ ReversePathCommand::Undo()
|
|||||||
void
|
void
|
||||||
ReversePathCommand::GetName(BString& name)
|
ReversePathCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
name << B_TRANSLATE("Reverse Path");
|
name << B_TRANSLATE("Reverse path");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ RotatePathIndicesCommand::Undo()
|
|||||||
void
|
void
|
||||||
RotatePathIndicesCommand::GetName(BString& name)
|
RotatePathIndicesCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
name << B_TRANSLATE("Rotate Path Indices");
|
name << B_TRANSLATE("Rotate path indices");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ void
|
|||||||
SplitPointsCommand::GetName(BString& name)
|
SplitPointsCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Split {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Split {0, plural, "
|
||||||
"one{Control Point} other{Control Points}}"));
|
"one{vertex} other{vertices}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -69,5 +69,5 @@ UnassignPathCommand::Undo()
|
|||||||
void
|
void
|
||||||
UnassignPathCommand::GetName(BString& name)
|
UnassignPathCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
name << B_TRANSLATE("Unassign Path");
|
name << B_TRANSLATE("Unassign path");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,6 @@ void
|
|||||||
AddStylesCommand::GetName(BString& name)
|
AddStylesCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Add {0, plural, "
|
||||||
"one{Style} other{Styles}}"));
|
"one{style} other{styles}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ AssignStyleCommand::Undo()
|
|||||||
void
|
void
|
||||||
AssignStyleCommand::GetName(BString& name)
|
AssignStyleCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
name << B_TRANSLATE("Assign Style");
|
name << B_TRANSLATE("Assign style");
|
||||||
if (fNewStyle)
|
if (fNewStyle)
|
||||||
name << " \"" << fNewStyle->Name() << "\"";
|
name << " \"" << fNewStyle->Name() << "\"";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ void
|
|||||||
MoveStylesCommand::GetName(BString& name)
|
MoveStylesCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Move {0, plural, "
|
||||||
"one{Style} other{Styles}}"));
|
"one{style} other{styles}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,6 +118,6 @@ void
|
|||||||
RemoveStylesCommand::GetName(BString& name)
|
RemoveStylesCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Remove {0, plural, "
|
||||||
"one{Style} other{Styles}}"));
|
"one{style} other{styles}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ SetColorCommand::Undo()
|
|||||||
void
|
void
|
||||||
SetColorCommand::GetName(BString& name)
|
SetColorCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
name << B_TRANSLATE("Change Color");
|
name << B_TRANSLATE("Change color");
|
||||||
}
|
}
|
||||||
|
|
||||||
// CombineWithNext
|
// CombineWithNext
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ SetGradientCommand::Undo()
|
|||||||
void
|
void
|
||||||
SetGradientCommand::GetName(BString& name)
|
SetGradientCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
name << B_TRANSLATE("Edit Gradient");
|
name << B_TRANSLATE("Edit gradient");
|
||||||
}
|
}
|
||||||
|
|
||||||
// CombineWithNext
|
// CombineWithNext
|
||||||
|
|||||||
@@ -91,6 +91,6 @@ void
|
|||||||
ResetTransformationCommand::GetName(BString& name)
|
ResetTransformationCommand::GetName(BString& name)
|
||||||
{
|
{
|
||||||
static BStringFormat format(B_TRANSLATE("Reset {0, plural, "
|
static BStringFormat format(B_TRANSLATE("Reset {0, plural, "
|
||||||
"one{Transformation} other{Transformations}}"));
|
"one{transformation} other{transformations}}"));
|
||||||
format.Format(name, fCount);
|
format.Format(name, fCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -580,5 +580,5 @@ OffsetCenterState::UpdateViewCursor(BView* view, BPoint current) const
|
|||||||
const char*
|
const char*
|
||||||
OffsetCenterState::ActionName() const
|
OffsetCenterState::ActionName() const
|
||||||
{
|
{
|
||||||
return B_TRANSLATE("Move Pivot");
|
return B_TRANSLATE("Move pivot");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user