Merge branch 'master' into x86_64

Conflicts:
	src/servers/app/ServerWindow.cpp
This commit is contained in:
Alex Smith
2012-08-16 21:11:15 +01:00
445 changed files with 7063 additions and 5041 deletions
+1 -1
View File
@@ -2085,7 +2085,7 @@ BContainerWindow::AddWindowMenu(BMenu* menu)
menu->AddSeparatorItem();
item = new BMenuItem(B_TRANSLATE("Preferences" B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Tracker preferences" B_UTF8_ELLIPSIS),
new BMessage(kShowSettingsWindow));
item->SetTarget(be_app);
menu->AddItem(item);